wip

Author: jezekra1

agents/chat/.vscode/launch.json

@@ -7,6 +7,7 @@
         {
             "name": "agent-chat",
             "type": "debugpy",
+            "justMyCode": false,
             "request": "launch",
             "program": "${workspaceFolder}/src/chat/agent.py",
             "console": "integratedTerminal"

agents/chat/src/chat/agent.py

@@ -12,14 +12,11 @@
 from agentstack_sdk.server.middleware.platform_auth_backend import PlatformAuthBackend
 from beeai_framework.agents.requirement.utils._tool import FinalAnswerTool
 from beeai_framework.errors import FrameworkError
-from pydantic import BaseModel
 
 from agentstack_sdk.a2a.extensions import (
     AgentDetail,
     AgentDetailContributor,
     AgentDetailTool,
-    BaseExtensionServer,
-    BaseExtensionSpec,
     CitationExtensionServer,
     CitationExtensionSpec,
     ErrorExtensionParams,
@@ -31,15 +28,8 @@
     LLMServiceExtensionSpec,
 )
 
-# Monkey-patch to remove FormExtensionSpec which no longer exists
-# TODO: remove after next release
-import agentstack_sdk.a2a.extensions as agentstack_extensions
 from chat.tools.files.file_reader import FileReaderTool
 
-agentstack_extensions.FormExtensionSpec = BaseExtensionSpec
-agentstack_extensions.FormExtensionServer = BaseExtensionServer
-agentstack_extensions.TextField = BaseModel
-
 from beeai_framework.adapters.agentstack.backend.chat import AgentStackChatModel
 from beeai_framework.agents.requirement import RequirementAgent
 from beeai_framework.agents.requirement.events import (
@@ -301,7 +291,7 @@ def serve():
             port=int(os.getenv("PORT", 8000)),
             configure_telemetry=True,
             context_store=PlatformContextStore(),
-            auth_backend=PlatformAuthBackend(skip_audience_validation=True),
+            auth_backend=PlatformAuthBackend(),
         )
     except KeyboardInterrupt:
         pass

agents/rag/.vscode/launch.json

@@ -7,6 +7,7 @@
         {
             "name": "agent-rag",
             "type": "debugpy",
+            "justMyCode": false,
             "request": "launch",
             "program": "${workspaceFolder}/src/rag/agent.py",
             "console": "integratedTerminal"

agents/rag/src/rag/agent.py

@@ -7,7 +7,6 @@
 from typing import Annotated
 import os
 
-from pydantic import BaseModel
 from agentstack_sdk.a2a.extensions import (
     AgentDetail,
     CitationExtensionServer,
@@ -18,18 +17,8 @@
     LLMServiceExtensionSpec,
     EmbeddingServiceExtensionServer,
     EmbeddingServiceExtensionSpec,
-    BaseExtensionSpec,
-    BaseExtensionServer,
 )
 
-# Monkey-patch to remove FormExtensionSpec which no longer exists
-# TODO: remove after next release
-import agentstack_sdk.a2a.extensions as agentstack_extensions
-
-agentstack_extensions.FormExtensionSpec = BaseExtensionSpec
-agentstack_extensions.FormExtensionServer = BaseExtensionServer
-agentstack_extensions.TextField = BaseModel
-
 from a2a.types import AgentSkill, Message
 from beeai_framework.adapters.agentstack.backend.chat import AgentStackChatModel
 from beeai_framework.agents.requirement import RequirementAgent

apps/agentstack-sdk-py/src/agentstack_sdk/a2a/extensions/ui/canvas.py

@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
+from typing_extensions import override
 
 import pydantic
 from a2a.server.agent_execution.context import RequestContext

apps/agentstack-sdk-py/src/agentstack_sdk/platform/context.py

@@ -13,6 +13,7 @@
 
 from agentstack_sdk.platform.client import PlatformClient, get_platform_client
 from agentstack_sdk.platform.common import PaginatedResult
+from agentstack_sdk.platform.provider import Provider
 from agentstack_sdk.platform.types import Metadata, MetadataPatch
 from agentstack_sdk.util.utils import filter_dict
 
@@ -40,7 +41,7 @@ class ContextPermissions(pydantic.BaseModel):
 class Permissions(ContextPermissions):
     llm: set[Literal["*"] | str] = set()
     embeddings: set[Literal["*"] | str] = set()
-    a2a_proxy: set[Literal["*"]] = set()
+    a2a_proxy: set[Literal["*"] | str] = set()
     model_providers: set[Literal["read", "write", "*"]] = set()
     variables: SerializeAsAny[set[Literal["read", "write", "*"]]] = set()
 
@@ -179,6 +180,7 @@ async def delete(
     async def generate_token(
         self: Context | str,
         *,
+        providers: list[str] | list[Provider] | None = None,
         client: PlatformClient | None = None,
         grant_global_permissions: Permissions | None = None,
         grant_context_permissions: ContextPermissions | None = None,
@@ -193,6 +195,18 @@ async def generate_token(
         context_id = self if isinstance(self, str) else self.id
         grant_global_permissions = grant_global_permissions or Permissions()
         grant_context_permissions = grant_context_permissions or Permissions()
+
+        if isinstance(self, Context) and self.metadata and (provider_id := self.metadata.get("provider_id", None)):
+            providers = providers or [provider_id]
+
+        if "*" not in grant_global_permissions.a2a_proxy:
+            if not providers:
+                raise ValueError(
+                    "Invalid audience: You must specify providers or use '*' in grant_global_permissions.a2a_proxy."
+                )
+
+            grant_global_permissions.a2a_proxy |= {p.id if isinstance(p, Provider) else p for p in providers}
+
         async with client or get_platform_client() as client:
             token_response = (
                 (

apps/agentstack-sdk-py/src/agentstack_sdk/server/dependencies.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 inspect
 from collections import Counter
 from collections.abc import AsyncIterator, Callable

apps/agentstack-sdk-py/src/agentstack_sdk/server/exceptions.py

@@ -0,0 +1,3 @@
+# Copyright 2025 © BeeAI a Series of LF Projects, LLC
+# SPDX-License-Identifier: Apache-2.0
+

apps/agentstack-sdk-py/src/agentstack_sdk/server/middleware/platform_auth_backend.py

@@ -4,6 +4,7 @@
 import logging
 import os
 from datetime import timedelta
+from urllib.parse import urljoin
 
 from a2a.auth.user import User
 from async_lru import alru_cache
@@ -76,12 +77,13 @@ def __init__(self, public_url: str | None = None, skip_audience_validation: bool
             if skip_audience_validation is not None
             else os.getenv("PLATFORM_AUTH__SKIP_AUDIENCE_VALIDATION", "false").lower() in ("true", "1")
         )
-        _audience = public_url or os.getenv("PLATFORM_AUTH__PUBLIC_URL", "http://host.docker.internal:8333")
-        if not self.skip_audience_validation and not _audience:
-            raise ValueError(
-                "Public URL must be provided if audience validation is enabled (hint: set PLATFORM_AUTH__PUBLIC_URL env variable)"
+        self._audience: str | None = public_url or os.getenv("PLATFORM_AUTH__PUBLIC_URL", None)
+        if not self.skip_audience_validation and not self._audience:
+            logger.warning(
+                "Public URL is not provided and audience validation is enabled. Proceeding to check audience from the request target URL. "
+                + "This may not work when requests to agents are proxied. (hint: set PLATFORM_AUTH__PUBLIC_URL env variable)"
             )
-        self.audience: str = _audience or "skip"
+
         self.security: HTTPBearer = HTTPBearer(auto_error=False)
 
     @override
@@ -95,7 +97,15 @@ async def authenticate(self, conn: HTTPConnection) -> tuple[AuthCredentials, Bas
         if not (auth := await self.security(request)):
             raise AuthenticationError("Missing Authorization header")
 
+        audiences: list[str] = []
+        if not self.skip_audience_validation:
+            if self._audience:
+                audiences = [urljoin(self._audience, path) for path in ["/", "/jsonrpc"]]
+            else:
+                audiences = [str(request.url.replace(path=path)) for path in ["/", "/jsonrpc"]]
+
         try:
+            # check only hostname urljoin("http://host:port/a/b", "/") -> "http://host:port/"
             jwks = await discover_jwks()
 
             # Verify signature
@@ -107,7 +117,7 @@ async def authenticate(self, conn: HTTPConnection) -> tuple[AuthCredentials, Bas
                     "exp": {"essential": True},
                     # "iss": {"essential": True}, # Issuer validation might be tricky if internal/external URLs differ
                 }
-                | ({"aud": {"essential": True, "value": self.audience}} if not self.skip_audience_validation else {}),
+                | ({"aud": {"essential": True, "values": audiences}} if not self.skip_audience_validation else {}),
             )
             claims.validate()
 

apps/agentstack-sdk-py/src/agentstack_sdk/types.py

@@ -1,3 +1,6 @@
+# Copyright 2025 © BeeAI a Series of LF Projects, LLC
+# SPDX-License-Identifier: Apache-2.0
+
 from typing import TYPE_CHECKING, TypeAlias
 
 if TYPE_CHECKING: