refactor: adjust code after merge

Signed-off-by: Shingo OKAWA <shingo.okawa.g.h.c@gmail.com>

Author: ognis1205

examples/apicatalog/__main__.py

@@ -1,16 +1,15 @@
 import logging
-import os
 import sys
 import traceback
 
 import click
 import uvicorn
-from dotenv import load_dotenv
 
 from agent_executors import (  # type: ignore[import-untyped]
     EchoAgentExecutor,
     HelloWorldAgentExecutor,
 )
+from dotenv import load_dotenv
 
 from a2a.server.apps import A2AStarletteBuilder, A2AStarletteRouteBuilder
 from a2a.server.request_handlers import DefaultRequestHandler
@@ -54,19 +53,19 @@ def main(host: str, port: int):
     )
 
     echo_skill = AgentSkill(
-        id="echo",
-        name="Echo input",
-        description="Returns the input text as is",
-        tags=["echo"],
-        examples=["Hello!", "Repeat after me"],
+        id='echo',
+        name='Echo input',
+        description='Returns the input text as is',
+        tags=['echo'],
+        examples=['Hello!', 'Repeat after me'],
     )
     echo_card = AgentCard(
-        name="Echo Agent",
-        description="An agent that echoes back your input.",
-        url=f"http://{host}:{port}/a2a/echo",
-        version="1.0.0",
-        defaultInputModes=["text"],
-        defaultOutputModes=["text"],
+        name='Echo Agent',
+        description='An agent that echoes back your input.',
+        url=f'http://{host}:{port}/a2a/echo',
+        version='1.0.0',
+        defaultInputModes=['text'],
+        defaultOutputModes=['text'],
         capabilities=AgentCapabilities(streaming=True),
         skills=[echo_skill],
         supportsAuthenticatedExtendedCard=False,
@@ -80,16 +79,11 @@ def main(host: str, port: int):
         http_handler=echo_handler,
     )
 
-    server = (
-        A2AStarletteBuilder()
-            .mount(hello_agent)
-            .mount(echo_agent)
-            .build()
-    )
+    server = A2AStarletteBuilder().mount(hello_agent).mount(echo_agent).build()
     uvicorn.run(server, host=host, port=port)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     try:
         main()
     except Exception as _:

examples/apicatalog/test_client.py

@@ -1,12 +1,12 @@
 import asyncio
 import json
 import logging
-import os
 import sys
 import traceback
 
 import click
 import httpx
+
 from dotenv import load_dotenv
 
 
@@ -31,7 +31,7 @@ def main(host: str, port: int):
     print(json.dumps(catalog))
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     try:
         main()
     except Exception as _:

src/a2a/server/apps/__init__.py

@@ -3,8 +3,8 @@
 from a2a.server.apps.jsonrpc import (
     A2AFastAPIApplication,
     A2AStarletteApplication,
-    A2AStarletteRouteBuilder,
     A2AStarletteBuilder,
+    A2AStarletteRouteBuilder,
     CallContextBuilder,
     JSONRPCApplication,
 )
@@ -13,8 +13,8 @@
 __all__ = [
     'A2AFastAPIApplication',
     'A2AStarletteApplication',
-    'A2AStarletteRouteBuilder',
     'A2AStarletteBuilder',
+    'A2AStarletteRouteBuilder',
     'CallContextBuilder',
     'JSONRPCApplication',
 ]

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

@@ -5,12 +5,18 @@
     CallContextBuilder,
     JSONRPCApplication,
 )
-from a2a.server.apps.jsonrpc.starlette_app import A2AStarletteApplication
+from a2a.server.apps.jsonrpc.starlette_app import (
+    A2AStarletteApplication,
+    A2AStarletteBuilder,
+    A2AStarletteRouteBuilder,
+)
 
 
 __all__ = [
     'A2AFastAPIApplication',
     'A2AStarletteApplication',
+    'A2AStarletteBuilder',
+    'A2AStarletteRouteBuilder',
     'CallContextBuilder',
     'JSONRPCApplication',
 ]

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

@@ -6,7 +6,7 @@
 
 from a2a.server.apps.jsonrpc.jsonrpc_app import (
     CallContextBuilder,
-    JSONRPCApplication,
+    JSONRPCApplicationAspect,
 )
 from a2a.server.request_handlers.jsonrpc_handler import RequestHandler
 from a2a.types import AgentCard
@@ -15,7 +15,7 @@
 logger = logging.getLogger(__name__)
 
 
-class A2AFastAPIApplication(JSONRPCApplication):
+class A2AFastAPIApplication(JSONRPCApplicationAspect):
     """A FastAPI application implementing the A2A protocol server endpoints.
 
     Handles incoming JSON-RPC requests, routes them to the appropriate

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

@@ -1,13 +1,11 @@
 import contextlib
 import json
 import logging
-import posixpath
 import traceback
 
 from abc import ABC, abstractmethod
 from collections.abc import AsyncGenerator
-from typing import Any
-from urllib.parse import urlparse, urlunparse
+from typing import Any, Protocol, runtime_checkable
 
 from fastapi import FastAPI
 from pydantic import ValidationError
@@ -26,9 +24,6 @@
     A2AError,
     A2ARequest,
     AgentCard,
-    AgentCatalog,
-    AgentLinkContext,
-    AgentLinkTarget,
     CancelTaskRequest,
     GetTaskPushNotificationConfigRequest,
     GetTaskRequest,
@@ -97,7 +92,7 @@ def build(self, request: Request) -> ServerCallContext:
         return ServerCallContext(user=user, state=state)
 
 
-class JSONRPCApplication(ABC):
+class JSONRPCApplicationAspect:
     """Base class for A2A JSONRPC applications.
 
     Handles incoming JSON-RPC requests, routes them to the appropriate
@@ -409,7 +404,15 @@ async def _handle_get_authenticated_extended_agent_card(
             status_code=404,
         )
 
-    @abstractmethod
+
+@runtime_checkable
+class JSONRPCApplication(Protocol):
+    """Protocol for building a JSON-RPC application.
+
+    Implementers of this protocol must provide a `build` method that returns a FastAPI
+    or Starlette application instance configured for A2A JSON-RPC communication.
+    """
+
     def build(
         self,
         agent_card_url: str = '/.well-known/agent.json',
@@ -426,6 +429,4 @@ def build(
         Returns:
             A configured JSONRPC application instance.
         """
-        raise NotImplementedError(
-            'Subclasses must implement the build method to create the application instance.'
-        )
+        ...