mirror of
https://github.com/Significant-Gravitas/AutoGPT.git
synced 2026-02-18 02:32:04 -05:00
113e87a23c
I'm getting circular import issues because there is a lot of cross-importing between `backend.data`, `backend.blocks`, and other modules. This change reduces block-related cross-imports and thus risk of breaking circular imports. ### Changes 🏗️ - Strip down `backend.data.block` - Move `Block` base class and related class/enum defs to `backend.blocks._base` - Move `is_block_auth_configured` to `backend.blocks._utils` - Move `get_blocks()`, `get_io_block_ids()` etc. to `backend.blocks` (`__init__.py`) - Update imports everywhere - Remove unused and poorly typed `Block.create()` - Change usages from `block_cls.create()` to `block_cls()` - Improve typing of `load_all_blocks` and `get_blocks` - Move cross-import of `backend.api.features.library.model` from `backend/data/__init__.py` to `backend/data/integrations.py` - Remove deprecated attribute `NodeModel.webhook` - Re-generate OpenAPI spec and fix frontend usage - Eliminate module-level `backend.blocks` import from `blocks/agent.py` - Eliminate module-level `backend.data.execution` and `backend.executor.manager` imports from `blocks/helpers/review.py` - Replace `BlockInput` with `GraphInput` for graph inputs ### Checklist 📋 #### For code changes: - [x] I have clearly listed my changes in the PR description - [x] I have made a test plan - [x] I have tested my changes according to the test plan: - CI static type-checking + tests should be sufficient for this
131 lines
4.1 KiB
Python
131 lines
4.1 KiB
Python
import operator
|
|
from enum import Enum
|
|
from typing import Any
|
|
|
|
from backend.blocks._base import (
|
|
Block,
|
|
BlockCategory,
|
|
BlockOutput,
|
|
BlockSchemaInput,
|
|
BlockSchemaOutput,
|
|
)
|
|
from backend.data.model import SchemaField
|
|
|
|
|
|
class Operation(Enum):
|
|
ADD = "Add"
|
|
SUBTRACT = "Subtract"
|
|
MULTIPLY = "Multiply"
|
|
DIVIDE = "Divide"
|
|
POWER = "Power"
|
|
|
|
|
|
class CalculatorBlock(Block):
|
|
class Input(BlockSchemaInput):
|
|
operation: Operation = SchemaField(
|
|
description="Choose the math operation you want to perform",
|
|
placeholder="Select an operation",
|
|
)
|
|
a: float = SchemaField(
|
|
description="Enter the first number (A)", placeholder="For example: 10"
|
|
)
|
|
b: float = SchemaField(
|
|
description="Enter the second number (B)", placeholder="For example: 5"
|
|
)
|
|
round_result: bool = SchemaField(
|
|
description="Do you want to round the result to a whole number?",
|
|
default=False,
|
|
)
|
|
|
|
class Output(BlockSchemaOutput):
|
|
result: float = SchemaField(description="The result of your calculation")
|
|
|
|
def __init__(self):
|
|
super().__init__(
|
|
id="b1ab9b19-67a6-406d-abf5-2dba76d00c79",
|
|
input_schema=CalculatorBlock.Input,
|
|
output_schema=CalculatorBlock.Output,
|
|
description="Performs a mathematical operation on two numbers.",
|
|
categories={BlockCategory.LOGIC},
|
|
test_input={
|
|
"operation": Operation.ADD.value,
|
|
"a": 10.0,
|
|
"b": 5.0,
|
|
"round_result": False,
|
|
},
|
|
test_output=[
|
|
("result", 15.0),
|
|
],
|
|
)
|
|
|
|
async def run(self, input_data: Input, **kwargs) -> BlockOutput:
|
|
operation = input_data.operation
|
|
a = input_data.a
|
|
b = input_data.b
|
|
|
|
operations = {
|
|
Operation.ADD: operator.add,
|
|
Operation.SUBTRACT: operator.sub,
|
|
Operation.MULTIPLY: operator.mul,
|
|
Operation.DIVIDE: operator.truediv,
|
|
Operation.POWER: operator.pow,
|
|
}
|
|
|
|
op_func = operations[operation]
|
|
|
|
try:
|
|
if operation == Operation.DIVIDE and b == 0:
|
|
raise ZeroDivisionError("Cannot divide by zero")
|
|
|
|
result = op_func(a, b)
|
|
|
|
if input_data.round_result:
|
|
result = round(result)
|
|
|
|
yield "result", result
|
|
|
|
except ZeroDivisionError:
|
|
yield "result", float("inf") # Return infinity for division by zero
|
|
except Exception:
|
|
yield "result", float("nan") # Return NaN for other errors
|
|
|
|
|
|
class CountItemsBlock(Block):
|
|
class Input(BlockSchemaInput):
|
|
collection: Any = SchemaField(
|
|
description="Enter the collection you want to count. This can be a list, dictionary, string, or any other iterable.",
|
|
placeholder="For example: [1, 2, 3] or {'a': 1, 'b': 2} or 'hello'",
|
|
)
|
|
|
|
class Output(BlockSchemaOutput):
|
|
count: int = SchemaField(description="The number of items in the collection")
|
|
|
|
def __init__(self):
|
|
super().__init__(
|
|
id="3c9c2f42-b0c3-435f-ba35-05f7a25c772a",
|
|
input_schema=CountItemsBlock.Input,
|
|
output_schema=CountItemsBlock.Output,
|
|
description="Counts the number of items in a collection.",
|
|
categories={BlockCategory.LOGIC},
|
|
test_input={"collection": [1, 2, 3, 4, 5]},
|
|
test_output=[
|
|
("count", 5),
|
|
],
|
|
)
|
|
|
|
async def run(self, input_data: Input, **kwargs) -> BlockOutput:
|
|
collection = input_data.collection
|
|
|
|
try:
|
|
if isinstance(collection, (str, list, tuple, set, dict)):
|
|
count = len(collection)
|
|
elif hasattr(collection, "__iter__"):
|
|
count = sum(1 for _ in collection)
|
|
else:
|
|
raise ValueError("Input is not a countable collection")
|
|
|
|
yield "count", count
|
|
|
|
except Exception:
|
|
yield "count", -1 # Return -1 to indicate an error
|