Merge branch 'main' into jscpd-fixes

Author: holtskinner

.github/workflows/update-a2a-types.yml

@@ -58,7 +58,8 @@ jobs:
             --use-default-kwarg \
             --use-one-literal-as-default \
             --class-name A2A \
-            --use-standard-collections
+            --use-standard-collections \
+            --use-subclass-enum
           echo "Codegen finished."
 
       - name: Create Pull Request with Updates
@@ -67,8 +68,8 @@ jobs:
           token: ${{ secrets.A2A_BOT_PAT }}
           committer: "a2a-bot <[email protected]>"
           author: "a2a-bot <[email protected]>"
-          commit-message: "chore: 🤖Auto-update A2A types from google-a2a/A2A@${{ github.event.client_payload.sha }}"
-          title: "chore: 🤖 Auto-update A2A types from google-a2a/A2A"
+          commit-message: "${{github.event.client_payload.message}} 🤖"
+          title: "${{github.event.client_payload.message}} 🤖"
           body: |
             This PR updates `src/a2a/types.py` based on the latest `specification/json/a2a.json` from [google-a2a/A2A](https://github.com/google-a2a/A2A/commit/${{ github.event.client_payload.sha }}).
           branch: "auto-update-a2a-types-${{ github.event.client_payload.sha }}"

README.md

@@ -48,13 +48,14 @@ pip install a2a-sdk
 
    ```bash
    git clone https://github.com/google-a2a/a2a-samples.git
-   cd samples/helloworld
+   cd a2a-samples/samples/python/agents/helloworld
    uv run .
    ```
 
 2. In another terminal, run the client
 
    ```bash
+   cd a2a-samples/samples/python/agents/helloworld
    uv run test_client.py
    ```
 

development.md

@@ -17,5 +17,6 @@ uv run datamodel-codegen \
   --use-default-kwarg \
   --use-one-literal-as-default \
   --class-name A2A \
-  --use-standard-collections
+  --use-standard-collections \
+  --use-subclass-enum
 ```

src/a2a/server/apps/starlette_app.py

@@ -45,8 +45,20 @@
 
 logger = logging.getLogger(__name__)
 
-# Register Starlette User as an implementation of a2a.auth.user.User
-A2AUser.register(BaseUser)
+
+class StarletteUserProxy(A2AUser):
+    """Adapts the Starlette User class to the A2A user representation."""
+
+    def __init__(self, user: BaseUser):
+        self._user = user
+
+    @property
+    def is_authenticated(self):
+        return self._user.is_authenticated
+
+    @property
+    def user_name(self):
+        return self._user.display_name
 
 
 class CallContextBuilder(ABC):
@@ -64,7 +76,7 @@ def build(self, request: Request) -> ServerCallContext:
         user = UnauthenticatedUser()
         state = {}
         with contextlib.suppress(Exception):
-            user = request.user
+            user = StarletteUserProxy(request.user)
             state['auth'] = request.auth
         return ServerCallContext(user=user, state=state)
 

src/a2a/server/events/event_queue.py

@@ -3,8 +3,6 @@
 import sys
 
 from a2a.types import (
-    A2AError,
-    JSONRPCError,
     Message,
     Task,
     TaskArtifactUpdateEvent,
@@ -16,14 +14,7 @@
 logger = logging.getLogger(__name__)
 
 
-Event = (
-    Message
-    | Task
-    | TaskStatusUpdateEvent
-    | TaskArtifactUpdateEvent
-    | A2AError
-    | JSONRPCError
-)
+Event = Message | Task | TaskStatusUpdateEvent | TaskArtifactUpdateEvent
 """Type alias for events that can be enqueued."""
 
 

src/a2a/server/tasks/task_updater.py

@@ -1,5 +1,6 @@
 import uuid
 
+from datetime import datetime, timezone
 from typing import Any
 
 from a2a.server.events import EventQueue
@@ -34,15 +35,23 @@ def __init__(self, event_queue: EventQueue, task_id: str, context_id: str):
         self.context_id = context_id
 
     def update_status(
-        self, state: TaskState, message: Message | None = None, final=False
+        self,
+        state: TaskState,
+        message: Message | None = None,
+        final=False,
+        timestamp: str | None = None,
     ):
         """Updates the status of the task and publishes a `TaskStatusUpdateEvent`.
 
         Args:
             state: The new state of the task.
             message: An optional message associated with the status update.
             final: If True, indicates this is the final status update for the task.
+            timestamp: Optional ISO 8601 datetime string. Defaults to current time.
         """
+        current_timestamp = (
+            timestamp if timestamp else datetime.now(timezone.utc).isoformat()
+        )
         self.event_queue.enqueue_event(
             TaskStatusUpdateEvent(
                 taskId=self.task_id,
@@ -51,6 +60,7 @@ def update_status(
                 status=TaskStatus(
                     state=state,
                     message=message,
+                    timestamp=current_timestamp,
                 ),
             )
         )
@@ -97,6 +107,10 @@ def failed(self, message: Message | None = None):
         """Marks the task as failed and publishes a final status update."""
         self.update_status(TaskState.failed, message=message, final=True)
 
+    def reject(self, message: Message | None = None):
+        """Marks the task as rejected and publishes a final status update."""
+        self.update_status(TaskState.rejected, message=message, final=True)
+
     def submit(self, message: Message | None = None):
         """Marks the task as submitted and publishes a status update."""
         self.update_status(

src/a2a/types.py

@@ -13,7 +13,7 @@ class A2A(RootModel[Any]):
     root: Any
 
 
-class In(Enum):
+class In(str, Enum):
     """
     The location of the API key. Valid values are "query", "header", or "cookie".
     """
@@ -464,9 +464,9 @@ class JSONRPCRequest(BaseModel):
     """
 
 
-class JSONRPCResult(BaseModel):
+class JSONRPCSuccessResponse(BaseModel):
     """
-    Represents a JSON-RPC 2.0 Result object.
+    Represents a JSON-RPC 2.0 Success Response object.
     """
 
     id: str | int | None = None
@@ -484,7 +484,7 @@ class JSONRPCResult(BaseModel):
     """
 
 
-class Role(Enum):
+class Role(str, Enum):
     """
     Message sender's role
     """
@@ -583,6 +583,10 @@ class PushNotificationConfig(BaseModel):
     """
 
     authentication: PushNotificationAuthenticationInfo | None = None
+    id: str | None = None
+    """
+    Push Notification ID - created by server to support multiple callbacks
+    """
     token: str | None = None
     """
     Token unique to this task/session.
@@ -712,7 +716,7 @@ class TaskResubscriptionRequest(BaseModel):
     JSON-RPC request model for the 'tasks/resubscribe' method.
     """
 
-    id: str | int | None = None
+    id: str | int
     """
     An identifier established by the Client that MUST contain a String, Number.
     Numbers SHOULD NOT contain fractional parts.
@@ -731,7 +735,7 @@ class TaskResubscriptionRequest(BaseModel):
     """
 
 
-class TaskState(Enum):
+class TaskState(str, Enum):
     """
     Represents the possible states of a Task.
     """
@@ -821,7 +825,7 @@ class CancelTaskRequest(BaseModel):
     JSON-RPC request model for the 'tasks/cancel' method.
     """
 
-    id: str | int | None = None
+    id: str | int
     """
     An identifier established by the Client that MUST contain a String, Number.
     Numbers SHOULD NOT contain fractional parts.
@@ -864,7 +868,7 @@ class GetTaskPushNotificationConfigRequest(BaseModel):
     JSON-RPC request model for the 'tasks/pushNotificationConfig/get' method.
     """
 
-    id: str | int | None = None
+    id: str | int
     """
     An identifier established by the Client that MUST contain a String, Number.
     Numbers SHOULD NOT contain fractional parts.
@@ -910,7 +914,7 @@ class GetTaskRequest(BaseModel):
     JSON-RPC request model for the 'tasks/get' method.
     """
 
-    id: str | int | None = None
+    id: str | int
     """
     An identifier established by the Client that MUST contain a String, Number.
     Numbers SHOULD NOT contain fractional parts.
@@ -1017,7 +1021,7 @@ class SetTaskPushNotificationConfigRequest(BaseModel):
     JSON-RPC request model for the 'tasks/pushNotificationConfig/set' method.
     """
 
-    id: str | int | None = None
+    id: str | int
     """
     An identifier established by the Client that MUST contain a String, Number.
     Numbers SHOULD NOT contain fractional parts.
@@ -1086,9 +1090,7 @@ class Artifact(BaseModel):
 
 
 class GetTaskPushNotificationConfigResponse(
-    RootModel[
-        JSONRPCErrorResponse | GetTaskPushNotificationConfigSuccessResponse
-    ]
+    RootModel[JSONRPCErrorResponse | GetTaskPushNotificationConfigSuccessResponse]
 ):
     root: JSONRPCErrorResponse | GetTaskPushNotificationConfigSuccessResponse
     """
@@ -1195,7 +1197,7 @@ class SendMessageRequest(BaseModel):
     JSON-RPC request model for the 'message/send' method.
     """
 
-    id: str | int | None = None
+    id: str | int
     """
     An identifier established by the Client that MUST contain a String, Number.
     Numbers SHOULD NOT contain fractional parts.
@@ -1219,7 +1221,7 @@ class SendStreamingMessageRequest(BaseModel):
     JSON-RPC request model for the 'message/stream' method.
     """
 
-    id: str | int | None = None
+    id: str | int
     """
     An identifier established by the Client that MUST contain a String, Number.
     Numbers SHOULD NOT contain fractional parts.
@@ -1239,9 +1241,7 @@ class SendStreamingMessageRequest(BaseModel):
 
 
 class SetTaskPushNotificationConfigResponse(
-    RootModel[
-        JSONRPCErrorResponse | SetTaskPushNotificationConfigSuccessResponse
-    ]
+    RootModel[JSONRPCErrorResponse | SetTaskPushNotificationConfigSuccessResponse]
 ):
     root: JSONRPCErrorResponse | SetTaskPushNotificationConfigSuccessResponse
     """
@@ -1387,6 +1387,10 @@ class AgentCard(BaseModel):
     """
     A URL to documentation for the agent.
     """
+    iconUrl: str | None = None
+    """
+    A URL to an icon for the agent.
+    """
     name: str
     """
     Human readable name of the agent.
@@ -1420,10 +1424,6 @@ class AgentCard(BaseModel):
     """
     The version of the agent - format is up to the provider.
     """
-    supportsAuthenticatedExtendedCard: bool | None = Field(default=None)
-    """
-    Optional field indicating there is an extended card available post authentication at the /agent/authenticatedExtendedCard endpoint.
-    """
 
 
 class Task(BaseModel):
@@ -1534,9 +1534,7 @@ class SendStreamingMessageSuccessResponse(BaseModel):
     """
 
 
-class CancelTaskResponse(
-    RootModel[JSONRPCErrorResponse | CancelTaskSuccessResponse]
-):
+class CancelTaskResponse(RootModel[JSONRPCErrorResponse | CancelTaskSuccessResponse]):
     root: JSONRPCErrorResponse | CancelTaskSuccessResponse
     """
     JSON-RPC response for the 'tasks/cancel' method.
@@ -1546,7 +1544,7 @@ class CancelTaskResponse(
 class GetTaskResponse(RootModel[JSONRPCErrorResponse | GetTaskSuccessResponse]):
     root: JSONRPCErrorResponse | GetTaskSuccessResponse
     """
-    JSON-RPC success response for the 'tasks/get' method.
+    JSON-RPC response for the 'tasks/get' method.
     """
 
 
@@ -1575,9 +1573,7 @@ class JSONRPCResponse(
     """
 
 
-class SendMessageResponse(
-    RootModel[JSONRPCErrorResponse | SendMessageSuccessResponse]
-):
+class SendMessageResponse(RootModel[JSONRPCErrorResponse | SendMessageSuccessResponse]):
     root: JSONRPCErrorResponse | SendMessageSuccessResponse
     """
     JSON-RPC response model for the 'message/send' method.

src/a2a/utils/message.py

@@ -21,8 +21,6 @@ def new_agent_text_message(
         text: The text content of the message.
         context_id: The context ID for the message.
         task_id: The task ID for the message.
-        final: Optional boolean indicating if this is the final message.
-        metadata: Optional metadata for the message.
 
     Returns:
         A new `Message` object with role 'agent'.
@@ -47,8 +45,6 @@ def new_agent_parts_message(
         parts: The list of `Part` objects for the message content.
         context_id: The context ID for the message.
         task_id: The task ID for the message.
-        final: Optional boolean indicating if this is the final message.
-        metadata: Optional metadata for the message.
 
     Returns:
         A new `Message` object with role 'agent'.