Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(group): use iterable when possible #352

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(group): use iterable when possible #352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions remoulade/composition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from __future__ import annotations

from collections import namedtuple
from collections.abc import Iterator
from contextlib import nullcontext
from typing import TYPE_CHECKING, Any, Generic, Iterable, TypeVar, Union, cast, overload

Expand Down Expand Up @@ -147,7 +148,7 @@ def build(self, *, last_options=None, composition_id: str = None, cancel_on_erro
options["cancel_on_error"] = cancel_on_error

if isinstance(child, group):
next_child = child.build(options)
next_child = list(child.build(options))
else:
next_child = [child.build(options)]

Expand Down Expand Up @@ -258,7 +259,7 @@ def __len__(self) -> int:
def __str__(self) -> str: # pragma: no cover
return f"group({', '.join(str(child) for child in self.children)})"

def build(self, options=None) -> list[Message]:
def build(self, options=None) -> Iterator[Message]:
"""Build group for pipeline"""
if options is None:
options = {}
Expand All @@ -273,15 +274,13 @@ def build(self, options=None) -> list[Message]:
"cancel_on_error": self.cancel_on_error,
**options,
}
messages: list[Message] = []
for group_child in self.children:
if isinstance(group_child, pipeline):
messages += group_child.build(
yield from group_child.build(
last_options=options, composition_id=composition_id, cancel_on_error=cancel_on_error
)
else:
messages += [group_child.build(options)]
return messages
yield group_child.build(options)

@property
def info(self) -> GroupInfo:
Expand Down