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

Jump to bottom

fix(backend): Fix iteration and timer block #8596

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix(backend): Fix iteration and timer block #8596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57ddeb4
fix(backend): Fix iteration and timer block
majdyz Nov 8, 2024
976c8d5
Merge branch 'dev' into zamilmajdy/fix-iteration-and-timer-block
majdyz Nov 8, 2024
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
45 changes: 33 additions & 12 deletions autogpt_platform/backend/backend/blocks/iteration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,28 @@

from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
from backend.data.model import SchemaField
from backend.util.json import json


class StepThroughItemsBlock(Block):
class Input(BlockSchema):
items: list | dict = SchemaField(
items: list = SchemaField(
advanced=False,
description="The list or dictionary of items to iterate over",
placeholder="[1, 2, 3, 4, 5] or {'key1': 'value1', 'key2': 'value2'}",
default=[],
)
items_object: dict = SchemaField(
advanced=False,
description="The list or dictionary of items to iterate over",
placeholder="[1, 2, 3, 4, 5] or {'key1': 'value1', 'key2': 'value2'}",
default={},
)
items_str: str = SchemaField(
advanced=False,
description="The list or dictionary of items to iterate over",
placeholder="[1, 2, 3, 4, 5] or {'key1': 'value1', 'key2': 'value2'}",
default="",
)

class Output(BlockSchema):
Expand Down Expand Up @@ -39,14 +54,20 @@ def __init__(self):
)

def run(self, input_data: Input, **kwargs) -> BlockOutput:
items = input_data.items
if isinstance(items, dict):
# If items is a dictionary, iterate over its values
for item in items.values():
yield "item", item
yield "key", item
else:
# If items is a list, iterate over the list
for index, item in enumerate(items):
yield "item", item
yield "key", index
for data in [input_data.items, input_data.items_object, input_data.items_str]:
if not data:
continue
if isinstance(data, str):
items = json.loads(data)
else:
items = data
if isinstance(items, dict):
# If items is a dictionary, iterate over its values
for item in items.values():
yield "item", item
yield "key", item
else:
# If items is a list, iterate over the list
for index, item in enumerate(items):
yield "item", item
yield "key", index
27 changes: 15 additions & 12 deletions autogpt_platform/backend/backend/blocks/time_blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,23 +139,26 @@ def run(self, input_data: Input, **kwargs) -> BlockOutput:

class CountdownTimerBlock(Block):
class Input(BlockSchema):
input_message: Any = SchemaField(
input_data: Any = SchemaField(
advanced=False,
description="Message to output after the timer finishes",
default="timer finished",
)
seconds: Union[int, str] = SchemaField(
description="Duration in seconds", default=0
advanced=False, description="Duration in seconds", default=0
)
minutes: Union[int, str] = SchemaField(
description="Duration in minutes", default=0
advanced=False, description="Duration in minutes", default=0
)
hours: Union[int, str] = SchemaField(
advanced=False, description="Duration in hours", default=0
)
days: Union[int, str] = SchemaField(
advanced=False, description="Duration in days", default=0
)
hours: Union[int, str] = SchemaField(description="Duration in hours", default=0)
days: Union[int, str] = SchemaField(description="Duration in days", default=0)

class Output(BlockSchema):
output_message: str = SchemaField(
description="Message after the timer finishes"
)
output_data: Any = SchemaField(description="Message after the timer finishes")

def __init__(self):
super().__init__(
Expand All @@ -166,11 +169,11 @@ def __init__(self):
output_schema=CountdownTimerBlock.Output,
test_input=[
{"seconds": 1},
{"input_message": "Custom message"},
{"input_data": "Custom message"},
],
test_output=[
("output_message", "timer finished"),
("output_message", "Custom message"),
("output_data", "timer finished"),
("output_data", "Custom message"),
],
)

Expand All @@ -183,4 +186,4 @@ def run(self, input_data: Input, **kwargs) -> BlockOutput:
total_seconds = seconds + minutes * 60 + hours * 3600 + days * 86400

time.sleep(total_seconds)
yield "output_message", input_data.input_message
yield "output_data", input_data.input_data
Loading