sycommon-python-lib 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

sycommon/middleware/middleware.py

@@ -8,29 +8,32 @@ from sycommon.middleware.traceid import setup_trace_id_handler
 from sycommon.health.health_check import setup_health_handler
 
 
-def setup_middleware(app, config: dict):
-    # 设置请求超时中间件
-    app = setup_request_timeout_middleware(app, config)
+class Middleware:
 
-    # 设置异常处理
-    app = setup_exception_handler(app, config)
+    @classmethod
+    def setup_middleware(cls, app, config: dict):
+        # 设置请求超时中间件
+        app = setup_request_timeout_middleware(app, config)
 
-    # 设置 trace_id 处理中间件
-    app = setup_trace_id_handler(app)
+        # 设置异常处理
+        app = setup_exception_handler(app, config)
 
-    # 设置内存监控中间件
-    # app = setup_monitor_memory_middleware(app)
+        # 设置 trace_id 处理中间件
+        app = setup_trace_id_handler(app)
 
-    # 设置cors
-    # app = setup_cors_handler(app)
+        # 设置内存监控中间件
+        # app = setup_monitor_memory_middleware(app)
 
-    # 健康检查
-    app = setup_health_handler(app)
+        # 设置cors
+        # app = setup_cors_handler(app)
 
-    # ping
-    app = setup_ping_handler(app)
+        # 健康检查
+        app = setup_health_handler(app)
 
-    # 添加mq中间件
-    # app = setup_mq_middleware(app)
+        # ping
+        app = setup_ping_handler(app)
 
-    return app
+        # 添加mq中间件
+        # app = setup_mq_middleware(app)
+
+        return app

sycommon/models/base_http.py

@@ -0,0 +1,99 @@
+from typing import TypeVar, Any, Generic
+from pydantic import BaseModel, Field
+from fastapi.responses import JSONResponse
+from fastapi import status
+
+# 修改泛型约束，支持任意类型（包括基础类型和BaseModel）
+T = TypeVar('T')
+
+
+class BaseResponseModel(BaseModel, Generic[T]):
+    """基础响应模型，支持多种数据类型（包括字符串、字典和Pydantic模型）"""
+    code: int = Field(default=0, description="业务响应码，成功0，失败非0")
+    message: str = Field(default="success", description="业务响应信息")
+    data: T | None = Field(default=None, description="业务响应数据，支持任意类型")
+    traceId: str | None = Field(default=None, description="请求链路追踪ID")
+
+    class Config:
+        arbitrary_types_allowed = True
+        from_attributes = True
+
+
+def build_response_content(
+    data: T | Any = None,
+    code: int = 0,
+    message: str = "success"
+) -> dict:
+    """
+    只构建响应内容的字典部分
+
+    Args:
+        data: 响应数据（支持字符串、字典、Pydantic模型等）
+        code: 业务响应码
+        message: 响应信息
+
+    Returns:
+        响应内容字典，格式为{"code": int, "message": str, "data": Any}
+    """
+    response = BaseResponseModel(
+        code=code,
+        message=message,
+        data=data
+    )
+
+    if isinstance(response.data, BaseModel):
+        return {
+            "code": response.code,
+            "message": response.message,
+            "data": response.data.model_dump()
+        }
+    else:
+        return response.model_dump()
+
+
+def create_response(
+    data: T | Any = None,
+    code: int = 0,
+    message: str = "success",
+    status_code: int = status.HTTP_200_OK
+) -> JSONResponse:
+    """创建完整的JSONResponse响应"""
+    content = build_response_content(data=data, code=code, message=message)
+    return JSONResponse(
+        content=content,
+        status_code=status_code
+    )
+
+
+def success_response(data: T | Any = None, message: str = "success") -> JSONResponse:
+    """快捷创建成功响应"""
+    return create_response(data=data, message=message)
+
+
+def error_response(
+    message: str = "error",
+    code: int = 1,
+    data: T | Any = None,
+    status_code: int = status.HTTP_500_INTERNAL_SERVER_ERROR
+) -> JSONResponse:
+    """快捷创建错误响应"""
+    return create_response(
+        data=data,
+        code=code,
+        message=message,
+        status_code=status_code
+    )
+
+
+def success_content(data: T | Any = None, message: str = "success") -> dict:
+    """只构建成功响应的内容字典"""
+    return build_response_content(data=data, message=message)
+
+
+def error_content(
+    message: str = "error",
+    code: int = 1,
+    data: T | Any = None
+) -> dict:
+    """只构建错误响应的内容字典"""
+    return build_response_content(data=data, code=code, message=message)

sycommon/services.py

@@ -2,7 +2,10 @@ from typing import Any, Callable, Dict, List, Tuple, Union, Optional, Awaitable
 import asyncio
 import logging
 from contextlib import asynccontextmanager
+from dotenv import load_dotenv
+from fastapi import FastAPI
 from pydantic import BaseModel
+import yaml
 from sycommon.config.Config import SingletonMeta
 from sycommon.models.mqlistener_config import RabbitMQListenerConfig
 from sycommon.models.mqsend_config import RabbitMQSendConfig
@@ -16,19 +19,21 @@ class Services(metaclass=SingletonMeta):
     _registered_senders: List[str] = []
     _mq_tasks: List[asyncio.Task] = []
     _pending_setup: Optional[Callable[..., Awaitable[None]]] = None
+    _instance: Optional['Services'] = None
 
     def __init__(self, config):
         if not Services._config:
             Services._config = config
-            RabbitMQService.init(config)
+        Services._instance = self
 
     @classmethod
     def get_lifespan(cls, config):
         """返回 FastAPI 的 lifespan 管理器"""
+        cls._config = config
+
         @asynccontextmanager
         async def lifespan(app):
             # 应用启动时初始化
-            cls._config = config
             cls._loop = asyncio.get_running_loop()
             cls._initialized = True
             logging.info("Services initialized with FastAPI event loop")
@@ -51,8 +56,38 @@ class Services(metaclass=SingletonMeta):
 
         return lifespan
 
-    def plugins(
+    @classmethod
+    def plugins(cls,
+                middleware: Optional[Tuple[Callable, FastAPI]] = None,
+                nacos_service: Optional[Callable] = None,
+                logging_service: Optional[Callable] = None,
+                database_service: Optional[Union[Tuple[Callable, str],
+                                                 List[Tuple[Callable, str]]]] = None,
+                rabbitmq_listeners: Optional[List[RabbitMQListenerConfig]] = None,
+                rabbitmq_senders: Optional[List[RabbitMQSendConfig]] = None
+                ) -> None:
+        """
+        类方法：注册各种服务插件
+        确保单例实例存在后调用实例方法的register_plugins
+        """
+        # 确保实例已创建
+        if not cls._instance:
+            if not cls._config:
+                raise ValueError("Services尚未初始化，请先提供配置")
+            cls._instance = Services(cls._config)
+
+        cls._instance.register_plugins(
+            middleware=middleware,
+            nacos_service=nacos_service,
+            logging_service=logging_service,
+            database_service=database_service,
+            rabbitmq_listeners=rabbitmq_listeners,
+            rabbitmq_senders=rabbitmq_senders
+        )
+
+    def register_plugins(
         self,
+        middleware: Optional[Tuple[Callable, FastAPI]] = None,
         nacos_service: Optional[Callable] = None,
         logging_service: Optional[Callable] = None,
         database_service: Optional[Union[Tuple[Callable,
@@ -60,8 +95,10 @@ class Services(metaclass=SingletonMeta):
         rabbitmq_listeners: Optional[List[RabbitMQListenerConfig]] = None,
         rabbitmq_senders: Optional[List[RabbitMQSendConfig]] = None
     ) -> None:
-        """注册各种服务插件"""
+        """实例方法：实际执行各种服务插件的注册逻辑"""
         # 注册非异步服务
+        if middleware:
+            self._setup_middleware(middleware)
         if nacos_service:
             nacos_service(self._config)
         if logging_service:
@@ -69,6 +106,8 @@ class Services(metaclass=SingletonMeta):
         if database_service:
             self._setup_database(database_service)
 
+        RabbitMQService.init(self._config)
+
         # MQ设置异步函数
         async def setup_mq_components():
             if rabbitmq_senders:
@@ -87,6 +126,11 @@ class Services(metaclass=SingletonMeta):
             for db_setup, db_name in database_service:
                 db_setup(self._config, db_name)
 
+    def _setup_middleware(self, middleware):
+        if isinstance(middleware, tuple):
+            middleware_setup, app = middleware
+            middleware_setup(app, self._config)
+
     def _setup_senders(self, rabbitmq_senders):
         Services._registered_senders = [
             sender.queue_name for sender in rabbitmq_senders]

{sycommon_python_lib-0.1.2.dist-info → sycommon_python_lib-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.2
+Version: 0.1.3
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.1.2.dist-info → sycommon_python_lib-0.1.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sycommon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/services.py,sha256=HI4VJaJCEwvd2vcRw2ek-0TLcCHS3QKp-mN-L-lXB4s,6774
+sycommon/services.py,sha256=Ow3BwiscQeX0k9fcr5t9ykpw6Oy-vcKkLR_UlFTb4WQ,8537
 sycommon/config/Config.py,sha256=rSqr-6QIf4ISbfkGffqKhrZrSV4K_9QEXEmTPjnJ28c,3023
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
 sycommon/config/EmbeddingConfig.py,sha256=gPKwiDYbeu1GpdIZXMmgqM7JqBIzCXi0yYuGRLZooMI,362
@@ -19,12 +19,13 @@ sycommon/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 sycommon/middleware/context.py,sha256=_5ghpv4u_yAvjkgM-XDx8OnO-YI1XtntHrXsHJHZkwo,88
 sycommon/middleware/cors.py,sha256=bGwDPI5Bfr0yH0hM-K7wK8mur5YqTy_XVZqlsdY_WdU,301
 sycommon/middleware/exception.py,sha256=Bk8IchNND1wg6tUX9hf4xWeEJhvA-E_zE9ysBpRZrqE,3010
-sycommon/middleware/middleware.py,sha256=b94HaLIdZkEUapQzcmQBV3J8-Gdi7ROQt8ETzx3NqN4,1107
+sycommon/middleware/middleware.py,sha256=z6osiDyKDxNKqErI29RVgijcjjl8e2wg-T9WN4xdbys,1220
 sycommon/middleware/monitor_memory.py,sha256=pYRK-wRuDd6enSg9Pf8tQxPdYQS6S0AyjyXeKFRLKEs,628
 sycommon/middleware/mq.py,sha256=4wBqiT5wJGcrfjk2GSr0_U3TStBxoNpHTzcRxVlMEHE,183
 sycommon/middleware/timeout.py,sha256=fImlAPLm4Oa8N9goXtT_0os1GZPCi9F92OgXU81DgDU,656
 sycommon/middleware/traceid.py,sha256=2QtyyOlSOB6QnGyZatevxUYyrzicbVD1ROA3KXn2SEo,5470
 sycommon/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sycommon/models/base_http.py,sha256=bbVvNnqi22DZavYKsYJN0Z1yJzfF9vzUzG_u2lFpNlc,2886
 sycommon/models/log.py,sha256=rZpj6VkDRxK3B6H7XSeWdYZshU8F0Sks8bq1p6pPlDw,500
 sycommon/models/mqlistener_config.py,sha256=PPwhAVJ2AWvVAvNox_1t0fuBKTyRH3Ui9cuuU-q7Byo,1590
 sycommon/models/mqmsg_model.py,sha256=cxn0M5b0utQK6crMYmL-1waeGYHvK3AlGaRy23clqTE,277
@@ -38,7 +39,7 @@ sycommon/synacos/nacos_service.py,sha256=8l2qaVg5GQSTybGrcdmg0B5jRNAzbOPM3mjQ6T0
 sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/snowflake.py,sha256=rc-VUjBMMpdAvbnHroVwfVt1xzApJbTCthUy9mglAuw,237
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.2.dist-info/METADATA,sha256=84t_rsGFPHu34thuOizkiZRAPwChc6ioSM2dwg8WnrY,7002
-sycommon_python_lib-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.2.dist-info/top_level.txt,sha256=qb-vRf3lrmIaCLrGZxsv6k8Q8l3_lGuAeFtwjh0wYCQ,9
-sycommon_python_lib-0.1.2.dist-info/RECORD,,
+sycommon_python_lib-0.1.3.dist-info/METADATA,sha256=gMk24-2tUlocvBYsQWJAbZeM_pg3opRbX7JnAtg25kc,7002
+sycommon_python_lib-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.3.dist-info/top_level.txt,sha256=qb-vRf3lrmIaCLrGZxsv6k8Q8l3_lGuAeFtwjh0wYCQ,9
+sycommon_python_lib-0.1.3.dist-info/RECORD,,