feat(sdk): unify SDK import paths for consistency

agents/chat/src/chat/agent.py

@@ -7,10 +7,7 @@
 from textwrap import dedent
 from typing import Annotated
 
-from a2a.types import (
-    AgentSkill,
-    Message,
-)
+from a2a.types import AgentSkill, Message
 from agentstack_sdk.a2a.extensions import (
     AgentDetail,
     AgentDetailContributor,
@@ -24,8 +21,6 @@
     LLMServiceExtensionSpec,
     TrajectoryExtensionServer,
     TrajectoryExtensionSpec,
-)
-from agentstack_sdk.a2a.extensions.services.platform import (
     PlatformApiExtensionServer,
     PlatformApiExtensionSpec,
 )

agents/deepagents_content_builder/src/content_builder/utils.py

@@ -11,8 +11,7 @@
 from langchain_core.tools import BaseTool
 from langchain_openai import ChatOpenAI
 from pydantic import SecretStr
-from a2a.types import Role
-from a2a.types import Message as A2AMessage
+from a2a.types import Role, Message as A2AMessage
 from langchain.messages import AIMessage, HumanMessage
 from agentstack_sdk.a2a.extensions import LLMFulfillment
 

agents/form/src/form/agent.py

@@ -9,7 +9,7 @@
 import a2a.types
 import agentstack_sdk.a2a.extensions
 from a2a.types import Message
-from agentstack_sdk.a2a.extensions.common.form import (
+from agentstack_sdk.a2a.extensions import (
     CheckboxField,
     DateField,
     FileField,
@@ -18,8 +18,6 @@
     MultiSelectField,
     OptionItem,
     TextField,
-)
-from agentstack_sdk.a2a.extensions.services.form import (
     FormServiceExtensionServer,
     FormServiceExtensionSpec,
 )

agents/rag/src/rag/agent.py

@@ -21,8 +21,9 @@
     LLMServiceExtensionSpec,
     TrajectoryExtensionServer,
     TrajectoryExtensionSpec,
+    PlatformApiExtensionServer,
+    PlatformApiExtensionSpec,
 )
-from agentstack_sdk.a2a.extensions.services.platform import PlatformApiExtensionServer, PlatformApiExtensionSpec
 from agentstack_sdk.a2a.types import AgentArtifact, AgentMessage
 from agentstack_sdk.server import Server
 from agentstack_sdk.server.context import RunContext
@@ -41,7 +42,12 @@
 from rag.helpers.citations import extract_citations
 from rag.helpers.event_binder import EventBinder
 from rag.helpers.trajectory import ToolCallTrajectoryEvent
-from rag.helpers.vectore_store import CreateVectorStoreEvent, EmbeddingFunction, create_vector_store, embed_all_files
+from rag.helpers.vectore_store import (
+    CreateVectorStoreEvent,
+    EmbeddingFunction,
+    create_vector_store,
+    embed_all_files,
+)
 from rag.tools.files.file_creator import FileCreatorTool, FileCreatorToolOutput
 from rag.tools.files.file_reader import create_file_reader_tool_class
 from rag.tools.files.utils import extract_files, to_framework_message

agents/rag/src/rag/helpers/trajectory.py

@@ -7,7 +7,7 @@
 from typing import Any, Literal
 from beeai_framework.errors import FrameworkError
 from beeai_framework.tools import ToolOutput
-from agentstack_sdk.a2a.extensions.ui.trajectory import TrajectoryExtensionServer
+from agentstack_sdk.a2a.extensions import TrajectoryExtensionServer
 from pydantic import BaseModel, Field, InstanceOf, field_serializer
 
 

agents/rag/src/rag/helpers/vectore_store.py

@@ -12,16 +12,10 @@
 from openai.types import CreateEmbeddingResponse
 
 from agentstack_sdk.a2a.extensions import TrajectoryExtensionServer
-from agentstack_sdk.platform import File, VectorStore
-from agentstack_sdk.platform.vector_store import VectorStoreItem
+from agentstack_sdk.platform import File, VectorStore, VectorStoreItem
 from langchain_text_splitters import RecursiveCharacterTextSplitter
 from rag.helpers.trajectory import TrajectoryEvent
-from tenacity import (
-    AsyncRetrying,
-    retry_if_exception_type,
-    stop_after_delay,
-    wait_fixed,
-)
+from tenacity import AsyncRetrying, retry_if_exception_type, stop_after_delay, wait_fixed
 
 
 class FileExtractionEvent(TrajectoryEvent):

agents/rag/src/rag/tools/files/file_reader.py

@@ -7,11 +7,7 @@
 
 from agentstack_sdk.platform import File
 from beeai_framework.emitter import Emitter
-from beeai_framework.tools import (
-    JSONToolOutput,
-    Tool,
-    ToolRunOptions,
-)
+from beeai_framework.tools import JSONToolOutput, Tool, ToolRunOptions
 from pydantic import BaseModel, Field, create_model
 
 from rag.tools.files.utils import format_size

agents/rag/src/rag/tools/general/act.py

@@ -6,15 +6,10 @@
 import typing
 from typing import Literal
 
-from beeai_framework.agents.requirement import (
-    RequirementAgent,
-    RequirementAgentRunState,
-)
+from beeai_framework.agents.requirement import RequirementAgent, RequirementAgentRunState
 from beeai_framework.agents.requirement.events import RequirementAgentStartEvent
 from beeai_framework.agents.requirement.requirements import Requirement, Rule
-from beeai_framework.agents.requirement.requirements.requirement import (
-    run_with_context,
-)
+from beeai_framework.agents.requirement.requirements.requirement import run_with_context
 from beeai_framework.context import RunContext
 from beeai_framework.emitter import Emitter, EventMeta
 from beeai_framework.tools import (

agents/rag/src/rag/tools/general/clarification.py

@@ -3,20 +3,12 @@
 
 from __future__ import annotations
 
-from beeai_framework.agents.requirement import (
-    RequirementAgent,
-    RequirementAgentRunState,
-)
+from beeai_framework.agents.requirement import RequirementAgent, RequirementAgentRunState
 from beeai_framework.agents.requirement.events import RequirementAgentStartEvent
 from beeai_framework.backend import AssistantMessage
 from beeai_framework.context import RunContext
 from beeai_framework.emitter import Emitter, EventMeta
-from beeai_framework.tools import (
-    StringToolOutput,
-    Tool,
-    ToolInputValidationError,
-    ToolRunOptions,
-)
+from beeai_framework.tools import StringToolOutput, Tool, ToolInputValidationError, ToolRunOptions
 from pydantic import BaseModel, Field
 
 

apps/agentstack-sdk-py/examples/agent.py

@@ -25,7 +25,7 @@
 import uvicorn
 
 import agentstack_sdk.a2a.extensions
-from agentstack_sdk.a2a.extensions.services.llm import LLMServiceExtensionServer
+from agentstack_sdk.a2a.extensions import LLMServiceExtensionServer
 
 agent_detail_extension_spec = agentstack_sdk.a2a.extensions.AgentDetailExtensionSpec(
     params=agentstack_sdk.a2a.extensions.AgentDetail(

apps/agentstack-sdk-py/examples/artifacts.py

@@ -11,17 +11,13 @@
 from a2a.utils.message import get_message_text
 from beeai_framework.adapters.agentstack.backend.chat import AgentStackChatModel
 from beeai_framework.agents.requirement import RequirementAgent
-from beeai_framework.agents.requirement.requirements.conditional import (
-    ConditionalRequirement,
-)
+from beeai_framework.agents.requirement.requirements.conditional import ConditionalRequirement
 from beeai_framework.backend import AssistantMessage, UserMessage
 from beeai_framework.tools.think import ThinkTool
 
 from agentstack_sdk.a2a.extensions import (
     LLMServiceExtensionServer,
     LLMServiceExtensionSpec,
-)
-from agentstack_sdk.a2a.extensions.ui.canvas import (
     CanvasEditRequest,
     CanvasExtensionServer,
     CanvasExtensionSpec,

apps/agentstack-sdk-py/examples/canvas_ui_code_agent.py

@@ -15,8 +15,9 @@
     ErrorExtensionParams,
     ErrorExtensionServer,
     ErrorExtensionSpec,
+    CanvasExtensionServer,
+    CanvasExtensionSpec,
 )
-from agentstack_sdk.a2a.extensions.ui.canvas import CanvasExtensionServer, CanvasExtensionSpec
 from agentstack_sdk.a2a.types import AgentArtifact, AgentMessage
 from agentstack_sdk.server import Server
 from agentstack_sdk.server.context import RunContext

apps/agentstack-sdk-py/examples/canvas_ui_test_agent.py

@@ -11,7 +11,7 @@
 
 from a2a.types import Message, TextPart
 
-from agentstack_sdk.a2a.extensions.ui.canvas import CanvasExtensionServer, CanvasExtensionSpec
+from agentstack_sdk.a2a.extensions import CanvasExtensionServer, CanvasExtensionSpec
 from agentstack_sdk.a2a.types import AgentArtifact, AgentMessage
 from agentstack_sdk.server import Server
 from agentstack_sdk.server.context import RunContext

apps/agentstack-sdk-py/examples/citation_agent.py

@@ -8,11 +8,7 @@
 
 from a2a.types import Message
 
-from agentstack_sdk.a2a.extensions import (
-    Citation,
-    CitationExtensionServer,
-    CitationExtensionSpec,
-)
+from agentstack_sdk.a2a.extensions import Citation, CitationExtensionServer, CitationExtensionSpec
 from agentstack_sdk.a2a.types import AgentMessage
 from agentstack_sdk.server import Server
 from agentstack_sdk.server.context import RunContext

apps/agentstack-sdk-py/examples/citation_agent_artifact.py

@@ -8,11 +8,7 @@
 
 from a2a.types import Message, TextPart
 
-from agentstack_sdk.a2a.extensions import (
-    Citation,
-    CitationExtensionServer,
-    CitationExtensionSpec,
-)
+from agentstack_sdk.a2a.extensions import Citation, CitationExtensionServer, CitationExtensionSpec
 from agentstack_sdk.a2a.types import AgentArtifact
 from agentstack_sdk.server import Server
 from agentstack_sdk.server.context import RunContext

apps/agentstack-sdk-py/examples/connector_management.py

@@ -16,7 +16,7 @@
 import asyncio
 import logging
 
-from agentstack_sdk.platform.connector import Connector, ConnectorState
+from agentstack_sdk.platform import Connector, ConnectorState
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)

apps/agentstack-sdk-py/examples/connectors_agent.py

@@ -9,8 +9,12 @@
 from a2a.types import Message
 from mcp import ClientSession
 
-from agentstack_sdk.a2a.extensions.services.mcp import MCPServiceExtensionServer, MCPServiceExtensionSpec
-from agentstack_sdk.a2a.extensions.services.platform import PlatformApiExtensionServer, PlatformApiExtensionSpec
+from agentstack_sdk.a2a.extensions import (
+    MCPServiceExtensionServer,
+    MCPServiceExtensionSpec,
+    PlatformApiExtensionServer,
+    PlatformApiExtensionSpec,
+)
 from agentstack_sdk.a2a.types import RunYield
 from agentstack_sdk.server import Server
 from agentstack_sdk.server.context import RunContext

apps/agentstack-sdk-py/examples/connectors_client.py

@@ -12,8 +12,8 @@
 from pydantic import HttpUrl
 
 import agentstack_sdk.a2a.extensions
-from agentstack_sdk.a2a.extensions.services.platform import PlatformApiExtensionClient
-from agentstack_sdk.platform.client import use_platform_client
+from agentstack_sdk.a2a.extensions import PlatformApiExtensionClient
+from agentstack_sdk.platform import use_platform_client
 from agentstack_sdk.platform.context import Context, ContextPermissions, Permissions
 
 

apps/agentstack-sdk-py/examples/dependencies.py

@@ -8,12 +8,14 @@
 
 from a2a.types import Message
 
-from agentstack_sdk.a2a.extensions import LLMServiceExtensionServer, LLMServiceExtensionSpec
-from agentstack_sdk.a2a.extensions.services.platform import (
+from agentstack_sdk.a2a.extensions import (
+    LLMServiceExtensionServer,
+    LLMServiceExtensionSpec,
     PlatformApiExtensionServer,
     PlatformApiExtensionSpec,
+    TrajectoryExtensionServer,
+    TrajectoryExtensionSpec,
 )
-from agentstack_sdk.a2a.extensions.ui.trajectory import TrajectoryExtensionServer, TrajectoryExtensionSpec
 from agentstack_sdk.a2a.types import AuthRequired, RunYield
 from agentstack_sdk.platform import File
 from agentstack_sdk.server import Server

apps/agentstack-sdk-py/examples/error_agent.py

@@ -8,7 +8,7 @@
 
 from a2a.types import Message
 
-from agentstack_sdk.a2a.extensions.ui.error import (
+from agentstack_sdk.a2a.extensions import (
     ErrorExtensionParams,
     ErrorExtensionServer,
     ErrorExtensionSpec,

apps/agentstack-sdk-py/examples/form_agent.py

@@ -7,8 +7,9 @@
 from a2a.types import Message
 from pydantic import BaseModel
 
-from agentstack_sdk.a2a.extensions.common.form import FormRender, TextField
-from agentstack_sdk.a2a.extensions.services.form import (
+from agentstack_sdk.a2a.extensions import (
+    FormRender,
+    TextField,
     FormServiceExtensionServer,
     FormServiceExtensionSpec,
 )

apps/agentstack-sdk-py/examples/form_request_agent.py

@@ -8,7 +8,7 @@
 from a2a.types import Message
 from pydantic import BaseModel
 
-from agentstack_sdk.a2a.extensions.common.form import (
+from agentstack_sdk.a2a.extensions import (
     CheckboxField,
     DateField,
     FileField,
@@ -18,8 +18,9 @@
     OptionItem,
     SingleSelectField,
     TextField,
+    FormRequestExtensionServer,
+    FormRequestExtensionSpec,
 )
-from agentstack_sdk.a2a.extensions.ui.form_request import FormRequestExtensionServer, FormRequestExtensionSpec
 from agentstack_sdk.server import Server
 
 server = Server()

apps/agentstack-sdk-py/examples/github_mcp_agent.py

@@ -10,7 +10,7 @@
 from a2a.types import Message
 from mcp import ClientSession
 
-from agentstack_sdk.a2a.extensions.services.mcp import MCPServiceExtensionServer, MCPServiceExtensionSpec
+from agentstack_sdk.a2a.extensions import MCPServiceExtensionServer, MCPServiceExtensionSpec
 from agentstack_sdk.a2a.types import RunYield
 from agentstack_sdk.server import Server
 

apps/agentstack-sdk-py/examples/history_framework.py

@@ -14,10 +14,7 @@
 from beeai_framework.backend import AssistantMessage, UserMessage
 from beeai_framework.tools.think import ThinkTool
 
-from agentstack_sdk.a2a.extensions import (
-    LLMServiceExtensionServer,
-    LLMServiceExtensionSpec,
-)
+from agentstack_sdk.a2a.extensions import LLMServiceExtensionServer, LLMServiceExtensionSpec
 from agentstack_sdk.a2a.types import AgentMessage
 from agentstack_sdk.server import Server
 from agentstack_sdk.server.context import RunContext

apps/agentstack-sdk-py/examples/mcp_agent.py

@@ -9,9 +9,11 @@
 from a2a.types import Message
 from mcp import ClientSession
 
-from agentstack_sdk.a2a.extensions.auth.oauth import OAuthExtensionServer, OAuthExtensionSpec
-from agentstack_sdk.a2a.extensions.services.mcp import MCPServiceExtensionServer, MCPServiceExtensionSpec
-from agentstack_sdk.a2a.extensions.tools.call import (
+from agentstack_sdk.a2a.extensions import (
+    OAuthExtensionServer,
+    OAuthExtensionSpec,
+    MCPServiceExtensionServer,
+    MCPServiceExtensionSpec,
     ToolCallExtensionParams,
     ToolCallExtensionServer,
     ToolCallExtensionSpec,

apps/agentstack-sdk-py/examples/mcp_client.py

@@ -15,7 +15,7 @@
 from pydantic import AnyUrl
 
 import agentstack_sdk.a2a.extensions
-from agentstack_sdk.a2a.extensions.tools.call import ToolCallResponse
+from agentstack_sdk.a2a.extensions import ToolCallResponse
 
 
 class OAuthHandler:

apps/agentstack-sdk-py/examples/oauth.py

@@ -11,21 +11,19 @@
 from a2a.utils.message import get_message_text
 from beeai_framework.adapters.agentstack.backend.chat import AgentStackChatModel
 from beeai_framework.agents.requirement import RequirementAgent
-from beeai_framework.agents.requirement.requirements.conditional import (
-    ConditionalRequirement,
-)
+from beeai_framework.agents.requirement.requirements.conditional import ConditionalRequirement
 from beeai_framework.backend import AssistantMessage, UserMessage
 from beeai_framework.backend.types import ChatModelParameters
 from beeai_framework.tools.mcp import MCPTool
 from beeai_framework.tools.think import ThinkTool
 from mcp import ClientSession
-from mcp.client.streamable_http import streamablehttp_client  # pyrefly: ignore [deprecated] -- TODO: upgrade
+from mcp.client.streamable_http import (
+    streamablehttp_client  # pyrefly: ignore [deprecated] -- TODO: upgrade,
+)
 
 from agentstack_sdk.a2a.extensions import (
     LLMServiceExtensionServer,
     LLMServiceExtensionSpec,
-)
-from agentstack_sdk.a2a.extensions.auth.oauth import (
     OAuthExtensionServer,
     OAuthExtensionSpec,
 )