aixtools 0.2.19__tar.gz → 0.2.21__tar.gz

{aixtools-0.2.19 → aixtools-0.2.21}/PKG-INFO

@@ -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 → aixtools-0.2.21}/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 = 'g09e184e90'
+__commit_id__ = commit_id = 'gbbd8ec97d'

{aixtools-0.2.19 → aixtools-0.2.21}/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-0.2.19 → aixtools-0.2.21}/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-0.2.19/aixtools/logging/mcp_middleware.py → aixtools-0.2.21/aixtools/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-0.2.21/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-0.2.19 → aixtools-0.2.21}/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 → aixtools-0.2.21}/aixtools.egg-info/SOURCES.txt

@@ -61,7 +61,6 @@ aixtools/logging/log_objects.py
 aixtools/logging/logging_config.py
 aixtools/logging/mcp_log_models.py
 aixtools/logging/mcp_logger.py
-aixtools/logging/mcp_middleware.py
 aixtools/logging/model_patch_logging.py
 aixtools/logging/open_telemetry.py
 aixtools/mcp/__init__.py
@@ -71,6 +70,8 @@ aixtools/mcp/example_server.py
 aixtools/mcp/exceptions.py
 aixtools/mcp/fast_mcp_log.py
 aixtools/mcp/faulty_mcp.py
+aixtools/mcp/middleware.py
+aixtools/mcp/server.py
 aixtools/model_patch/model_patch.py
 aixtools/server/__init__.py
 aixtools/server/app_mounter.py