Merge branch 'main' into 172-helper-functions

Author: njbrake

pyproject.toml

@@ -8,15 +8,15 @@ authors = [{ name = "Google LLC", email = "[email protected]" }]
 requires-python = ">=3.10"
 keywords = ["A2A", "A2A SDK", "A2A Protocol", "Agent2Agent"]
 dependencies = [
-    "fastapi>=0.115.12",
+    "fastapi>=0.115.2",
     "httpx>=0.28.1",
     "httpx-sse>=0.4.0",
     "google-api-core>=1.26.0",
     "opentelemetry-api>=1.33.0",
     "opentelemetry-sdk>=1.33.0",
     "pydantic>=2.11.3",
-    "sse-starlette>=2.3.3",
-    "starlette>=0.46.2",
+    "sse-starlette",
+    "starlette",
     "grpcio>=1.60",
     "grpcio-tools>=1.60",
     "grpcio_reflection>=1.7.0",

src/a2a/server/apps/jsonrpc/fastapi_app.py

@@ -49,25 +49,21 @@ def __init__(
             context_builder=context_builder,
         )
 
-    def build(
+    def add_routes_to_app(
         self,
+        app: FastAPI,
         agent_card_url: str = '/.well-known/agent.json',
         rpc_url: str = '/',
         extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
-        **kwargs: Any,
-    ) -> FastAPI:
-        """Builds and returns the FastAPI application instance.
+    ) -> None:
+        """Adds the routes to the FastAPI application.
 
         Args:
+            app: The FastAPI application to add the routes to.
             agent_card_url: The URL for the agent card endpoint.
             rpc_url: The URL for the A2A JSON-RPC endpoint.
             extended_agent_card_url: The URL for the authenticated extended agent card endpoint.
-            **kwargs: Additional keyword arguments to pass to the FastAPI constructor.
-
-        Returns:
-            A configured FastAPI application instance.
         """
-        app = FastAPI(**kwargs)
 
         @app.post(rpc_url)
         async def handle_a2a_request(request: Request) -> Response:
@@ -85,4 +81,28 @@ async def get_extended_agent_card(request: Request) -> Response:
                     request
                 )
 
+    def build(
+        self,
+        agent_card_url: str = '/.well-known/agent.json',
+        rpc_url: str = '/',
+        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
+        **kwargs: Any,
+    ) -> FastAPI:
+        """Builds and returns the FastAPI application instance.
+
+        Args:
+            agent_card_url: The URL for the agent card endpoint.
+            rpc_url: The URL for the A2A JSON-RPC endpoint.
+            extended_agent_card_url: The URL for the authenticated extended agent card endpoint.
+            **kwargs: Additional keyword arguments to pass to the FastAPI constructor.
+
+        Returns:
+            A configured FastAPI application instance.
+        """
+        app = FastAPI(**kwargs)
+
+        self.add_routes_to_app(
+            app, agent_card_url, rpc_url, extended_agent_card_url
+        )
+
         return app

src/a2a/server/apps/jsonrpc/starlette_app.py

@@ -92,6 +92,28 @@ def routes(
             )
         return app_routes
 
+    def add_routes_to_app(
+        self,
+        app: Starlette,
+        agent_card_url: str = '/.well-known/agent.json',
+        rpc_url: str = '/',
+        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
+    ) -> None:
+        """Adds the routes to the Starlette application.
+
+        Args:
+            app: The Starlette application to add the routes to.
+            agent_card_url: The URL path for the agent card endpoint.
+            rpc_url: The URL path for the A2A JSON-RPC endpoint (POST requests).
+            extended_agent_card_url: The URL for the authenticated extended agent card endpoint.
+        """
+        routes = self.routes(
+            agent_card_url=agent_card_url,
+            rpc_url=rpc_url,
+            extended_agent_card_url=extended_agent_card_url,
+        )
+        app.routes.extend(routes)
+
     def build(
         self,
         agent_card_url: str = '/.well-known/agent.json',
@@ -110,14 +132,10 @@ def build(
         Returns:
             A configured Starlette application instance.
         """
-        app_routes = self.routes(
-            agent_card_url=agent_card_url,
-            rpc_url=rpc_url,
-            extended_agent_card_url=extended_agent_card_url,
+        app = Starlette(**kwargs)
+
+        self.add_routes_to_app(
+            app, agent_card_url, rpc_url, extended_agent_card_url
         )
-        if 'routes' in kwargs:
-            kwargs['routes'].extend(app_routes)
-        else:
-            kwargs['routes'] = app_routes
 
-        return Starlette(**kwargs)
+        return app

src/a2a/server/tasks/task_updater.py

@@ -65,12 +65,14 @@ async def update_status(
             )
         )
 
-    async def add_artifact(
+    async def add_artifact(  # noqa: PLR0913
         self,
         parts: list[Part],
         artifact_id: str | None = None,
         name: str | None = None,
         metadata: dict[str, Any] | None = None,
+        append: bool | None = None,
+        last_chunk: bool | None = None,
     ) -> None:
         """Adds an artifact chunk to the task and publishes a `TaskArtifactUpdateEvent`.
 
@@ -79,6 +81,8 @@ async def add_artifact(
             artifact_id: The ID of the artifact. A new UUID is generated if not provided.
             name: Optional name for the artifact.
             metadata: Optional metadata for the artifact.
+            append: Optional boolean indicating if this chunk appends to a previous one.
+            last_chunk: Optional boolean indicating if this is the last chunk.
         """
         if not artifact_id:
             artifact_id = str(uuid.uuid4())
@@ -93,6 +97,8 @@ async def add_artifact(
                     parts=parts,
                     metadata=metadata,
                 ),
+                append=append,
+                lastChunk=last_chunk
             )
         )