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

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

@@ -1,24 +1,24 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.6
+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.116.1
-Requires-Dist: kafka>=1.3.5
+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.7
-Requires-Dist: python-dotenv>=1.1.1
-Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: sqlalchemy>=2.0.43
+Requires-Dist: pydantic>=2.12.3
+Requires-Dist: python-dotenv>=1.2.1
+Requires-Dist: pyyaml>=6.0.3
+Requires-Dist: sqlalchemy>=2.0.44
+Requires-Dist: starlette>=0.48.0
 Requires-Dist: uuid>=1.30
-Requires-Dist: uvicorn>=0.35.0
+Requires-Dist: uvicorn>=0.38.0
 
 # sycommon-python-lib
 

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

@@ -1,26 +1,29 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.6"
+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.116.1",
-    "kafka>=1.3.5",
+    "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.7",
-    "python-dotenv>=1.1.1",
-    "pyyaml>=6.0.2",
-    "sqlalchemy>=2.0.43",
+    "pydantic>=2.12.3",
+    "python-dotenv>=1.2.1",
+    "pyyaml>=6.0.3",
+    "sqlalchemy>=2.0.44",
+    "starlette>=0.48.0",
     "uuid>=1.30",
-    "uvicorn>=0.35.0",
+    "uvicorn>=0.38.0",
 ]
 
 [tool.setuptools]
 packages = {find = {where = ["src"]}}
+
+[project.scripts]
+sycommon = "command.cli:main"

sycommon_python_lib-0.1.36/src/command/cli.py

@@ -0,0 +1,167 @@
+import argparse
+import os
+import datetime
+import re
+from pathlib import Path
+from importlib.resources import files
+
+
+def get_all_files_in_directory(directory: Path) -> list[tuple[Path, str]]:
+    """
+    获取目录下所有文件的相对路径（忽略__pycache__目录）
+    返回值: 元组列表 (模板文件路径, 相对目标路径)
+    """
+    file_mappings = []
+    if not directory.exists() or not directory.is_dir():
+        return file_mappings
+
+    # 遍历目录下所有文件
+    for root, _, files in os.walk(directory):
+        # 跳过包含__pycache__的目录
+        if "__pycache__" in root:
+            continue
+
+        for file in files:
+            # 获取文件的绝对路径
+            file_path = Path(root) / file
+            # 计算相对模板目录的路径
+            rel_path = file_path.relative_to(directory)
+            # 添加到映射列表
+            file_mappings.append((file_path, str(rel_path)))
+
+    return file_mappings
+
+
+def init_project(project_name: str, project_type: str) -> None:
+    """
+    初始化项目，自动读取模板文件并替换占位符
+    """
+    project_path = Path(os.getcwd()) / project_name
+    if project_path.exists():
+        print(f"❌ 错误：工程 '{project_path}' 已存在")
+        return
+
+    template_root = files("command.templates")
+    if not template_root.is_dir():
+        print("❌ 错误：未找到模板文件目录（command/templates）")
+        return
+
+    # 处理项目名称
+    short_project_name = project_name.replace("shengye-platform-", "")
+    short_project_name_upper = short_project_name.upper()
+
+    # 定义模板变量
+    context = {
+        "__cli__.project_name": project_name,
+        "__cli__.short_project_name": short_project_name,
+        "__cli__.short_project_name_upper": short_project_name_upper,
+        "__cli__.project_type": project_type,
+        "__cli__.create_time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+        "__cli__.author": os.getlogin(),
+        "__cli__.default_port": 8080
+    }
+
+    # 自动获取基础模板文件和特定类型模板文件
+    base_dir = template_root / "base"
+    type_dir = template_root / project_type
+
+    base_files = get_all_files_in_directory(base_dir)
+    type_specific_files = get_all_files_in_directory(type_dir)
+
+    # 合并所有文件映射
+    file_mappings = base_files + type_specific_files
+    copied_files = 0
+
+    # 处理每个文件
+    for template_file, target_rel_path in file_mappings:
+        try:
+            # 1. 读取模板内容
+            template_content = template_file.read_text(encoding="utf-8")
+
+            # 2. 替换所有占位符（包含花括号）
+            rendered_content = template_content
+            for key, value in context.items():
+                # 精确匹配带有花括号的占位符
+                pattern = re.compile(rf'{{\s*{re.escape(key)}\s*}}')
+                rendered_content = pattern.sub(str(value), rendered_content)
+
+            # 3. 清理引号（针对YAML键值对格式）
+            rendered_content = re.sub(
+                r'(\w+)\s*:\s*["\']([^"\']+)["\']',
+                r'\1: \2',
+                rendered_content
+            )
+
+            # 4. 最后检查并移除任何残留的花括号
+            for value in context.values():
+                rendered_content = re.sub(
+                    rf'{{+{re.escape(str(value))}+}}',
+                    str(value),
+                    rendered_content
+                )
+
+            # 5. 处理文件后缀：直接移除.tpl后缀
+            if target_rel_path.endswith('.tpl'):
+                target_rel_path = target_rel_path[:-4]
+
+            # 6. 写入文件
+            target_file = project_path / target_rel_path
+            target_file.parent.mkdir(parents=True, exist_ok=True)
+            target_file.write_text(rendered_content, encoding="utf-8")
+
+            copied_files += 1
+        except Exception as e:
+            print(f"❌ 处理模板 {template_file} 失败: {str(e)}")
+
+    if copied_files > 0:
+        print(f"✅ 模板{project_type}工程 {project_name} 创建完成！")
+        print(f"📁 工程路径：{project_path}")
+        print(f"📊 共创建 {copied_files} 个文件")
+    else:
+        print(f"\n⚠️  未创建任何文件，可能是缺少模板文件或模板路径配置错误")
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(
+        prog="sycommon",
+        description="sycommon 工具集 - 项目初始化工具",
+        formatter_class=argparse.RawTextHelpFormatter
+    )
+    subparsers = parser.add_subparsers(
+        dest="command", required=True, help="子命令（当前支持：init）"
+    )
+
+    init_parser = subparsers.add_parser(
+        "init",
+        help="创建Web/Agent类型项目模板",
+        formatter_class=argparse.RawTextHelpFormatter,
+        epilog="示例:\n"
+               "  sycommon init web   my_project  # 创建Web类型项目\n"
+               "  sycommon init agent my_project  # 创建AI Agent类型项目"
+    )
+    init_parser.add_argument(
+        "project_type",
+        choices=["web", "agent"],
+        help="项目类型：web - Web服务项目；agent - AI Agent服务项目"
+    )
+    init_parser.add_argument(
+        "project_name",
+        help="工程名称（如 my_web_project，将创建同名根目录）"
+    )
+
+    try:
+        args = parser.parse_args()
+        if args.command == "init":
+            init_project(args.project_name, args.project_type)
+    except argparse.ArgumentError as e:
+        print(f"❌ 错误：{e}\n")
+        print(
+            f"请使用 {parser.prog} {args.command if 'args' in locals() else ''} -h 查看帮助")
+    except SystemExit:
+        pass
+
+
+if __name__ == "__main__":
+    # uv pip install -e .
+    # sycommon init web my_project
+    main()

{sycommon_python_lib-0.1.6 → 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.6 → sycommon_python_lib-0.1.36}/src/sycommon/health/health_check.py

@@ -6,7 +6,7 @@ def setup_health_handler(app: FastAPI):
 
     @health_router.get("/actuator/health")
     async def health_check():
-        """返回应用的健康状态"""
+        """实现 Nacos 健康检查接口"""
         return {
             "status": "UP",
             "groups": ["liveness", "readiness"]

sycommon_python_lib-0.1.36/src/sycommon/health/metrics.py

@@ -0,0 +1,13 @@
+from fastapi import FastAPI, APIRouter
+
+
+def setup_metrics_handler(app: FastAPI):
+    metrics_router = APIRouter()
+
+    @metrics_router.get("/metrics")
+    async def metrics():
+        return {"status": "alive"}
+
+    app.include_router(metrics_router)
+
+    return app

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

@@ -1,4 +1,5 @@
 import os
+import pprint
 import sys
 import traceback
 import asyncio
@@ -70,6 +71,8 @@ class KafkaLogger(metaclass=SingletonMeta):
             buffer_memory=67108864,  # 增大缓冲区内存
             connections_max_idle_ms=540000,  # 连接最大空闲时间
             reconnect_backoff_max_ms=10000,  # 增加重连退避最大时间
+            max_in_flight_requests_per_connection=1,  # 限制单个连接上未确认的请求数量
+            # enable_idempotence=True,  # 开启幂等性
         )
 
         # 启动后台发送线程
@@ -170,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
                 }
 
                 # 智能队列管理
@@ -467,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 = ''
@@ -487,22 +500,26 @@ class SYLogger:
             logger.info(_log)
 
         if os.getenv('DEV-LOG', 'false').lower() == 'true':
-            print(_log)
+            pprint.pprint(_log)
 
     @staticmethod
-    def info(msg: any):
+    def info(msg: any, *args, **kwargs):
         SYLogger._log(msg, "INFO")
 
     @staticmethod
-    def warning(msg: any):
+    def warning(msg: any, *args, **kwargs):
         SYLogger._log(msg, "WARNING")
 
     @staticmethod
-    def error(msg: any):
+    def debug(msg: any, *args, **kwargs):
+        SYLogger._log(msg, "DEBUG")
+
+    @staticmethod
+    def error(msg: any, *args, **kwargs):
         SYLogger._log(msg, "ERROR")
 
     @staticmethod
-    def exception(msg: any):
+    def exception(msg: any, *args, **kwargs):
         """记录异常信息，包括完整堆栈"""
         trace_id = SYLogger.get_trace_id()
 

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.36/src/sycommon/middleware/cors.py

@@ -0,0 +1,16 @@
+from fastapi.middleware.cors import CORSMiddleware
+
+
+def setup_cors_handler(app):
+    # 允许所有源访问（*）
+    # 注意：此时allow_credentials必须为False，否则浏览器会拦截响应
+    app.add_middleware(
+        CORSMiddleware,
+        # allow_origins=["*"],         # 允许所有源
+        # allow_credentials=False,     # 必须为False（与*配合）
+        # allow_methods=["*"],         # 允许所有HTTP方法
+        allow_headers=["*"],         # 允许所有请求头
+        expose_headers=["*"]         # 允许前端访问所有响应头
+    )
+
+    return app

sycommon_python_lib-0.1.36/src/sycommon/middleware/docs.py

@@ -0,0 +1,30 @@
+from fastapi import FastAPI, APIRouter
+from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
+
+
+def setup_docs_handler(app: FastAPI):
+    docs_router = APIRouter()
+
+    @docs_router.get("/docs", include_in_schema=False)
+    async def custom_swagger_ui_html():
+        return get_swagger_ui_html(
+            openapi_url=app.openapi_url,
+            title=f"{app.title}",
+            swagger_favicon_url="https://static.sytechnology.com/img/sylogopng.png",
+            swagger_js_url="https://cdn.bootcdn.net/ajax/libs/swagger-ui/5.27.1/swagger-ui-bundle.js",
+            swagger_css_url="https://cdn.bootcdn.net/ajax/libs/swagger-ui/5.27.1/swagger-ui.css",
+            swagger_ui_parameters={"defaultModelsExpandDepth": -1},
+        )
+
+    @docs_router.get("/redoc", include_in_schema=False)
+    async def custom_redoc_html():
+        return get_redoc_html(
+            openapi_url=app.openapi_url,
+            title=f"{app.title}",
+            redoc_favicon_url="https://static.sytechnology.com/img/sylogopng.png",
+            redoc_js_url="https://cdn.bootcdn.net/ajax/libs/redoc/2.1.5/redoc.standalone.js",
+        )
+
+    app.include_router(docs_router)
+
+    return app

{sycommon_python_lib-0.1.6 → sycommon_python_lib-0.1.36}/src/sycommon/middleware/middleware.py

@@ -1,5 +1,7 @@
+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
 from sycommon.middleware.exception import setup_exception_handler
 from sycommon.middleware.monitor_memory import setup_monitor_memory_middleware
 from sycommon.middleware.mq import setup_mq_middleware
@@ -25,7 +27,7 @@ class Middleware:
         # app = setup_monitor_memory_middleware(app)
 
         # 设置cors
-        # app = setup_cors_handler(app)
+        app = setup_cors_handler(app)
 
         # 健康检查
         app = setup_health_handler(app)
@@ -33,7 +35,13 @@ class Middleware:
         # ping
         app = setup_ping_handler(app)
 
+        # metrics
+        app = setup_metrics_handler(app)
+
         # 添加mq中间件
         # app = setup_mq_middleware(app)
 
+        # doc
+        # app = setup_docs_handler(app)
+
         return app

{sycommon_python_lib-0.1.6 → sycommon_python_lib-0.1.36}/src/sycommon/middleware/traceid.py

@@ -78,13 +78,19 @@ def setup_trace_id_handler(app):
             response = await call_next(request)
 
             content_type = response.headers.get("Content-Type", "")
+
+            # 处理 SSE 响应 - 关键修复点
             if "text/event-stream" in content_type:
-                # 处理 SSE 响应
+                # 流式响应不能有Content-Length，移除它
+                if "Content-Length" in response.headers:
+                    del response.headers["Content-Length"]
                 response.headers["x-traceId-header"] = trace_id
                 return response
 
+            # 处理普通响应
             response_body = b""
             try:
+                # 收集所有响应块
                 async for chunk in response.body_iterator:
                     response_body += chunk
 
@@ -95,17 +101,39 @@ def setup_trace_id_handler(app):
                 if "application/json" in content_type and not content_disposition.startswith("attachment"):
                     try:
                         data = json.loads(response_body)
-                        data["trace_id"] = trace_id
+                        data["traceId"] = trace_id
                         new_body = json.dumps(
                             data, ensure_ascii=False).encode()
+
+                        # 创建新响应，确保Content-Length正确
                         response = Response(
                             content=new_body,
                             status_code=response.status_code,
-                            headers=dict(response.headers)
+                            headers=dict(response.headers),
+                            media_type=response.media_type
                         )
+                        # 显式设置正确的Content-Length
                         response.headers["Content-Length"] = str(len(new_body))
                     except json.JSONDecodeError:
-                        pass
+                        # 如果不是JSON，恢复原始响应体并更新长度
+                        response = Response(
+                            content=response_body,
+                            status_code=response.status_code,
+                            headers=dict(response.headers),
+                            media_type=response.media_type
+                        )
+                        response.headers["Content-Length"] = str(
+                            len(response_body))
+                else:
+                    # 非JSON响应，恢复原始响应体
+                    response = Response(
+                        content=response_body,
+                        status_code=response.status_code,
+                        headers=dict(response.headers),
+                        media_type=response.media_type
+                    )
+                    response.headers["Content-Length"] = str(
+                        len(response_body))
             except StopAsyncIteration:
                 pass
 
@@ -129,7 +157,7 @@ def setup_trace_id_handler(app):
                 "uploaded_files": files_info if files_info else None
             }
             error_message_str = json.dumps(error_message, ensure_ascii=False)
-            SYLogger.error(error_message_str)  # 无需显式传递 trace_id
+            SYLogger.error(error_message_str)
             raise
         finally:
             # 清理上下文变量，防止泄漏