sycommon-python-lib 0.1.21__py3-none-any.whl → 0.1.46__py3-none-any.whl

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/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 = ''
@@ -490,7 +500,7 @@ class SYLogger:
             logger.info(_log)
 
         if os.getenv('DEV-LOG', 'false').lower() == 'true':
-            pprint(_log)
+            pprint.pprint(_log)
 
     @staticmethod
     def info(msg: any, *args, **kwargs):

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/middleware/middleware.py

@@ -1,4 +1,4 @@
-from src.sycommon.health.metrics import setup_metrics_handler
+from sycommon.health.metrics import setup_metrics_handler
 from sycommon.health.ping import setup_ping_handler
 from sycommon.middleware.cors import setup_cors_handler
 from sycommon.middleware.docs import setup_docs_handler

sycommon/middleware/traceid.py

@@ -79,7 +79,7 @@ def setup_trace_id_handler(app):
 
             content_type = response.headers.get("Content-Type", "")
 
-            # 处理 SSE 响应 - 关键修复点
+            # 处理 SSE 响应
             if "text/event-stream" in content_type:
                 # 流式响应不能有Content-Length，移除它
                 if "Content-Length" in response.headers:

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:
         """模型配置"""