aixtools 0.2.19__py3-none-any.whl → 0.2.21__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.19'
-__version_tuple__ = version_tuple = (0, 2, 19)
+__version__ = version = '0.2.21'
+__version_tuple__ = version_tuple = (0, 2, 21)
 
 __commit_id__ = commit_id = None

aixtools/mcp/__init__.py

@@ -4,8 +4,12 @@ Model Context Protocol (MCP) implementation for AI agent communication.
 
 from aixtools.mcp.exceptions import AixToolError
 from aixtools.mcp.fast_mcp_log import FastMcpLog
+from aixtools.mcp.middleware import AixErrorHandlingMiddleware
+from aixtools.mcp.server import create_mcp_server
 
 __all__ = [
-    "FastMcpLog",
+    "AixErrorHandlingMiddleware",
     "AixToolError",
+    "FastMcpLog",
+    "create_mcp_server",
 ]

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
@@ -87,6 +88,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 +117,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)

aixtools/{logging/mcp_middleware.py → mcp/middleware.py}

@@ -7,7 +7,7 @@ import traceback
 from fastmcp.server.middleware.error_handling import ErrorHandlingMiddleware
 from fastmcp.server.middleware.middleware import MiddlewareContext
 
-from aixtools.mcp import AixToolError
+from aixtools.mcp.exceptions import AixToolError
 
 
 class AixErrorHandlingMiddleware(ErrorHandlingMiddleware):

aixtools/mcp/server.py

@@ -0,0 +1,72 @@
+"""Utilities for FastMCP servers."""
+
+from typing import Any
+
+from fastmcp import FastMCP
+from fastmcp.server.middleware.logging import LoggingMiddleware
+from fastmcp.server.middleware.timing import TimingMiddleware
+from fastmcp.utilities.types import NotSet
+
+from aixtools.auth.auth import AccessTokenAuthProvider
+from aixtools.logging.logging_config import get_logger
+from aixtools.mcp.middleware import AixErrorHandlingMiddleware
+
+
+def create_mcp_server(
+    *,
+    name: str,
+    instructions: str | None = None,
+    **kwargs: Any,
+) -> FastMCP:
+    """
+    MCP server instance with preconfigured auth and middleware.
+
+    All FastMCP constructor parameters are supported via **kwargs.
+
+    Args:
+        name: Server name
+        instructions: Optional server instructions
+        **kwargs: All other FastMCP constructor parameters:
+            - version: str | None
+            - auth: AuthProvider | None (AccessTokenAuthProvider if not set, pass None to disable)
+            - middleware: list[Middleware] | None (custom middleware if not set, pass None to disable)
+            - lifespan: Callable | None
+            - tool_serializer: Callable[[Any], str] | None
+            - cache_expiration_seconds: float | None
+            - on_duplicate_tools: DuplicateBehavior | None
+            - on_duplicate_resources: DuplicateBehavior | None
+            - on_duplicate_prompts: DuplicateBehavior | None
+            - resource_prefix_format: Literal["protocol", "path"] | None
+            - mask_error_details: bool | None
+            - tools: list[Tool | Callable] | None
+            - tool_transformations: dict[str, ToolTransformConfig] | None
+            - dependencies: list[str] | None
+            - include_tags: set[str] | None
+            - exclude_tags: set[str] | None
+            - include_fastmcp_meta: bool | None
+
+    Returns:
+        Configured FastMCP server instance
+    """
+    middleware = kwargs.pop("middleware", NotSet)
+    auth = kwargs.pop("auth", NotSet)
+
+    if middleware is NotSet:
+        middleware = [
+            LoggingMiddleware(include_payloads=True, logger=get_logger("middleware.log")),
+            AixErrorHandlingMiddleware(include_traceback=True, logger=get_logger("middleware.err")),
+            TimingMiddleware(logger=get_logger("middleware.timing")),
+        ]
+
+    if auth is NotSet:
+        auth = AccessTokenAuthProvider()
+
+    mcp_args = {
+        "name": name,
+        "instructions": instructions,
+        "auth": auth,
+        "middleware": middleware,
+        **kwargs,
+    }
+
+    return FastMCP(**mcp_args)

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.19.dist-info → aixtools-0.2.21.dist-info}/METADATA

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

{aixtools-0.2.19.dist-info → aixtools-0.2.21.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aixtools/__init__.py,sha256=9NGHm7LjsQmsvjTZvw6QFJexSvAU4bCoN_KBk9SCa00,260
-aixtools/_version.py,sha256=32XF9c5EeiOUdyiWeKcwkXTWZQBgtvbmKx8wZoDEW0o,706
+aixtools/_version.py,sha256=ssMI60XkNnqSio7IM67x0S2AEvggFaGv48yM5LcifrI,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
@@ -59,16 +59,17 @@ aixtools/logging/log_objects.py,sha256=gohsgcfyr8vsY7G_hfmj973-Ek1_PN-bMMLEUA-4u
 aixtools/logging/logging_config.py,sha256=LvxV3C75-I0096PpcCIbgM-Cp998LzWXeMM14HYbU20,4985
 aixtools/logging/mcp_log_models.py,sha256=7-H2GJXiiyLhpImuyLLftAGG4skxJal8Swax0ob04MY,3463
 aixtools/logging/mcp_logger.py,sha256=d2I5l4t0d6rQH17w23FpE1IUD8Ax-mSaKfByCH86q4I,6257
-aixtools/logging/mcp_middleware.py,sha256=0kpTAwvz9Fd_mFDP3J9ldH4dPP-bhcUjLJKELGOx0IQ,2257
 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=Qp4uD1RtypCYgzWrt_ThBVxa5-CFBgcwMWkHbHFUQ54,232
-aixtools/mcp/client.py,sha256=1flZ49irNzM6kdoKKocwFslFR3exDVWccoR0fp9SPvk,18396
+aixtools/mcp/__init__.py,sha256=y6Akm5xeEFJ0K0TNM6aiTsUSe5k5kft8LSTaSEaY7vE,404
+aixtools/mcp/client.py,sha256=5iyQ7IGPhgTH7ATC3vP-fSgrw6Prd0OuD1v0ZAWK3Rs,18523
 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
 aixtools/mcp/fast_mcp_log.py,sha256=XYOS406dVjn5YTHyGRsRvVNQ0SKlRObfrKj6EeLFjHg,1057
 aixtools/mcp/faulty_mcp.py,sha256=uU9vlNGCS_i2k20wocVMaDHTlYjMQxuzjILad9O1cjA,12807
+aixtools/mcp/middleware.py,sha256=V-bWhSL6F-tv74EtqaoYjbvxIUCIfG3XKz1khU7ebU4,2268
+aixtools/mcp/server.py,sha256=wpN7tJmUZqGsb_rOVfXbyTFJ9VPnQl7nG5wa1JAz-No,2566
 aixtools/model_patch/model_patch.py,sha256=JT-oHubIn2LeoSwWbzEQ5vLH7crJmFUecHyQfaAFHa0,1813
 aixtools/server/__init__.py,sha256=rwPx020YpOzCnrxA80Lc4yLLcIp-Mpe9hNqVO9wDPv0,448
 aixtools/server/app_mounter.py,sha256=0tJ0tC140ezAjnYdlhpLJQjY-TO8NVw7D8LseYCCVY8,3336
@@ -84,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
@@ -94,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.19.dist-info/METADATA,sha256=sWkvJFInIkf9THB_rs-E5HOZ3nXBLiMtn7aL8TtdZLc,27958
-aixtools-0.2.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aixtools-0.2.19.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
-aixtools-0.2.19.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
-aixtools-0.2.19.dist-info/RECORD,,
+aixtools-0.2.21.dist-info/METADATA,sha256=jlzBoBeNrkpGy8Pd0KZwEIy3ynz8mMZiA1XEtK6SNQU,27958
+aixtools-0.2.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aixtools-0.2.21.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
+aixtools-0.2.21.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
+aixtools-0.2.21.dist-info/RECORD,,