dtlpymcp 0.1.11__tar.gz → 0.1.12__tar.gz

{dtlpymcp-0.1.11 → dtlpymcp-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtlpymcp
-Version: 0.1.11
+Version: 0.1.12
 Summary: STDIO MCP proxy server for Dataloop platform.
 Author-email: Your Name <your.email@example.com>
 Classifier: Programming Language :: Python :: 3.10

{dtlpymcp-0.1.11 → dtlpymcp-0.1.12}/dtlpymcp/__init__.py

@@ -1,3 +1,3 @@
 from .utils.dtlpy_context import DataloopContext, MCPSource
 
-__version__ = "0.1.11"
+__version__ = "0.1.12"

{dtlpymcp-0.1.11 → dtlpymcp-0.1.12}/dtlpymcp/utils/dtlpy_context.py

@@ -1,3 +1,4 @@
+from imp import source_from_cache
 from mcp.server.fastmcp.utilities.func_metadata import ArgModelBase, FuncMetadata
 from mcp.client.streamable_http import streamablehttp_client
 from typing import List, Tuple, Callable, Optional
@@ -20,6 +21,8 @@ logger = logging.getLogger("dtlpymcp")
 class MCPSource(BaseModel):
     dpk_name: Optional[str] = None
     app_url: Optional[str] = None
+    dpk_version: Optional[str] = None
+    app_trusted: Optional[bool] = None
     server_url: Optional[str] = None
     app_jwt: Optional[str] = None
     tools: Optional[List[Tool]] = []
@@ -60,6 +63,7 @@ class DataloopContext:
                 sources.append(
                     {
                         "dpk_name": app.dpk_name,
+                        "dpk_version": app.dpk_version,	
                         "app_url": next(iter(app.routes.values())),
                         "server_url": None,
                         "app_jwt": None,
@@ -154,6 +158,8 @@ class DataloopContext:
                 app = apps[0]
                 logger.info(f"App: {app.name}")
                 source.app_url = next(iter(app.routes.values()))
+            dpk = dl.dpks.get(dpk_name=source.dpk_name, dpk_version=source.dpk_version).to_json()
+            source.app_trusted = dpk.get('trusted', False)
             session = requests.Session()
             response = session.get(source.app_url, headers=dl.client_api.auth)
             logger.info(f"App route URL: {response.url}")
@@ -168,14 +174,21 @@ class DataloopContext:
     def is_expired(app_jwt: str) -> bool:
         """
         Check if the APP_JWT is expired.
+
+        Note: Verification is intentionally skipped - this is only used for
+        client-side expiration checking. The server validates the JWT.
         """
         try:
-            decoded = jwt.decode(app_jwt, options={"verify_signature": False})
-            if decoded.get("exp") < time.time():
-                return True
-            return False
-        except jwt.ExpiredSignatureError:
-            return True
+            decoded = jwt.decode(
+                app_jwt,
+                options={
+                    "verify_signature": False,
+                    "verify_exp": False,
+                    "verify_aud": False,
+                    "verify_iss": False,
+                },
+            )
+            return decoded.get("exp", 0) < time.time()
         except Exception as e:
             logger.error(f"Error decoding JWT: {e}")
             return True
@@ -203,9 +216,19 @@ class DataloopContext:
     def user_info(token: str) -> dict:
         """
         Decode a JWT token and return user info.
+
+        Note: Verification is intentionally skipped - this is only used for
+        reading claims client-side. The server validates the JWT.
         """
-        decoded = jwt.decode(token, options={"verify_signature": False})
-        return decoded
+        return jwt.decode(
+            token,
+            options={
+                "verify_signature": False,
+                "verify_exp": False,
+                "verify_aud": False,
+                "verify_iss": False,
+            },
+        )
 
     async def list_source_tools(self, source: MCPSource) -> Tuple[str, List[dict], Callable]:
         """
@@ -214,7 +237,10 @@ class DataloopContext:
         if source.server_url is None:
             logger.error("DataloopContext required for DPK servers")
             raise ValueError("DataloopContext required for DPK servers")
-        headers = {"Cookie": f"JWT-APP={source.app_jwt}", "x-dl-info": f"{self.token}"}
+        if source.app_trusted:
+            headers = {"authorization": f"Bearer {self.token}", "x-dl-info": f"{self.token}"}
+        else:
+            headers = {"Cookie": f"JWT-APP={source.app_jwt}", "x-dl-info": f"{self.token}"}
         async with streamablehttp_client(source.server_url, headers=headers) as (read, write, _):
             async with ClientSession(read, write, read_timeout_seconds=timedelta(seconds=60)) as session:
                 await session.initialize()

{dtlpymcp-0.1.11 → dtlpymcp-0.1.12}/dtlpymcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtlpymcp
-Version: 0.1.11
+Version: 0.1.12
 Summary: STDIO MCP proxy server for Dataloop platform.
 Author-email: Your Name <your.email@example.com>
 Classifier: Programming Language :: Python :: 3.10

{dtlpymcp-0.1.11 → dtlpymcp-0.1.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dtlpymcp"
-version = "0.1.11"
+version = "0.1.12"
 description = "STDIO MCP proxy server for Dataloop platform."
 authors = [
     { name = "Your Name", email = "your.email@example.com" }

{dtlpymcp-0.1.11 → dtlpymcp-0.1.12}/tests/test_run.py

@@ -1,7 +1,7 @@
 from dtlpymcp.proxy import main
 import dtlpy as dl
 import os
-dl.setenv('rc')
+dl.setenv('prod')
 if dl.token_expired():
     dl.login()
 os.environ["DATALOOP_API_KEY"] = dl.token()