dtlpymcp 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

dtlpymcp/__init__.py

@@ -1,34 +1,3 @@
 from .utils.dtlpy_context import DataloopContext, MCPSource
-import logging
-from datetime import datetime
-from pathlib import Path
 
-__version__ = "0.1.9"
-
-
-# Setup logging directory and file
-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"))
-
-# Configure root logger
-logging.basicConfig(level=logging.DEBUG, handlers=[file_handler, console_handler])
-
-# Get the main logger
-logger = logging.getLogger("dtlpymcp")
-logger.info(f"Logging configured with level: DEBUG")
-logger.info(f"Log file: {log_file}")
+__version__ = "0.1.11"

dtlpymcp/__main__.py

@@ -24,11 +24,19 @@ def main():
         default=30.0,
         help="Timeout in seconds for Dataloop context initialization (default: 30.0)",
     )
+    start_parser.add_argument(
+        "--log-level",
+        "-l",
+        type=str,
+        default="INFO",
+        choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
+        help="Logging level (default: INFO)",
+    )
 
     args = parser.parse_args()
 
     if args.command == "start":
-        sys.exit(proxy_main(sources_file=args.sources_file, init_timeout=args.init_timeout))
+        sys.exit(proxy_main(sources_file=args.sources_file, init_timeout=args.init_timeout, log_level=args.log_level))
     else:
         parser.print_help()
         return 1

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/proxy.py

@@ -2,6 +2,8 @@ from mcp.server.fastmcp import FastMCP, Context
 from mcp.server.fastmcp.tools.base import Tool, FuncMetadata
 from typing import Any, Optional, List
 import traceback
+from datetime import datetime
+from pathlib import Path
 import os
 import asyncio
 import logging
@@ -10,7 +12,48 @@ from mcp.server.fastmcp.utilities.func_metadata import ArgModelBase
 
 from dtlpymcp.utils.dtlpy_context import DataloopContext
 
-logger = logging.getLogger("dtlpymcp")
+
+def setup_logging(log_level: str = "INFO") -> logging.Logger:
+    """
+    Setup logging configuration with the specified log level.
+    
+    Args:
+        log_level: Logging level as string (DEBUG, INFO, WARNING, ERROR, CRITICAL)
+        
+    Returns:
+        logging.Logger: Configured logger instance
+    """
+    # Setup logging directory and file
+    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"))
+
+    # Convert string log level to logging constant
+    numeric_level = getattr(logging, log_level.upper(), logging.INFO)
+    
+    # Configure root logger
+    logging.basicConfig(level=numeric_level, handlers=[file_handler, console_handler])
+
+    # Get the main logger
+    logger = logging.getLogger("dtlpymcp")
+    logger.info(f"Logging configured with level: {log_level.upper()}")
+    logger.info(f"Log file: {log_file}")
+    
+    return logger
 
 
 def run_async(coro):
@@ -29,13 +72,13 @@ async def initialize_dataloop_context(sources_file: Optional[str] = None, init_t
     Initialize Dataloop context with timeout protection.
 
     Args:
-        dl_context: The DataloopContext instance to initialize
-        app: The FastMCP app instance to register tools with
+        sources_file: Path to sources file
         init_timeout: Timeout in seconds for initialization
 
     Returns:
         List[Tool]: List of tools
     """
+    logger = logging.getLogger("dtlpymcp")
     try:
         tools = []
         dl_context = DataloopContext(
@@ -75,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)
@@ -101,8 +144,10 @@ def create_dataloop_mcp_server(sources_file: Optional[str] = None, init_timeout:
     return app
 
 
-def main(sources_file: Optional[str] = None, init_timeout: float = 30.0) -> int:
-
+def main(sources_file: Optional[str] = None, init_timeout: float = 30.0, log_level: str = "INFO") -> int:
+    # Setup logging with the specified level
+    logger = setup_logging(log_level)
+    
     logger.info("Starting Dataloop MCP server in stdio mode")
 
     # Validate environment variables

dtlpymcp/utils/dtlpy_context.py

@@ -95,6 +95,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):
@@ -230,6 +234,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.9.dist-info → dtlpymcp-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtlpymcp
-Version: 0.1.9
+Version: 0.1.11
 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.dist-info/RECORD

@@ -0,0 +1,10 @@
+dtlpymcp/__init__.py,sha256=-iPfWD7k43HTz0akAm7BHONlJipmtYiMjmF1CCEj0us,87
+dtlpymcp/__main__.py,sha256=ZsXN8guga8Qo-94bSvgC6u9s5gmmdyppUijb-_bCxCw,1347
+dtlpymcp/min_proxy.py,sha256=QYGoqclGNN7ZMjoLzWBLCxUm4yT2xCoLTbtdFRsqlEk,2572
+dtlpymcp/proxy.py,sha256=IzZrK6s37sXM-AM2L2m_K9AveT7uX_VSxwgrwggJYV4,6213
+dtlpymcp/utils/dtlpy_context.py,sha256=6ad136vmk0Cstp10cAcY6YaZkUTgFzyvMlocIP6DwiE,12112
+dtlpymcp-0.1.11.dist-info/METADATA,sha256=G895DOpzSG2bf9EzmzGIIO2MJgH0RtX6W48Z_eXqnRU,2190
+dtlpymcp-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dtlpymcp-0.1.11.dist-info/entry_points.txt,sha256=6hRVZNTjQevj7erwt9dAOURtPVrSrYu6uHXhAlhTaXQ,52
+dtlpymcp-0.1.11.dist-info/top_level.txt,sha256=z85v20pIEnY3cBaWgwhU3EZS4WAZRywejhIutwd-iHk,9
+dtlpymcp-0.1.11.dist-info/RECORD,,

dtlpymcp-0.1.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-dtlpymcp/__init__.py,sha256=lhPPMskLqsH9l-ucRa0Zj2oCQEhsaoT1xtZX67kTwLQ,1178
-dtlpymcp/__main__.py,sha256=RWyPaVtfYpLyJplQpQ8ZcGfP5UTfbefQMo5MB9HD9CY,1084
-dtlpymcp/min_proxy.py,sha256=n9KzWwaGU-8uUKRJigGHAnyZ6GXfNl5bwMpULfBrbEc,2554
-dtlpymcp/proxy.py,sha256=0xMlO7QUUk4Kq6pb4F0b-n_c0ZWjcFY1jJHqkMwGxAQ,4515
-dtlpymcp/utils/dtlpy_context.py,sha256=qeKwptMx_fenYTRs5-l3711yPyo2iof_FoQX8jM3fmE,10670
-dtlpymcp-0.1.9.dist-info/METADATA,sha256=YBf64o9pxbX9Shb2zxzoN9JWZk6prSJqGu0EccW4s6Y,2189
-dtlpymcp-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dtlpymcp-0.1.9.dist-info/entry_points.txt,sha256=6hRVZNTjQevj7erwt9dAOURtPVrSrYu6uHXhAlhTaXQ,52
-dtlpymcp-0.1.9.dist-info/top_level.txt,sha256=z85v20pIEnY3cBaWgwhU3EZS4WAZRywejhIutwd-iHk,9
-dtlpymcp-0.1.9.dist-info/RECORD,,