agentstack-sdk 0.6.2rc6__tar.gz → 0.7.0rc11__tar.gz

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: agentstack-sdk
-Version: 0.6.2rc6
+Version: 0.7.0rc11
 Summary: Agent Stack SDK
 Author: IBM Corp.
-Requires-Dist: a2a-sdk==0.3.21
+Requires-Dist: a2a-sdk==0.3.24
 Requires-Dist: objprint>=0.3.0
-Requires-Dist: uvicorn>=0.35.0
+Requires-Dist: uvicorn>=0.37.0,<0.38.0
 Requires-Dist: asyncclick>=8.1.8
 Requires-Dist: sse-starlette>=2.2.1
 Requires-Dist: starlette>=0.47.2
@@ -22,9 +22,10 @@ Requires-Dist: fastapi>=0.116.1
 Requires-Dist: authlib>=1.3.0
 Requires-Dist: async-lru>=2.0.4
 Requires-Dist: cachetools>=6.2.3
+Requires-Dist: typing-extensions>=4.15.0
 Requires-Dist: opentelemetry-instrumentation-httpx>=0.60b1
 Requires-Dist: opentelemetry-instrumentation-openai>=0.52.3
-Requires-Python: >=3.11, <3.14
+Requires-Python: >=3.11, <3.15
 Description-Content-Type: text/markdown
 
 # Agent Stack Server SDK

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/pyproject.toml

@@ -1,14 +1,14 @@
 [project]
 name = "agentstack-sdk"
-version = "0.6.2-rc6"
+version = "0.7.0-rc11"
 description = "Agent Stack SDK"
 readme = "README.md"
 authors = [{ name = "IBM Corp." }]
-requires-python = ">=3.11,<3.14"
+requires-python = ">=3.11,<3.15"
 dependencies = [
-    "a2a-sdk==0.3.21",
+    "a2a-sdk==0.3.24",
     "objprint>=0.3.0",
-    "uvicorn>=0.35.0",
+    "uvicorn>=0.37.0,<0.38.0",
     "asyncclick>=8.1.8",
     "sse-starlette>=2.2.1",
     "starlette>=0.47.2",
@@ -25,6 +25,7 @@ dependencies = [
     "authlib>=1.3.0",
     "async-lru>=2.0.4",
     "cachetools>=6.2.3",
+    "typing-extensions>=4.15.0",
     "opentelemetry-instrumentation-httpx>=0.60b1",
     "opentelemetry-instrumentation-openai>=0.52.3",
 ]
@@ -40,7 +41,7 @@ dev = [
 ]
 
 [build-system]
-requires = ["uv_build>=0.9.0,<0.10.0"]
+requires = ["uv_build>=0.10.0,<0.11.0"]
 build-backend = "uv_build"
 
 [tool.ruff]

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/__init__.py

@@ -1,6 +1,12 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from importlib.metadata import version
 
+from agentstack_sdk.util.pydantic import apply_compatibility_monkey_patching
+
 __version__ = version("agentstack-sdk")
+
+apply_compatibility_monkey_patching()

agentstack_sdk-0.7.0rc11/src/agentstack_sdk/a2a/__init__.py

@@ -0,0 +1,4 @@
+# Copyright 2025 © BeeAI a Series of LF Projects, LLC
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/__init__.py

@@ -1,6 +1,8 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from .auth import *
 from .interactions import *
 from .services import *

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/auth/__init__.py

@@ -1,5 +1,7 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from .oauth import *
 from .secrets import *

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/auth/oauth/__init__.py

@@ -1,4 +1,6 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from .oauth import *

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/auth/oauth/oauth.py

@@ -1,6 +1,7 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+
 from __future__ import annotations
 
 import uuid
@@ -19,6 +20,19 @@ from typing_extensions import override
 from agentstack_sdk.a2a.extensions.auth.oauth.storage import MemoryTokenStorageFactory, TokenStorageFactory
 from agentstack_sdk.a2a.extensions.base import BaseExtensionClient, BaseExtensionServer, BaseExtensionSpec
 from agentstack_sdk.a2a.types import AgentMessage, AuthRequired, RunYieldResume
+from agentstack_sdk.util.pydantic import REVEAL_SECRETS, SecureBaseModel
+
+__all__ = [
+    "AuthRequest",
+    "AuthResponse",
+    "OAuthDemand",
+    "OAuthExtensionClient",
+    "OAuthExtensionMetadata",
+    "OAuthExtensionParams",
+    "OAuthExtensionServer",
+    "OAuthExtensionSpec",
+    "OAuthFulfillment",
+]
 
 if TYPE_CHECKING:
     from agentstack_sdk.server.context import RunContext
@@ -26,15 +40,15 @@ if TYPE_CHECKING:
 _DEFAULT_DEMAND_NAME = "default"
 
 
-class AuthRequest(pydantic.BaseModel):
+class AuthRequest(SecureBaseModel):
     authorization_endpoint_url: pydantic.AnyUrl
 
 
-class AuthResponse(pydantic.BaseModel):
+class AuthResponse(SecureBaseModel):
     redirect_uri: pydantic.AnyUrl
 
 
-class OAuthFulfillment(pydantic.BaseModel):
+class OAuthFulfillment(SecureBaseModel):
     redirect_uri: pydantic.AnyUrl
 
 
@@ -112,6 +126,7 @@ class OAuthExtensionServer(BaseExtensionServer[OAuthExtensionSpec, OAuthExtensio
         oauth_auth = OAuthClientProvider(
             server_url=str(resource_url),
             client_metadata=OAuthClientMetadata(
+                client_name="AgentStack Agent",
                 redirect_uris=[fulfillment.redirect_uri],
             ),
             storage=await self.token_storage_factory.create_storage(),
@@ -122,7 +137,10 @@ class OAuthExtensionServer(BaseExtensionServer[OAuthExtensionSpec, OAuthExtensio
 
     def create_auth_request(self, *, authorization_endpoint_url: pydantic.AnyUrl):
         data = AuthRequest(authorization_endpoint_url=authorization_endpoint_url)
-        return AgentMessage(text="Authorization required", metadata={self.spec.URI: data.model_dump(mode="json")})
+        return AgentMessage(
+            text="Authorization required",
+            metadata={self.spec.URI: data.model_dump(mode="json", context={REVEAL_SECRETS: True})},
+        )
 
     def parse_auth_response(self, *, message: A2AMessage):
         if not message or not message.metadata or not (data := message.metadata.get(self.spec.URI)):
@@ -147,5 +165,5 @@ class OAuthExtensionClient(BaseExtensionClient[OAuthExtensionSpec, NoneType]):
             role=Role.user,
             parts=[TextPart(text="Authorization completed")],
             task_id=task_id,
-            metadata={self.spec.URI: data.model_dump(mode="json")},
+            metadata={self.spec.URI: data.model_dump(mode="json", context={REVEAL_SECRETS: True})},
         )

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/auth/oauth/storage/__init__.py

@@ -1,5 +1,7 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from .base import *
 from .memory import *

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/auth/oauth/storage/base.py

@@ -1,6 +1,8 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 import abc
 
 from mcp.client.auth import TokenStorage

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/auth/oauth/storage/memory.py

@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
+from __future__ import annotations
+
 from mcp.client.auth import TokenStorage
 from mcp.shared.auth import OAuthClientInformationFull, OAuthToken
 

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/auth/secrets/__init__.py

@@ -1,4 +1,6 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from .secrets import *

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/auth/secrets/secrets.py

@@ -1,6 +1,7 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Self
@@ -8,22 +9,40 @@ from typing import TYPE_CHECKING, Self
 import pydantic
 from a2a.server.agent_execution.context import RequestContext
 from a2a.types import Message as A2AMessage
+from opentelemetry import trace
 from typing_extensions import override
 
 from agentstack_sdk.a2a.extensions.base import BaseExtensionClient, BaseExtensionServer, BaseExtensionSpec
 from agentstack_sdk.a2a.types import AgentMessage, AuthRequired
+from agentstack_sdk.util.pydantic import REDACT_SECRETS, REVEAL_SECRETS, SecureBaseModel
+from agentstack_sdk.util.telemetry import flatten_dict
+
+__all__ = [
+    "A2A_EXTENSION_SECRETS_REQUESTED",
+    "A2A_EXTENSION_SECRETS_RESOLVED",
+    "SecretDemand",
+    "SecretFulfillment",
+    "SecretsExtensionClient",
+    "SecretsExtensionServer",
+    "SecretsExtensionSpec",
+    "SecretsServiceExtensionMetadata",
+    "SecretsServiceExtensionParams",
+]
 
 if TYPE_CHECKING:
     from agentstack_sdk.server.context import RunContext
 
+A2A_EXTENSION_SECRETS_REQUESTED = "a2a_extension.secrets.requested"
+A2A_EXTENSION_SECRETS_RESOLVED = "a2a_extension.secrets.resolved"
+
 
 class SecretDemand(pydantic.BaseModel):
     name: str
     description: str | None = None
 
 
-class SecretFulfillment(pydantic.BaseModel):
-    secret: str
+class SecretFulfillment(SecureBaseModel):
+    secret: pydantic.SecretStr
 
 
 class SecretsServiceExtensionParams(pydantic.BaseModel):
@@ -61,15 +80,25 @@ class SecretsExtensionServer(BaseExtensionServer[SecretsExtensionSpec, SecretsSe
         return SecretsServiceExtensionMetadata.model_validate(data)
 
     async def request_secrets(self, params: SecretsServiceExtensionParams) -> SecretsServiceExtensionMetadata:
+        span = trace.get_current_span()
+        span.add_event(
+            A2A_EXTENSION_SECRETS_REQUESTED,
+            attributes=flatten_dict(params.model_dump(context={REDACT_SECRETS: True})),
+        )
         resume = await self.context.yield_async(
             AuthRequired(
                 message=AgentMessage(
-                    metadata={self.spec.URI: params.model_dump(mode="json")},
+                    metadata={self.spec.URI: params.model_dump(mode="json", context={REVEAL_SECRETS: True})},
                 )
             )
         )
         if isinstance(resume, A2AMessage):
-            return self.parse_secret_response(message=resume)
+            response = self.parse_secret_response(message=resume)
+            span.add_event(
+                A2A_EXTENSION_SECRETS_RESOLVED,
+                attributes=flatten_dict(response.model_dump(context={REDACT_SECRETS: True})),
+            )
+            return response
         else:
             raise ValueError("Secrets has not been provided in response.")
 

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/base.py

@@ -1,6 +1,7 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+
 from __future__ import annotations
 
 import abc
@@ -13,8 +14,17 @@ import pydantic
 from a2a.server.agent_execution.context import RequestContext
 from a2a.types import AgentCard, AgentExtension
 from a2a.types import Message as A2AMessage
+from opentelemetry import trace
+from opentelemetry.trace import SpanKind
+from pydantic import BaseModel
 from typing_extensions import override
 
+from agentstack_sdk.util.pydantic import REDACT_SECRETS
+from agentstack_sdk.util.telemetry import (
+    flatten_dict,
+    trace_class,
+)
+
 ParamsT = typing.TypeVar("ParamsT")
 MetadataFromClientT = typing.TypeVar("MetadataFromClientT")
 MetadataFromServerT = typing.TypeVar("MetadataFromServerT")
@@ -25,6 +35,10 @@ if typing.TYPE_CHECKING:
     from agentstack_sdk.server.dependencies import Dependency
 
 
+A2A_EXTENSION_URI = "a2a_extension.uri"
+A2A_EXTENSION_METADATA_RECEIVED_EVENT = "a2a_extension.metadata.received"
+
+
 def _get_generic_args(cls: type, base_class: type) -> tuple[typing.Any, ...]:
     for base in getattr(cls, "__orig_bases__", ()):
         if typing.get_origin(base) is base_class and (args := typing.get_args(base)):
@@ -67,7 +81,7 @@ class BaseExtensionSpec(abc.ABC, typing.Generic[ParamsT]):
         self.params = params
 
     @classmethod
-    def from_agent_card(cls: type[BaseExtensionSpec], agent: AgentCard) -> typing.Self | None:
+    def from_agent_card(cls: type["BaseExtensionSpec"], agent: AgentCard) -> typing.Self | None:
         """
         Client should construct an extension instance using this classmethod.
         """
@@ -121,7 +135,14 @@ class BaseExtensionServer(abc.ABC, typing.Generic[ExtensionSpecT, MetadataFromCl
 
     def __init_subclass__(cls, **kwargs):
         super().__init_subclass__(**kwargs)
-        cls.MetadataFromClient = _get_generic_args(cls, BaseExtensionServer)[1]
+
+        generic_args = _get_generic_args(cls, BaseExtensionServer)
+        trace_class(
+            kind=SpanKind.SERVER,
+            exclude_list=["lifespan", "_fork"],
+            attributes={A2A_EXTENSION_URI: generic_args[0].URI},
+        )(cls)
+        cls.MetadataFromClient = generic_args[1]
 
     _metadata_from_client: MetadataFromClientT | None = None
     _dependencies: dict[str, Dependency] = {}  # noqa: RUF012
@@ -151,6 +172,11 @@ class BaseExtensionServer(abc.ABC, typing.Generic[ExtensionSpecT, MetadataFromCl
     def handle_incoming_message(self, message: A2AMessage, run_context: RunContext, request_context: RequestContext):
         if self._metadata_from_client is None:
             self._metadata_from_client = self.parse_client_metadata(message)
+            if isinstance(self._metadata_from_client, BaseModel):
+                trace.get_current_span().add_event(
+                    A2A_EXTENSION_METADATA_RECEIVED_EVENT,
+                    attributes=flatten_dict(self._metadata_from_client.model_dump(context={REDACT_SECRETS: True})),
+                )
 
     def _fork(self) -> typing.Self:
         """Creates a clone of this instance with the same arguments as the original"""
@@ -182,7 +208,10 @@ class BaseExtensionClient(abc.ABC, typing.Generic[ExtensionSpecT, MetadataFromSe
 
     def __init_subclass__(cls, **kwargs):
         super().__init_subclass__(**kwargs)
-        cls.MetadataFromServer = _get_generic_args(cls, BaseExtensionClient)[1]
+
+        generic_args = _get_generic_args(cls, BaseExtensionClient)
+        trace_class(kind=SpanKind.CLIENT, attributes={A2A_EXTENSION_URI: generic_args[0].URI})(cls)
+        cls.MetadataFromServer = generic_args[1]
 
     def __init__(self, spec: ExtensionSpecT) -> None:
         self.spec = spec

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/common/__init__.py

@@ -1,4 +1,6 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from .form import *

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/common/form.py

@@ -1,8 +1,10 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from collections.abc import Generator
-from typing import Literal
+from typing import Generic, Literal, TypeVar
 
 from pydantic import BaseModel, Field, model_validator
 
@@ -78,15 +80,37 @@ class CheckboxField(BaseField):
     default_value: bool = False
 
 
-FormField = TextField | DateField | FileField | SingleSelectField | MultiSelectField | CheckboxField
+class CheckboxGroupField(BaseField):
+    type: Literal["checkbox_group"] = "checkbox_group"
+    fields: list[CheckboxField]
+
+
+FormField = (
+    TextField | DateField | FileField | SingleSelectField | MultiSelectField | CheckboxField | CheckboxGroupField
+)
+
+SettingsFormField = CheckboxGroupField | SingleSelectField
+
 
+F = TypeVar("F", bound=FormField | SettingsFormField)
 
-class FormRender(BaseModel):
+
+class BaseFormRender(BaseModel, Generic[F]):
     title: str | None = None
     description: str | None = None
     columns: int | None = Field(default=None, ge=1, le=4)
     submit_label: str | None = None
-    fields: list[FormField]
+    fields: list[F]
+
+
+class FormRender(BaseFormRender[FormField]):
+    pass
+
+
+class SettingsFormRender(BaseFormRender[SettingsFormField]):
+    """FormRender for settings - only allows fields defined in SettingsFormField."""
+
+    pass
 
 
 class TextFieldValue(BaseModel):
@@ -125,6 +149,11 @@ class CheckboxFieldValue(BaseModel):
     value: bool | None = None
 
 
+class CheckboxGroupFieldValue(BaseModel):
+    type: Literal["checkbox_group"] = "checkbox_group"
+    value: dict[str, bool | None] | None = None
+
+
 FormFieldValue = (
     TextFieldValue
     | DateFieldValue
@@ -132,13 +161,24 @@ FormFieldValue = (
     | SingleSelectFieldValue
     | MultiSelectFieldValue
     | CheckboxFieldValue
+    | CheckboxGroupFieldValue
 )
 
+SettingsFormFieldValue = CheckboxGroupFieldValue | SingleSelectFieldValue
+
+FV = TypeVar("FV", bound=FormFieldValue | SettingsFormFieldValue)
+
+
+NonFileIterValue = dict[str, bool | None] | list[str] | str | bool | None
+IterValue = list[dict[str, str | None]] | NonFileIterValue
+
 
-class FormResponse(BaseModel):
-    values: dict[str, FormFieldValue]
+class BaseFormResponse(BaseModel, Generic[FV]):
+    values: dict[str, FV]
 
-    def __iter__(self) -> Generator[tuple[str, list[dict[str, str | None]] | list[str] | str | bool | None]]:
+    def __iter__(
+        self,
+    ) -> Generator[tuple[str, IterValue]]:
         for key, value in self.values.items():
             match value:
                 case FileFieldValue():
@@ -147,4 +187,14 @@ class FormResponse(BaseModel):
                         [file.model_dump() for file in value.value] if value.value else None,
                     )
                 case _:
-                    yield key, value.value
+                    yield key, value.value  # pyrefly: ignore[invalid-yield]
+
+
+class FormResponse(BaseFormResponse[FormFieldValue]):
+    pass
+
+
+class SettingsFormResponse(BaseFormResponse[SettingsFormFieldValue]):
+    """FormResponse for settings - only allows fields defined in SettingsFormFieldValue."""
+
+    pass

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/exceptions.py

@@ -1,6 +1,8 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from agentstack_sdk.a2a.extensions.base import BaseExtensionSpec
 
 

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/interactions/__init__.py

@@ -1,4 +1,6 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from .approval import *

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/interactions/approval.py

@@ -1,6 +1,7 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+
 from __future__ import annotations
 
 import uuid
@@ -9,33 +10,56 @@ from typing import TYPE_CHECKING, Annotated, Any, Literal
 
 import a2a.types
 from mcp import Implementation, Tool
+from opentelemetry import trace
 from pydantic import BaseModel, Discriminator, Field, TypeAdapter
 
 from agentstack_sdk.a2a.extensions.base import BaseExtensionClient, BaseExtensionServer, BaseExtensionSpec
 from agentstack_sdk.a2a.types import AgentMessage, InputRequired
+from agentstack_sdk.util.pydantic import REDACT_SECRETS, REVEAL_SECRETS, SecureBaseModel
+from agentstack_sdk.util.telemetry import flatten_dict
+
+__all__ = [
+    "A2A_EXTENSION_APPROVAL_REQUESTED",
+    "A2A_EXTENSION_APPROVAL_RESOLVED",
+    "ApprovalExtensionClient",
+    "ApprovalExtensionMetadata",
+    "ApprovalExtensionParams",
+    "ApprovalExtensionServer",
+    "ApprovalExtensionSpec",
+    "ApprovalRejectionError",
+    "ApprovalRequest",
+    "ApprovalResponse",
+    "GenericApprovalRequest",
+    "ToolCallApprovalRequest",
+    "ToolCallServer",
+]
 
 if TYPE_CHECKING:
     from agentstack_sdk.server.context import RunContext
 
 
+A2A_EXTENSION_APPROVAL_REQUESTED = "a2a_extension.approval.requested"
+A2A_EXTENSION_APPROVAL_RESOLVED = "a2a_extension.approval.resolved"
+
+
 class ApprovalRejectionError(RuntimeError):
     pass
 
 
-class GenericApprovalRequest(BaseModel):
+class GenericApprovalRequest(SecureBaseModel):
     action: Literal["generic"] = "generic"
 
     title: str | None = Field(None, description="A human-readable title for the action being approved.")
     description: str | None = Field(None, description="A human-readable description of the action being approved.")
 
 
-class ToolCallServer(BaseModel):
+class ToolCallServer(SecureBaseModel):
     name: str = Field(description="The programmatic name of the server.")
     title: str | None = Field(description="A human-readable title for the server.")
     version: str = Field(description="The version of the server.")
 
 
-class ToolCallApprovalRequest(BaseModel):
+class ToolCallApprovalRequest(SecureBaseModel):
     action: Literal["tool-call"] = "tool-call"
 
     title: str | None = Field(None, description="A human-readable title of the tool.")
@@ -47,7 +71,7 @@ class ToolCallApprovalRequest(BaseModel):
     @staticmethod
     def from_mcp_tool(
         tool: Tool, input: dict[str, Any] | None, server: Implementation | None = None
-    ) -> ToolCallApprovalRequest:
+    ) -> "ToolCallApprovalRequest":
         return ToolCallApprovalRequest(
             name=tool.name,
             title=tool.annotations.title if tool.annotations else None,
@@ -60,7 +84,7 @@ class ToolCallApprovalRequest(BaseModel):
 ApprovalRequest = Annotated[GenericApprovalRequest | ToolCallApprovalRequest, Discriminator("action")]
 
 
-class ApprovalResponse(BaseModel):
+class ApprovalResponse(SecureBaseModel):
     decision: Literal["approve", "reject"]
 
     @property
@@ -86,7 +110,10 @@ class ApprovalExtensionMetadata(BaseModel):
 
 class ApprovalExtensionServer(BaseExtensionServer[ApprovalExtensionSpec, ApprovalExtensionMetadata]):
     def create_request_message(self, *, request: ApprovalRequest):
-        return AgentMessage(text="Approval requested", metadata={self.spec.URI: request.model_dump(mode="json")})
+        return AgentMessage(
+            text="Approval requested",
+            metadata={self.spec.URI: request.model_dump(mode="json", context={REVEAL_SECRETS: True})},
+        )
 
     def parse_response(self, *, message: a2a.types.Message):
         if not message.metadata or not (data := message.metadata.get(self.spec.URI)):
@@ -99,11 +126,21 @@ class ApprovalExtensionServer(BaseExtensionServer[ApprovalExtensionSpec, Approva
         *,
         context: RunContext,
     ) -> ApprovalResponse:
+        span = trace.get_current_span()
+        span.add_event(
+            A2A_EXTENSION_APPROVAL_REQUESTED,
+            attributes=flatten_dict(request.model_dump(context={REDACT_SECRETS: True})),
+        )
         message = self.create_request_message(request=request)
         message = await context.yield_async(InputRequired(message=message))
         if not message:
             raise RuntimeError("Yield did not return a message")
-        return self.parse_response(message=message)
+        response = self.parse_response(message=message)
+        span.add_event(
+            A2A_EXTENSION_APPROVAL_RESOLVED,
+            attributes=flatten_dict(response.model_dump(context={REDACT_SECRETS: True})),
+        )
+        return response
 
 
 class ApprovalExtensionClient(BaseExtensionClient[ApprovalExtensionSpec, NoneType]):
@@ -113,7 +150,7 @@ class ApprovalExtensionClient(BaseExtensionClient[ApprovalExtensionSpec, NoneTyp
             role=a2a.types.Role.user,
             parts=[],
             task_id=task_id,
-            metadata={self.spec.URI: response.model_dump(mode="json")},
+            metadata={self.spec.URI: response.model_dump(mode="json", context={REVEAL_SECRETS: True})},
         )
 
     def parse_request(self, *, message: a2a.types.Message):
@@ -122,4 +159,4 @@ class ApprovalExtensionClient(BaseExtensionClient[ApprovalExtensionSpec, NoneTyp
         return TypeAdapter(ApprovalRequest).validate_python(data)
 
     def metadata(self) -> dict[str, Any]:
-        return {self.spec.URI: ApprovalExtensionMetadata().model_dump(mode="json")}
+        return {self.spec.URI: ApprovalExtensionMetadata().model_dump(mode="json", context={REVEAL_SECRETS: True})}

{agentstack_sdk-0.6.2rc6 → agentstack_sdk-0.7.0rc11}/src/agentstack_sdk/a2a/extensions/services/__init__.py

@@ -1,6 +1,8 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import annotations
+
 from .embedding import *
 from .form import *
 from .llm import *