Merge branch 'pwuts/move-block-base-to-fix-circular-imports' into pwuts/open-2995-copilot-microservice-with-block-refactor

autogpt_platform/backend/backend/api/external/v1/routes.py

@@ -12,11 +12,11 @@ import backend.api.features.store.cache as store_cache
 import backend.api.features.store.model as store_model
 import backend.blocks
 from backend.api.external.middleware import require_permission
-from backend.blocks._base import BlockInput, CompletedBlockOutput
 from backend.data import execution as execution_db
 from backend.data import graph as graph_db
 from backend.data import user as user_db
 from backend.data.auth.base import APIAuthorizationInfo
+from backend.data.model import BlockInput, CompletedBlockOutput
 from backend.executor.utils import add_graph_execution
 from backend.util.settings import Settings
 

autogpt_platform/backend/backend/api/features/builder/db.py

@@ -10,9 +10,14 @@ import backend.api.features.library.db as library_db
 import backend.api.features.library.model as library_model
 import backend.api.features.store.db as store_db
 import backend.api.features.store.model as store_model
-import backend.blocks._base
 from backend.blocks import load_all_blocks
-from backend.blocks._base import AnyBlockSchema, BlockCategory, BlockInfo, BlockSchema
+from backend.blocks._base import (
+    AnyBlockSchema,
+    BlockCategory,
+    BlockInfo,
+    BlockSchema,
+    BlockType,
+)
 from backend.blocks.llm import LlmModel
 from backend.data.db import query_raw_with_schema
 from backend.integrations.providers import ProviderName
@@ -22,7 +27,7 @@ from backend.util.models import Pagination
 from .model import (
     BlockCategoryResponse,
     BlockResponse,
-    BlockType,
+    BlockTypeFilter,
     CountResponse,
     FilterType,
     Provider,
@@ -88,7 +93,7 @@ def get_block_categories(category_blocks: int = 3) -> list[BlockCategoryResponse
 def get_blocks(
     *,
     category: str | None = None,
-    type: BlockType | None = None,
+    type: BlockTypeFilter | None = None,
     provider: ProviderName | None = None,
     page: int = 1,
     page_size: int = 50,
@@ -669,9 +674,9 @@ async def get_suggested_blocks(count: int = 5) -> list[BlockInfo]:
     for block_type in load_all_blocks().values():
         block: AnyBlockSchema = block_type()
         if block.disabled or block.block_type in (
-            backend.blocks._base.BlockType.INPUT,
-            backend.blocks._base.BlockType.OUTPUT,
-            backend.blocks._base.BlockType.AGENT,
+            BlockType.INPUT,
+            BlockType.OUTPUT,
+            BlockType.AGENT,
         ):
             continue
         # Find the execution count for this block

autogpt_platform/backend/backend/api/features/builder/model.py

@@ -15,7 +15,7 @@ FilterType = Literal[
     "my_agents",
 ]
 
-BlockType = Literal["all", "input", "action", "output"]
+BlockTypeFilter = Literal["all", "input", "action", "output"]
 
 
 class SearchEntry(BaseModel):

autogpt_platform/backend/backend/api/features/builder/routes.py

@@ -88,7 +88,7 @@ async def get_block_categories(
 )
 async def get_blocks(
     category: Annotated[str | None, fastapi.Query()] = None,
-    type: Annotated[builder_model.BlockType | None, fastapi.Query()] = None,
+    type: Annotated[builder_model.BlockTypeFilter | None, fastapi.Query()] = None,
     provider: Annotated[ProviderName | None, fastapi.Query()] = None,
     page: Annotated[int, fastapi.Query()] = 1,
     page_size: Annotated[int, fastapi.Query()] = 50,

autogpt_platform/backend/backend/api/features/library/db.py

@@ -12,12 +12,11 @@ import backend.api.features.store.image_gen as store_image_gen
 import backend.api.features.store.media as store_media
 import backend.data.graph as graph_db
 import backend.data.integrations as integrations_db
-from backend.blocks._base import BlockInput
 from backend.data.db import transaction
 from backend.data.execution import get_graph_execution
 from backend.data.graph import GraphSettings
 from backend.data.includes import AGENT_PRESET_INCLUDE, library_agent_include
-from backend.data.model import CredentialsMetaInput
+from backend.data.model import BlockInput, CredentialsMetaInput
 from backend.integrations.creds_manager import IntegrationCredentialsManager
 from backend.integrations.webhooks.graph_lifecycle_hooks import (
     on_graph_activate,

autogpt_platform/backend/backend/api/features/library/model.py

@@ -6,9 +6,12 @@ import prisma.enums
 import prisma.models
 import pydantic
 
-from backend.blocks._base import BlockInput
 from backend.data.graph import GraphModel, GraphSettings, GraphTriggerInfo
-from backend.data.model import CredentialsMetaInput, is_credentials_field_name
+from backend.data.model import (
+    BlockInput,
+    CredentialsMetaInput,
+    is_credentials_field_name,
+)
 from backend.util.json import loads as json_loads
 from backend.util.models import Pagination
 

autogpt_platform/backend/backend/api/features/store/image_gen.py

@@ -7,15 +7,6 @@ from replicate.client import Client as ReplicateClient
 from replicate.exceptions import ReplicateError
 from replicate.helpers import FileOutput
 
-from backend.blocks.ideogram import (
-    AspectRatio,
-    ColorPalettePreset,
-    IdeogramModelBlock,
-    IdeogramModelName,
-    MagicPromptOption,
-    StyleType,
-    UpscaleOption,
-)
 from backend.data.graph import GraphBaseMeta
 from backend.data.model import CredentialsMetaInput, ProviderName
 from backend.integrations.credentials_store import ideogram_credentials
@@ -50,6 +41,16 @@ async def generate_agent_image_v2(graph: GraphBaseMeta | AgentGraph) -> io.Bytes
     if not ideogram_credentials.api_key:
         raise ValueError("Missing Ideogram API key")
 
+    from backend.blocks.ideogram import (
+        AspectRatio,
+        ColorPalettePreset,
+        IdeogramModelBlock,
+        IdeogramModelName,
+        MagicPromptOption,
+        StyleType,
+        UpscaleOption,
+    )
+
     name = graph.name
     description = f"{name} ({graph.description})" if graph.description else name
 

autogpt_platform/backend/backend/api/features/v1.py

@@ -41,7 +41,6 @@ from backend.api.model import (
     UploadFileResponse,
 )
 from backend.blocks import get_block, get_blocks
-from backend.blocks._base import BlockInput, CompletedBlockOutput
 from backend.data import execution as execution_db
 from backend.data import graph as graph_db
 from backend.data.auth import api_key as api_key_db
@@ -55,7 +54,12 @@ from backend.data.credit import (
     set_auto_top_up,
 )
 from backend.data.graph import GraphSettings
-from backend.data.model import CredentialsMetaInput, UserOnboarding
+from backend.data.model import (
+    BlockInput,
+    CompletedBlockOutput,
+    CredentialsMetaInput,
+    UserOnboarding,
+)
 from backend.data.notifications import NotificationPreference, NotificationPreferenceDTO
 from backend.data.onboarding import (
     FrontendOnboardingStep,

autogpt_platform/backend/backend/blocks/__init__.py

@@ -3,16 +3,13 @@ import logging
 import os
 import re
 from pathlib import Path
-from typing import TYPE_CHECKING, Sequence, Type, TypeVar
+from typing import Sequence, Type, TypeVar
 
+from backend.blocks._base import AnyBlockSchema, BlockType
 from backend.util.cache import cached
 
 logger = logging.getLogger(__name__)
 
-
-if TYPE_CHECKING:
-    from backend.blocks._base import AnyBlockSchema, BlockType
-
 T = TypeVar("T")
 
 
@@ -125,12 +122,12 @@ def _all_subclasses(cls: type[T]) -> list[type[T]]:
 # ============== Block access helper functions ============== #
 
 
-def get_blocks() -> dict[str, Type[AnyBlockSchema]]:
+def get_blocks() -> dict[str, Type["AnyBlockSchema"]]:
     return load_all_blocks()
 
 
 # Note on the return type annotation: https://github.com/microsoft/pyright/issues/10281
-def get_block(block_id: str) -> AnyBlockSchema | None:
+def get_block(block_id: str) -> "AnyBlockSchema | None":
     cls = get_blocks().get(block_id)
     return cls() if cls else None
 

autogpt_platform/backend/backend/blocks/_base.py

@@ -1,7 +1,6 @@
 import inspect
 import logging
 from abc import ABC, abstractmethod
-from collections.abc import AsyncGenerator as AsyncGen
 from enum import Enum
 from typing import (
     TYPE_CHECKING,
@@ -21,6 +20,16 @@ import jsonref
 import jsonschema
 from pydantic import BaseModel
 
+from backend.data.model import (
+    BlockInput,
+    BlockOutput,
+    BlockOutputEntry,
+    Credentials,
+    CredentialsFieldInfo,
+    CredentialsMetaInput,
+    SchemaField,
+    is_credentials_field_name,
+)
 from backend.integrations.providers import ProviderName
 from backend.util import json
 from backend.util.exceptions import (
@@ -32,30 +41,18 @@ from backend.util.exceptions import (
 )
 from backend.util.settings import Config
 
-from ..data.model import (
-    ContributorDetails,
-    Credentials,
-    CredentialsFieldInfo,
-    CredentialsMetaInput,
-    SchemaField,
-    is_credentials_field_name,
-)
-
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
     from backend.data.execution import ExecutionContext
-    from backend.data.model import NodeExecutionStats
+    from backend.data.model import ContributorDetails, NodeExecutionStats
 
     from ..data.graph import Link
 
 app_config = Config()
 
-BlockInput = dict[str, Any]  # Input: 1 input pin consumes 1 data.
-BlockOutputEntry = tuple[str, Any]  # Output data should be a tuple of (name, value).
-BlockOutput = AsyncGen[BlockOutputEntry, None]  # Output: 1 output pin produces n data.
+
 BlockTestOutput = BlockOutputEntry | tuple[str, Callable[[Any], bool]]
-CompletedBlockOutput = dict[str, list[Any]]  # Completed stream, collected as a dict.
 
 
 class BlockType(Enum):
@@ -426,7 +423,7 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
         self,
         id: str = "",
         description: str = "",
-        contributors: list[ContributorDetails] = [],
+        contributors: list["ContributorDetails"] = [],
         categories: set[BlockCategory] | None = None,
         input_schema: Type[BlockSchemaInputType] = EmptyInputSchema,
         output_schema: Type[BlockSchemaOutputType] = EmptyOutputSchema,

autogpt_platform/backend/backend/data/__init__.py

@@ -1,8 +1 @@
-from backend.api.features.library.model import LibraryAgentPreset
 
-from .graph import NodeModel
-from .integrations import Webhook  # noqa: F401
-
-# Resolve Webhook forward references
-NodeModel.model_rebuild()
-LibraryAgentPreset.model_rebuild()

autogpt_platform/backend/backend/data/execution.py

@@ -40,7 +40,8 @@ from pydantic import BaseModel, ConfigDict, JsonValue, ValidationError
 from pydantic.fields import Field
 
 from backend.blocks import get_block, get_io_block_ids, get_webhook_block_ids
-from backend.blocks._base import BlockInput, BlockType, CompletedBlockOutput
+from backend.blocks._base import BlockType
+from backend.data.model import BlockInput, CompletedBlockOutput
 from backend.util import type as type_utils
 from backend.util.exceptions import DatabaseError
 from backend.util.json import SafeJson

autogpt_platform/backend/backend/data/graph.py

@@ -24,13 +24,7 @@ from pydantic import BaseModel, BeforeValidator, Field
 from pydantic.fields import computed_field
 
 from backend.blocks import get_block, get_blocks
-from backend.blocks._base import (
-    AnyBlockSchema,
-    Block,
-    BlockInput,
-    BlockType,
-    EmptySchema,
-)
+from backend.blocks._base import Block, BlockType, EmptySchema
 from backend.blocks.agent import AgentExecutorBlock
 from backend.blocks.io import AgentInputBlock, AgentOutputBlock
 from backend.blocks.llm import LlmModel
@@ -38,6 +32,7 @@ from backend.data.db import prisma as db
 from backend.data.dynamic_fields import is_tool_pin, sanitize_pin_name
 from backend.data.includes import MAX_GRAPH_VERSIONS_FETCH
 from backend.data.model import (
+    BlockInput,
     CredentialsFieldInfo,
     CredentialsMetaInput,
     is_credentials_field_name,
@@ -52,8 +47,9 @@ from .db import BaseDbModel, query_raw_with_schema, transaction
 from .includes import AGENT_GRAPH_INCLUDE, AGENT_NODE_INCLUDE
 
 if TYPE_CHECKING:
+    from backend.blocks._base import AnyBlockSchema
+
     from .execution import NodesInputMasks
-    from .integrations import Webhook
 
 logger = logging.getLogger(__name__)
 
@@ -127,7 +123,7 @@ class Node(BaseDbModel):
         return self.metadata.get("credentials_optional", False)
 
     @property
-    def block(self) -> AnyBlockSchema | "_UnknownBlockBase":
+    def block(self) -> "AnyBlockSchema | _UnknownBlockBase":
         """Get the block for this node. Returns UnknownBlock if block is deleted/missing."""
         block = get_block(self.block_id)
         if not block:
@@ -144,12 +140,10 @@ class NodeModel(Node):
     graph_version: int
 
     webhook_id: Optional[str] = None
-    webhook: Optional["Webhook"] = None
+    # webhook: Optional["Webhook"] = None  # deprecated
 
     @staticmethod
     def from_db(node: AgentNode, for_export: bool = False) -> "NodeModel":
-        from .integrations import Webhook
-
         obj = NodeModel(
             id=node.id,
             block_id=node.agentBlockId,
@@ -158,7 +152,6 @@ class NodeModel(Node):
             graph_id=node.agentGraphId,
             graph_version=node.agentGraphVersion,
             webhook_id=node.webhookId,
-            webhook=Webhook.from_db(node.Webhook) if node.Webhook else None,
         )
         obj.input_links = [Link.from_db(link) for link in node.Input or []]
         obj.output_links = [Link.from_db(link) for link in node.Output or []]
@@ -191,7 +184,6 @@ class NodeModel(Node):
 
         # Remove webhook info
         stripped_node.webhook_id = None
-        stripped_node.webhook = None
 
         return stripped_node
 

autogpt_platform/backend/backend/data/graph_test.py

@@ -323,7 +323,6 @@ async def test_clean_graph(server: SpinTestServer):
     # Verify webhook info is removed (if any nodes had it)
     for node in cleaned_graph.nodes:
         assert node.webhook_id is None
-        assert node.webhook is None
 
 
 @pytest.mark.asyncio(loop_scope="session")

autogpt_platform/backend/backend/data/integrations.py

@@ -1,5 +1,5 @@
 import logging
-from typing import TYPE_CHECKING, AsyncGenerator, Literal, Optional, overload
+from typing import AsyncGenerator, Literal, Optional, overload
 
 from prisma.models import AgentNode, AgentPreset, IntegrationWebhook
 from prisma.types import (
@@ -22,9 +22,6 @@ from backend.integrations.webhooks.utils import webhook_ingress_url
 from backend.util.exceptions import NotFoundError
 from backend.util.json import SafeJson
 
-if TYPE_CHECKING:
-    from backend.api.features.library.model import LibraryAgentPreset
-
 from .db import BaseDbModel
 from .graph import NodeModel
 
@@ -75,11 +72,6 @@ class WebhookWithRelations(Webhook):
                 "AgentNodes and AgentPresets must be included in "
                 "IntegrationWebhook query with relations"
             )
-        # LibraryAgentPreset import is moved to TYPE_CHECKING to avoid circular import:
-        # integrations.py → library/model.py → integrations.py (for Webhook)
-        # Runtime import is used in WebhookWithRelations.from_db() method instead
-        # Import at runtime to avoid circular dependency
-        from backend.api.features.library.model import LibraryAgentPreset
 
         return WebhookWithRelations(
             **Webhook.from_db(webhook).model_dump(),
@@ -90,6 +82,11 @@ class WebhookWithRelations(Webhook):
         )
 
 
+# LibraryAgentPreset import must be after WebhookWithRelations definition to avoid
+# broken circular import:
+# integrations.py → library/model.py → integrations.py (for Webhook)
+from backend.api.features.library.model import LibraryAgentPreset  # noqa: E402
+
 # --------------------- CRUD functions --------------------- #
 
 

autogpt_platform/backend/backend/data/model.py

@@ -10,6 +10,7 @@ from typing import (
     TYPE_CHECKING,
     Annotated,
     Any,
+    AsyncGenerator,
     Callable,
     ClassVar,
     Generic,
@@ -168,6 +169,12 @@ T = TypeVar("T")
 logger = logging.getLogger(__name__)
 
 
+BlockInput = dict[str, Any]  # Input: 1 input pin <- 1 data.
+BlockOutputEntry = tuple[str, Any]  # Output data should be a tuple of (name, value).
+BlockOutput = AsyncGenerator[BlockOutputEntry, None]  # Output: 1 output pin -> N data.
+CompletedBlockOutput = dict[str, list[Any]]  # Completed stream, collected as a dict.
+
+
 class BlockSecret:
     def __init__(self, key: Optional[str] = None, value: Optional[str] = None):
         if value is not None:

autogpt_platform/backend/backend/executor/manager.py

@@ -17,7 +17,7 @@ from prometheus_client import Gauge, start_http_server
 from redis.asyncio.lock import Lock as AsyncRedisLock
 
 from backend.blocks import get_block
-from backend.blocks._base import BlockInput, BlockOutput, BlockOutputEntry, BlockSchema
+from backend.blocks._base import BlockSchema
 from backend.blocks.agent import AgentExecutorBlock
 from backend.blocks.io import AgentOutputBlock
 from backend.data import redis_client as redis
@@ -34,7 +34,13 @@ from backend.data.execution import (
     NodesInputMasks,
 )
 from backend.data.graph import Link, Node
-from backend.data.model import GraphExecutionStats, NodeExecutionStats
+from backend.data.model import (
+    BlockInput,
+    BlockOutput,
+    BlockOutputEntry,
+    GraphExecutionStats,
+    NodeExecutionStats,
+)
 from backend.data.notifications import (
     AgentRunData,
     LowBalanceData,

autogpt_platform/backend/backend/executor/scheduler.py

@@ -24,9 +24,8 @@ from dotenv import load_dotenv
 from pydantic import BaseModel, Field, ValidationError
 from sqlalchemy import MetaData, create_engine
 
-from backend.blocks._base import BlockInput
 from backend.data.execution import GraphExecutionWithNodes
-from backend.data.model import CredentialsMetaInput
+from backend.data.model import BlockInput, CredentialsMetaInput
 from backend.executor import utils as execution_utils
 from backend.monitoring import (
     NotificationJobArgs,

autogpt_platform/backend/backend/executor/utils.py

@@ -9,13 +9,7 @@ from typing import Mapping, Optional, cast
 from pydantic import BaseModel, JsonValue, ValidationError
 
 from backend.blocks import get_block
-from backend.blocks._base import (
-    Block,
-    BlockCostType,
-    BlockInput,
-    BlockOutputEntry,
-    BlockType,
-)
+from backend.blocks._base import Block, BlockCostType, BlockType
 from backend.data import execution as execution_db
 from backend.data import graph as graph_db
 from backend.data import human_review as human_review_db
@@ -35,7 +29,12 @@ from backend.data.execution import (
     NodesInputMasks,
 )
 from backend.data.graph import GraphModel, Node
-from backend.data.model import USER_TIMEZONE_NOT_SET, CredentialsMetaInput
+from backend.data.model import (
+    USER_TIMEZONE_NOT_SET,
+    BlockInput,
+    BlockOutputEntry,
+    CredentialsMetaInput,
+)
 from backend.data.rabbitmq import Exchange, ExchangeType, Queue, RabbitMQConfig
 from backend.util.clients import (
     get_async_execution_event_bus,

autogpt_platform/backend/backend/integrations/webhooks/graph_lifecycle_hooks.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, Optional, cast, overload
 
 from backend.blocks._base import BlockSchema
 from backend.data.graph import set_node_webhook
+from backend.data.integrations import get_webhook
 from backend.integrations.creds_manager import IntegrationCredentialsManager
 
 from . import get_webhook_manager, supports_webhooks
@@ -113,31 +114,32 @@ async def on_node_deactivate(
 
     webhooks_manager = get_webhook_manager(provider)
 
-    if node.webhook_id:
-        logger.debug(f"Node #{node.id} has webhook_id {node.webhook_id}")
-        if not node.webhook:
-            logger.error(f"Node #{node.id} has webhook_id but no webhook object")
-            raise ValueError("node.webhook not included")
+    if webhook_id := node.webhook_id:
+        logger.warning(
+            f"Node #{node.id} still attached to webhook #{webhook_id} - "
+            "did migration by `migrate_legacy_triggered_graphs` fail? "
+            "Triggered nodes are deprecated since Significant-Gravitas/AutoGPT#10418."
+        )
+        webhook = await get_webhook(webhook_id)
 
         # Detach webhook from node
         logger.debug(f"Detaching webhook from node #{node.id}")
         updated_node = await set_node_webhook(node.id, None)
 
         # Prune and deregister the webhook if it is no longer used anywhere
-        webhook = node.webhook
         logger.debug(
             f"Pruning{' and deregistering' if credentials else ''} "
-            f"webhook #{webhook.id}"
+            f"webhook #{webhook_id}"
         )
         await webhooks_manager.prune_webhook_if_dangling(
-            user_id, webhook.id, credentials
+            user_id, webhook_id, credentials
         )
         if (
             cast(BlockSchema, block.input_schema).get_credentials_fields()
             and not credentials
         ):
             logger.warning(
-                f"Cannot deregister webhook #{webhook.id}: credentials "
+                f"Cannot deregister webhook #{webhook_id}: credentials "
                 f"#{webhook.credentials_id} not available "
                 f"({webhook.provider.value} webhook ID: {webhook.provider_webhook_id})"
             )

autogpt_platform/backend/scripts/generate_block_docs.py

@@ -24,7 +24,10 @@ import sys
 from collections import defaultdict
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any, Type
+
+if TYPE_CHECKING:
+    from backend.blocks._base import AnyBlockSchema
 
 # Add backend to path for imports
 backend_dir = Path(__file__).parent.parent
@@ -242,9 +245,9 @@ def file_path_to_title(file_path: str) -> str:
     return apply_fixes(name.replace("_", " ").title())
 
 
-def extract_block_doc(block_cls: type) -> BlockDoc:
+def extract_block_doc(block_cls: Type["AnyBlockSchema"]) -> BlockDoc:
     """Extract documentation data from a block class."""
-    block = block_cls.create()
+    block = block_cls()
 
     # Get source file
     try:
@@ -520,7 +523,7 @@ def generate_overview_table(blocks: list[BlockDoc], block_dir_prefix: str = "")
     lines.append("")
 
     # Group blocks by category
-    by_category = defaultdict(list)
+    by_category = defaultdict[str, list[BlockDoc]](list)
     for block in blocks:
         primary_cat = block.categories[0] if block.categories else "BASIC"
         by_category[primary_cat].append(block)