More missed instances of AgentAuthentication + nox format

Author: mikeas1

examples/google_adk/calendar_agent/__main__.py

@@ -64,7 +64,6 @@ def main(host: str, port: int):
         defaultOutputModes=['text'],
         capabilities=AgentCapabilities(streaming=True),
         skills=[skill],
-        authentication=AgentAuthentication(schemes=['public']),
     )
 
     adk_agent = create_agent(

tests/client/test_client.py

@@ -1,9 +1,14 @@
 import json
-from unittest.mock import AsyncMock, MagicMock, patch
+
 from collections.abc import AsyncGenerator
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock, patch
+
 import httpx
 import pytest
 
+from httpx_sse import EventSource, ServerSentEvent
+
 from a2a.client import (
     A2ACardResolver,
     A2AClient,
@@ -12,31 +17,28 @@
     create_text_message_object,
 )
 from a2a.types import (
+    A2ARequest,
+    AgentCapabilities,
     AgentCard,
     AgentSkill,
-    AgentCapabilities,
-    AgentAuthentication,
-    A2ARequest,
-    Role,
-    TaskQueryParams,
-    TaskIdParams,
+    CancelTaskRequest,
+    CancelTaskResponse,
+    CancelTaskSuccessResponse,
     GetTaskRequest,
     GetTaskResponse,
-    SendMessageRequest,
+    InvalidParamsError,
+    JSONRPCErrorResponse,
     MessageSendParams,
+    Role,
+    SendMessageRequest,
     SendMessageResponse,
     SendMessageSuccessResponse,
-    JSONRPCErrorResponse,
-    InvalidParamsError,
-    CancelTaskRequest,
-    CancelTaskResponse,
-    CancelTaskSuccessResponse,
     SendStreamingMessageRequest,
     SendStreamingMessageResponse,
+    TaskIdParams,
     TaskNotCancelableError,
+    TaskQueryParams,
 )
-from typing import Any
-from httpx_sse import ServerSentEvent, EventSource
 
 
 AGENT_CARD = AgentCard(
@@ -56,7 +58,6 @@
             examples=['hi', 'hello world'],
         )
     ],
-    authentication=AgentAuthentication(schemes=['public']),
 )
 
 MINIMAL_TASK: dict[str, Any] = {
@@ -86,7 +87,7 @@ def mock_agent_card() -> MagicMock:
 
 async def async_iterable_from_list(
     items: list[ServerSentEvent],
-) -> AsyncGenerator[ServerSentEvent, None]:
+) -> AsyncGenerator[ServerSentEvent]:
     """Helper to create an async iterable from a list."""
     for item in items:
         yield item

tests/test_types.py

@@ -7,14 +7,15 @@
 from a2a.types import (
     A2AError,
     A2ARequest,
-    AgentAuthentication,
+    APIKeySecurityScheme,
     AgentCapabilities,
     AgentCard,
     AgentProvider,
     AgentSkill,
     Artifact,
     CancelTaskRequest,
     CancelTaskResponse,
+    CancelTaskSuccessResponse,
     ContentTypeNotSupportedError,
     DataPart,
     FileBase,
@@ -23,8 +24,11 @@
     FileWithUri,
     GetTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigResponse,
+    GetTaskPushNotificationConfigSuccessResponse,
     GetTaskRequest,
     GetTaskResponse,
+    GetTaskSuccessResponse,
+    In,
     InternalError,
     InvalidParamsError,
     InvalidRequestError,
@@ -35,18 +39,25 @@
     JSONRPCRequest,
     JSONRPCResponse,
     Message,
+    MessageSendParams,
     MethodNotFoundError,
+    OAuth2SecurityScheme,
     Part,
     PartBase,
     PushNotificationAuthenticationInfo,
     PushNotificationConfig,
     PushNotificationNotSupportedError,
+    Role,
+    SecurityScheme,
     SendMessageRequest,
     SendMessageResponse,
+    SendMessageSuccessResponse,
     SendStreamingMessageRequest,
     SendStreamingMessageResponse,
+    SendStreamingMessageSuccessResponse,
     SetTaskPushNotificationConfigRequest,
     SetTaskPushNotificationConfigResponse,
+    SetTaskPushNotificationConfigSuccessResponse,
     Task,
     TaskArtifactUpdateEvent,
     TaskIdParams,
@@ -55,27 +66,20 @@
     TaskPushNotificationConfig,
     TaskQueryParams,
     TaskResubscriptionRequest,
-    MessageSendParams,
     TaskState,
     TaskStatus,
     TaskStatusUpdateEvent,
     TextPart,
     UnsupportedOperationError,
-    GetTaskSuccessResponse,
-    SendStreamingMessageSuccessResponse,
-    SendMessageSuccessResponse,
-    CancelTaskSuccessResponse,
-    Role,
-    SetTaskPushNotificationConfigSuccessResponse,
-    GetTaskPushNotificationConfigSuccessResponse,
 )
 
+
 # --- Helper Data ---
 
-MINIMAL_AGENT_AUTH: dict[str, Any] = {'schemes': ['Bearer']}
-FULL_AGENT_AUTH: dict[str, Any] = {
-    'schemes': ['Bearer', 'Basic'],
-    'credentials': 'user:pass',
+MINIMAL_AGENT_SECURITY_SCHEME: dict[str, Any] = {
+    'type': 'apiKey',
+    'in': 'header',
+    'name': 'X-API-KEY',
 }
 
 MINIMAL_AGENT_SKILL: dict[str, Any] = {
@@ -95,7 +99,6 @@
 }
 
 MINIMAL_AGENT_CARD: dict[str, Any] = {
-    'authentication': MINIMAL_AGENT_AUTH,
     'capabilities': {},  # AgentCapabilities is required but can be empty
     'defaultInputModes': ['text/plain'],
     'defaultOutputModes': ['application/json'],
@@ -175,26 +178,23 @@
 # --- Test Functions ---
 
 
-def test_agent_authentication_valid():
-    auth = AgentAuthentication(**MINIMAL_AGENT_AUTH)
-    assert auth.schemes == ['Bearer']
-    assert auth.credentials is None
-
-    auth_full = AgentAuthentication(**FULL_AGENT_AUTH)
-    assert auth_full.schemes == ['Bearer', 'Basic']
-    assert auth_full.credentials == 'user:pass'
+def test_security_scheme_valid():
+    scheme = SecurityScheme.model_validate(MINIMAL_AGENT_SECURITY_SCHEME)
+    assert isinstance(scheme.root, APIKeySecurityScheme)
+    assert scheme.root.type == 'apiKey'
+    assert scheme.root.in_ == In.header
+    assert scheme.root.name == 'X-API-KEY'
 
 
-def test_agent_authentication_invalid():
+def test_security_scheme_invalid():
     with pytest.raises(ValidationError):
-        AgentAuthentication(
-            credentials='only_creds'
-        )  # Missing schemes  # type: ignore
+        APIKeySecurityScheme(
+            name='my_api_key',
+        )  # Missing "in"  # type: ignore
 
-        AgentAuthentication(
-            schemes=['Bearer'],
-            extra_field='extra',  # type: ignore
-        )  # Extra field
+        OAuth2SecurityScheme(
+            description='OAuth2 scheme missing flows',
+        )  # Missing "flows"
 
 
 def test_agent_capabilities():
@@ -251,7 +251,6 @@ def test_agent_card_valid():
     card = AgentCard(**MINIMAL_AGENT_CARD)
     assert card.name == 'TestAgent'
     assert card.version == '1.0'
-    assert card.authentication.schemes == ['Bearer']
     assert len(card.skills) == 1
     assert card.skills[0].id == 'skill-123'
     assert card.provider is None  # Optional