mcp-dbutils 0.15.2__py3-none-any.whl → 0.15.4__py3-none-any.whl

mcp_dbutils/base.py

@@ -1,24 +1,11 @@
 """Connection server base class"""
 
-class ConnectionHandlerError(Exception):
-    """Base exception for connection errors"""
-    pass
-
-class ConfigurationError(ConnectionHandlerError):
-    """Configuration related errors"""
-    pass
-
-class ConnectionError(ConnectionHandlerError):
-    """Connection related errors"""
-    pass
-
 import json
 from abc import ABC, abstractmethod
 from contextlib import asynccontextmanager
 from datetime import datetime
 from importlib.metadata import metadata
-from typing import AsyncContextManager
-from unittest.mock import MagicMock
+from typing import Any, AsyncContextManager, Dict
 
 import mcp.server.stdio
 import mcp.types as types
@@ -28,6 +15,19 @@ from mcp.server import Server
 from .log import create_logger
 from .stats import ResourceStats
 
+
+class ConnectionHandlerError(Exception):
+    """Base exception for connection errors"""
+    pass
+
+class ConfigurationError(ConnectionHandlerError):
+    """Configuration related errors"""
+    pass
+
+class ConnectionError(ConnectionHandlerError):
+    """Connection related errors"""
+    pass
+
 # 常量定义
 DATABASE_CONNECTION_NAME = "Database connection name"
 EMPTY_QUERY_ERROR = "SQL query cannot be empty"
@@ -347,14 +347,16 @@ class ConnectionServer:
 
                 handler.stats.record_connection_start()
                 self.send_log(LOG_LEVEL_DEBUG, f"Handler created successfully for {connection}")
-                # 处理MagicMock对象，避免JSON序列化错误
+                # 使用通用的方式处理统计信息序列化
                 try:
-                    stats_dict = handler.stats.to_dict()
-                    stats_json = json.dumps(stats_dict)
-                    self.send_log(LOG_LEVEL_INFO, f"Resource stats: {stats_json}")
+                    if hasattr(handler.stats, 'to_dict') and callable(handler.stats.to_dict):
+                        stats_dict = handler.stats.to_dict()
+                        stats_json = json.dumps(stats_dict)
+                        self.send_log(LOG_LEVEL_INFO, f"Resource stats: {stats_json}")
+                    else:
+                        self.send_log(LOG_LEVEL_INFO, "Resource stats not available")
                 except TypeError:
-                    # 在测试环境中，stats可能是MagicMock对象
-                    self.send_log(LOG_LEVEL_INFO, "Resource stats: [Mock object in test environment]")
+                    self.send_log(LOG_LEVEL_INFO, "Resource stats: [Could not serialize stats object]")
                 yield handler
             except yaml.YAMLError as e:
                 raise ConfigurationError(f"Invalid YAML configuration: {str(e)}")
@@ -364,16 +366,19 @@ class ConnectionServer:
                 if handler:
                     self.send_log(LOG_LEVEL_DEBUG, f"Cleaning up handler for {connection}")
                     handler.stats.record_connection_end()
-                    # 处理MagicMock对象，避免JSON序列化错误
+                    # 使用通用的方式处理统计信息序列化
                     try:
-                        stats_dict = handler.stats.to_dict()
-                        stats_json = json.dumps(stats_dict)
-                        self.send_log(LOG_LEVEL_INFO, f"Final resource stats: {stats_json}")
+                        if hasattr(handler.stats, 'to_dict') and callable(handler.stats.to_dict):
+                            stats_dict = handler.stats.to_dict()
+                            stats_json = json.dumps(stats_dict)
+                            self.send_log(LOG_LEVEL_INFO, f"Final resource stats: {stats_json}")
+                        else:
+                            self.send_log(LOG_LEVEL_INFO, "Final resource stats not available")
                     except TypeError:
-                        # 在测试环境中，stats可能是MagicMock对象
-                        self.send_log(LOG_LEVEL_INFO, "Final resource stats: [Mock object in test environment]")
-                    # 在测试环境中，handler可能是MagicMock对象，但cleanup可能是AsyncMock
-                    await handler.cleanup()
+                        self.send_log(LOG_LEVEL_INFO, "Final resource stats: [Could not serialize stats object]")
+                    # 清理资源
+                    if hasattr(handler, 'cleanup') and callable(handler.cleanup):
+                        await handler.cleanup()
 
     def _setup_handlers(self):
         """Setup MCP handlers"""

mcp_dbutils/sqlite/server.py

@@ -163,7 +163,7 @@ class SQLiteServer(ConnectionServer):
                 columns = [desc[0] for desc in cursor.description]
                 formatted_results = [dict(zip(columns, row)) for row in results]
 
-                # 在测试环境中，connection可能是MagicMock对象，不能序列化为JSON
+                # 使用更通用的方法确定配置名称
                 config_name = connection if isinstance(connection, str) else 'default'
                 result_text = json.dumps({
                     'type': 'sqlite',
@@ -179,7 +179,7 @@ class SQLiteServer(ConnectionServer):
                 return [types.TextContent(type="text", text=result_text)]
 
         except sqlite3.Error as e:
-            # 在测试环境中，connection可能是MagicMock对象，不能序列化为JSON
+            # 使用更通用的方法确定配置名称
             config_name = connection if isinstance(connection, str) else 'default'
             error_msg = json.dumps({
                 'type': 'sqlite',

{mcp_dbutils-0.15.2.dist-info → mcp_dbutils-0.15.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-dbutils
-Version: 0.15.2
+Version: 0.15.4
 Summary: MCP Database Utilities Service
 Author: Dong Hao
 License-Expression: MIT

{mcp_dbutils-0.15.2.dist-info → mcp_dbutils-0.15.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mcp_dbutils/__init__.py,sha256=6LLccQv7je2L4IpY_I3OzSJZcK32VUDJv2IY31y6eYg,1900
-mcp_dbutils/base.py,sha256=aTmKLuuLFZEbTH-RdioSBwKhGVrqvQSVlUoDQ-vx6CI,28831
+mcp_dbutils/base.py,sha256=d4kt29NQeE7xZ0DlGpJcpBXS1pY1VnY98gX-xJ-Ehpg,29126
 mcp_dbutils/config.py,sha256=bmXpOd1fyYfoyUS75I035ChT6t3wP5AyEnJ06e2ZS2o,1848
 mcp_dbutils/log.py,sha256=mqxi6I_IL-MF1F_pxBtnYZQKOHbGBJ74gsvZHVelr1w,823
 mcp_dbutils/stats.py,sha256=wMqWPfGnEOg9v5YBtTsARV-1YsFUMM_pKdzitzSU9x4,7137
@@ -14,9 +14,9 @@ mcp_dbutils/postgres/server.py,sha256=_CiJC9PitpI1NB99Q1Bcs5TYADNgDpYMwv88fRHQun
 mcp_dbutils/sqlite/__init__.py,sha256=fK_3-WylCBYpBAzwuopi8hlwoIGJm2TPAlwcPWG46I0,134
 mcp_dbutils/sqlite/config.py,sha256=j67TJ8mQJ2D886MthSa-zYMtvUUYyyxYLMlNxkYoqZE,4509
 mcp_dbutils/sqlite/handler.py,sha256=T5atpRn71IwlTyPKhdpQsGIJb16716SKLBplsl9Wv50,17750
-mcp_dbutils/sqlite/server.py,sha256=qhY6OOx_Dzx17wbE1DlVQgnifTqgJJ1BJp9pHmROVkA,7275
-mcp_dbutils-0.15.2.dist-info/METADATA,sha256=r9AXHFQU3rrmSHTE3wdUtUXyCK9OydxPSirRBVVZUXs,16714
-mcp_dbutils-0.15.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_dbutils-0.15.2.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
-mcp_dbutils-0.15.2.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
-mcp_dbutils-0.15.2.dist-info/RECORD,,
+mcp_dbutils/sqlite/server.py,sha256=3W0kB1mrVzcfMjVG3dkmt1R4Mh4lbiXkQsXon7e4i1U,7199
+mcp_dbutils-0.15.4.dist-info/METADATA,sha256=Zuqz-dphdUevGpuzXasySN28wmdg9GExh0jp7V4RCF4,16714
+mcp_dbutils-0.15.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mcp_dbutils-0.15.4.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
+mcp_dbutils-0.15.4.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
+mcp_dbutils-0.15.4.dist-info/RECORD,,