aixtools 0.2.20__py3-none-any.whl → 0.2.22__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.20'
-__version_tuple__ = version_tuple = (0, 2, 20)
+__version__ = version = '0.2.22'
+__version_tuple__ = version_tuple = (0, 2, 22)
 
 __commit_id__ = commit_id = None

aixtools/a2a/google_sdk/pydantic_ai_adapter/agent_executor.py

@@ -20,7 +20,7 @@ from pydantic_ai import Agent, BinaryContent
 
 from aixtools.a2a.google_sdk.pydantic_ai_adapter.storage import InMemoryHistoryStorage
 from aixtools.a2a.google_sdk.remote_agent_connection import is_in_terminal_state
-from aixtools.a2a.google_sdk.utils import get_session_id_tuple
+from aixtools.a2a.google_sdk.utils import get_auth_token, get_session_id_tuple
 from aixtools.agents import get_agent
 from aixtools.agents.prompt import build_user_input
 from aixtools.context import SessionIdTuple
@@ -100,7 +100,8 @@ class PydanticAgentExecutor(AgentExecutor):
             event_queue (EventQueue): The event queue to enqueue events.
         """
         session_tuple = get_session_id_tuple(context)
-        agent = self._build_agent(session_tuple)
+        auth_token = get_auth_token(context)
+        agent = self._build_agent(session_tuple, auth_token)
         if context.message is None:
             raise ValueError("No message provided")
 
@@ -258,9 +259,9 @@ class PydanticAgentExecutor(AgentExecutor):
             )
         )
 
-    def _build_agent(self, session_tuple: SessionIdTuple) -> Agent:
+    def _build_agent(self, session_tuple: SessionIdTuple, auth_token: str | None) -> Agent:
         params = self._agent_parameters
-        mcp_servers = get_configured_mcp_servers(session_tuple, params.mcp_servers)
+        mcp_servers = get_configured_mcp_servers(session_tuple, params.mcp_servers, auth_token=auth_token)
         return get_agent(
             system_prompt=params.system_prompt,
             toolsets=mcp_servers,

aixtools/a2a/google_sdk/utils.py

@@ -96,3 +96,15 @@ 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)
+
+
+def get_auth_token(context: RequestContext) -> str | None:
+    """Get the Authorization bearer token from the request context."""
+    headers = context.call_context.state.get("headers", {})
+    auth_header = headers.get("Authorization") or headers.get("authorization")
+    auth_token = None
+    if auth_header and auth_header.lower().startswith("bearer "):
+        auth_token = auth_header.split(" ", 1)[1].strip()
+    else:
+        logger.warning("Cannot find bearer token in Authorization header: %s", auth_header)
+    return auth_token

aixtools/mcp/client.py

@@ -23,6 +23,7 @@ from pydantic_ai.toolsets.abstract import ToolsetTool
 from aixtools.context import SessionIdTuple
 from aixtools.logging.logging_config import get_logger
 from aixtools.server.utils import create_session_headers
+from aixtools.utils.config import MCP_TOOLS_MAX_RETRIES
 
 MCP_TOOL_CACHE_TTL = 300  # 5 minutes
 DEFAULT_MCP_CONNECTION_TIMEOUT = 30
@@ -31,7 +32,6 @@ CACHE_KEY = "TOOL_LIST"
 
 logger = get_logger(__name__)
 
-
 # Default log_handler for MCP clients
 LOGGING_LEVEL_MAP = logging.getLevelNamesMapping()
 
@@ -87,6 +87,7 @@ def get_mcp_servers(
     mcp_configs: list[MCPConfig],
     session_id_tuple: SessionIdTuple,
     auth_token: str = None,
+    max_retries: int = MCP_TOOLS_MAX_RETRIES,
     *,
     timeout: float = DEFAULT_MCP_CONNECTION_TIMEOUT,
 ):
@@ -115,7 +116,7 @@ def get_mcp_servers(
     servers = []
     for config in mcp_configs:
         server = CachedMCPServerStreamableHTTP(
-            url=config.url, headers=headers, timeout=timeout, read_timeout=config.read_timeout
+            url=config.url, headers=headers, timeout=timeout, read_timeout=config.read_timeout, max_retries=max_retries
         )
         logger.info("Using MCP server at %s", config.url)
         servers.append(server)
@@ -123,10 +124,16 @@ def get_mcp_servers(
 
 
 def get_configured_mcp_servers(
-    session_id_tuple: SessionIdTuple, mcp_urls: list[str], timeout: int = DEFAULT_MCP_CONNECTION_TIMEOUT
+    session_id_tuple: SessionIdTuple,
+    mcp_urls: list[str],
+    *,
+    timeout: int = DEFAULT_MCP_CONNECTION_TIMEOUT,
+    auth_token: str | None = None,
 ):
     """Create MCP server instances from a list of URLs."""
-    return get_mcp_servers([MCPConfig(url=url) for url in mcp_urls], session_id_tuple, timeout=timeout)
+    return get_mcp_servers(
+        [MCPConfig(url=url) for url in mcp_urls], session_id_tuple, timeout=timeout, auth_token=auth_token
+    )
 
 
 class CachedMCPServerStreamableHTTP(MCPServerStreamableHTTP):

aixtools/utils/config.py

@@ -144,3 +144,5 @@ SKIP_MCP_AUTHORIZATION = str2bool(get_variable_env("SKIP_MCP_AUTHORIZATION", Tru
 APP_DEFAULT_SCOPE = get_variable_env("APP_DEFAULT_SCOPE", allow_empty=True)
 
 AUTH_TEST_TOKEN = get_variable_env("AUTH_TEST_TOKEN", allow_empty=True)
+
+MCP_TOOLS_MAX_RETRIES = int(get_variable_env("MCP_TOOLS_MAX_RETRIES", default=10))

{aixtools-0.2.20.dist-info → aixtools-0.2.22.dist-info}/METADATA

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

{aixtools-0.2.20.dist-info → aixtools-0.2.22.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aixtools/__init__.py,sha256=9NGHm7LjsQmsvjTZvw6QFJexSvAU4bCoN_KBk9SCa00,260
-aixtools/_version.py,sha256=4N3ayuoZZJYPEGMvrxu7tnGigRTxbAdCyp5a8y7c6aw,706
+aixtools/_version.py,sha256=I7oxlElEVr-U2wT5qgQ2G41IxS87cokjF8Z2fKVHGrc,706
 aixtools/app.py,sha256=JzQ0nrv_bjDQokllIlGHOV0HEb-V8N6k_nGQH-TEsVU,5227
 aixtools/chainlit.md,sha256=yC37Ly57vjKyiIvK4oUvf4DYxZCwH7iocTlx7bLeGLU,761
 aixtools/context.py,sha256=I_MD40ZnvRm5WPKAKqBUAdXIf8YaurkYUUHSVVy-QvU,598
@@ -21,8 +21,8 @@ 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/remote_agent_connection.py,sha256=gFsIja_nIQsAzxElv3A7_hG9GpDI5pkV-B_KDlcYlnc,3329
-aixtools/a2a/google_sdk/utils.py,sha256=rMezLwv7P-Drn2TPkuwTBkbW23yPhwOIywGb5CrFKE0,3828
-aixtools/a2a/google_sdk/pydantic_ai_adapter/agent_executor.py,sha256=8VuU2WXeSHUK3_rRm_mjX6elqdC9NA2uz1aELzeC8BU,9784
+aixtools/a2a/google_sdk/utils.py,sha256=k5VtTr4XLxsSKQDqly9QtWcZ5xfm03VbPpQ8OwoXtiQ,4369
+aixtools/a2a/google_sdk/pydantic_ai_adapter/agent_executor.py,sha256=xamLIKl-FeB8PElVKgiIKR-MhFKmPjywHmC_ow-fGAA,9904
 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=7ZxKVOqLI_9K5LsTnqoTwRRHp6i-nFgQrJ6yA4M9iUE,7700
@@ -62,7 +62,7 @@ aixtools/logging/mcp_logger.py,sha256=d2I5l4t0d6rQH17w23FpE1IUD8Ax-mSaKfByCH86q4
 aixtools/logging/model_patch_logging.py,sha256=CW5-kKI-zNEgZhNV4vx3EQu6fbrEtX7VjA6fE5loRLQ,2916
 aixtools/logging/open_telemetry.py,sha256=fJjF1ou_8GyfNfbyWDQPGK6JAUrUaPwURYPHhXEtDBE,1121
 aixtools/mcp/__init__.py,sha256=y6Akm5xeEFJ0K0TNM6aiTsUSe5k5kft8LSTaSEaY7vE,404
-aixtools/mcp/client.py,sha256=1flZ49irNzM6kdoKKocwFslFR3exDVWccoR0fp9SPvk,18396
+aixtools/mcp/client.py,sha256=lu1780mO3uRMzfzb32p74wH2VUv7jwfrHfZeLB5s3ME,18610
 aixtools/mcp/example_client.py,sha256=QCFGP3NCNJMOKWjUOnFwjnbJhUSb879IA1ZYmwjRnmc,889
 aixtools/mcp/example_server.py,sha256=1SWCyrLWsAnOa81HC4QbPJo_lBVu0b3SZBWI-qDh1vQ,458
 aixtools/mcp/exceptions.py,sha256=9m3hy9fRINbXTSgkE71XW_luklgH6xBRp7VnSRfpyzQ,173
@@ -85,7 +85,7 @@ aixtools/tools/doctor/mcp_tool_doctor.py,sha256=sX2q5GfNkmUYxnXrqMpeGIwGfeL1LpYJ
 aixtools/tools/doctor/tool_doctor.py,sha256=EY1pshjLGLD0j6cc1ZFtbc0G19I5IbOZwHFDqypE49Q,2661
 aixtools/tools/doctor/tool_recommendation.py,sha256=LYyVOSXdAorWiY4P-ucSA1vLlV5BTEfX4GzBXNE_X0M,1569
 aixtools/utils/__init__.py,sha256=xT6almZBQYMfj4h7Hq9QXDHyVXbOOTxqLsmJsxYYnSw,757
-aixtools/utils/config.py,sha256=e6gzGfo9c21V4ImuthLMP1RmF2-2FbBnsirMmve3ZWE,5491
+aixtools/utils/config.py,sha256=OGTlvkc8hxL9GJk9AqEWTUIKLntl6TeL10Ni7t6C0nE,5575
 aixtools/utils/config_util.py,sha256=3Ya4Qqhj1RJ1qtTTykQ6iayf5uxlpigPXgEJlTi1wn4,2229
 aixtools/utils/enum_with_description.py,sha256=zjSzWxG74eR4x7dpmb74pLTYCWNSMvauHd7_9LpDYIw,1088
 aixtools/utils/files.py,sha256=8JnxwHJRJcjWCdFpjzWmo0po2fRg8esj4H7sOxElYXU,517
@@ -95,8 +95,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.20.dist-info/METADATA,sha256=Z5i3qRQdNfrFrKutnd6j0UMFab38xzXcKl7Hr2GKnos,27958
-aixtools-0.2.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aixtools-0.2.20.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
-aixtools-0.2.20.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
-aixtools-0.2.20.dist-info/RECORD,,
+aixtools-0.2.22.dist-info/METADATA,sha256=JfIBvHI6hfSp7sjuKUg7lTnsx48sJFQfwpt5UzaZCeg,27958
+aixtools-0.2.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aixtools-0.2.22.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
+aixtools-0.2.22.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
+aixtools-0.2.22.dist-info/RECORD,,