aixtools 0.2.16__py3-none-any.whl → 0.2.18__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.16'
-__version_tuple__ = version_tuple = (0, 2, 16)
+__version__ = version = '0.2.18'
+__version_tuple__ = version_tuple = (0, 2, 18)
 
 __commit_id__ = commit_id = None

aixtools/agents/agent.py

@@ -105,7 +105,7 @@ def get_model(model_family=MODEL_FAMILY, model_name=None, http_client=None, **kw
         case "azure":
             return _get_model_openai_azure(model_name=model_name or AZURE_MODEL_NAME, http_client=http_client, **kwargs)
         case "bedrock":
-            return _get_model_bedrock(model_name=model_name or BEDROCK_MODEL_NAME, http_client=http_client, **kwargs)
+            return _get_model_bedrock(model_name=model_name or BEDROCK_MODEL_NAME, **kwargs)
         case "ollama":
             return _get_model_ollama(model_name=model_name or OLLAMA_MODEL_NAME, http_client=http_client, **kwargs)
         case "openai":

aixtools/logging/mcp_middleware.py

@@ -0,0 +1,54 @@
+"""
+Custom middleware for MCP servers
+"""
+
+import traceback
+
+from fastmcp.server.middleware.error_handling import ErrorHandlingMiddleware
+from fastmcp.server.middleware.middleware import MiddlewareContext
+
+from aixtools.mcp import AixToolError
+
+
+class AixErrorHandlingMiddleware(ErrorHandlingMiddleware):
+    """Custom middleware class for handling errors in MCP servers."""
+
+    def log_as_warn_with_traceback(
+        self, *, error: Exception, original_error: Exception, context: MiddlewareContext
+    ) -> None:
+        """Logs provided error as warning.
+        original_error is an 'unwrapped' error if applicable, otherwise can be the same as error param.
+        """
+        error_type = type(original_error).__name__
+        method = context.method or "unknown"
+        error_key = f"{error_type}:{method}"
+        self.error_counts[error_key] = self.error_counts.get(error_key, 0) + 1
+        base_message = f"{method} resulted in {error_type}: {str(error)}"
+        if self.include_traceback:
+            self.logger.warning(f"{base_message}\n{traceback.format_exc()}")
+        if self.error_callback:
+            try:
+                self.error_callback(error, context)
+            except Exception as callback_error:  # pylint: disable=broad-exception-caught
+                self.logger.warning("Callback failed spectacularly: %s", callback_error)
+
+    def handle_error(self, error: Exception, context: MiddlewareContext) -> bool:
+        """Custom error logging"""
+        if isinstance(error, AixToolError):
+            self.log_as_warn_with_traceback(error=error, original_error=error, context=context)
+            return True
+
+        inner_error = error
+        while hasattr(inner_error, "__cause__") and inner_error.__cause__ is not None:
+            inner_error = inner_error.__cause__
+            if isinstance(inner_error, AixToolError):
+                self.log_as_warn_with_traceback(error=error, original_error=inner_error, context=context)
+                return True
+
+        return False
+
+    def _log_error(self, error: Exception, context: MiddlewareContext) -> None:
+        """Override original _log_error method."""
+        if self.handle_error(error, context):
+            return
+        super()._log_error(error, context)

{aixtools-0.2.16.dist-info → aixtools-0.2.18.dist-info}/METADATA

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

{aixtools-0.2.16.dist-info → aixtools-0.2.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aixtools/__init__.py,sha256=9NGHm7LjsQmsvjTZvw6QFJexSvAU4bCoN_KBk9SCa00,260
-aixtools/_version.py,sha256=81M4aoZnnhAMgK9y7KuoW7Ajd2qecfEExTSfgmPaZoc,706
+aixtools/_version.py,sha256=dCdYCOiddErhHj0N8E7eGD9CFxW2AjdU7N-JosKZW0o,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
@@ -25,7 +25,7 @@ aixtools/a2a/google_sdk/utils.py,sha256=4VIPV2GtG5IRY-KSZN6iRMS3ntxG2uKgd_d5tQvn
 aixtools/a2a/google_sdk/pydantic_ai_adapter/agent_executor.py,sha256=8VuU2WXeSHUK3_rRm_mjX6elqdC9NA2uz1aELzeC8BU,9784
 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=loBbSrRY-QZH8wec27JjNi_h1jhqkZ9-UrR0lqPNMWI,7725
+aixtools/agents/agent.py,sha256=7ZxKVOqLI_9K5LsTnqoTwRRHp6i-nFgQrJ6yA4M9iUE,7700
 aixtools/agents/agent_batch.py,sha256=0Zu9yNCRPAQZPjXQ-dIUAmP1uGTVbxVt7xvnMpoJMjU,2251
 aixtools/agents/nodes_to_md.py,sha256=hAT8dgiZTG4uGoSgeRZkIJ7zgkQUNpdIr8KSFhjWAH0,7515
 aixtools/agents/nodes_to_message.py,sha256=ZqcmxUNf4esiCTRk37wWP1LquhqNsCmydvMr4kjZEjw,1012
@@ -59,6 +59,7 @@ 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
@@ -93,8 +94,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.16.dist-info/METADATA,sha256=_MbOVw-AX2e09r_f4VdU2Zra9SAXOcPFLMOElbY-b-w,27958
-aixtools-0.2.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aixtools-0.2.16.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
-aixtools-0.2.16.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
-aixtools-0.2.16.dist-info/RECORD,,
+aixtools-0.2.18.dist-info/METADATA,sha256=h94-SI_IsK2rFnfBJs4R1k6qESnQVGd9T5UKMZV-sUw,27958
+aixtools-0.2.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aixtools-0.2.18.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
+aixtools-0.2.18.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
+aixtools-0.2.18.dist-info/RECORD,,