mcp-dbutils 0.9.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

mcp_dbutils/postgres/config.py

@@ -1,28 +1,35 @@
 """PostgreSQL configuration module"""
 from dataclasses import dataclass
 from typing import Optional, Dict, Any, Literal
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs
 from ..config import ConnectionConfig
 
-def parse_jdbc_url(jdbc_url: str) -> Dict[str, str]:
-    """Parse JDBC URL into connection parameters
+@dataclass
+class SSLConfig:
+    """SSL configuration for PostgreSQL connection"""
+    mode: Literal['disable', 'require', 'verify-ca', 'verify-full'] = 'disable'
+    cert: Optional[str] = None
+    key: Optional[str] = None
+    root: Optional[str] = None
+
+def parse_url(url: str) -> Dict[str, Any]:
+    """Parse PostgreSQL URL into connection parameters
     
     Args:
-        jdbc_url: JDBC URL (e.g. jdbc:postgresql://host:port/dbname)
+        url: URL (e.g. postgresql://host:port/dbname?sslmode=verify-full)
         
     Returns:
-        Dictionary of connection parameters
+        Dictionary of connection parameters including SSL settings
     """
-    if not jdbc_url.startswith('jdbc:postgresql://'):
-        raise ValueError("Invalid PostgreSQL JDBC URL format")
+    if not url.startswith('postgresql://'):
+        raise ValueError("Invalid PostgreSQL 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.")
+        raise ValueError("URL should not contain credentials. Please provide username and password separately.")
     
-    # Parse URL
+    # Parse URL and query parameters
     parsed = urlparse(url)
+    query_params = parse_qs(parsed.query)
     
     params = {
         'host': parsed.hostname or 'localhost',
@@ -32,6 +39,24 @@ def parse_jdbc_url(jdbc_url: str) -> Dict[str, str]:
     
     if not params['dbname']:
         raise ValueError("PostgreSQL database name must be specified in URL")
+
+    # Parse SSL parameters if present
+    ssl_params = {}
+    if 'sslmode' in query_params:
+        mode = query_params['sslmode'][0]
+        if mode not in ['disable', 'require', 'verify-ca', 'verify-full']:
+            raise ValueError(f"Invalid sslmode: {mode}")
+        ssl_params['mode'] = mode
+        
+    if 'sslcert' in query_params:
+        ssl_params['cert'] = query_params['sslcert'][0]
+    if 'sslkey' in query_params:
+        ssl_params['key'] = query_params['sslkey'][0]
+    if 'sslrootcert' in query_params:
+        ssl_params['root'] = query_params['sslrootcert'][0]
+        
+    if ssl_params:
+        params['ssl'] = SSLConfig(**ssl_params)
         
     return params
 
@@ -44,6 +69,8 @@ class PostgreSQLConfig(ConnectionConfig):
     port: str = '5432'
     local_host: Optional[str] = None
     type: Literal['postgres'] = 'postgres'
+    url: Optional[str] = None
+    ssl: Optional[SSLConfig] = None
 
     @classmethod
     def from_yaml(cls, yaml_path: str, db_name: str, local_host: Optional[str] = None) -> 'PostgreSQLConfig':
@@ -74,9 +101,9 @@ class PostgreSQLConfig(ConnectionConfig):
             raise ValueError("Password must be specified in connection configuration")
 
         # Get connection parameters
-        if 'jdbc_url' in db_config:
-            # Parse JDBC URL for connection parameters
-            params = parse_jdbc_url(db_config['jdbc_url'])
+        if 'url' in db_config:
+            # Parse URL for connection parameters
+            params = parse_url(db_config['url'])
             config = cls(
                 dbname=params['dbname'],
                 user=db_config['user'],
@@ -84,6 +111,8 @@ class PostgreSQLConfig(ConnectionConfig):
                 host=params['host'],
                 port=params['port'],
                 local_host=local_host,
+                url=db_config['url'],
+                ssl=params.get('ssl')
             )
         else:
             if not db_config.get('dbname'):
@@ -92,6 +121,24 @@ class PostgreSQLConfig(ConnectionConfig):
                 raise ValueError("Host must be specified in connection configuration")
             if not db_config.get('port'):
                 raise ValueError("Port must be specified in connection configuration")
+            
+            # Parse SSL configuration if present
+            ssl_config = None
+            if 'ssl' in db_config:
+                ssl_params = db_config['ssl']
+                if not isinstance(ssl_params, dict):
+                    raise ValueError("SSL configuration must be a dictionary")
+                
+                if ssl_params.get('mode') not in [None, 'disable', 'require', 'verify-ca', 'verify-full']:
+                    raise ValueError(f"Invalid sslmode: {ssl_params.get('mode')}")
+                
+                ssl_config = SSLConfig(
+                    mode=ssl_params.get('mode', 'disable'),
+                    cert=ssl_params.get('cert'),
+                    key=ssl_params.get('key'),
+                    root=ssl_params.get('root')
+                )
+            
             config = cls(
                 dbname=db_config['dbname'],
                 user=db_config['user'],
@@ -99,17 +146,18 @@ class PostgreSQLConfig(ConnectionConfig):
                 host=db_config['host'],
                 port=str(db_config['port']),
                 local_host=local_host,
+                ssl=ssl_config
             )
         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) -> 'PostgreSQLConfig':
-        """Create configuration from JDBC URL and credentials
+    def from_url(cls, url: str, user: str, password: str, 
+                local_host: Optional[str] = None) -> 'PostgreSQLConfig':
+        """Create configuration from URL and credentials
         
         Args:
-            jdbc_url: JDBC URL (jdbc:postgresql://host:port/dbname)
+            url: URL (postgresql://host:port/dbname)
             user: Username for connection
             password: Password for connection
             local_host: Optional local host address
@@ -117,7 +165,7 @@ class PostgreSQLConfig(ConnectionConfig):
         Raises:
             ValueError: If URL format is invalid or required parameters are missing
         """
-        params = parse_jdbc_url(jdbc_url)
+        params = parse_url(url)
         
         config = cls(
             dbname=params['dbname'],
@@ -126,6 +174,8 @@ class PostgreSQLConfig(ConnectionConfig):
             host=params['host'],
             port=params['port'],
             local_host=local_host,
+            url=url,
+            ssl=params.get('ssl')
         )
         config.debug = cls.get_debug_mode()
         return config
@@ -139,6 +189,17 @@ class PostgreSQLConfig(ConnectionConfig):
             'host': self.local_host or self.host,
             'port': self.port
         }
+        
+        # Add SSL parameters if configured
+        if self.ssl:
+            params['sslmode'] = self.ssl.mode
+            if self.ssl.cert:
+                params['sslcert'] = self.ssl.cert
+            if self.ssl.key:
+                params['sslkey'] = self.ssl.key
+            if self.ssl.root:
+                params['sslrootcert'] = self.ssl.root
+                
         return {k: v for k, v in params.items() if v}
 
     def get_masked_connection_info(self) -> Dict[str, Any]:

{mcp_dbutils-0.9.0.dist-info → mcp_dbutils-0.10.2.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: mcp-dbutils
-Version: 0.9.0
+Version: 0.10.2
 Summary: MCP Database Utilities Service
 Author: Dong Hao
 License-Expression: MIT
 License-File: LICENSE
 Requires-Python: >=3.10
 Requires-Dist: mcp>=1.2.1
+Requires-Dist: mysql-connector-python>=8.2.0
 Requires-Dist: psycopg2-binary>=2.9.10
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: pyyaml>=6.0.2
@@ -32,7 +33,7 @@ Description-Content-Type: text/markdown
 [中文文档](README_CN.md)
 
 ## Overview
-MCP Database Utilities is a unified database access service that supports multiple database types (PostgreSQL and SQLite). Through its abstraction layer design, it provides a simple and unified database operation interface for MCP servers.
+MCP Database Utilities is a unified database access service that supports multiple database types (PostgreSQL, SQLite, and MySQL). Through its abstraction layer design, it provides a simple and unified database operation interface for MCP servers.
 
 ## Features
 - Unified database access interface
@@ -42,6 +43,7 @@ MCP Database Utilities is a unified database access service that supports multip
 - Database tables listing via MCP tools
 - Intelligent connection management and resource cleanup
 - Debug mode support
+- SSL/TLS connection support for PostgreSQL and MySQL
 
 ## Installation and Configuration
 
@@ -143,54 +145,138 @@ Add to Claude configuration:
 - Python 3.10+
 - PostgreSQL (optional)
 - SQLite3 (optional)
+- MySQL (optional)
 
 ### Configuration File
-The project requires a YAML configuration file, specified via the `--config` parameter. Configuration example:
+The project requires a YAML configuration file, specified via the `--config` parameter. Configuration examples:
 
 ```yaml
 connections:
-  # Standard PostgreSQL configuration example
-  my_postgres:
+  # SQLite configuration examples
+  dev-db:
+    type: sqlite
+    path: /path/to/dev.db
+    # Password is optional
+    password: 
+
+  # PostgreSQL standard configuration
+  test-db:
     type: postgres
-    dbname: test_db
-    user: postgres
-    password: secret
-    host: host.docker.internal  # For Mac/Windows
-    # host: 172.17.0.1         # For Linux (docker0 IP)
+    host: postgres.example.com
     port: 5432
+    dbname: test_db
+    user: test_user
+    password: test_pass
 
-  # PostgreSQL with JDBC URL example
-  my_postgres_jdbc:
+  # PostgreSQL URL configuration with SSL
+  prod-db:
     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 standard configuration
-  my_sqlite:
-    type: sqlite
-    path: /app/sqlite.db       # Database file path
-    password: optional_password # optional
-
-  # SQLite with JDBC URL configuration
-  my_sqlite_jdbc:
-    type: sqlite
-    jdbc_url: jdbc:sqlite:/app/data.db?mode=ro&cache=shared  # Supports query parameters
-    password: optional_password    # Provided separately for security
+    url: postgresql://postgres.example.com:5432/prod-db?sslmode=verify-full
+    user: prod_user
+    password: prod_pass
+    
+  # PostgreSQL full SSL configuration example
+  secure-db:
+    type: postgres
+    host: secure-db.example.com
+    port: 5432
+    dbname: secure_db
+    user: secure_user
+    password: secure_pass
+    ssl:
+      mode: verify-full  # disable/require/verify-ca/verify-full
+      cert: /path/to/client-cert.pem
+      key: /path/to/client-key.pem
+      root: /path/to/root.crt
+      
+  # MySQL standard configuration
+  sandbox-mysql:
+    type: mysql
+    host: localhost
+    port: 3306
+    database: sandbox_db
+    user: sandbox_user
+    password: sandbox_pass
+    charset: utf8mb4
+
+  # MySQL URL configuration
+  integration-mysql:
+    type: mysql
+    url: mysql://mysql.example.com:3306/integration_db?charset=utf8mb4
+    user: integration_user
+    password: integration_pass
+    
+  # MySQL with SSL configuration
+  secure-mysql:
+    type: mysql
+    host: secure-mysql.example.com
+    port: 3306
+    database: secure_db
+    user: secure_user
+    password: secure_pass
+    charset: utf8mb4
+    ssl:
+      mode: verify_identity
+      ca: /path/to/ca.pem
+      cert: /path/to/client-cert.pem
+      key: /path/to/client-key.pem
 ```
 
-The configuration supports JDBC URL format for both PostgreSQL and SQLite:
-
-PostgreSQL:
-1. Standard configuration with individual parameters
-2. JDBC URL configuration with separate credentials
-
-SQLite:
-1. Standard configuration with path parameter
-2. JDBC URL configuration with query parameters support:
-   - mode=ro: Read-only mode
-   - cache=shared: Shared cache mode
-   - Other SQLite URI parameters
+Database SSL Configuration Options:
+
+PostgreSQL SSL Configuration:
+1. Using URL parameters:
+   ```
+   postgresql://host:port/dbname?sslmode=verify-full&sslcert=/path/to/cert.pem
+   ```
+2. Using dedicated SSL configuration section:
+   ```yaml
+   ssl:
+     mode: verify-full  # SSL verification mode
+     cert: /path/to/cert.pem      # Client certificate
+     key: /path/to/key.pem        # Client private key
+     root: /path/to/root.crt      # CA certificate
+   ```
+
+PostgreSQL SSL Modes:
+- disable: No SSL
+- require: Use SSL but no certificate verification
+- verify-ca: Verify server certificate is signed by trusted CA
+- verify-full: Verify server certificate and hostname match
+
+MySQL SSL Configuration:
+1. Using URL parameters:
+   ```
+   mysql://host:port/dbname?ssl-mode=verify_identity&ssl-ca=/path/to/ca.pem
+   ```
+2. Using dedicated SSL configuration section:
+   ```yaml
+   ssl:
+     mode: verify_identity  # SSL verification mode
+     ca: /path/to/ca.pem         # CA certificate
+     cert: /path/to/cert.pem     # Client certificate
+     key: /path/to/key.pem       # Client private key
+   ```
+
+MySQL SSL Modes:
+- disabled: No SSL
+- preferred: Use SSL if available, but allow unencrypted connection
+- required: Always use SSL, but don't verify server certificate
+- verify_ca: Verify server certificate is signed by trusted CA
+- verify_identity: Verify server certificate and hostname match
+
+SQLite Configuration Options:
+1. Basic configuration with path:
+   ```yaml
+   type: sqlite
+   path: /path/to/db.sqlite
+   password: optional_password  # Optional encryption
+   ```
+2. Using URI parameters:
+   ```yaml
+   type: sqlite
+   path: /path/to/db.sqlite?mode=ro&cache=shared
+   ```
 
 ### Debug Mode
 Set environment variable `MCP_DEBUG=1` to enable debug mode for detailed logging output.
@@ -207,12 +293,15 @@ graph TD
     DatabaseHandler[Database Handler]
     PostgresHandler[PostgreSQL Handler]
     SQLiteHandler[SQLite Handler]
+    MySQLHandler[MySQL Handler]
     DatabaseServer --> DatabaseHandler
     DatabaseHandler --> PostgresHandler
     DatabaseHandler --> SQLiteHandler
+    DatabaseHandler --> MySQLHandler
   end
   PostgresHandler --> PostgreSQL[(PostgreSQL)]
   SQLiteHandler --> SQLite[(SQLite)]
+  MySQLHandler --> MySQL[(MySQL)]
 ```
 
 The abstraction layer design is the core architectural concept in MCP Database Utilities. Just like a universal remote control that works with different devices, users only need to know the basic operations without understanding the underlying complexities.
@@ -224,7 +313,7 @@ The abstraction layer design is the core architectural concept in MCP Database U
 
 #### 2. Unified Interface Design
 - DatabaseHandler abstract class defines unified operation interfaces
-- All specific database implementations (PostgreSQL/SQLite) follow the same interface
+- All specific database implementations (PostgreSQL/SQLite/MySQL) follow the same interface
 - Users interact with different databases in the same way
 
 #### 3. Configuration and Implementation Separation
@@ -241,7 +330,7 @@ The abstraction layer design is the core architectural concept in MCP Database U
 2. DatabaseHandler
    - Abstract base class defining unified interface
    - Includes get_tables(), get_schema(), execute_query(), etc.
-   - Implemented by PostgreSQL and SQLite handlers
+   - Implemented by PostgreSQL, SQLite, and MySQL handlers
 
 3. Configuration System
    - YAML-based configuration file
@@ -364,6 +453,13 @@ Provides SQLite-specific features:
 - URI scheme support
 - Password protection support (optional)
 
+### MySQL Implementation
+Provides MySQL-specific features:
+- Remote connection support
+- Character set configuration
+- SSL/TLS secure connection
+- URL and standard connection methods
+
 ## Contributing
 Contributions are welcome! Here's how you can help:
 
@@ -383,7 +479,6 @@ For detailed guidelines, see [CONTRIBUTING.md](.github/CONTRIBUTING.md)
 - [MCP Servers](https://github.com/modelcontextprotocol/servers) for inspiration and demonstration
 - AI Editors:
   * [Claude Desktop](https://claude.ai/download)
-  * [5ire](https://5ire.app/)
   * [Cline](https://cline.bot)
 - [Model Context Protocol](https://modelcontextprotocol.io/) for comprehensive interfaces
 

mcp_dbutils-0.10.2.dist-info/RECORD

@@ -0,0 +1,22 @@
+mcp_dbutils/__init__.py,sha256=9dqT2BdVvwforQVWOvJq2M0zCHxFamWIYWC4-6aY70k,1905
+mcp_dbutils/base.py,sha256=UjZuGxh0Zojcs-CIDfxz506EH7vJGqk79LBgq5RCoII,27653
+mcp_dbutils/config.py,sha256=K0rlNio8sjuTp-CAuY1CnG8zljp2dhPsfZY7wUhwZX4,1923
+mcp_dbutils/log.py,sha256=wKyMzB8IpKI7wsDUsN5SRfjf-bh_se6U9QhmzoNuxhw,809
+mcp_dbutils/stats.py,sha256=WYD9NAKHH2bFKmUSTOg18-SuIXergpznPq8AtIjtxdI,7101
+mcp_dbutils/mysql/__init__.py,sha256=OgwFO0gdymkvcEw-d1yqJB55XhcucmYQMEZkQ__CG_M,129
+mcp_dbutils/mysql/config.py,sha256=C977PtaRk7gJm47fV7NaPeEDGInDZNBIQKfcgvjdBbU,8069
+mcp_dbutils/mysql/handler.py,sha256=AJ1C-aVsBD3NXD31UjFC44cl4yuNeOO-HOY2mFBym0U,19737
+mcp_dbutils/mysql/server.py,sha256=dF1FE_sYM9UOg6pQrq6EEHHPj2RtqB4Ve0FjQbVp-Fc,8603
+mcp_dbutils/postgres/__init__.py,sha256=XanCXw-kVE6ayqFqjuLJ9swWPcCVlcKZXB2Et2Wjl9w,154
+mcp_dbutils/postgres/config.py,sha256=FG0YUV4TtP1IGZT87ov_PK-ouOEjAOHdSaK42klk5OE,7750
+mcp_dbutils/postgres/handler.py,sha256=O45K0MOosNQ68SJ8piXXH3aZ74RVQ981hudk6faj28Y,24397
+mcp_dbutils/postgres/server.py,sha256=FROogvjr3xlKAZcAvJMNHGgyHqT_LaMK9-vYbA0Dbm0,8716
+mcp_dbutils/sqlite/__init__.py,sha256=lTUOkSfSWNw_BohJ_KNxYKMCANdtpGa3JK_ZyJsg_Ls,134
+mcp_dbutils/sqlite/config.py,sha256=2ekTp89rcCu4qQN1O3sZjIcOwjhzWi4tisD20T2WAik,4533
+mcp_dbutils/sqlite/handler.py,sha256=VxBVbwpNSQHyiudQXYFYpcdoScvbK2IGzYMbkcpvFcI,17731
+mcp_dbutils/sqlite/server.py,sha256=49ug43nyXZApclMXo0t5dKCN4wjDyDUZ-vmf746ac8M,7709
+mcp_dbutils-0.10.2.dist-info/METADATA,sha256=2jbwB4ShFyfAiADcjChvtg4OvZVYA731BFS2VyYlRJw,14354
+mcp_dbutils-0.10.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mcp_dbutils-0.10.2.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
+mcp_dbutils-0.10.2.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
+mcp_dbutils-0.10.2.dist-info/RECORD,,

mcp_dbutils-0.9.0.dist-info/RECORD

@@ -1,18 +0,0 @@
-mcp_dbutils/__init__.py,sha256=9dqT2BdVvwforQVWOvJq2M0zCHxFamWIYWC4-6aY70k,1905
-mcp_dbutils/base.py,sha256=2fLSPL-BxdgKIOT_eq73wQGla6MZB03jUrWqBRSWVBQ,25474
-mcp_dbutils/config.py,sha256=uFI4Haw4en5gxHfCM9zugUqNCQFikdlHJZU_NTht7gQ,1905
-mcp_dbutils/log.py,sha256=fibVIwsb1HVU5zriGrDZTMEirKjgIuxuN_B_YTdAJ7I,996
-mcp_dbutils/stats.py,sha256=WYD9NAKHH2bFKmUSTOg18-SuIXergpznPq8AtIjtxdI,7101
-mcp_dbutils/postgres/__init__.py,sha256=XanCXw-kVE6ayqFqjuLJ9swWPcCVlcKZXB2Et2Wjl9w,154
-mcp_dbutils/postgres/config.py,sha256=Kqq0ZCa7PhtvMaBX3sfdEscGosHR1dWuiP8IkI5lzDo,5495
-mcp_dbutils/postgres/handler.py,sha256=O45K0MOosNQ68SJ8piXXH3aZ74RVQ981hudk6faj28Y,24397
-mcp_dbutils/postgres/server.py,sha256=FROogvjr3xlKAZcAvJMNHGgyHqT_LaMK9-vYbA0Dbm0,8716
-mcp_dbutils/sqlite/__init__.py,sha256=lTUOkSfSWNw_BohJ_KNxYKMCANdtpGa3JK_ZyJsg_Ls,134
-mcp_dbutils/sqlite/config.py,sha256=2ekTp89rcCu4qQN1O3sZjIcOwjhzWi4tisD20T2WAik,4533
-mcp_dbutils/sqlite/handler.py,sha256=VxBVbwpNSQHyiudQXYFYpcdoScvbK2IGzYMbkcpvFcI,17731
-mcp_dbutils/sqlite/server.py,sha256=49ug43nyXZApclMXo0t5dKCN4wjDyDUZ-vmf746ac8M,7709
-mcp_dbutils-0.9.0.dist-info/METADATA,sha256=I52Q7IV8un9A5tmTTmEOFKZiW_UYCrWwBDhDq1tzFyE,11986
-mcp_dbutils-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_dbutils-0.9.0.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
-mcp_dbutils-0.9.0.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
-mcp_dbutils-0.9.0.dist-info/RECORD,,