feat: intro router to manager handlers

Signed-off-by: Chojan Shang <chojan.shang@vesoft.com>

Author: Chojan Shang

src/acp/agent/connection.py

@@ -28,7 +28,7 @@
 )
 from ..terminal import TerminalHandle
 from ..utils import notify_model, request_model, request_optional_model
-from .handlers import dispatch_agent_method
+from .router import build_agent_router
 
 __all__ = ["AgentSideConnection"]
 
@@ -52,8 +52,13 @@ def __init__(
         self._conn = Connection(handler, input_stream, output_stream)
 
     def _create_handler(self, agent: Agent) -> MethodHandler:
+        router = build_agent_router(agent)
+
         async def handler(method: str, params: Any | None, is_notification: bool) -> Any:
-            return await dispatch_agent_method(agent, method, params, is_notification)
+            if is_notification:
+                await router.dispatch_notification(method, params)
+                return None
+            return await router.dispatch_request(method, params)
 
         return handler
 

src/acp/agent/handlers.py

@@ -0,0 +1,76 @@
+from __future__ import annotations
+
+from typing import Any
+
+from ..exceptions import RequestError
+from ..interfaces import Agent
+from ..meta import AGENT_METHODS
+from ..router import MessageRouter, RouterBuilder
+from ..schema import (
+    AuthenticateRequest,
+    CancelNotification,
+    InitializeRequest,
+    LoadSessionRequest,
+    NewSessionRequest,
+    PromptRequest,
+    SetSessionModelRequest,
+    SetSessionModeRequest,
+)
+from ..utils import normalize_result
+
+__all__ = ["build_agent_router"]
+
+
+def build_agent_router(agent: Agent) -> MessageRouter:
+    builder = RouterBuilder()
+
+    builder.request_attr(AGENT_METHODS["initialize"], InitializeRequest, agent, "initialize")
+    builder.request_attr(AGENT_METHODS["session_new"], NewSessionRequest, agent, "newSession")
+    builder.request_attr(
+        AGENT_METHODS["session_load"],
+        LoadSessionRequest,
+        agent,
+        "loadSession",
+        adapt_result=normalize_result,
+    )
+    builder.request_attr(
+        AGENT_METHODS["session_set_mode"],
+        SetSessionModeRequest,
+        agent,
+        "setSessionMode",
+        adapt_result=normalize_result,
+    )
+    builder.request_attr(AGENT_METHODS["session_prompt"], PromptRequest, agent, "prompt")
+    builder.request_attr(
+        AGENT_METHODS["session_set_model"],
+        SetSessionModelRequest,
+        agent,
+        "setSessionModel",
+        adapt_result=normalize_result,
+    )
+    builder.request_attr(
+        AGENT_METHODS["authenticate"],
+        AuthenticateRequest,
+        agent,
+        "authenticate",
+        adapt_result=normalize_result,
+    )
+
+    builder.notification_attr(AGENT_METHODS["session_cancel"], CancelNotification, agent, "cancel")
+
+    async def handle_extension_request(name: str, payload: dict[str, Any]) -> Any:
+        ext = getattr(agent, "extMethod", None)
+        if ext is None:
+            raise RequestError.method_not_found(f"_{name}")
+        return await ext(name, payload)
+
+    async def handle_extension_notification(name: str, payload: dict[str, Any]) -> None:
+        ext = getattr(agent, "extNotification", None)
+        if ext is None:
+            return
+        await ext(name, payload)
+
+    return builder.build(
+        request_extensions=handle_extension_request,
+        notification_extensions=handle_extension_notification,
+    )

src/acp/agent/router.py

@@ -29,7 +29,7 @@
     request_model,
     request_model_from_dict,
 )
-from .handlers import dispatch_client_method
+from .router import build_client_router
 
 __all__ = ["ClientSideConnection"]
 
@@ -53,8 +53,13 @@ def __init__(
         self._conn = Connection(handler, input_stream, output_stream)
 
     def _create_handler(self, client: Client) -> MethodHandler:
+        router = build_client_router(client)
+
         async def handler(method: str, params: Any | None, is_notification: bool) -> Any:
-            return await dispatch_client_method(client, method, params, is_notification)
+            if is_notification:
+                await router.dispatch_notification(method, params)
+                return None
+            return await router.dispatch_request(method, params)
 
         return handler