a2a-handler 0.1.15__tar.gz → 0.1.17__tar.gz

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: a2a-handler
-Version: 0.1.15
+Version: 0.1.17
 Summary: An A2A Protocol client TUI and CLI.
 Keywords: a2a,a2a-protocol,agent,agent-to-agent,ai,cli,tui
 Author: Al Duncanson
@@ -18,10 +18,10 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Dist: a2a-sdk>=0.3.22
+Requires-Dist: a2a-sdk>=0.3.24
 Requires-Dist: click>=8.0.0
 Requires-Dist: rich-click>=1.8.0
-Requires-Dist: google-adk>=0.5.0
+Requires-Dist: google-adk>=1.26.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: litellm>=1.0.0
 Requires-Dist: python-dotenv>=1.0.0

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "a2a-handler"
-version = "0.1.15"
+version = "0.1.17"
 description = "An A2A Protocol client TUI and CLI."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -32,10 +32,10 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "a2a-sdk>=0.3.22",
+    "a2a-sdk>=0.3.24",
     "click>=8.0.0",
     "rich-click>=1.8.0",
-    "google-adk>=0.5.0",
+    "google-adk>=1.26.0",
     "httpx>=0.27.0",
     "litellm>=1.0.0",
     "python-dotenv>=1.0.0",

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/src/a2a_handler/cli/__init__.py

@@ -67,11 +67,12 @@ def version() -> None:
 
 
 @cli.command()
-def tui() -> None:
+@click.option("--bearer", "-b", "bearer_token", help="Bearer token for agent auth")
+def tui(bearer_token: str | None) -> None:
     """Launch the interactive terminal interface."""
     log.info("Launching TUI")
     logging.getLogger().handlers = []
-    app = HandlerTUI()
+    app = HandlerTUI(initial_bearer_token=bearer_token)
     app.run()
 
 

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/src/a2a_handler/cli/card.py

@@ -9,6 +9,7 @@ from a2a.types import AgentCard
 
 from a2a_handler.common import Output, get_logger
 from a2a_handler.service import A2AService
+from a2a_handler.session import get_credentials
 from a2a_handler.validation import (
     ValidationResult,
     validate_agent_card_from_file,
@@ -34,12 +35,15 @@ def card() -> None:
 def card_get(agent_url: str, authenticated: bool) -> None:
     """Retrieve an agent's card."""
     log.info("Fetching agent card from %s", agent_url)
+    credentials = get_credentials(agent_url) if authenticated else None
+    if authenticated and credentials is None:
+        log.warning("No saved credentials found for %s", agent_url)
 
     async def do_get() -> None:
         output = Output()
         try:
             async with build_http_client() as http_client:
-                service = A2AService(http_client, agent_url)
+                service = A2AService(http_client, agent_url, credentials=credentials)
                 card_data = await service.get_card()
                 log.info("Retrieved card for agent: %s", card_data.name)
 

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/src/a2a_handler/server/app.py

@@ -48,6 +48,7 @@ class APIKeyAuthMiddleware(BaseHTTPMiddleware):
 
     OPEN_PATHS = {
         "/.well-known/agent-card.json",
+        "/.well-known/agent.json",
         "/health",
     }
 

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/src/a2a_handler/service.py

@@ -9,6 +9,7 @@ from typing import AsyncIterator
 
 import httpx
 from a2a.client import A2ACardResolver, Client, ClientConfig, ClientFactory
+from a2a.client.errors import A2AClientHTTPError
 from a2a.types import (
     AgentCard,
     GetTaskPushNotificationConfigParams,
@@ -27,6 +28,11 @@ from a2a.types import (
     TransportProtocol,
 )
 
+from a2a.utils.constants import (
+    AGENT_CARD_WELL_KNOWN_PATH,
+    PREV_AGENT_CARD_WELL_KNOWN_PATH,
+)
+
 from a2a_handler.auth import AuthCredentials
 from a2a_handler.common import get_logger
 
@@ -255,18 +261,47 @@ class A2AService:
         auth_headers = credentials.to_headers()
         self.http_client.headers.update(auth_headers)
         self._applied_auth_headers = set(auth_headers.keys())
+        # Rebuild the SDK client so updated headers are guaranteed to be used.
+        self._cached_client = None
         logger.debug("Applied authentication headers: %s", list(auth_headers.keys()))
 
+    def clear_credentials(self) -> None:
+        """Clear authentication credentials from the service and HTTP client."""
+        for header_name in self._applied_auth_headers:
+            self.http_client.headers.pop(header_name, None)
+        self._applied_auth_headers.clear()
+        self.credentials = None
+        # Rebuild the SDK client so cleared headers are guaranteed to be used.
+        self._cached_client = None
+        logger.debug("Cleared authentication headers")
+
     async def get_card(self) -> AgentCard:
         """Fetch and cache the agent card.
 
+        Tries the standard well-known path first (``agent-card.json``), then
+        falls back to the previous path (``agent.json``) used by older ADK
+        versions.
+
         Returns:
             The agent's card with metadata and capabilities
         """
         if self._cached_agent_card is None:
             logger.info("Fetching agent card from %s", self.agent_url)
             card_resolver = A2ACardResolver(self.http_client, self.agent_url)
-            self._cached_agent_card = await card_resolver.get_agent_card()
+            try:
+                self._cached_agent_card = await card_resolver.get_agent_card()
+            except (A2AClientHTTPError, httpx.HTTPStatusError):
+                logger.info(
+                    "Agent card not found at %s, trying %s",
+                    AGENT_CARD_WELL_KNOWN_PATH,
+                    PREV_AGENT_CARD_WELL_KNOWN_PATH,
+                )
+                fallback_resolver = A2ACardResolver(
+                    self.http_client,
+                    self.agent_url,
+                    agent_card_path=PREV_AGENT_CARD_WELL_KNOWN_PATH,
+                )
+                self._cached_agent_card = await fallback_resolver.get_agent_card()
             logger.info("Connected to agent: %s", self._cached_agent_card.name)
         return self._cached_agent_card
 

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/src/a2a_handler/tui/app.py

@@ -19,6 +19,7 @@ from textual.logging import TextualHandler
 from textual.screen import Screen
 from textual.widgets import Button, Footer, Input
 
+from a2a_handler.auth import AuthCredentials
 from a2a_handler.common import get_theme, install_tui_log_handler, save_theme
 from a2a_handler.service import A2AService
 from a2a_handler.tui.components import (
@@ -72,7 +73,7 @@ class HandlerTUI(App[Any]):
             return False
         return True
 
-    def __init__(self, **kwargs: Any) -> None:
+    def __init__(self, initial_bearer_token: str | None = None, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.current_agent_card: AgentCard | None = None
         self.http_client: httpx.AsyncClient | None = None
@@ -80,6 +81,7 @@ class HandlerTUI(App[Any]):
         self.current_agent_url: str | None = None
         self._agent_service: A2AService | None = None
         self._is_maximized: bool = False
+        self._initial_bearer_token = initial_bearer_token
 
     def compose(self) -> ComposeResult:
         with Container(id="root-container"):
@@ -102,6 +104,8 @@ class HandlerTUI(App[Any]):
 
         messages_panel = self.query_one("#messages-container", TabbedMessagesPanel)
         messages_panel.load_logs(tui_log_handler.get_lines())
+        if self._initial_bearer_token:
+            messages_panel.set_bearer_token(self._initial_bearer_token)
 
         contact_panel = self.query_one("#contact-container", ContactPanel)
         contact_panel.set_version(__version__)
@@ -125,12 +129,20 @@ class HandlerTUI(App[Any]):
         agent_card_panel = self.query_one("#agent-card-container", AgentCardPanel)
         agent_card_panel.refresh_theme()
 
-    async def _connect_to_agent(self, agent_url: str) -> AgentCard:
+    async def _connect_to_agent(
+        self,
+        agent_url: str,
+        credentials: AuthCredentials | None = None,
+    ) -> AgentCard:
         if not self.http_client:
             raise RuntimeError("HTTP client not initialized")
 
         logger.info("Connecting to agent at %s", agent_url)
-        self._agent_service = A2AService(self.http_client, agent_url)
+        self._agent_service = A2AService(
+            self.http_client,
+            agent_url,
+            credentials=credentials,
+        )
         return await self._agent_service.get_card()
 
     def _update_ui_for_connected_state(self, agent_card: AgentCard) -> None:
@@ -155,7 +167,8 @@ class HandlerTUI(App[Any]):
         messages_panel.add_system_message(f"Connecting to {agent_url}...")
 
         try:
-            agent_card = await self._connect_to_agent(agent_url)
+            credentials = messages_panel.get_auth_credentials()
+            agent_card = await self._connect_to_agent(agent_url, credentials)
 
             self.current_agent_card = agent_card
             self.current_agent_url = agent_url
@@ -214,6 +227,8 @@ class HandlerTUI(App[Any]):
             credentials = messages_panel.get_auth_credentials()
             if credentials:
                 self._agent_service.set_credentials(credentials)
+            else:
+                self._agent_service.clear_credentials()
 
             send_result = await self._agent_service.send(
                 message_text,

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/src/a2a_handler/tui/components/auth.py

@@ -97,3 +97,13 @@ class AuthPanel(Vertical):
         elif pressed.id == "auth-bearer":
             return AuthType.BEARER
         return None
+
+    def set_bearer_token(self, token: str) -> None:
+        """Preconfigure bearer token authentication."""
+        self.query_one("#bearer-token-input", Input).value = token
+        self.query_one("#auth-bearer", RadioButton).value = True
+
+        # Ensure fields are visible even if no RadioSet event is emitted.
+        self.query_one("#api-key-fields", Vertical).add_class("hidden")
+        self.query_one("#bearer-fields", Vertical).remove_class("hidden")
+        logger.debug("Preconfigured bearer token authentication")

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/src/a2a_handler/tui/components/messages.py

@@ -251,6 +251,11 @@ class TabbedMessagesPanel(Container):
         auth_panel = self._get_auth_panel()
         return auth_panel.get_credentials()
 
+    def set_bearer_token(self, token: str) -> None:
+        """Preconfigure bearer token authentication in the auth panel."""
+        auth_panel = self._get_auth_panel()
+        auth_panel.set_bearer_token(token)
+
     def add_task(self, task: "Task") -> None:
         """Add a task to the tasks panel."""
         tasks_panel = self._get_tasks_panel()

{a2a_handler-0.1.15 → a2a_handler-0.1.17}/src/a2a_handler/validation.py

@@ -11,7 +11,12 @@ from typing import Any
 
 import httpx
 from a2a.client import A2ACardResolver
+from a2a.client.errors import A2AClientHTTPError
 from a2a.types import AgentCard
+from a2a.utils.constants import (
+    AGENT_CARD_WELL_KNOWN_PATH,
+    PREV_AGENT_CARD_WELL_KNOWN_PATH,
+)
 from pydantic import ValidationError
 
 from a2a_handler.common import get_logger
@@ -101,7 +106,20 @@ async def validate_agent_card_from_url(
 
     try:
         resolver = A2ACardResolver(http_client, agent_url)
-        agent_card = await resolver.get_agent_card()
+        try:
+            agent_card = await resolver.get_agent_card()
+        except (A2AClientHTTPError, httpx.HTTPStatusError):
+            logger.info(
+                "Agent card not found at %s, trying %s",
+                AGENT_CARD_WELL_KNOWN_PATH,
+                PREV_AGENT_CARD_WELL_KNOWN_PATH,
+            )
+            fallback_resolver = A2ACardResolver(
+                http_client,
+                agent_url,
+                agent_card_path=PREV_AGENT_CARD_WELL_KNOWN_PATH,
+            )
+            agent_card = await fallback_resolver.get_agent_card()
 
         logger.info("Agent card validation successful for %s", agent_card.name)
         return ValidationResult(