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

mcp_dbutils/__init__.py

@@ -6,12 +6,16 @@ import os
 import sys
 from pathlib import Path
 import yaml
+from importlib.metadata import metadata
 
 from .log import create_logger
 from .base import DatabaseServer
 
+# 获取包信息
+pkg_meta = metadata("mcp-dbutils")
+
 # 创建全局logger
-log = create_logger("mcp-dbutils")
+log = create_logger(pkg_meta["Name"])
 
 async def run_server():
     """服务器运行逻辑"""
@@ -26,8 +30,9 @@ async def run_server():
 
     # 更新logger的debug状态
     global log
-    log = create_logger("mcp-dbutils", debug)
+    log = create_logger(pkg_meta["Name"], debug)
 
+    log("info", f"MCP Database Utilities Service v{pkg_meta['Version']}")
     if debug:
         log("debug", "Debug模式已开启")
 

mcp_dbutils/base.py

@@ -17,12 +17,18 @@ from typing import Any, List, Optional, AsyncContextManager
 from contextlib import asynccontextmanager
 import json
 import yaml
+from importlib.metadata import metadata
 from mcp.server import Server, NotificationOptions
 import mcp.server.stdio
 import mcp.types as types
+from mcp.shared.session import RequestResponder
+
 from .log import create_logger
 from .stats import ResourceStats
 
+# 获取包信息用于日志命名
+pkg_meta = metadata("mcp-dbutils")
+
 class DatabaseHandler(ABC):
     """Abstract base class defining common interface for database handlers"""
 
@@ -37,9 +43,15 @@ class DatabaseHandler(ABC):
         self.config_path = config_path
         self.database = database
         self.debug = debug
-        self.log = create_logger(f"db-handler-{database}", debug)
+        self.log = create_logger(f"{pkg_meta['Name']}.handler.{database}", debug)
         self.stats = ResourceStats()
 
+    @property
+    @abstractmethod
+    def db_type(self) -> str:
+        """Return database type"""
+        pass
+
     @abstractmethod
     async def get_tables(self) -> list[types.Resource]:
         """Get list of table resources from database"""
@@ -85,18 +97,27 @@ class DatabaseServer:
         """
         self.config_path = config_path
         self.debug = debug
-        self.logger = create_logger("db-server", debug)
-        self.server = Server("database-server")
+        # 获取包信息用于服务器配置
+        pkg_meta = metadata("mcp-dbutils")
+        self.logger = create_logger(f"{pkg_meta['Name']}.server", debug)
+        self.server = Server(
+            name=pkg_meta["Name"],
+            version=pkg_meta["Version"]
+        )
         self._setup_handlers()
         self._setup_prompts()
 
     def _setup_prompts(self):
         """Setup prompts handlers"""
+        @self.server.list_prompts()
         async def handle_list_prompts() -> list[types.Prompt]:
-            """Return empty list of prompts for now"""
-            return []
-        
-        self.server.request_handlers["prompts/list"] = handle_list_prompts
+            """Handle prompts/list request"""
+            try:
+                self.logger("debug", "Handling list_prompts request")
+                return []
+            except Exception as e:
+                self.logger("error", f"Error in list_prompts: {str(e)}")
+                raise
 
     @asynccontextmanager
     async def get_handler(self, database: str) -> AsyncContextManager[DatabaseHandler]:
@@ -226,10 +247,8 @@ class DatabaseServer:
     async def run(self):
         """Run server"""
         async with mcp.server.stdio.stdio_server() as streams:
-            init_options = self.server.create_initialization_options()
-            init_options.capabilities.prompts = types.PromptsCapability(list=True)
             await self.server.run(
                 streams[0],
                 streams[1],
-                init_options
+                self.server.create_initialization_options()
             )

mcp_dbutils/log.py

@@ -20,8 +20,8 @@ def create_logger(name: str, is_debug: bool = False) -> Callable:
         if level == "debug" and not is_debug:
             return
 
-        timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
-        log_message = f"[{timestamp}] [{name}] [{level}] {message}"
+        timestamp = datetime.utcnow().isoformat(timespec='milliseconds') + 'Z'
+        log_message = f"{timestamp} [{name}] [{level}] {message}"
 
         # 始终输出到stderr
         print(log_message, file=sys.stderr, flush=True)
@@ -30,4 +30,4 @@ def create_logger(name: str, is_debug: bool = False) -> Callable:
         if notify:
             notify(level=level, data=message)
 
-    return log
+    return log

mcp_dbutils/postgres/handler.py

@@ -8,6 +8,10 @@ from ..base import DatabaseHandler, DatabaseError
 from .config import PostgresConfig
 
 class PostgresHandler(DatabaseHandler):
+    @property
+    def db_type(self) -> str:
+        return 'postgres'
+
     def __init__(self, config_path: str, database: str, debug: bool = False):
         """Initialize PostgreSQL handler
 
@@ -128,6 +132,7 @@ class PostgresHandler(DatabaseHandler):
                     formatted_results = [dict(zip(columns, row)) for row in results]
 
                     result_text = str({
+                        'type': self.db_type,
                         'columns': columns,
                         'rows': formatted_results,
                         'row_count': len(results)
@@ -138,7 +143,7 @@ class PostgresHandler(DatabaseHandler):
                 finally:
                     cur.execute("ROLLBACK")
         except psycopg2.Error as e:
-            error_msg = f"Query execution failed: [Code: {e.pgcode}] {e.pgerror or str(e)}"
+            error_msg = f"[{self.db_type}] Query execution failed: [Code: {e.pgcode}] {e.pgerror or str(e)}"
             raise DatabaseError(error_msg)
         finally:
             if conn:

mcp_dbutils/postgres/server.py

@@ -3,9 +3,13 @@ import psycopg2
 from psycopg2.pool import SimpleConnectionPool
 from typing import Optional, List
 import mcp.types as types
+from importlib.metadata import metadata
 from ..base import DatabaseServer
 from ..log import create_logger
 from .config import PostgresConfig
+
+# 获取包信息用于日志命名
+pkg_meta = metadata("mcp-dbutils")
 class PostgresServer(DatabaseServer):
     def __init__(self, config: PostgresConfig, config_path: Optional[str] = None):
         """初始化PostgreSQL服务器
@@ -13,10 +17,10 @@ class PostgresServer(DatabaseServer):
             config: 数据库配置
             config_path: 配置文件路径(可选)
         """
-        super().__init__("postgres-server", config.debug)
+        super().__init__(config_path, config.debug)
         self.config = config
         self.config_path = config_path
-        self.log = create_logger("postgres", config.debug)
+        self.log = create_logger(f"{pkg_meta['Name']}.db.postgres", config.debug)
         # 创建连接池
         try:
             conn_params = config.get_connection_params()

mcp_dbutils/sqlite/handler.py

@@ -9,6 +9,10 @@ from ..base import DatabaseHandler, DatabaseError
 from .config import SqliteConfig
 
 class SqliteHandler(DatabaseHandler):
+    @property
+    def db_type(self) -> str:
+        return 'sqlite'
+
     def __init__(self, config_path: str, database: str, debug: bool = False):
         """Initialize SQLite handler
 
@@ -110,6 +114,7 @@ class SqliteHandler(DatabaseHandler):
                 formatted_results = [dict(zip(columns, row)) for row in results]
 
                 result_text = str({
+                    'type': self.db_type,
                     'columns': columns,
                     'rows': formatted_results,
                     'row_count': len(results)
@@ -119,7 +124,7 @@ class SqliteHandler(DatabaseHandler):
                 return result_text
 
         except sqlite3.Error as e:
-            error_msg = f"Query execution failed: {str(e)}"
+            error_msg = f"[{self.db_type}] Query execution failed: {str(e)}"
             raise DatabaseError(error_msg)
 
     async def cleanup(self):

mcp_dbutils/sqlite/server.py

@@ -5,11 +5,15 @@ from pathlib import Path
 from contextlib import closing
 from typing import Optional, List
 import mcp.types as types
+from importlib.metadata import metadata
 
 from ..base import DatabaseServer
 from ..log import create_logger
 from .config import SqliteConfig
 
+# 获取包信息用于日志命名
+pkg_meta = metadata("mcp-dbutils")
+
 class SqliteServer(DatabaseServer):
     def __init__(self, config: SqliteConfig, config_path: Optional[str] = None):
         """初始化 SQLite 服务器
@@ -17,10 +21,10 @@ class SqliteServer(DatabaseServer):
         Args:
             config: SQLite 配置
         """
-        super().__init__("sqlite-server", config.debug)
+        super().__init__(config_path, config.debug)
         self.config = config
         self.config_path = config_path
-        self.log = create_logger("sqlite", config.debug)
+        self.log = create_logger(f"{pkg_meta['Name']}.db.sqlite", config.debug)
 
         # 确保数据库目录存在
         db_file = Path(self.config.absolute_path)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-dbutils
-Version: 0.2.8
+Version: 0.3.0
 Summary: MCP Database Utilities Service
 Author: Dong Hao
 License-Expression: MIT
@@ -62,7 +62,7 @@ uvx mcp-dbutils --config /path/to/config.yaml
 Add to Claude configuration:
 ```json
 "mcpServers": {
-  "dbutils": {
+  "mcp-dbutils": {
     "command": "uvx",
     "args": [
       "mcp-dbutils",
@@ -84,7 +84,7 @@ pip install mcp-dbutils
 Add to Claude configuration:
 ```json
 "mcpServers": {
-  "dbutils": {
+  "mcp-dbutils": {
     "command": "python",
     "args": [
       "-m",
@@ -111,7 +111,7 @@ docker run -i --rm \
 Add to Claude configuration:
 ```json
 "mcpServers": {
-  "dbutils": {
+  "mcp-dbutils": {
     "command": "docker",
     "args": [
       "run",

mcp_dbutils-0.3.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+mcp_dbutils/__init__.py,sha256=xcfE1spAaONAoxBYB1ZyDX8tw7nxV1PMqo_RwxLDp0A,1892
+mcp_dbutils/base.py,sha256=xdeLOKv9-dbMUzlIbD-BbRVbqAf1a3RjO25aw61vAzY,9691
+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/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/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.2.8.dist-info/RECORD

@@ -1,18 +0,0 @@
-mcp_dbutils/__init__.py,sha256=_zVdjN2P_G5qEye7f5vQxiXAd6EwX2gyTL1wpFpqKck,1718
-mcp_dbutils/base.py,sha256=Hj35seBlmYgcq0qyoZchnUbKzDMPlhUxsCw7U79OA2c,9186
-mcp_dbutils/config.py,sha256=EwnPNuQVCBKd5WOXQfROyDTM-YpM_Odp0GhCPRg8YwE,1863
-mcp_dbutils/log.py,sha256=RJwWtHyZnJA2YRcyCK-WgnFadNuwtJeYKSxPbE-DCG0,991
-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/handler.py,sha256=mvktsgak0tR-L4oknqv7UhOZ0_R8KPB9JRWiswh0bl4,5955
-mcp_dbutils/postgres/server.py,sha256=3AdQyQfgrClkCmWOZ-xFXTeI9t3tpFkrY3qmyOR0b-U,8586
-mcp_dbutils/sqlite/__init__.py,sha256=QV4th2ywzUmCCa3GHCcBf8blJ_E8OYy0dJ2fSf1TfSU,134
-mcp_dbutils/sqlite/config.py,sha256=QK1JlY-ZBB5VyhydbiU-aAKNESTWMtyBfawbv2DAVCQ,2452
-mcp_dbutils/sqlite/handler.py,sha256=7mD50sQRii7UKX-8dE9RNicIXGwMDPB59Ee1dmncSlg,4842
-mcp_dbutils/sqlite/server.py,sha256=Q29O2YOW4kqDGc3z1hMXVv4M0KSkuZbqvVDMgZE8Fd8,7593
-mcp_dbutils-0.2.8.dist-info/METADATA,sha256=YdBbIw37bEGOtLGOE1XTjZaE7ESHog-y6rXxIp5N5y8,9466
-mcp_dbutils-0.2.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_dbutils-0.2.8.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
-mcp_dbutils-0.2.8.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
-mcp_dbutils-0.2.8.dist-info/RECORD,,