sycommon-python-lib 0.1.24__tar.gz → 0.1.36__tar.gz

{sycommon_python_lib-0.1.24 → sycommon_python_lib-0.1.36}/PKG-INFO

@@ -1,24 +1,24 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.24
+Version: 0.1.36
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: aio-pika>=9.5.7
-Requires-Dist: aiohttp>=3.12.15
+Requires-Dist: aiohttp>=3.13.1
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: fastapi>=0.118.0
+Requires-Dist: fastapi>=0.120.0
 Requires-Dist: kafka-python>=2.2.15
 Requires-Dist: loguru>=0.7.3
-Requires-Dist: mysql-connector-python>=9.4.0
+Requires-Dist: mysql-connector-python>=9.5.0
 Requires-Dist: nacos-sdk-python>=2.0.9
-Requires-Dist: pydantic>=2.11.9
-Requires-Dist: python-dotenv>=1.1.1
+Requires-Dist: pydantic>=2.12.3
+Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: sqlalchemy>=2.0.43
-Requires-Dist: starlette>=0.46.2
+Requires-Dist: sqlalchemy>=2.0.44
+Requires-Dist: starlette>=0.48.0
 Requires-Dist: uuid>=1.30
-Requires-Dist: uvicorn>=0.37.0
+Requires-Dist: uvicorn>=0.38.0
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.1.24 → sycommon_python_lib-0.1.36}/pyproject.toml

@@ -1,25 +1,25 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.24"
+version = "0.1.36"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
     "aio-pika>=9.5.7",
-    "aiohttp>=3.12.15",
+    "aiohttp>=3.13.1",
     "decorator>=5.2.1",
-    "fastapi>=0.118.0",
+    "fastapi>=0.120.0",
     "kafka-python>=2.2.15",
     "loguru>=0.7.3",
-    "mysql-connector-python>=9.4.0",
+    "mysql-connector-python>=9.5.0",
     "nacos-sdk-python>=2.0.9",
-    "pydantic>=2.11.9",
-    "python-dotenv>=1.1.1",
+    "pydantic>=2.12.3",
+    "python-dotenv>=1.2.1",
     "pyyaml>=6.0.3",
-    "sqlalchemy>=2.0.43",
-    "starlette>=0.46.2",
+    "sqlalchemy>=2.0.44",
+    "starlette>=0.48.0",
     "uuid>=1.30",
-    "uvicorn>=0.37.0",
+    "uvicorn>=0.38.0",
 ]
 
 [tool.setuptools]

{sycommon_python_lib-0.1.24 → sycommon_python_lib-0.1.36}/src/sycommon/database/database_service.py

@@ -3,6 +3,7 @@ from sqlalchemy import create_engine, text
 from sycommon.config.Config import SingletonMeta
 from sycommon.config.DatabaseConfig import DatabaseConfig, convert_dict_keys
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.logging.sql_logger import SQLTraceLogger
 from sycommon.synacos.nacos_service import NacosService
 
 
@@ -62,9 +63,13 @@ class DatabaseConnector(metaclass=SingletonMeta):
             max_overflow=20,  # 最大溢出连接数
             pool_timeout=30,  # 连接超时时间（秒）
             pool_recycle=3600,  # 连接回收时间（秒）
-            pool_pre_ping=True  # 每次获取连接前检查连接是否有效
+            pool_pre_ping=True,  # 每次获取连接前检查连接是否有效
+            echo=False,  # 打印 SQL 语句
         )
 
+        # 注册 SQL 日志拦截器
+        SQLTraceLogger.setup_sql_logging(self.engine)
+
         # 测试
         if not self.test_connection():
             raise Exception("Database connection test failed")

{sycommon_python_lib-0.1.24 → sycommon_python_lib-0.1.36}/src/sycommon/logging/kafka_log.py

@@ -173,7 +173,7 @@ class KafkaLogger(metaclass=SingletonMeta):
                     "className": "",
                     "sqlCost": 0,
                     "size": len(str(message)),
-                    "uid": int(trace_id) if trace_id and trace_id.isdigit() else 0
+                    "uid": int(Snowflake.next_id())  # 独立新的id
                 }
 
                 # 智能队列管理
@@ -470,12 +470,22 @@ class SYLogger:
         thread_info = SYLogger._get_execution_context()
 
         # 构建日志结构，添加线程/协程信息到threadName字段
-        request_log = {
-            "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
-            "message": msg_str,
-            "level": level,
-            "threadName": thread_info
-        }
+        request_log = {}
+        if level == "ERROR":
+            request_log = {
+                "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
+                "message": msg_str,
+                "traceback": traceback.format_exc(),
+                "level": level,
+                "threadName": thread_info
+            }
+        else:
+            request_log = {
+                "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
+                "message": msg_str,
+                "level": level,
+                "threadName": thread_info
+            }
 
         # 选择日志级别
         _log = ''

sycommon_python_lib-0.1.36/src/sycommon/logging/sql_logger.py

@@ -0,0 +1,53 @@
+from sqlalchemy import event
+from sqlalchemy.engine import Engine
+from sycommon.logging.kafka_log import SYLogger
+import time
+from datetime import datetime
+from decimal import Decimal
+
+
+class SQLTraceLogger:
+    @staticmethod
+    def setup_sql_logging(engine: Engine):
+        """为 SQLAlchemy 引擎注册事件监听器"""
+        def serialize_params(params):
+            """处理特殊类型参数的序列化"""
+            if isinstance(params, (list, tuple)):
+                return [serialize_params(p) for p in params]
+            elif isinstance(params, dict):
+                return {k: serialize_params(v) for k, v in params.items()}
+            elif isinstance(params, datetime):
+                return params.isoformat()
+            elif isinstance(params, Decimal):
+                return float(params)
+            else:
+                return params
+
+        @event.listens_for(Engine, "after_cursor_execute")
+        def after_cursor_execute(
+            conn, cursor, statement, parameters, context, executemany
+        ):
+            try:
+                start_time = conn._execution_options.get(
+                    "_start_time", time.time())
+                execution_time = (time.time() - start_time) * 1000
+
+                sql_log = {
+                    "type": "SQL",
+                    "statement": statement,
+                    "parameters": serialize_params(parameters),
+                    "execution_time_ms": round(execution_time, 2),
+                }
+
+                SYLogger.info(f"SQL执行: {sql_log}")
+            except Exception as e:
+                SYLogger.error(f"SQL日志处理失败: {str(e)}")
+
+        @event.listens_for(Engine, "before_cursor_execute")
+        def before_cursor_execute(
+            conn, cursor, statement, parameters, context, executemany
+        ):
+            try:
+                conn = conn.execution_options(_start_time=time.time())
+            except Exception as e:
+                SYLogger.error(f"SQL开始时间记录失败: {str(e)}")

{sycommon_python_lib-0.1.24 → sycommon_python_lib-0.1.36}/src/sycommon/models/mqlistener_config.py

@@ -31,6 +31,7 @@ class RabbitMQListenerConfig(BaseModel):
     durable: bool = Field(True, description="是否持久化")
     auto_delete: bool = Field(False, description="是否自动删除队列")
     auto_parse_json: bool = Field(True, description="是否自动解析JSON消息")
+    prefetch_count: int = Field(2, description="mq同时消费数量")
 
     class Config:
         """模型配置"""