aixtools 0.2.9__tar.gz → 0.2.11__tar.gz

{aixtools-0.2.9 → aixtools-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aixtools
-Version: 0.2.9
+Version: 0.2.11
 Summary: Tools for AI exploration and debugging
 Requires-Python: >=3.11.2
 Description-Content-Type: text/markdown
@@ -9,7 +9,7 @@ Requires-Dist: cachebox>=5.0.1
 Requires-Dist: chainlit>=2.5.5
 Requires-Dist: colorlog>=6.9.0
 Requires-Dist: fasta2a>=0.5.0
-Requires-Dist: fastmcp>=2.10.2
+Requires-Dist: fastmcp>=2.11.0
 Requires-Dist: hvac>=2.3.0
 Requires-Dist: ipykernel>=6.29.5
 Requires-Dist: langchain-chroma>=0.2.3

{aixtools-0.2.9 → aixtools-0.2.11}/aixtools/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.9'
-__version_tuple__ = version_tuple = (0, 2, 9)
+__version__ = version = '0.2.11'
+__version_tuple__ = version_tuple = (0, 2, 11)
 
-__commit_id__ = commit_id = 'g9ef985eb7'
+__commit_id__ = commit_id = 'g66be32dcf'

{aixtools-0.2.9 → aixtools-0.2.11}/aixtools/auth/auth.py

@@ -7,7 +7,11 @@ import logging
 
 import jwt
 from fastapi import HTTPException
+from fastmcp.server.auth.auth import AuthProvider
 from jwt import ExpiredSignatureError, InvalidAudienceError, InvalidIssuerError, InvalidSignatureError, PyJWKClient
+from mcp.server.auth.provider import (
+    AccessToken,
+)
 
 from aixtools.utils import config
 
@@ -147,3 +151,29 @@ class AccessTokenVerifier:
             AuthTokenErrorCode.MISSING_GROUPS_ERROR,
             f"Could not find any group in JWT token, matching: {self.authorized_groups}",
         )
+
+
+class AccessTokenAuthProvider(AuthProvider):
+    """Authentication provider for MCP servers for validating, authorizing and extracting access tokens."""
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.token_verifier = AccessTokenVerifier()
+        self.app_scope = config.APP_DEFAULT_SCOPE
+
+    async def verify_token(self, token: str) -> AccessToken:
+        """Verify the access token and return an AccessToken object."""
+
+        logger.info("Received verify token request")
+        claims = self.token_verifier.verify(token)
+        scopes = claims.get("scp", "")
+        self.token_verifier.authorize_claims(claims, self.app_scope)
+
+        scopes_arr = []
+        if scopes:
+            scopes_arr = scopes.split(" ")
+
+        logger.info("Authorized the token")
+        return AccessToken(
+            token=token, client_id=self.token_verifier.api_id, scopes=scopes_arr, expires_at=claims.get("exp", None)
+        )

{aixtools-0.2.9 → aixtools-0.2.11}/aixtools/utils/config.py

@@ -138,3 +138,7 @@ APP_TENANT_ID = get_variable_env("APP_TENANT_ID")
 
 # used for token authorization check
 APP_AUTHORIZED_GROUPS = get_variable_env("APP_AUTHORIZED_GROUPS", allow_empty=True)
+
+# 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)

{aixtools-0.2.9 → aixtools-0.2.11}/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
     "chainlit>=2.5.5",
     "colorlog>=6.9.0",
     "fasta2a>=0.5.0",
-    "fastmcp>=2.10.2",
+    "fastmcp>=2.11.0",
     "hvac>=2.3.0",
     "ipykernel>=6.29.5",
     "langchain-chroma>=0.2.3",