mcp-dbutils 0.3.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

mcp_dbutils/postgres/config.py

@@ -1,8 +1,40 @@
 """PostgreSQL configuration module"""
 from dataclasses import dataclass
 from typing import Optional, Dict, Any, Literal
+from urllib.parse import urlparse
 from ..config import DatabaseConfig
 
+def parse_jdbc_url(jdbc_url: str) -> Dict[str, str]:
+    """Parse JDBC URL into connection parameters
+    
+    Args:
+        jdbc_url: JDBC URL (e.g. jdbc:postgresql://host:port/dbname)
+        
+    Returns:
+        Dictionary of connection parameters
+    """
+    if not jdbc_url.startswith('jdbc:postgresql://'):
+        raise ValueError("Invalid PostgreSQL JDBC URL format")
+    
+    # Remove jdbc: prefix and ensure no credentials in URL
+    url = jdbc_url[5:]
+    if '@' in url:
+        raise ValueError("JDBC URL should not contain credentials. Please provide username and password separately.")
+    
+    # Parse URL
+    parsed = urlparse(url)
+    
+    params = {
+        'host': parsed.hostname or 'localhost',
+        'port': str(parsed.port or 5432),
+        'dbname': parsed.path.lstrip('/') if parsed.path else '',
+    }
+    
+    if not params['dbname']:
+        raise ValueError("Database name must be specified in URL")
+        
+    return params
+
 @dataclass
 class PostgresConfig(DatabaseConfig):
     dbname: str
@@ -35,12 +67,64 @@ class PostgresConfig(DatabaseConfig):
         if db_config['type'] != 'postgres':
             raise ValueError(f"Configuration is not PostgreSQL type: {db_config['type']}")
 
+        # Check required credentials
+        if not db_config.get('user'):
+            raise ValueError("User must be specified in database configuration")
+        if not db_config.get('password'):
+            raise ValueError("Password must be specified in database configuration")
+
+        # Get connection parameters
+        if 'jdbc_url' in db_config:
+            # Parse JDBC URL for connection parameters
+            params = parse_jdbc_url(db_config['jdbc_url'])
+            config = cls(
+                dbname=params['dbname'],
+                user=db_config['user'],
+                password=db_config['password'],
+                host=params['host'],
+                port=params['port'],
+                local_host=local_host,
+            )
+        else:
+            if not db_config.get('dbname'):
+                raise ValueError("Database name must be specified in configuration")
+            if not db_config.get('host'):
+                raise ValueError("Host must be specified in configuration")
+            if not db_config.get('port'):
+                raise ValueError("Port must be specified in configuration")
+            config = cls(
+                dbname=db_config['dbname'],
+                user=db_config['user'],
+                password=db_config['password'],
+                host=db_config['host'],
+                port=str(db_config['port']),
+                local_host=local_host,
+            )
+        config.debug = cls.get_debug_mode()
+        return config
+
+    @classmethod
+    def from_jdbc_url(cls, jdbc_url: str, user: str, password: str, 
+                     local_host: Optional[str] = None) -> 'PostgresConfig':
+        """Create configuration from JDBC URL and credentials
+        
+        Args:
+            jdbc_url: JDBC URL (jdbc:postgresql://host:port/dbname)
+            user: Username for database connection
+            password: Password for database connection
+            local_host: Optional local host address
+            
+        Raises:
+            ValueError: If URL format is invalid or required parameters are missing
+        """
+        params = parse_jdbc_url(jdbc_url)
+        
         config = cls(
-            dbname=db_config.get('dbname', ''),
-            user=db_config.get('user', ''),
-            password=db_config.get('password', ''),
-            host=db_config.get('host', 'localhost'),
-            port=str(db_config.get('port', 5432)),
+            dbname=params['dbname'],
+            user=user,
+            password=password,
+            host=params['host'],
+            port=params['port'],
             local_host=local_host,
         )
         config.debug = cls.get_debug_mode()

mcp_dbutils/sqlite/config.py

@@ -3,8 +3,50 @@
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Dict, Any, Optional, Literal
+from urllib.parse import urlparse, parse_qs
 from ..config import DatabaseConfig
 
+def parse_jdbc_url(jdbc_url: str) -> Dict[str, str]:
+    """Parse JDBC URL into connection parameters
+
+    Args:
+        jdbc_url: JDBC URL (e.g. jdbc:sqlite:file:/path/to/database.db or jdbc:sqlite:/path/to/database.db)
+
+    Returns:
+        Dictionary of connection parameters
+
+    Raises:
+        ValueError: If URL format is invalid
+    """
+    if not jdbc_url.startswith('jdbc:sqlite:'):
+        raise ValueError("Invalid SQLite JDBC URL format")
+
+    # Remove jdbc:sqlite: prefix
+    url = jdbc_url[12:]
+
+    # Handle file: prefix
+    if url.startswith('file:'):
+        url = url[5:]
+
+    # Parse URL
+    parsed = urlparse(url)
+    path = parsed.path
+
+    # Extract query parameters
+    params = {}
+    if parsed.query:
+        query_params = parse_qs(parsed.query)
+        for key, values in query_params.items():
+            params[key] = values[0]
+
+    if not path:
+        raise ValueError("Database path must be specified in URL")
+
+    return {
+        'path': path,
+        'parameters': params
+    }
+
 @dataclass
 class SqliteConfig(DatabaseConfig):
     path: str
@@ -12,6 +54,30 @@ class SqliteConfig(DatabaseConfig):
     uri: bool = True  # Enable URI mode to support parameters like password
     type: Literal['sqlite'] = 'sqlite'
 
+    @classmethod
+    def from_jdbc_url(cls, jdbc_url: str, password: Optional[str] = None) -> 'SqliteConfig':
+        """Create configuration from JDBC URL
+
+        Args:
+            jdbc_url: JDBC URL (e.g. jdbc:sqlite:file:/path/to/database.db)
+            password: Optional password for database encryption
+
+        Returns:
+            SqliteConfig instance
+
+        Raises:
+            ValueError: If URL format is invalid
+        """
+        params = parse_jdbc_url(jdbc_url)
+
+        config = cls(
+            path=params['path'],
+            password=password,
+            uri=True
+        )
+        config.debug = cls.get_debug_mode()
+        return config
+
     @property
     def absolute_path(self) -> str:
         """Return absolute path to database file"""
@@ -62,13 +128,23 @@ class SqliteConfig(DatabaseConfig):
             raise ValueError("Database configuration must include 'type' field")
         if db_config['type'] != 'sqlite':
             raise ValueError(f"Configuration is not SQLite type: {db_config['type']}")
-        if 'path' not in db_config:
-            raise ValueError("SQLite configuration must include 'path' field")
 
-        config = cls(
-            path=db_config['path'],
-            password=db_config.get('password'),
-            uri=True
-        )
+        # Check if using JDBC URL configuration
+        if 'jdbc_url' in db_config:
+            params = parse_jdbc_url(db_config['jdbc_url'])
+            config = cls(
+                path=params['path'],
+                password=db_config.get('password'),
+                uri=True
+            )
+        else:
+            if 'path' not in db_config:
+                raise ValueError("SQLite configuration must include 'path' field")
+            config = cls(
+                path=db_config['path'],
+                password=db_config.get('password'),
+                uri=True
+            )
+
         config.debug = cls.get_debug_mode()
         return config

{mcp_dbutils-0.3.0.dist-info → mcp_dbutils-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-dbutils
-Version: 0.3.0
+Version: 0.5.0
 Summary: MCP Database Utilities Service
 Author: Dong Hao
 License-Expression: MIT
@@ -148,7 +148,7 @@ The project requires a YAML configuration file, specified via the `--config` par
 
 ```yaml
 databases:
-  # PostgreSQL example (when using Docker)
+  # Standard PostgreSQL configuration example
   my_postgres:
     type: postgres
     dbname: test_db
@@ -158,6 +158,13 @@ databases:
     # host: 172.17.0.1         # For Linux (docker0 IP)
     port: 5432
 
+  # PostgreSQL with JDBC URL example
+  my_postgres_jdbc:
+    type: postgres
+    jdbc_url: jdbc:postgresql://host.docker.internal:5432/test_db
+    user: postgres            # Credentials must be provided separately
+    password: secret          # Not included in JDBC URL for security
+
   # SQLite example (when using Docker)
   my_sqlite:
     type: sqlite
@@ -165,6 +172,10 @@ databases:
     password: optional_password # optional
 ```
 
+The configuration supports two formats for PostgreSQL:
+1. Standard configuration with individual parameters
+2. JDBC URL configuration with separate credentials (recommended for better compatibility)
+
 ### Debug Mode
 Set environment variable `MCP_DEBUG=1` to enable debug mode for detailed logging output.
 

{mcp_dbutils-0.3.0.dist-info → mcp_dbutils-0.5.0.dist-info}/RECORD

@@ -4,15 +4,15 @@ mcp_dbutils/config.py,sha256=EwnPNuQVCBKd5WOXQfROyDTM-YpM_Odp0GhCPRg8YwE,1863
 mcp_dbutils/log.py,sha256=fibVIwsb1HVU5zriGrDZTMEirKjgIuxuN_B_YTdAJ7I,996
 mcp_dbutils/stats.py,sha256=2hiKi_M8V4xhVHlH5FS-Df5GuMEpuzif12C8ik06Khs,2538
 mcp_dbutils/postgres/__init__.py,sha256=Y6v_RsI79pqAfpKM3SrT1T1I9r5yWuKT0GUUNmHD3DE,146
-mcp_dbutils/postgres/config.py,sha256=ipjskdlv3u949R9rC2AKPCINRrtEAiKDjeogpFfM6aE,2401
+mcp_dbutils/postgres/config.py,sha256=Np0GS5iUaUuWpYI8QfnyjUDy7v-vResQEAexR4W92-o,5447
 mcp_dbutils/postgres/handler.py,sha256=JC_Qyw1s6qjVR0tdH7FLAEAs9EPl_-wgFQLryQyMq5c,6089
 mcp_dbutils/postgres/server.py,sha256=_S3HF1KooxPB9gX1FedoOOGn93tHlIevCab6vjCt2TU,8715
 mcp_dbutils/sqlite/__init__.py,sha256=QV4th2ywzUmCCa3GHCcBf8blJ_E8OYy0dJ2fSf1TfSU,134
-mcp_dbutils/sqlite/config.py,sha256=QK1JlY-ZBB5VyhydbiU-aAKNESTWMtyBfawbv2DAVCQ,2452
+mcp_dbutils/sqlite/config.py,sha256=RTHT2Xx--g-osD73CpT8DrCk0VHpHfPil3D6YUzXD-g,4519
 mcp_dbutils/sqlite/handler.py,sha256=bf_k93rCcJn09zc7tsqrlbiTGUg3FspimfWKxK_JQTs,4970
 mcp_dbutils/sqlite/server.py,sha256=7Bbq9l7Ca_4dzkAbbdRcXxvHoO_NFLzZHwlhKB0HIJc,7724
-mcp_dbutils-0.3.0.dist-info/METADATA,sha256=hy1Xl8rcvFAxmLRq_FHP8Ow1LM_x6Ujz5NO_TkzUtXY,9478
-mcp_dbutils-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_dbutils-0.3.0.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
-mcp_dbutils-0.3.0.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
-mcp_dbutils-0.3.0.dist-info/RECORD,,
+mcp_dbutils-0.5.0.dist-info/METADATA,sha256=g3WO-pqGFLsXxu1RcLQg9KjHEjVSG9ncrjqTzcgkm3A,9966
+mcp_dbutils-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mcp_dbutils-0.5.0.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
+mcp_dbutils-0.5.0.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
+mcp_dbutils-0.5.0.dist-info/RECORD,,