distributed-a2a 0.1.9rc8__py3-none-any.whl → 0.1.9rc9__py3-none-any.whl

distributed_a2a/executors.py

@@ -1,17 +1,20 @@
 import json
 import logging
 import os
+from logging import Logger
 
 from a2a.server.agent_execution import AgentExecutor, RequestContext
 from a2a.server.events import EventQueue
 from a2a.types import TaskStatusUpdateEvent, TaskStatus, TaskState, TaskArtifactUpdateEvent, Artifact
 from a2a.utils import new_text_artifact
 from langchain_core.tools import BaseTool
+from langchain_mcp_adapters.client import MultiServerMCPClient
 
 from .agent import StatusAgent, RoutingResponse, StringResponse
 from .model import AgentConfig, RouterConfig
+from .registry import McpRegistryLookup
 
-logger = logging.getLogger(__name__)
+logger: Logger = logging.getLogger(__name__)
 
 ROUTING_SYSTEM_PROMPT = """
 You are a helpful routing assistant which routes user requests to specialized remote agents. Your main task is to:
@@ -27,7 +30,10 @@ class RoutingAgentExecutor(AgentExecutor):
         api_key = os.environ.get(agent_config.agent.llm.api_key_env)
         if api_key is None:
             raise ValueError("No API key found for LLM.")
-
+        self.mcp_registry = McpRegistryLookup(registry_url=agent_config.registry.mcp.url)
+        self.agent_config = agent_config
+        self.registered_tools = {}
+        self.api_key = api_key
         self.agent = StatusAgent[StringResponse](
             llm_config=agent_config.agent.llm,
             system_prompt=agent_config.agent.system_prompt,
@@ -57,6 +63,7 @@ class RoutingAgentExecutor(AgentExecutor):
                                                               final=False,
                                                               context_id=context.context_id,
                                                               task_id=context.task_id))
+        self.reinitialize_agent_with_tools()
         agent_response: StringResponse = await self.agent(message=context.get_user_input(),
                                                           context_id=context.context_id)
 
@@ -97,6 +104,22 @@ class RoutingAgentExecutor(AgentExecutor):
             context_id=context.context_id,
             task_id=context.task_id))
 
+    def reinitialize_agent_with_tools(self):
+        mcp_tools = self.mcp_registry.get_mcp_tool_for_agent(self.agent_config.agent.card.name)
+        logger.info(f"Agent {self.agent_config.agent.card.name} has access to the following tools: {mcp_tools}")
+        tools = {tool["name"]: {"url": tool["url"], "transport": tool["protocol"]} for tool in mcp_tools}
+        mcp_client = MultiServerMCPClient(tools)
+        mcp_tools = mcp_client.get_tools()
+
+        self.agent = StatusAgent[StringResponse](
+            llm_config=self.agent_config.agent.llm,
+            system_prompt=self.agent_config.agent.system_prompt,
+            name=self.agent_config.agent.card.name,
+            api_key=self.api_key,
+            is_routing=False,
+            tools=mcp_tools,
+        )
+
 
 class RoutingExecutor(AgentExecutor):
     def __init__(self, router_config: RouterConfig, routing_tool: BaseTool) -> None:

distributed_a2a/registry.py

@@ -1,6 +1,4 @@
-import json
 import asyncio
-import boto3
 import requests
 from langchain_core.tools import StructuredTool
 from a2a.types import AgentCard
@@ -45,17 +43,12 @@ class AgentRegistryLookup:
         return StructuredTool.from_function(func=lambda: self.get_agent_cards(), name="agent_card_lookup",
                                             description="Gets all available agent cards")
 
-class DynamoDbRegistryLookup:
-    def __init__(self, agent_card_tabel: str):
-        dynamo = boto3.resource("dynamodb", region_name="eu-central-1")
-        self.table = dynamo.Table(agent_card_tabel)
 
-    def get_agent_cards(self) -> list[dict]:
-
-        items = self.table.scan().get("Items", [])
-        cards: list[dict] = [json.loads(it["card"]) for it in items]
-        return cards
+class McpRegistryLookup:
+    def __init__(self, registry_url: str):
+        self.registry_url = registry_url
 
-    def as_tool(self) -> StructuredTool:
-        return StructuredTool.from_function(func=lambda: self.get_agent_cards(), name="agent_card_lookup",
-                                            description="Gets all available agent cards")
+    def get_mcp_tool_for_agent(self, agent_name: str) -> list[dict]:
+        response = requests.get(url=f"{self.registry_url}/mcp/agent/{agent_name}/tools")
+        response.raise_for_status()
+        return response.json()

distributed_a2a/router.py

@@ -9,8 +9,8 @@ from fastapi import FastAPI
 
 from .executors import RoutingExecutor
 from .model import RouterConfig
-from .registry import AgentRegistryLookup, registry_heart_beat
-from .server import CAPABILITIES, HEART_BEAT_INTERVAL_SEC, get_expire_at
+from .registry import AgentRegistryLookup
+from .server import CAPABILITIES
 
 
 def load_router(router_dic: dict[str, Any]) -> FastAPI:
@@ -37,18 +37,6 @@ def load_router(router_dic: dict[str, Any]) -> FastAPI:
         routing_tool=AgentRegistryLookup(router_config.router.registry.agent.url).as_tool()
     )
 
-    @asynccontextmanager
-    async def lifespan(_: FastAPI) -> AsyncGenerator[None, Any]:
-        import asyncio
-        asyncio.create_task(registry_heart_beat(
-            name=router_config.router.card.name,
-            registry_url=router_config.router.registry.agent.url,
-            agent_card=agent_card,
-            interval_sec=HEART_BEAT_INTERVAL_SEC,
-            get_expire_at=get_expire_at
-        ))
-        yield
-
     return A2ARESTFastAPIApplication(
         agent_card=agent_card,
         http_handler=DefaultRequestHandler(
@@ -56,5 +44,4 @@ def load_router(router_dic: dict[str, Any]) -> FastAPI:
             task_store=InMemoryTaskStore()  # TODO replace with dynamodb store
 
         )).build(title=agent_card.name,
-                 lifespan=lifespan,
                  root_path=f"/{router_config.router.card.name}")

{distributed_a2a-0.1.9rc8.dist-info → distributed_a2a-0.1.9rc9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distributed_a2a
-Version: 0.1.9rc8
+Version: 0.1.9rc9
 Summary: A library for building A2A agents with routing capabilities
 Home-page: https://github.com/Barra-Technologies/distributed-a2a
 Author: Fabian Bell

distributed_a2a-0.1.9rc9.dist-info/RECORD

@@ -0,0 +1,13 @@
+distributed_a2a/__init__.py,sha256=gO8sTT20O6XvDRzj7B322O9v6HxV-_eIlJD1wMlPYoI,171
+distributed_a2a/agent.py,sha256=qY775N3Br2YMuaHLALU4t6MO47syuEoTtFLLPRr8TyA,2910
+distributed_a2a/client.py,sha256=3tEBqu3HKEQyOFk5vsO1YiuKP2pZx-n6SCzsJUYNcyc,4601
+distributed_a2a/executors.py,sha256=Y_9E4gAFBfcBlbXmxKoW_3TSFuTqV4AmqrsajNo6F7Q,9381
+distributed_a2a/model.py,sha256=rW9jY0OIR8L_I77zz47JQMd-ucQQnnfNw_HIS-YvrcM,3533
+distributed_a2a/registry.py,sha256=lTXdS3PHXXMPXNjZDxyNRJjhJ1uZJOxgOgpokQp7boc,2050
+distributed_a2a/router.py,sha256=l1kDn5_iYNq6QZj8JsouLC6zz5vdK-qGSpj4KODwXY8,1834
+distributed_a2a/server.py,sha256=-__c-BKzJWSXpW21NOp6faUIdjWV_o32jqv42_lPi2g,3352
+distributed_a2a-0.1.9rc9.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
+distributed_a2a-0.1.9rc9.dist-info/METADATA,sha256=meehLdwrAH4uh0yarVbNTaooEcWkIdpeSFAdTBwmpRM,3198
+distributed_a2a-0.1.9rc9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+distributed_a2a-0.1.9rc9.dist-info/top_level.txt,sha256=23qJ8n5k7796BHDK7a58uuO-X4GV0EgUWcGi8NIn-0k,16
+distributed_a2a-0.1.9rc9.dist-info/RECORD,,

distributed_a2a-0.1.9rc8.dist-info/RECORD

@@ -1,13 +0,0 @@
-distributed_a2a/__init__.py,sha256=gO8sTT20O6XvDRzj7B322O9v6HxV-_eIlJD1wMlPYoI,171
-distributed_a2a/agent.py,sha256=qY775N3Br2YMuaHLALU4t6MO47syuEoTtFLLPRr8TyA,2910
-distributed_a2a/client.py,sha256=3tEBqu3HKEQyOFk5vsO1YiuKP2pZx-n6SCzsJUYNcyc,4601
-distributed_a2a/executors.py,sha256=gu3MdnUldOt-9yUJA2xkmJNoDyhwH7qyznRY4lwlTys,8226
-distributed_a2a/model.py,sha256=rW9jY0OIR8L_I77zz47JQMd-ucQQnnfNw_HIS-YvrcM,3533
-distributed_a2a/registry.py,sha256=4OK_Zbsq38UNKliyagifKfDG6nUIhflxq0VAoqeLKgM,2368
-distributed_a2a/router.py,sha256=D0f3xUkf5NNFBe5-6MWmSFXh3Uz_6KGu5r4K5K5Bdes,2359
-distributed_a2a/server.py,sha256=-__c-BKzJWSXpW21NOp6faUIdjWV_o32jqv42_lPi2g,3352
-distributed_a2a-0.1.9rc8.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
-distributed_a2a-0.1.9rc8.dist-info/METADATA,sha256=q3GpFDoB5Lu3BRp5nveRGXLjJYLNyKZySoRGbah3krw,3198
-distributed_a2a-0.1.9rc8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-distributed_a2a-0.1.9rc8.dist-info/top_level.txt,sha256=23qJ8n5k7796BHDK7a58uuO-X4GV0EgUWcGi8NIn-0k,16
-distributed_a2a-0.1.9rc8.dist-info/RECORD,,