dtlpymcp 0.1.10__tar.gz → 0.1.12__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtlpymcp
-Version: 0.1.10
+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.10 → dtlpymcp-0.1.12}/dtlpymcp/__init__.py

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

{dtlpymcp-0.1.10 → dtlpymcp-0.1.12}/dtlpymcp/min_proxy.py

@@ -28,7 +28,7 @@ def create_dataloop_mcp_server() -> FastMCP:
         log_level="DEBUG",
     )
     tool_name = "test"
-    input_schema = {"properties": {"ping": {"type": "string", "default": "pong"}}, "required": ["ping"]}
+    input_schema = {"type": "object", "properties": {"ping": {"type": "string", "default": "pong"}}, "required": ["ping"]}
     # Create Dataloop context
     dynamic_pydantic_model_params = DataloopContext.build_pydantic_fields_from_schema(input_schema)
     arguments_model = create_model(f"{tool_name}Arguments", **dynamic_pydantic_model_params, __base__=ArgModelBase)

{dtlpymcp-0.1.10 → dtlpymcp-0.1.12}/dtlpymcp/proxy.py

@@ -118,7 +118,7 @@ def create_dataloop_mcp_server(sources_file: Optional[str] = None, init_timeout:
         return result
 
     tool_name = "test"
-    input_schema = {"properties": {"ping": {"type": "string"}}, "required": ["ping"]}
+    input_schema = {"type": "object", "properties": {"ping": {"type": "string"}}, "required": ["ping"]}
     dynamic_pydantic_model_params = DataloopContext.build_pydantic_fields_from_schema(input_schema)
     arguments_model = create_model(f"{tool_name}Arguments", **dynamic_pydantic_model_params, __base__=ArgModelBase)
     resp = FuncMetadata(arg_model=arguments_model)

{dtlpymcp-0.1.10 → 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,
@@ -95,6 +99,10 @@ class DataloopContext:
             ns_tool_name = f"{server_name}.{tool_name}"
             description = tool.description
             input_schema = tool.inputSchema
+            
+            # Normalize input schema to ensure it has "type": "object" at root level
+            # This is required by the MCP specification
+            input_schema = self.normalize_input_schema(input_schema)
 
             def build_handler(tool_name):
                 async def inner(**kwargs):
@@ -150,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}")
@@ -164,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
@@ -199,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]:
         """
@@ -210,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()
@@ -230,6 +260,36 @@ class DataloopContext:
                 logger.info(f"Discovered {len(tools.tools)} tools for source {source.dpk_name}")
                 return (source.dpk_name, tools, call_fn)
 
+    @staticmethod
+    def normalize_input_schema(input_schema: dict) -> dict:
+        """
+        Normalize input schema to ensure it conforms to MCP specification.
+        The schema must have "type": "object" at the root level.
+        """
+        if not isinstance(input_schema, dict):
+            return {"type": "object", "properties": {}, "required": []}
+        
+        # Create a copy to avoid mutating the original
+        normalized = input_schema.copy()
+        
+        # Ensure type is "object" at root level
+        if "type" not in normalized:
+            normalized["type"] = "object"
+        elif normalized.get("type") != "object":
+            # If type exists but isn't "object", log a warning and fix it
+            logger.warning(f"Input schema has type '{normalized.get('type')}' instead of 'object', fixing...")
+            normalized["type"] = "object"
+        
+        # Ensure properties exist
+        if "properties" not in normalized:
+            normalized["properties"] = {}
+        
+        # Ensure required exists (can be empty list)
+        if "required" not in normalized:
+            normalized["required"] = []
+        
+        return normalized
+
     @staticmethod
     def openapi_type_to_python(type_str):
         return {"string": str, "integer": int, "number": float, "boolean": bool, "array": list, "object": dict}.get(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtlpymcp
-Version: 0.1.10
+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.10 → dtlpymcp-0.1.12}/pyproject.toml

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

{dtlpymcp-0.1.10 → dtlpymcp-0.1.12}/tests/test_list_platform_tools.py

@@ -7,13 +7,13 @@ from mcp.client.stdio import stdio_client
 from mcp import ClientSession, StdioServerParameters
 import dtlpy as dl
 
-dl.setenv('rc')
+dl.setenv('prod')
 if dl.token_expired():
     dl.login()
 # Create server parameters for stdio connection
 server_params = StdioServerParameters(
-    command="dtlpymcp",  # Executable
-    args=["start"],  # Command line arguments
+    command="uvx",  # Executable
+    args=["dtlpymcp", "start"],  # Command line arguments
     env={"DATALOOP_API_KEY": dl.token()},  # Optional environment variables
     cwd=os.getcwd()
 )

{dtlpymcp-0.1.10 → 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()