dtlpymcp 0.1.3__py3-none-any.whl → 0.1.7__py3-none-any.whl

dtlpymcp/__init__.py

@@ -3,5 +3,5 @@ SOURCES_FILEPATH = os.path.join(os.path.dirname(__file__), "default_sources.json
 
 from .utils.dtlpy_context import DataloopContext, MCPSource
 
-__version__ = "0.1.3"
+__version__ = "0.1.7"
 

dtlpymcp/default_sources.json

@@ -16,5 +16,17 @@
         "app_url": null,
         "server_url": null,
         "app_jwt": null
+    },
+    {
+        "dpk_name": "dataloop-mcp-data",
+        "app_url": null,
+        "server_url": null,
+        "app_jwt": null
+    },
+    {
+        "dpk_name": "dataloop-mcp-dtlpy-sandbox",
+        "app_url": null,
+        "server_url": null,
+        "app_jwt": null
     }
 ]

dtlpymcp/proxy.py

@@ -1,94 +1,101 @@
-from pydantic_settings import BaseSettings, SettingsConfigDict
-from mcp.server.fastmcp import FastMCP, Context
-from typing import Any, Optional
-from datetime import datetime
-import traceback
-import logging
-import json
-import os
-from pathlib import Path
-
-from . import SOURCES_FILEPATH
-from .utils.dtlpy_context import DataloopContext, MCPSource
-
-# Setup logging to both console and file with timestamp
-log_dir = Path.home() / ".dataloop" / "mcplogs"
-log_dir.mkdir(parents=True, exist_ok=True)
-log_file = log_dir / f"{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.log"
-
-# Remove any existing handlers
-for handler in logging.root.handlers[:]:
-    logging.root.removeHandler(handler)
-
-# File handler with timestamp
-file_handler = logging.FileHandler(log_file, mode="a", encoding="utf-8")
-file_handler.setFormatter(
-    logging.Formatter(fmt="%(asctime)s [%(levelname)s] %(name)s: %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
-)
-
-# Console handler (default format)
-console_handler = logging.StreamHandler()
-console_handler.setFormatter(logging.Formatter(fmt="[%(levelname)s] %(name)s: %(message)s"))
-
-logging.basicConfig(level=logging.INFO, handlers=[file_handler, console_handler])
-logger = logging.getLogger("[DATALOOP-MCP]")
-
-
-class ServerSettings(BaseSettings):
-    """Settings for the Dataloop MCP server."""
-
-    model_config = SettingsConfigDict(env_prefix="MCP_DATALOOP_")
-
-    def __init__(self, **data):
-        super().__init__(**data)
-
-
-def create_dataloop_mcp_server(settings: ServerSettings, sources_file: str) -> FastMCP:
-    """Create a FastMCP server for Dataloop with Bearer token authentication."""
-    app = FastMCP(
-        name="Dataloop MCP Server",
-        instructions="A multi-tenant MCP server for Dataloop with authentication",
-        stateless_http=True,
-        debug=True,
-    )
-    dl_context = DataloopContext(token=os.environ.get('DATALOOP_API_KEY'), 
-                                 sources_file=sources_file)
-
-    @app.tool(description="Test tool for health checks")
-    async def test(ctx: Context, ping: Any = None) -> dict[str, Any]:
-        """Health check tool. Returns status ok and echoes ping if provided."""
-        result = {"status": "ok"}
-        if ping is not None:
-            result["ping"] = ping
-        return result
-
-    for source in dl_context.mcp_sources:
-        for tool in source.tools:
-            app._tool_manager._tools[tool.name] = tool
-    return app
-
-
-def main(sources_file: Optional[str] = None) -> int:
-    logger.info("Starting Dataloop MCP server in stdio mode")
-    try:
-        settings = ServerSettings()
-        logger.info("Successfully configured Dataloop MCP server")
-    except Exception as e:
-        logger.error(f"Unexpected error during startup:\n{e}")
-        return 1
-    try:
-        if sources_file is None:
-            sources_file = SOURCES_FILEPATH
-        logger.info(f"Using sources file: {sources_file}")
-        mcp_server = create_dataloop_mcp_server(settings, sources_file)
-        logger.info("Starting Dataloop MCP server in stdio mode")
-        logger.info("Users should provide their API key in the Authorization header as a Bearer token")
-        mcp_server.run(transport="stdio")
-        return 0
-    except Exception:
-        logger.error(f"Failed to start MCP server: {traceback.format_exc()}")
-        return 1
-
-
-if __name__ == "__main__":
-    main()
+from pydantic_settings import BaseSettings, SettingsConfigDict
+from mcp.server.fastmcp import FastMCP, Context
+from typing import Any, Optional
+from datetime import datetime
+import traceback
+import logging
+import asyncio
+import os
+from pathlib import Path
+
+from dtlpymcp.utils.dtlpy_context import DataloopContext, SOURCES_FILEPATH
+
+# Setup logging to both console and file with timestamp
+log_dir = Path.home() / ".dataloop" / "mcplogs"
+log_dir.mkdir(parents=True, exist_ok=True)
+log_file = log_dir / f"{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.log"
+
+# Remove any existing handlers
+for handler in logging.root.handlers[:]:
+    logging.root.removeHandler(handler)
+
+# File handler with timestamp
+file_handler = logging.FileHandler(log_file, mode="a", encoding="utf-8")
+file_handler.setFormatter(
+    logging.Formatter(fmt="%(asctime)s [%(levelname)s] %(name)s: %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
+)
+
+# Console handler (default format)
+console_handler = logging.StreamHandler()
+console_handler.setFormatter(logging.Formatter(fmt="[%(levelname)s] %(name)s: %(message)s"))
+
+logging.basicConfig(level=logging.INFO, handlers=[file_handler, console_handler])
+logger = logging.getLogger("[DATALOOP-MCP]")
+
+
+class ServerSettings(BaseSettings):
+    """Settings for the Dataloop MCP server."""
+
+    model_config = SettingsConfigDict(env_prefix="MCP_DATALOOP_")
+
+    def __init__(self, **data):
+        super().__init__(**data)
+
+
+def create_dataloop_mcp_server(settings: ServerSettings, sources_file: str) -> FastMCP:
+    """Create a FastMCP server for Dataloop with Bearer token authentication."""
+    app = FastMCP(
+        name="Dataloop MCP Server",
+        instructions="A multi-tenant MCP server for Dataloop with authentication",
+        stateless_http=True,
+        debug=True,
+    )
+    dl_context = DataloopContext(token=os.environ.get('DATALOOP_API_KEY'), 
+                                 env=os.environ.get('DATALOOP_ENV', 'prod'),
+                                 sources_file=sources_file)
+    
+    # Initialize the Dataloop context
+    asyncio.run(dl_context.initialize())
+    
+    @app.tool(description="Test tool for health checks")
+    async def test(ctx: Context, ping: Any = None) -> dict[str, Any]:
+        """Health check tool. Returns status ok and echoes ping if provided."""
+        result = {"status": "ok"}
+        if ping is not None:
+            result["ping"] = ping
+        return result
+
+    logger.info(f"Adding tools from {len(dl_context.mcp_sources)} sources")
+
+    for source in dl_context.mcp_sources:
+        logger.info(f"Adding tools from source: {source.dpk_name}")
+        for tool in source.tools:
+            app._tool_manager._tools[tool.name] = tool
+            logger.info(f"Registered tool: {tool.name}")
+    
+    return app
+
+
+def main(sources_file: Optional[str] = None) -> int:
+    logger.info("Starting Dataloop MCP server in stdio mode")
+    try:
+        settings = ServerSettings()
+        logger.info("Successfully configured Dataloop MCP server")
+    except Exception as e:
+        logger.error(f"Unexpected error during startup:\n{e}")
+        return 1
+    try:
+        if sources_file is None:
+            sources_file = SOURCES_FILEPATH
+        logger.info(f"Using sources file: {sources_file}")
+        mcp_server = create_dataloop_mcp_server(settings, sources_file)
+        logger.info("Starting Dataloop MCP server in stdio mode")
+        mcp_server.run(transport="stdio")
+        return 0
+    except Exception:
+        logger.error(f"Failed to start MCP server: {traceback.format_exc()}")
+        return 1
+
+
+if __name__ == "__main__":
+    main()

dtlpymcp/utils/dtlpy_context.py

@@ -15,7 +15,7 @@ import asyncio
 import time
 import jwt
 import json
-from .. import SOURCES_FILEPATH
+from dtlpymcp import SOURCES_FILEPATH
 
 # Utility to run async code from sync or async context
 # If called from a running event loop, returns a Task (caller must handle it)
@@ -48,8 +48,9 @@ class DataloopContext:
     Handles JWTs, server URLs, and dynamic tool registration for multi-tenant environments.
     """
 
-    def __init__(self, token: str = None, sources_file: str = None):
+    def __init__(self, token: str = None, sources_file: str = None, env: str = 'prod'):
         self._token = token
+        self.env = env
         self.mcp_sources: List[MCPSource] = []
         logger.info("DataloopContext initialized.")
         if sources_file is None:
@@ -68,10 +69,13 @@ class DataloopContext:
             data = json.load(f)
         logger.info(f"Loading MCP sources from {sources_file}")
         for entry in data:
-            if not isinstance(entry, dict):
-                raise ValueError(f"Invalid source entry: {entry}")
-            logger.info(f"Adding MCP source: {entry.get('dpk_name')}, url: {entry.get('server_url')}")
-            await self.add_mcp_source(MCPSource(**entry))
+            try:
+                if not isinstance(entry, dict):
+                    raise ValueError(f"Invalid source entry: {entry}")
+                logger.info(f"Adding MCP source: {entry.get('dpk_name')}, url: {entry.get('server_url')}")
+                await self.add_mcp_source(MCPSource(**entry))
+            except Exception as e:
+                logger.error(f"Failed to add MCP source: {entry}\n{traceback.format_exc()}")
 
     async def add_mcp_source(self, mcp_source: MCPSource):
         self.mcp_sources.append(mcp_source)
@@ -126,10 +130,17 @@ class DataloopContext:
         Get the source URL and app JWT for a given DPK name using Dataloop SDK.
         """
         try:
+            dl.setenv(self.env)
             dl.client_api.token = self.token
-            dpk = dl.dpks.get(dpk_name=source.dpk_name)
-            apps_filters = dl.Filters(field='dpkName', values=dpk.name, resource='apps')
-            app = dl.apps.list(filters=apps_filters).items[0]
+            filters = dl.Filters(resource='apps')
+            filters.add(field="dpkName", values=source.dpk_name)
+            filters.add(field="scope", values="system")
+            apps = list(dl.apps.list(filters=filters).all())
+            if len(apps) == 0:
+                raise ValueError(f"No app found for DPK name: {source.dpk_name}")
+            if len(apps) > 1:
+                logger.warning(f"Multiple apps found for DPK name: {source.dpk_name}, using first one")
+            app = apps[0]
             logger.info(f"App: {app.name}")
             source.app_url = next(iter(app.routes.values()))
             session = requests.Session()
@@ -137,9 +148,9 @@ class DataloopContext:
             logger.info(f"App route URL: {response.url}")
             source.server_url = response.url
             source.app_jwt = session.cookies.get("JWT-APP")
-        except Exception:
+        except Exception as e:
             logger.error(f"Failed getting app info: {traceback.format_exc()}")
-            raise ValueError(f"Failed getting app info: {traceback.format_exc()}")
+            raise Exception(f"Failed getting app info: {traceback.format_exc()}") from e
 
     @staticmethod
     def is_expired(app_jwt: str) -> bool:

{dtlpymcp-0.1.3.dist-info → dtlpymcp-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtlpymcp
-Version: 0.1.3
+Version: 0.1.7
 Summary: STDIO MCP proxy server for Dataloop platform.
 Author-email: Your Name <your.email@example.com>
 Classifier: Programming Language :: Python :: 3.10
@@ -68,8 +68,10 @@ To add this MCP to Cursor, add the following to your configuration:
 {
   "mcpServers": {
     "dataloop-ai-mcp": {
-      "command": "dtlpymcp start",
+      "command": "uvx",
+      "args": ["dtlpymcp", "start"],
       "env": {
+        "DATALOOP_ENV": "prod",
         "DATALOOP_API_KEY": "API KEY"
       }
     }

dtlpymcp-0.1.7.dist-info/RECORD

@@ -0,0 +1,10 @@
+dtlpymcp/__init__.py,sha256=tUwpqP2EpOpWItUNbzkuuC10aidfIn1SVheVwMf61bY,185
+dtlpymcp/__main__.py,sha256=1lo4qoZAoUHl9rkt1YGB2kCpKg5cIrTSBSrznxyk6F4,884
+dtlpymcp/default_sources.json,sha256=Kg6ArvMscwevXZp5zsnrnSSf8ds8M7AZDtKCYLJEly4,701
+dtlpymcp/proxy.py,sha256=pE-NAJI0A9wKcBJJt18_aSy1BskZKoxaK3f6VW7u44A,3608
+dtlpymcp/utils/dtlpy_context.py,sha256=WmLOoIpujudJ7pDvb07X8_jDAM_ndAi-L4Kqu4T3lFI,10231
+dtlpymcp-0.1.7.dist-info/METADATA,sha256=bkJWJnqSKUCJy2yvUaRHz-IL7DWESe2KyUq6yJnsgN8,1677
+dtlpymcp-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dtlpymcp-0.1.7.dist-info/entry_points.txt,sha256=6hRVZNTjQevj7erwt9dAOURtPVrSrYu6uHXhAlhTaXQ,52
+dtlpymcp-0.1.7.dist-info/top_level.txt,sha256=z85v20pIEnY3cBaWgwhU3EZS4WAZRywejhIutwd-iHk,9
+dtlpymcp-0.1.7.dist-info/RECORD,,

dtlpymcp-0.1.3.dist-info/RECORD

@@ -1,10 +0,0 @@
-dtlpymcp/__init__.py,sha256=ISimynz4Nggmf-PH4y1xR2gddnazpe77QNLxSAWM9IM,185
-dtlpymcp/__main__.py,sha256=1lo4qoZAoUHl9rkt1YGB2kCpKg5cIrTSBSrznxyk6F4,884
-dtlpymcp/default_sources.json,sha256=Es3XZcdMpe6o5FyOoqW9FG_oUjC5gkNbBC6N9eBqpQs,418
-dtlpymcp/proxy.py,sha256=_7BGShm-V5LZCe24vbFsysF-Z_Yc70Uuxilot3P5uP4,3447
-dtlpymcp/utils/dtlpy_context.py,sha256=A8TCGjcvRvUc38etrIY-IZlU-JDOPwVUsUJKweKJ1nk,9670
-dtlpymcp-0.1.3.dist-info/METADATA,sha256=zWm9OaXKvM9oIIphSuPNDgtWbylrLkdFlPMpFag3D28,1617
-dtlpymcp-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dtlpymcp-0.1.3.dist-info/entry_points.txt,sha256=6hRVZNTjQevj7erwt9dAOURtPVrSrYu6uHXhAlhTaXQ,52
-dtlpymcp-0.1.3.dist-info/top_level.txt,sha256=z85v20pIEnY3cBaWgwhU3EZS4WAZRywejhIutwd-iHk,9
-dtlpymcp-0.1.3.dist-info/RECORD,,