Upgrade generic_agent dependencies

Signed-off-by: Ed Snible <snible@us.ibm.com>

Author: esnible

a2a/generic_agent/pyproject.toml

@@ -4,7 +4,7 @@ version = "0.0.1"
 description = "Simple ollama-based Langgraph agent with MCP tool calling."
 requires-python = ">=3.11"
 dependencies = [
-    "a2a-sdk>=0.2.16",
+    "a2a-sdk>=1.1.0,<2",
     "langgraph>=1.2.2",
     "langchain-core>=1.4.0",
     "langchain-community>=0.4.2",

a2a/generic_agent/src/generic_agent/agent.py

@@ -3,17 +3,17 @@
 from textwrap import dedent
 
 import uvicorn
-from langchain_core.messages import HumanMessage
-from openinference.instrumentation.langchain import LangChainInstrumentor
-from starlette.routing import Route
-
+from a2a.helpers import new_task_from_user_message, new_text_part
 from a2a.server.agent_execution import AgentExecutor, RequestContext
-from a2a.server.apps import A2AStarletteApplication
 from a2a.server.events.event_queue import EventQueue
 from a2a.server.request_handlers import DefaultRequestHandler
+from a2a.server.routes import create_agent_card_routes, create_jsonrpc_routes
 from a2a.server.tasks import InMemoryTaskStore, TaskUpdater
-from a2a.types import AgentCapabilities, AgentCard, AgentSkill, TaskState, TextPart
-from a2a.utils import new_agent_text_message, new_task
+from a2a.types import AgentCapabilities, AgentCard, AgentInterface, AgentSkill, TaskState
+from langchain_core.messages import HumanMessage
+from openinference.instrumentation.langchain import LangChainInstrumentor
+from starlette.applications import Starlette
+
 from generic_agent.config import Configuration
 from generic_agent.graph import get_graph, get_mcp_server_names, get_mcpclient, get_skill_folder_paths
 
@@ -64,7 +64,12 @@ def get_agent_card(host: str, port: int) -> AgentCard:
             """,
         ),
         # Allow env var AGENT_ENDPOINT to override the URL in the agent card
-        url=os.getenv("AGENT_ENDPOINT", f"http://{host}:{port}").rstrip("/") + "/",
+        supported_interfaces=[
+            AgentInterface(
+                url=os.getenv("AGENT_ENDPOINT", f"http://{host}:{port}").rstrip("/") + "/",
+                protocol_binding="JSONRPC",
+            )
+        ],
         version=config.AGENT_VERSION,
         default_input_modes=["text"],
         default_output_modes=["text"],
@@ -99,20 +104,16 @@ async def emit_event(self, message: str, final: bool = False, failed: bool = Fal
         logger.info("Emitting event %s", message)
 
         if final or failed:
-            parts = [TextPart(text=message)]
+            parts = [new_text_part(message)]
             await self.task_updater.add_artifact(parts)
             if final:
                 await self.task_updater.complete()
             if failed:
                 await self.task_updater.failed()
         else:
             await self.task_updater.update_status(
-                TaskState.working,
-                new_agent_text_message(
-                    message,
-                    self.task_updater.context_id,
-                    self.task_updater.task_id,
-                ),
+                TaskState.TASK_STATE_WORKING,
+                self.task_updater.new_agent_message([new_text_part(message)]),
             )
 
 
@@ -129,7 +130,7 @@ async def execute(self, context: RequestContext, event_queue: EventQueue):
         # Setup Event Emitter
         task = context.current_task
         if not task:
-            task = new_task(context.message)  # type: ignore
+            task = new_task_from_user_message(context.message)  # type: ignore
             await event_queue.enqueue_event(task)
         task_updater = TaskUpdater(event_queue, task.id, task.context_id)
         event_emitter = A2AEvent(task_updater)
@@ -211,24 +212,17 @@ def run():
     request_handler = DefaultRequestHandler(
         agent_executor=GenericExecutor(),
         task_store=InMemoryTaskStore(),
-    )
-
-    server = A2AStarletteApplication(
         agent_card=agent_card,
-        http_handler=request_handler,
     )
 
-    app = server.build()
+    # a2a-sdk 1.x replaced A2AStarletteApplication with route factories that we
+    # assemble into a Starlette app ourselves.
+    routes = create_jsonrpc_routes(request_handler, rpc_url="/")
+    # Serve the current well-known path (/.well-known/agent-card.json) plus the
+    # legacy /.well-known/agent.json path for backward compatibility.
+    routes += create_agent_card_routes(agent_card)
+    routes += create_agent_card_routes(agent_card, card_url="/.well-known/agent.json")
 
-    # Add the new agent-card.json path alongside the legacy agent.json path
-    app.routes.insert(
-        0,
-        Route(
-            "/.well-known/agent-card.json",
-            server._handle_get_agent_card,
-            methods=["GET"],
-            name="agent_card_new",
-        ),
-    )
+    app = Starlette(routes=routes)
 
     uvicorn.run(app, host=host, port=port)