Upgrade git_issue_agent dependencies

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

Author: esnible

a2a/git_issue_agent/a2a_agent.py

@@ -13,22 +13,22 @@
 
 
 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.helpers import new_task_from_user_message, new_text_part
 from a2a.types import (
     AgentCapabilities,
     AgentCard,
+    AgentInterface,
     AgentSkill,
     TaskState,
-    TextPart,
     SecurityScheme,
     HTTPAuthSecurityScheme,
 )
-from a2a.utils import new_agent_text_message, new_task
 
-from starlette.routing import Route
+from starlette.applications import Starlette
 
 from git_issue_agent.config import settings, Settings
 from git_issue_agent.event import Event
@@ -51,20 +51,21 @@ def get_agent_card(host: str, port: int):
             "Show all issues assigned to me across any repository",
         ],
     )
+    # Allow env var AGENT_ENDPOINT to override the URL in the agent card
+    url = os.getenv("AGENT_ENDPOINT", f"http://{host}:{port}").rstrip("/") + "/"
     return AgentCard(
         name="Github issue agent",
         description="Answer queries about Github issues",
-        # 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=url, protocol_binding="JSONRPC")],
         version="1.0.0",
         default_input_modes=["text"],
         default_output_modes=["text"],
         capabilities=capabilities,
         skills=[skill],
-        securitySchemes={
+        security_schemes={
             "Bearer": SecurityScheme(
-                root=HTTPAuthSecurityScheme(
-                    type="http", scheme="bearer", bearerFormat="JWT", description="OAuth 2.0 JWT token"
+                http_auth_security_scheme=HTTPAuthSecurityScheme(
+                    scheme="bearer", bearer_format="JWT", description="OAuth 2.0 JWT token"
                 )
             )
         },
@@ -99,17 +100,13 @@ async def emit_event(self, message: str, final: bool = False) -> None:
         logger.info("Emitting event %s", message)
 
         if final:
-            parts = [TextPart(text=message)]
+            parts = [new_text_part(message)]
             await self.task_updater.add_artifact(parts)
             await self.task_updater.complete()
         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)]),
             )
 
 
@@ -153,7 +150,7 @@ async def execute(self, context: RequestContext, event_queue: EventQueue):
         user_input = [context.get_user_input()]
         task = context.current_task
         if not task:
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             await event_queue.enqueue_event(task)
         task_updater = TaskUpdater(event_queue, task.id, task.context_id)
         event_emitter = A2AEvent(task_updater)
@@ -216,24 +213,17 @@ def run():
     request_handler = DefaultRequestHandler(
         agent_executor=GithubExecutor(),
         task_store=InMemoryTaskStore(),
-    )
-
-    server = A2AStarletteApplication(
         agent_card=agent_card,
-        http_handler=request_handler,
     )
 
-    app = server.build()  # this returns a Starlette app
-
-    # 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",
-        ),
-    )
+    # 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")
+
+    app = Starlette(routes=routes)
 
     uvicorn.run(app, host="0.0.0.0", port=settings.SERVICE_PORT)

a2a/git_issue_agent/pyproject.toml

@@ -5,7 +5,7 @@ requires-python = ">=3.11,<3.13"
 description = "Git issue Agent module"
 dependencies = [
     "python-dotenv>=1.2.2",
-    "a2a-sdk>=0.2.16",
+    "a2a-sdk>=1.1.0,<2",
     # We use 1.6.1 instead of the latest because
     # crewai requires openai>=2.30.0
     # but litellm requires openai==2.24.0