aixtools 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

aixtools/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.6'
-__version_tuple__ = version_tuple = (0, 2, 6)
+__version__ = version = '0.2.8'
+__version_tuple__ = version_tuple = (0, 2, 8)
 
 __commit_id__ = commit_id = None

aixtools/a2a/google_sdk/pydantic_ai_adapter/agent_executor.py

@@ -158,7 +158,7 @@ class PydanticAgentExecutor(AgentExecutor):
             return
 
         for idx, artifact in enumerate(run_output.created_artifacts_paths):
-            image_file = FileWithUri(uri=str(artifact), name=f"image_{idx}")
+            artifact_file = FileWithUri(uri=str(artifact), name=f"art_{idx}")
             await event_queue.enqueue_event(
                 TaskArtifactUpdateEvent(
                     append=False,
@@ -166,8 +166,8 @@ class PydanticAgentExecutor(AgentExecutor):
                     task_id=task.id,
                     last_chunk=True,
                     artifact=Artifact(
-                        artifact_id=f"image_{idx}",
-                        parts=[Part(root=FilePart(file=image_file))],
+                        artifact_id=f"art_{idx}",
+                        parts=[Part(root=FilePart(file=artifact_file))],
                     ),
                 )
             )

aixtools/a2a/google_sdk/utils.py

@@ -1,3 +1,5 @@
+"""Utilities for handling A2A SDK agent cards and connections."""
+
 import asyncio
 
 import httpx
@@ -8,13 +10,34 @@ from a2a.utils import AGENT_CARD_WELL_KNOWN_PATH, PREV_AGENT_CARD_WELL_KNOWN_PAT
 
 from aixtools.a2a.google_sdk.remote_agent_connection import RemoteAgentConnection
 from aixtools.context import DEFAULT_SESSION_ID, DEFAULT_USER_ID, SessionIdTuple
+from aixtools.logging.logging_config import get_logger
+
+logger = get_logger(__name__)
+
+DEFAULT_A2A_TIMEOUT = 60.0
 
 
 class AgentCardLoadFailedError(Exception):
     pass
 
 
+async def get_agent_card(client: httpx.AsyncClient, address: str) -> AgentCard:
+    """Retrieve the agent card from the given agent address."""
+    for card_path in [AGENT_CARD_WELL_KNOWN_PATH, PREV_AGENT_CARD_WELL_KNOWN_PATH]:
+        try:
+            card_resolver = A2ACardResolver(client, address, card_path)
+            card = await card_resolver.get_agent_card()
+            card.url = address
+            return card
+        except Exception as e:
+            logger.warning(f"Error retrieving agent card from {address} at path {card_path}: {e}")
+
+    raise AgentCardLoadFailedError(f"Failed to load agent card from {address}")
+
+
 class _AgentCardResolver:
+    """Helper class to resolve and manage agent cards and their connections."""
+
     def __init__(self, client: httpx.AsyncClient):
         self._httpx_client = client
         self._a2a_client_factory = ClientFactory(ClientConfig(httpx_client=self._httpx_client))
@@ -25,17 +48,13 @@ class _AgentCardResolver:
         self.clients[card.name] = remote_connection
 
     async def retrieve_card(self, address: str):
-        for card_path in [AGENT_CARD_WELL_KNOWN_PATH, PREV_AGENT_CARD_WELL_KNOWN_PATH]:
-            try:
-                card_resolver = A2ACardResolver(self._httpx_client, address, card_path)
-                card = await card_resolver.get_agent_card()
-                card.url = address
-                self.register_agent_card(card)
-                return
-            except Exception as e:
-                print(f"Error retrieving agent card from {address} at path {card_path}: {e}")
-
-        raise AgentCardLoadFailedError(f"Failed to load agent card from {address}")
+        try:
+            card = await get_agent_card(self._httpx_client, address)
+            self.register_agent_card(card)
+            return
+        except Exception as e:
+            logger.error(f"Error retrieving agent card from {address}: {e}")
+            return
 
     async def get_a2a_clients(self, agent_hosts: list[str]) -> dict[str, RemoteAgentConnection]:
         async with asyncio.TaskGroup() as task_group:
@@ -45,15 +64,27 @@ class _AgentCardResolver:
         return self.clients
 
 
-async def get_a2a_clients(ctx: SessionIdTuple, agent_hosts: list[str]) -> dict[str, RemoteAgentConnection]:
+async def get_a2a_clients(
+    ctx: SessionIdTuple, agent_hosts: list[str], *, timeout: float = DEFAULT_A2A_TIMEOUT
+) -> dict[str, RemoteAgentConnection]:
+    """Get A2A clients for all agents defined in the configuration."""
     headers = {
         "user-id": ctx[0],
         "session-id": ctx[1],
     }
-    httpx_client = httpx.AsyncClient(headers=headers, timeout=60.0)
+    httpx_client = httpx.AsyncClient(headers=headers, timeout=timeout, follow_redirects=True)
     return await _AgentCardResolver(httpx_client).get_a2a_clients(agent_hosts)
 
 
+def card2description(card: AgentCard) -> str:
+    """Convert agent card to a description string."""
+    descr = f"{card.name}: {card.description}\n"
+    for skill in card.skills:
+        descr += f"\t - {skill.name}: {skill.description}\n"
+    return descr
+
+
 def get_session_id_tuple(context: RequestContext) -> SessionIdTuple:
+    """Get the user_id, session_id tuple from the request context."""
     headers = context.call_context.state.get("headers", {})
     return headers.get("user-id", DEFAULT_USER_ID), headers.get("session-id", DEFAULT_SESSION_ID)

{aixtools-0.2.6.dist-info → aixtools-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aixtools
-Version: 0.2.6
+Version: 0.2.8
 Summary: Tools for AI exploration and debugging
 Requires-Python: >=3.11.2
 Description-Content-Type: text/markdown

{aixtools-0.2.6.dist-info → aixtools-0.2.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aixtools/__init__.py,sha256=9NGHm7LjsQmsvjTZvw6QFJexSvAU4bCoN_KBk9SCa00,260
-aixtools/_version.py,sha256=2Q6v117QPuRsVsIEaHT3nJJVx7xxa47FYOkmuhVbGAI,704
+aixtools/_version.py,sha256=NCr4lkV1m1Jmisv_F-sazmV2gGdDIaVwqLyPwmjayqM,704
 aixtools/app.py,sha256=JzQ0nrv_bjDQokllIlGHOV0HEb-V8N6k_nGQH-TEsVU,5227
 aixtools/chainlit.md,sha256=yC37Ly57vjKyiIvK4oUvf4DYxZCwH7iocTlx7bLeGLU,761
 aixtools/context.py,sha256=I_MD40ZnvRm5WPKAKqBUAdXIf8YaurkYUUHSVVy-QvU,598
@@ -20,10 +20,9 @@ aixtools/.chainlit/translations/zh-CN.json,sha256=EWxhT2_6CW9z0F6SI2llr3RsaL2omH
 aixtools/a2a/app.py,sha256=p18G7fAInl9dcNYq6RStBjv1C3aD6oilQq3WXtBuk30,5069
 aixtools/a2a/utils.py,sha256=EHr3IyyBJn23ni-JcfAf6i3VpQmPs0g1TSnAZazvY_8,4039
 aixtools/a2a/google_sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aixtools/a2a/google_sdk/card.py,sha256=P0L3bKbm28HaRkcIxIvjuSGUKOOc0ymyRAFHKm3a5GQ,996
 aixtools/a2a/google_sdk/remote_agent_connection.py,sha256=oDCRSN3gfONY1Ibp8BrtysIVqfQQ-lWe5N7lr1ymHxY,2819
-aixtools/a2a/google_sdk/utils.py,sha256=hjrNRZywJEUxHHaOttJFQU0FLzteg0Ggtm3qAeXMSVw,2430
-aixtools/a2a/google_sdk/pydantic_ai_adapter/agent_executor.py,sha256=MMbhbEnUL6NwSYnisJrDdHW8zJoSyJ3Pzzkt8jqwNdI,7066
+aixtools/a2a/google_sdk/utils.py,sha256=7ru263peolaMnMLiWvCDWYimZs9aE9DFel2SyokCGjY,3501
+aixtools/a2a/google_sdk/pydantic_ai_adapter/agent_executor.py,sha256=VRwPNi_T4ShCp3vfcvIbB57gPC-vumuLboPhlBiU3lc,7068
 aixtools/a2a/google_sdk/pydantic_ai_adapter/storage.py,sha256=nGoVL7MPoZJW7iVR71laqpUYP308yFKZIifJtvUgpiU,878
 aixtools/agents/__init__.py,sha256=MAW196S2_G7uGqv-VNjvlOETRfuV44WlU1leO7SiR0A,282
 aixtools/agents/agent.py,sha256=tceQByn-RGBIhW8BOjKoP0yhNzZLwAa6CxwhPhRe3PU,7270
@@ -89,8 +88,8 @@ aixtools/utils/chainlit/cl_agent_show.py,sha256=vaRuowp4BRvhxEr5hw0zHEJ7iaSF_5bo
 aixtools/utils/chainlit/cl_utils.py,sha256=fxaxdkcZg6uHdM8uztxdPowg3a2f7VR7B26VPY4t-3c,5738
 aixtools/vault/__init__.py,sha256=fsr_NuX3GZ9WZ7dGfe0gp_5-z3URxAfwVRXw7Xyc0dU,141
 aixtools/vault/vault.py,sha256=9dZLWdZQk9qN_Q9Djkofw9LUKnJqnrX5H0fGusVLBhA,6037
-aixtools-0.2.6.dist-info/METADATA,sha256=ks0BVYWEcWW3I7hKY4Gm-s669muCpKJX6QLuwSborj4,27229
-aixtools-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aixtools-0.2.6.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
-aixtools-0.2.6.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
-aixtools-0.2.6.dist-info/RECORD,,
+aixtools-0.2.8.dist-info/METADATA,sha256=Ev-Wdm53oRwRAXJrf7Kn47DoJ2_WeiWae2CSasDVs_o,27229
+aixtools-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aixtools-0.2.8.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
+aixtools-0.2.8.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
+aixtools-0.2.8.dist-info/RECORD,,

aixtools/a2a/google_sdk/card.py

@@ -1,27 +0,0 @@
-import httpx
-from a2a.client import A2ACardResolver
-from a2a.types import AgentCard
-
-from aixtools.logging.logging_config import get_logger
-
-logger = get_logger(__name__)
-
-
-async def get_agent_card(httpx_client: httpx.AsyncClient, agent_url: str) -> AgentCard:
-    resolver = A2ACardResolver(
-        httpx_client=httpx_client,
-        base_url=agent_url,
-    )
-
-    try:
-        _public_card = await resolver.get_agent_card()  # Fetches from default public path
-        logger.info("Successfully fetched public agent card:")
-        logger.info(_public_card.model_dump_json(indent=2, exclude_none=True))
-        final_agent_card_to_use = _public_card
-    except Exception as e:
-        logger.error(f"Critical error fetching public agent card: {e}", exc_info=True)
-        raise RuntimeError("Failed to fetch the public agent card. Cannot continue.") from e
-
-    # Set the URL which is accessible from the container
-    final_agent_card_to_use.url = agent_url
-    return final_agent_card_to_use