distributed-a2a 0.1.9rc0__py3-none-any.whl → 0.1.9rc2__py3-none-any.whl

distributed_a2a/model.py

@@ -1,5 +1,5 @@
 import os
-from typing import List, Any
+from typing import List, Any, Optional
 
 from langchain_core.language_models import BaseChatModel
 from langchain_openai import ChatOpenAI
@@ -13,6 +13,15 @@ class SkillConfig(BaseModel):
     tags: List[str] = Field(description="The tags associated with the skill")
 
 
+class RegistryItemConfig(BaseModel):
+    url: str = Field(description="The url of the registry")
+
+
+class RegistryConfig(BaseModel):
+    agent: RegistryItemConfig = Field(description="The agent registry configuration")
+    mcp: Optional[RegistryItemConfig] = Field(description="The mcp registry configuration", required=False)
+
+
 class LLMConfig(BaseModel):
     base_url: str = Field(description="The base url of the LLM provider")
     model: str = Field(description="The model to use for the LLM e.g. gpt-3.5-turbo")
@@ -32,6 +41,7 @@ class CardConfig(BaseModel):
 
 
 class AgentItem(BaseModel):
+    registry: Optional[RegistryConfig] = Field(description="The registry configuration node", default=None)
     card: CardConfig = Field(description="The agent card configuration node")
     llm: LLMConfig = Field(description="The LLM configuration node")
     system_prompt: str = Field(description="The system prompt to use for the LLM or a path to a file containing the system prompt")
@@ -50,6 +60,7 @@ class AgentConfig(BaseModel):
 
 
 class RouterItem(BaseModel):
+    registry: Optional[RegistryConfig] = Field(description="The registry configuration node", default=None)
     card: CardConfig = Field(description="The router card configuration node")
     llm: LLMConfig = Field(description="The LLM configuration node")
 

distributed_a2a/router.py

@@ -8,7 +8,7 @@ from fastapi import FastAPI
 
 from .executors import RoutingExecutor
 from .model import RouterConfig
-from .registry import DynamoDbRegistryLookup
+from .registry import DynamoDbRegistryLookup, AgentRegistryLookup
 from .server import CAPABILITIES, AGENT_CARD_TABLE
 
 
@@ -33,8 +33,7 @@ def load_router(router_dic: dict[str, Any]) -> FastAPI:
 
     executor = RoutingExecutor(
         router_config=router_config,
-        routing_tool=DynamoDbRegistryLookup(agent_card_tabel=AGENT_CARD_TABLE).as_tool()
-
+        routing_tool=AgentRegistryLookup(router_config.router.registry.agent.url).as_tool()
     )
 
     return A2ARESTFastAPIApplication(

distributed_a2a/server.py

@@ -1,3 +1,4 @@
+import os
 import asyncio
 import time
 from contextlib import asynccontextmanager
@@ -13,7 +14,7 @@ from fastapi import FastAPI
 
 from .executors import RoutingAgentExecutor
 from .model import AgentConfig
-from .registry import DynamoDbRegistryLookup, registry_heart_beat
+from .registry import DynamoDbRegistryLookup, registry_heart_beat, AgentRegistryLookup
 
 CAPABILITIES = AgentCapabilities(streaming=False, push_notifications=False)
 
@@ -21,6 +22,7 @@ HEART_BEAT_INTERVAL_SEC = 5
 MAX_HEART_BEAT_MISSES = 3
 
 AGENT_CARD_TABLE = "agent-cards"
+AGENT_REGISTRY_URL = ""
 
 def get_expire_at() -> int:
     return int(time.time() + MAX_HEART_BEAT_MISSES * HEART_BEAT_INTERVAL_SEC)
@@ -69,20 +71,16 @@ def load_app(agent_config: Any) -> FastAPI:
         preferred_transport=agent_config.agent.card.preferred_transport_protocol,
         capabilities=CAPABILITIES
     )
-
-
+    agent_registry = AgentRegistryLookup(agent_config.agent.registry.agent.url)
     executor = RoutingAgentExecutor(agent_config=agent_config,
-                                    routing_tool=DynamoDbRegistryLookup(agent_card_tabel=AGENT_CARD_TABLE).as_tool())
+                                    routing_tool=agent_registry.as_tool())
 
     @asynccontextmanager
     async def lifespan(_: FastAPI) -> AsyncGenerator[None, Any]:
-        asyncio.create_task(heart_beat(name=agent_card.name, agent_card_table=AGENT_CARD_TABLE, agent_card=agent_card))
-        import os
-        registry_url = os.getenv("REGISTRY_URL")
-        if registry_url:
-            asyncio.create_task(registry_heart_beat(name=agent_card.name, registry_url=registry_url,
-                                                   agent_card=agent_card, interval_sec=HEART_BEAT_INTERVAL_SEC,
-                                                   get_expire_at=get_expire_at))
+        asyncio.create_task(registry_heart_beat(name=agent_card.name, registry_url=agent_config.agent.registry.agent.url,
+                                                agent_card=agent_card, interval_sec=HEART_BEAT_INTERVAL_SEC,
+                                                get_expire_at=get_expire_at))
+
         yield
 
 

{distributed_a2a-0.1.9rc0.dist-info → distributed_a2a-0.1.9rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distributed_a2a
-Version: 0.1.9rc0
+Version: 0.1.9rc2
 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.9rc2.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=1toayqLUan0f1INyMo5v02L9uCHMq6hp1gf0jVdjX6I,7152
+distributed_a2a/model.py,sha256=x-Es1WIm-MMBMizD3CePXf04mpWLiqRCYbz61KGDLRc,3535
+distributed_a2a/registry.py,sha256=hwG3f2eqny6eSNsPdJnxlf6jFA-K8flO3loJXGmc5bg,2144
+distributed_a2a/router.py,sha256=SRYBgLiN4j7JDIKb_9D8ypJxqVYs_fFlG5dgWYIbF7o,1803
+distributed_a2a/server.py,sha256=JVIcdjyjtVhP-YTeoaOb0R7d0honC_JPR0aQfJ4P_SQ,3434
+distributed_a2a-0.1.9rc2.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
+distributed_a2a-0.1.9rc2.dist-info/METADATA,sha256=45pKsZUMAPpxE-p-v-k_ek6uSnxANe7aNMSRBIeLHfQ,3198
+distributed_a2a-0.1.9rc2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+distributed_a2a-0.1.9rc2.dist-info/top_level.txt,sha256=23qJ8n5k7796BHDK7a58uuO-X4GV0EgUWcGi8NIn-0k,16
+distributed_a2a-0.1.9rc2.dist-info/RECORD,,

distributed_a2a-0.1.9rc0.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=1toayqLUan0f1INyMo5v02L9uCHMq6hp1gf0jVdjX6I,7152
-distributed_a2a/model.py,sha256=K4ltuBHTm_r5I-viITDt4GrxntwcUj1sOjLenHYB79k,2981
-distributed_a2a/registry.py,sha256=hwG3f2eqny6eSNsPdJnxlf6jFA-K8flO3loJXGmc5bg,2144
-distributed_a2a/router.py,sha256=NV8aKraFNrI53PxJAGXI5NtG3-Oy7x5ofHfgqeqsnsI,1780
-distributed_a2a/server.py,sha256=IZjDBBLYXYDYPFqBTyMxvGW20qMVweWXGSTP5jtgJKg,3540
-distributed_a2a-0.1.9rc0.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
-distributed_a2a-0.1.9rc0.dist-info/METADATA,sha256=zbcnqeXDcB8H88TT4apM50DRH7ZBAu9Clbka4UhEz2Y,3198
-distributed_a2a-0.1.9rc0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-distributed_a2a-0.1.9rc0.dist-info/top_level.txt,sha256=23qJ8n5k7796BHDK7a58uuO-X4GV0EgUWcGi8NIn-0k,16
-distributed_a2a-0.1.9rc0.dist-info/RECORD,,