aixtools 0.2.12__py3-none-any.whl → 0.2.14__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.12'
-__version_tuple__ = version_tuple = (0, 2, 12)
+__version__ = version = '0.2.14'
+__version_tuple__ = version_tuple = (0, 2, 14)
 
 __commit_id__ = commit_id = None

aixtools/agents/agent.py

@@ -51,17 +51,17 @@ def _get_model_bedrock(model_name=BEDROCK_MODEL_NAME, aws_region=AWS_REGION):
     return BedrockConverseModel(model_name=model_name, provider=provider)
 
 
-def _get_model_ollama(model_name=OLLAMA_MODEL_NAME, ollama_url=OLLAMA_URL):
+def _get_model_ollama(model_name=OLLAMA_MODEL_NAME, ollama_url=OLLAMA_URL, http_client=None):
     assert ollama_url, "OLLAMA_URL is not set"
     assert model_name, "Model name is not set"
-    provider = OpenAIProvider(base_url=ollama_url)
+    provider = OpenAIProvider(base_url=ollama_url, http_client=http_client)
     return OpenAIChatModel(model_name=model_name, provider=provider)
 
 
-def _get_model_openai(model_name=OPENAI_MODEL_NAME, openai_api_key=OPENAI_API_KEY):
+def _get_model_openai(model_name=OPENAI_MODEL_NAME, openai_api_key=OPENAI_API_KEY, http_client=None):
     assert openai_api_key, "OPENAI_API_KEY is not set"
     assert model_name, "Model name is not set"
-    provider = OpenAIProvider(api_key=openai_api_key)
+    provider = OpenAIProvider(api_key=openai_api_key, http_client=http_client)
     return OpenAIChatModel(model_name=model_name, provider=provider)
 
 
@@ -76,22 +76,27 @@ def _get_model_openai_azure(
     assert azure_openai_api_version, "AZURE_OPENAI_API_VERSION is not set"
     assert model_name, "Model name is not set"
     client = AsyncAzureOpenAI(
-        azure_endpoint=azure_openai_endpoint, api_version=azure_openai_api_version, api_key=azure_openai_api_key
+        azure_endpoint=azure_openai_endpoint,
+        api_version=azure_openai_api_version,
+        api_key=azure_openai_api_key,
     )
     return OpenAIChatModel(model_name=model_name, provider=OpenAIProvider(openai_client=client))
 
 
 def _get_model_open_router(
-    model_name=OPENROUTER_MODEL_NAME, openrouter_api_url=OPENROUTER_API_URL, openrouter_api_key=OPENROUTER_API_KEY
+    model_name=OPENROUTER_MODEL_NAME,
+    openrouter_api_url=OPENROUTER_API_URL,
+    openrouter_api_key=OPENROUTER_API_KEY,
+    http_client=None,
 ):
     assert openrouter_api_url, "OPENROUTER_API_URL is not set"
     assert openrouter_api_key, "OPENROUTER_API_KEY is not set"
     assert model_name, "Model name is not set, missing 'OPENROUTER_MODEL_NAME' environment variable?"
-    provider = OpenAIProvider(base_url=openrouter_api_url, api_key=openrouter_api_key)
+    provider = OpenAIProvider(base_url=openrouter_api_url, api_key=openrouter_api_key, http_client=http_client)
     return OpenAIChatModel(model_name, provider=provider)
 
 
-def get_model(model_family=MODEL_FAMILY, model_name=None, **kwargs):
+def get_model(model_family=MODEL_FAMILY, model_name=None, http_client=None, **kwargs):
     """Create and return appropriate model instance based on specified family and name."""
     assert model_family is not None and model_family != "", f"Model family '{model_family}' is not set"
     match model_family:
@@ -100,11 +105,13 @@ def get_model(model_family=MODEL_FAMILY, model_name=None, **kwargs):
         case "bedrock":
             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, **kwargs)
+            return _get_model_ollama(model_name=model_name or OLLAMA_MODEL_NAME, http_client=http_client, **kwargs)
         case "openai":
-            return _get_model_openai(model_name=model_name or OPENAI_MODEL_NAME, **kwargs)
+            return _get_model_openai(model_name=model_name or OPENAI_MODEL_NAME, http_client=http_client, **kwargs)
         case "openrouter":
-            return _get_model_open_router(model_name=model_name or OPENROUTER_MODEL_NAME, **kwargs)
+            return _get_model_open_router(
+                model_name=model_name or OPENROUTER_MODEL_NAME, http_client=http_client, **kwargs
+            )
         case _:
             raise ValueError(f"Model family '{model_family}' not supported")
 
@@ -119,12 +126,15 @@ def get_agent(  # noqa: PLR0913, pylint: disable=too-many-arguments,too-many-pos
     model_settings=None,
     output_type: Any = str,
     deps_type=NoneType,
+    http_client=None,
 ) -> Agent:
     """Get a PydanticAI agent"""
     if model_settings is None:
         model_settings = ModelSettings(timeout=MODEL_TIMEOUT)
     if model is None:
-        model = get_model()
+        model = get_model(
+            http_client=http_client,
+        )
     agent = Agent(
         model=model,
         output_type=output_type,

aixtools/mcp/__init__.py

@@ -2,8 +2,10 @@
 Model Context Protocol (MCP) implementation for AI agent communication.
 """
 
+from aixtools.mcp.exceptions import AixToolError
 from aixtools.mcp.fast_mcp_log import FastMcpLog
 
 __all__ = [
     "FastMcpLog",
+    "AixToolError",
 ]

aixtools/mcp/exceptions.py

@@ -0,0 +1,5 @@
+"""Custom exceptions for MCP services."""
+
+
+class AixToolError(Exception):
+    """Retryable tool error. Raise this when a tool fails but the operation should be retried."""

{aixtools-0.2.12.dist-info → aixtools-0.2.14.dist-info}/METADATA

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

{aixtools-0.2.12.dist-info → aixtools-0.2.14.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aixtools/__init__.py,sha256=9NGHm7LjsQmsvjTZvw6QFJexSvAU4bCoN_KBk9SCa00,260
-aixtools/_version.py,sha256=kUi3MrWsIVQiHrXbB13_ffDrVNg8qWHnVa_kbLjcxME,706
+aixtools/_version.py,sha256=lOOOEggb8ag564aDqoOp-6k18Oo-qSEBUsWUUBMG5Qs,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=tceQByn-RGBIhW8BOjKoP0yhNzZLwAa6CxwhPhRe3PU,7270
+aixtools/agents/agent.py,sha256=JRbWWo3lueXyNSd9UgnTztm4bZr7dPxeNOzCFNFG7RE,7620
 aixtools/agents/agent_batch.py,sha256=0Zu9yNCRPAQZPjXQ-dIUAmP1uGTVbxVt7xvnMpoJMjU,2251
 aixtools/agents/print_nodes.py,sha256=wVTngNfqM0As845WTRz6G3Rei_Gr3HuBlvu-G_eXuig,1665
 aixtools/agents/prompt.py,sha256=p9OYnyJ4-MyGXwHPrQeJBhZ2a3RV2HqhtdUUCrTMsAQ,3361
@@ -58,10 +58,11 @@ aixtools/logging/mcp_log_models.py,sha256=7-H2GJXiiyLhpImuyLLftAGG4skxJal8Swax0o
 aixtools/logging/mcp_logger.py,sha256=d2I5l4t0d6rQH17w23FpE1IUD8Ax-mSaKfByCH86q4I,6257
 aixtools/logging/model_patch_logging.py,sha256=MY2EvR7ZSctC4hJxNMe8iACeVayUJ2V5In2GAnKdgOo,2880
 aixtools/logging/open_telemetry.py,sha256=fJjF1ou_8GyfNfbyWDQPGK6JAUrUaPwURYPHhXEtDBE,1121
-aixtools/mcp/__init__.py,sha256=tLo2KZ1Ojo-rgEEJBGtZfUw-iOoopWoHDnYQTq3IzfE,163
+aixtools/mcp/__init__.py,sha256=Qp4uD1RtypCYgzWrt_ThBVxa5-CFBgcwMWkHbHFUQ54,232
 aixtools/mcp/client.py,sha256=aCDLc_AfrjV8JtZLWnKCTnScvFdNoMJZiGQhBUO8t8w,18289
 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/model_patch/model_patch.py,sha256=JT-oHubIn2LeoSwWbzEQ5vLH7crJmFUecHyQfaAFHa0,1813
@@ -88,8 +89,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.12.dist-info/METADATA,sha256=KnSz22SzcgaKB4P39ouB8gy-efFU3ZlhBpGJohIfoRw,27230
-aixtools-0.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aixtools-0.2.12.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
-aixtools-0.2.12.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
-aixtools-0.2.12.dist-info/RECORD,,
+aixtools-0.2.14.dist-info/METADATA,sha256=BVCtc_kv3nt7TFaIeOMK8APeIMu1ya4T5wnRdrAqams,27230
+aixtools-0.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aixtools-0.2.14.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
+aixtools-0.2.14.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
+aixtools-0.2.14.dist-info/RECORD,,