aixtools 0.2.11__py3-none-any.whl → 0.2.13__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.11'
-__version_tuple__ = version_tuple = (0, 2, 11)
+__version__ = version = '0.2.13'
+__version_tuple__ = version_tuple = (0, 2, 13)
 
 __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/auth/auth.py

@@ -16,6 +16,7 @@ from mcp.server.auth.provider import (
 from aixtools.utils import config
 
 logger = logging.getLogger(__name__)
+TEST_CLIENT = "test-client"
 
 
 class AuthTokenErrorCode(str, enum.Enum):
@@ -163,8 +164,15 @@ class AccessTokenAuthProvider(AuthProvider):
 
     async def verify_token(self, token: str) -> AccessToken:
         """Verify the access token and return an AccessToken object."""
-
         logger.info("Received verify token request")
+        test_token = config.AUTH_TEST_TOKEN
+
+        # check if the token is a test token
+        # this is used for integration test run
+        if test_token and token == test_token:
+            logger.info("Using test token:%s", test_token)
+            return AccessToken(token=token, client_id=TEST_CLIENT, scopes=[], expires_at=None)
+
         claims = self.token_verifier.verify(token)
         scopes = claims.get("scp", "")
         self.token_verifier.authorize_claims(claims, self.app_scope)

aixtools/utils/config.py

@@ -124,7 +124,7 @@ GOOGLE_CLOUD_LOCATION = get_variable_env("GOOGLE_CLOUD_LOCATION", True)
 # vault parameters.
 VAULT_ADDRESS = get_variable_env("VAULT_ADDRESS", default="http://localhost:8200")
 VAULT_TOKEN = get_variable_env("VAULT_TOKEN", allow_empty=True)
-VAULT_ENV = get_variable_env("ENV", allow_empty=True)
+VAULT_ENV = get_variable_env("VAULT_ENV", allow_empty=True)
 VAULT_MOUNT_POINT = get_variable_env("VAULT_MOUNT_POINT", allow_empty=True)
 VAULT_PATH_PREFIX = get_variable_env("VAULT_PATH_PREFIX", allow_empty=True)
 
@@ -142,3 +142,5 @@ APP_AUTHORIZED_GROUPS = get_variable_env("APP_AUTHORIZED_GROUPS", allow_empty=Tr
 # used to skip authorization in local tests if required.
 SKIP_MCP_AUTHORIZATION = str2bool(get_variable_env("SKIP_MCP_AUTHORIZATION", True, False))
 APP_DEFAULT_SCOPE = get_variable_env("APP_DEFAULT_SCOPE", allow_empty=True)
+
+AUTH_TEST_TOKEN = get_variable_env("AUTH_TEST_TOKEN", allow_empty=True)

{aixtools-0.2.11.dist-info → aixtools-0.2.13.dist-info}/METADATA

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

{aixtools-0.2.11.dist-info → aixtools-0.2.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aixtools/__init__.py,sha256=9NGHm7LjsQmsvjTZvw6QFJexSvAU4bCoN_KBk9SCa00,260
-aixtools/_version.py,sha256=ctqLY7UIopjEtEtkMewUbTAH-exVquX9ojG1BE5gJ1s,706
+aixtools/_version.py,sha256=Ne1JryemzOpPApsxRo0sW1JCbPxg8W1xrIqiCeYqiTA,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,12 +25,12 @@ 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
 aixtools/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aixtools/auth/auth.py,sha256=aCcFTHjTO-ieA5Xo7913-9OCDowRAoCYG_b_gmtsXsU,7100
+aixtools/auth/auth.py,sha256=gooviMSsfvAn9BulJLD5My2B45qsAR4ZT6JgIS3uSLQ,7467
 aixtools/compliance/__init__.py,sha256=vnw0zEdySIJWvDAJ8DCRRaWmY_agEOz1qlpAdhmtiuo,191
 aixtools/compliance/private_data.py,sha256=OOM9mIp3_w0fNgj3VAEWBl7-jrPc19_Ls1pC5dfF5UY,5323
 aixtools/db/__init__.py,sha256=b8vRhme3egV-aUZbAntnOaDkSXB8UT0Xy5oqQhU_z0Q,399
@@ -78,7 +78,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=fd7BWDqxzMnHke2M4tjKvkhrxwdkUsuZXDTOShiID24,5412
+aixtools/utils/config.py,sha256=e6gzGfo9c21V4ImuthLMP1RmF2-2FbBnsirMmve3ZWE,5491
 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
@@ -88,8 +88,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.11.dist-info/METADATA,sha256=E5GS2Ov0M2EdWvwzzxHduZJvSMepJo_0P5j_uEn95-g,27230
-aixtools-0.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aixtools-0.2.11.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
-aixtools-0.2.11.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
-aixtools-0.2.11.dist-info/RECORD,,
+aixtools-0.2.13.dist-info/METADATA,sha256=9MIU9MUcpdPA6NZlU9btnOeuN_utKGcVokMyb9Q_KBc,27230
+aixtools-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aixtools-0.2.13.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
+aixtools-0.2.13.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
+aixtools-0.2.13.dist-info/RECORD,,