distributed-a2a 0.1.9rc4__py3-none-any.whl → 0.1.9rc6__py3-none-any.whl

distributed_a2a/executors.py

@@ -64,11 +64,21 @@ class RoutingAgentExecutor(AgentExecutor):
         if agent_response.status == TaskState.rejected:
             routing_agent_response: RoutingResponse = await self.routing_agent(message=context.get_user_input(),
                                                                        context_id=context.context_id)
-            agent_name: str = json.loads(routing_agent_response.agent_card)["name"]
+            agent_card = routing_agent_response.agent_card
+            if isinstance(agent_card, str):
+                try:
+                    agent_card_dict = json.loads(agent_card)
+                except json.JSONDecodeError:
+                    logger.error(f"Failed to parse agent_card as JSON: {agent_card}")
+                    raise
+            else:
+                agent_card_dict = agent_card
+
+            agent_name: str = agent_card_dict["name"]
             logger.info(f"Request with id {context.context_id} got rejected and will be rerouted to a '{agent_name}'.",
                         extra={"card": routing_agent_response.agent_card})
             artifact = new_text_artifact(name='target_agent', description='New target agent for request.',
-                                         text=routing_agent_response.agent_card)
+                                         text=json.dumps(agent_card_dict) if isinstance(agent_card_dict, dict) else str(agent_card))
         else:
             logger.info(f"Request with id {context.context_id} was successfully processed by agent.")
             artifact = new_text_artifact(name='current_result', description='Result of request to agent.',
@@ -119,11 +129,23 @@ class RoutingExecutor(AgentExecutor):
         agent_response: RoutingResponse = await self.routing_agent(message=context.get_user_input(),
                                                                    context_id=context.context_id)
         logger.info(f"Routing agent response for request with id {context.context_id}: {agent_response}")
-        agent_name: str = json.loads(agent_response.agent_card)["name"]
+        agent_card = agent_response.agent_card
+        if isinstance(agent_card, str):
+            try:
+                agent_card_dict = json.loads(agent_card)
+            except json.JSONDecodeError:
+                # If it's not JSON, maybe it's already the name or something else?
+                # But AgentCard expects a dict if we use model_validate
+                logger.error(f"Failed to parse agent_card as JSON: {agent_card}")
+                raise
+        else:
+            agent_card_dict = agent_card
+
+        agent_name: str = agent_card_dict["name"]
         logger.info(f"Request with id {context.context_id} got rejected and will be rerouted to a '{agent_name}'.",
-                    extra={"card": agent_response.agent_card})
+                    extra={"card": agent_card})
         artifact = new_text_artifact(name='target_agent', description='New target agent for request.',
-                                     text=agent_response.agent_card)
+                                     text=json.dumps(agent_card_dict) if isinstance(agent_card_dict, dict) else str(agent_card))
 
         # publish actual result
         await event_queue.enqueue_event(TaskArtifactUpdateEvent(append=False,

distributed_a2a/registry.py

@@ -33,7 +33,13 @@ class AgentRegistryLookup:
             json=agent_card,
             timeout=30
         )
-        response.raise_for_status()
+        try:
+            response.raise_for_status()
+        except requests.exceptions.HTTPError as e:
+            print(f"HTTP error during put_agent_card: {e}")
+            if response.text:
+                print(f"Response content: {response.text}")
+            raise
 
     def as_tool(self) -> StructuredTool:
         return StructuredTool.from_function(func=lambda: self.get_agent_cards(), name="agent_card_lookup",

distributed_a2a/router.py

@@ -1,4 +1,5 @@
-from typing import Any
+from contextlib import asynccontextmanager
+from typing import Any, AsyncGenerator
 
 from a2a.server.apps import A2ARESTFastAPIApplication
 from a2a.server.request_handlers import DefaultRequestHandler
@@ -8,8 +9,8 @@ from fastapi import FastAPI
 
 from .executors import RoutingExecutor
 from .model import RouterConfig
-from .registry import DynamoDbRegistryLookup, AgentRegistryLookup
-from .server import CAPABILITIES, AGENT_CARD_TABLE
+from .registry import AgentRegistryLookup, registry_heart_beat
+from .server import CAPABILITIES, HEART_BEAT_INTERVAL_SEC, get_expire_at
 
 
 def load_router(router_dic: dict[str, Any]) -> FastAPI:
@@ -36,6 +37,19 @@ 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]:
+        if router_config.router.registry:
+            import asyncio
+            asyncio.create_task(registry_heart_beat(
+                name=agent_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(
@@ -43,4 +57,5 @@ 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.9rc4.dist-info → distributed_a2a-0.1.9rc6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distributed_a2a
-Version: 0.1.9rc4
+Version: 0.1.9rc6
 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.9rc6.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=gu3MdnUldOt-9yUJA2xkmJNoDyhwH7qyznRY4lwlTys,8226
+distributed_a2a/model.py,sha256=x-Es1WIm-MMBMizD3CePXf04mpWLiqRCYbz61KGDLRc,3535
+distributed_a2a/registry.py,sha256=4OK_Zbsq38UNKliyagifKfDG6nUIhflxq0VAoqeLKgM,2368
+distributed_a2a/router.py,sha256=jBk_tR8Qbq-PDTYm0-R9OHCCwuEYm5qv1r5QTopJ0D4,2404
+distributed_a2a/server.py,sha256=JVIcdjyjtVhP-YTeoaOb0R7d0honC_JPR0aQfJ4P_SQ,3434
+distributed_a2a-0.1.9rc6.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
+distributed_a2a-0.1.9rc6.dist-info/METADATA,sha256=Llaxl5djnyFtqrwbyLpCRJVhZ0e3wyGb38pamDx3xkY,3198
+distributed_a2a-0.1.9rc6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+distributed_a2a-0.1.9rc6.dist-info/top_level.txt,sha256=23qJ8n5k7796BHDK7a58uuO-X4GV0EgUWcGi8NIn-0k,16
+distributed_a2a-0.1.9rc6.dist-info/RECORD,,

distributed_a2a-0.1.9rc4.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=xinzle76ZpIpbAs1RqolaDKwABCQkz6mmrfE7gRqnFY,7258
-distributed_a2a/model.py,sha256=x-Es1WIm-MMBMizD3CePXf04mpWLiqRCYbz61KGDLRc,3535
-distributed_a2a/registry.py,sha256=2QDxCY02tkI8MsLA4JPYEzFSV4LuuKPtCVVx-u8BniU,2132
-distributed_a2a/router.py,sha256=SRYBgLiN4j7JDIKb_9D8ypJxqVYs_fFlG5dgWYIbF7o,1803
-distributed_a2a/server.py,sha256=JVIcdjyjtVhP-YTeoaOb0R7d0honC_JPR0aQfJ4P_SQ,3434
-distributed_a2a-0.1.9rc4.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
-distributed_a2a-0.1.9rc4.dist-info/METADATA,sha256=6scdu3Gkw42NX4EljgCrsyXp44Jy-Lninn2ZSQr01Kw,3198
-distributed_a2a-0.1.9rc4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-distributed_a2a-0.1.9rc4.dist-info/top_level.txt,sha256=23qJ8n5k7796BHDK7a58uuO-X4GV0EgUWcGi8NIn-0k,16
-distributed_a2a-0.1.9rc4.dist-info/RECORD,,