sycommon-python-lib 0.1.15__tar.gz → 0.1.16__tar.gz

{sycommon_python_lib-0.1.15 → sycommon_python_lib-0.1.16}/PKG-INFO

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

{sycommon_python_lib-0.1.15 → sycommon_python_lib-0.1.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.15"
+version = "0.1.16"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"

{sycommon_python_lib-0.1.15 → sycommon_python_lib-0.1.16}/src/sycommon/logging/kafka_log.py

@@ -72,7 +72,7 @@ class KafkaLogger(metaclass=SingletonMeta):
             connections_max_idle_ms=540000,  # 连接最大空闲时间
             reconnect_backoff_max_ms=10000,  # 增加重连退避最大时间
             max_in_flight_requests_per_connection=1,  # 限制单个连接上未确认的请求数量
-            enable_idempotence=True,  # 开启幂等性
+            # enable_idempotence=True,  # 开启幂等性
         )
 
         # 启动后台发送线程

{sycommon_python_lib-0.1.15 → sycommon_python_lib-0.1.16}/src/sycommon/rabbitmq/rabbitmq_service.py

@@ -100,7 +100,7 @@ class RabbitMQService:
             f"允许创建: {create_if_not_exists}"
         )
 
-        # 关键修改：将逗号分隔的host字符串拆分为集群节点列表
+        # 将逗号分隔的host字符串拆分为集群节点列表
         hosts_str = mq_config.get('host', "")
         hosts_list = [host.strip()
                       for host in hosts_str.split(',') if host.strip()]

{sycommon_python_lib-0.1.15 → sycommon_python_lib-0.1.16}/src/sycommon/services.py

@@ -19,6 +19,7 @@ class Services(metaclass=SingletonMeta):
     _mq_tasks: List[asyncio.Task] = []
     _instance: Optional['Services'] = None
     _app: Optional[FastAPI] = None
+    _user_lifespan: Optional[Callable] = None
 
     def __init__(self, config: dict, app: FastAPI):
         if not Services._config:
@@ -54,6 +55,7 @@ class Services(metaclass=SingletonMeta):
         # 保存应用实例和配置
         cls._app = app
         cls._config = config
+        cls._user_lifespan = app.router.lifespan_context
         # 设置文档
         applications.get_swagger_ui_html = custom_swagger_ui_html
         applications.get_redoc_html = custom_redoc_html
@@ -71,20 +73,15 @@ class Services(metaclass=SingletonMeta):
         if database_service:
             cls._setup_database_static(database_service, config)
 
-        # 创建生命周期管理器
+        # 创建组合生命周期管理器
         @asynccontextmanager
-        async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
-            # 启动阶段 - 执行初始化
+        async def combined_lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
+            # 1. 执行Services自身的初始化
             instance = cls(config, app)
-
-            # 检查是否存在监听器
             has_listeners = bool(
                 rabbitmq_listeners and len(rabbitmq_listeners) > 0)
-            # 检查是否存在发送器
-            has_senders = bool(
-                rabbitmq_senders and len(rabbitmq_senders) > 0)
+            has_senders = bool(rabbitmq_senders and len(rabbitmq_senders) > 0)
 
-            # 执行MQ异步初始化，传递是否有监听器的标志
             try:
                 await instance._setup_mq_async(
                     rabbitmq_listeners=rabbitmq_listeners,
@@ -93,22 +90,26 @@ class Services(metaclass=SingletonMeta):
                     has_senders=has_senders
                 )
                 cls._initialized = True
-                logging.info("所有服务初始化完成")
+                logging.info("Services初始化完成")
             except Exception as e:
-                logging.error(f"服务初始化失败: {str(e)}", exc_info=True)
+                logging.error(f"Services初始化失败: {str(e)}", exc_info=True)
                 raise
 
-            # 将实例挂载到app上
             app.state.services = instance
 
-            yield  # 应用运行阶段
+            # 2. 执行用户定义的生命周期
+            if cls._user_lifespan:
+                async with cls._user_lifespan(app):
+                    yield  # 应用运行阶段
+            else:
+                yield  # 没有用户生命周期时直接 yield
 
-            # 关闭阶段 - 清理资源
+            # 3. 执行Services的关闭逻辑
             await cls.shutdown()
-            logging.info("所有服务已关闭")
+            logging.info("Services已关闭")
 
-        # 设置生命周期
-        app.router.lifespan_context = lifespan
+        # 设置组合生命周期
+        app.router.lifespan_context = combined_lifespan
 
         return app
 

{sycommon_python_lib-0.1.15 → sycommon_python_lib-0.1.16}/src/sycommon_python_lib.egg-info/PKG-INFO

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