sycommon-python-lib 0.2.0b4__tar.gz → 0.2.0b6__tar.gz

{sycommon_python_lib-0.2.0b4 → sycommon_python_lib-0.2.0b6}/PKG-INFO

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

{sycommon_python_lib-0.2.0b4 → sycommon_python_lib-0.2.0b6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.0b4"
+version = "0.2.0b6"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.0b4 → sycommon_python_lib-0.2.0b6}/src/sycommon/rabbitmq/rabbitmq_client.py

@@ -354,37 +354,82 @@ class RabbitMQClient:
     async def _process_message_callback(self, message: AbstractIncomingMessage):
         """
         消息处理回调
+
+        【架构原理】
+        1. 优先尝试：
+           - 在子线程中构建完全独立的 asyncio 运行环境。
+           - XX.Semaphore 绑定到子线程 Loop，彻底隔离 CPU 压力。
+
+        2. 自动降级【混合模式】：
+           - 如果捕获到 Loop 冲突错误，说明 XX 是顽固的主线程单例。
+           - 此时直接在主线程 await 执行，利用异步 I/O 特性保持心跳响应。
         """
+        msg_obj = None  # 预声明防止 UnboundLocalError
+        trace_id = "unknown"
+
         try:
-            # === 阶段 1: 消息解析与上下文设置 (在主线程执行) ===
-            body_dict = json.loads(message.body.decode("utf-8"))
-            msg_obj: MQMsgModel = MQMsgModel(**body_dict)
+            # === 阶段 1: 消息解析与 TraceId 准备 (主线程) ===
+            try:
+                body_dict = json.loads(message.body.decode("utf-8"))
+                msg_obj: MQMsgModel = MQMsgModel(**body_dict)
+            except Exception as e:
+                logger.error(f"❌ 消息解析失败: {str(e)}")
+                await message.ack()  # 解析失败直接丢弃
+                return
 
             if not msg_obj.traceId:
                 msg_obj.traceId = message.headers.get(
                     "trace-id") if message.headers else SYLogger.get_trace_id()
 
-            SYLogger.set_trace_id(msg_obj.traceId)
+            trace_id = msg_obj.traceId
+            SYLogger.set_trace_id(trace_id)
 
-            # === 阶段 2: 业务逻辑执行 ===
+            # === 阶段 2: 智能执行 ===
             if self._message_handler:
-                def run_job_with_context():
-                    # 【关键修复】在子线程内重新设置 TraceId
-                    SYLogger.set_trace_id(msg_obj.traceId)
 
-                    return asyncio.run(
-                        functools.partial(
-                            self._message_handler, msg_obj, message)()
-                    )
+                # --- 模式 A: 终极隔离方案 (默认首选) ---
+                def run_in_isolated_thread(current_trace_id):
+                    # 【关键修复】通过参数传递 TraceId，防止闭包捕获导致并发 ID 错乱
+                    SYLogger.set_trace_id(current_trace_id)
 
-                await asyncio.to_thread(run_job_with_context)
+                    try:
+                        return asyncio.run(self._message_handler(msg_obj, message))
+                    except Exception as e:
+                        # 捕获异常并抛出，避免在子线程中崩溃导致主线程无法感知
+                        raise e
+
+                try:
+                    # 1. 扔进线程池执行 (主线程等待子线程完成)
+                    await asyncio.to_thread(run_in_isolated_thread, trace_id)
+
+                except RuntimeError as e:
+                    # --- 捕获特定错误，进入降级模式 ---
+                    if "bound to a different event loop" in str(e):
+                        logger.warning(
+                            f"⚠️ 检测到跨 Loop 冲突 (TraceId: {trace_id})，"
+                            f"自动切换至【混合模式】。业务逻辑将在主线程运行。"
+                        )
+
+                        # --- 模式 B: 混合模式 (降级方案) ---
+                        # 既然 Semaphore 绑定了主 Loop，且必须保证流控 (Ack 在最后)，
+                        # 那么直接在主线程 await 执行是唯一正确的解法。
+                        # 只要业务逻辑是异步 I/O，主线程会在 await 期间处理心跳。
+                        await self._message_handler(msg_obj, message)
+
+                    else:
+                        # 其他 RuntimeError 直接抛出
+                        raise
 
             # === 阶段 3: 消息确认 ===
+            # 只有代码执行到这里，说明业务已成功处理 (或已处理完异常)
+            # 此时 Ack 才能正确触发 MQ 的流控机制
             await message.ack()
 
         except Exception as e:
-            logger.error(f"❌ 消息处理异常: {str(e)}", exc_info=True)
+            logger.error(
+                f"❌ 消息处理异常 (TraceId: {trace_id}): {str(e)}", exc_info=True)
             try:
+                # 即使异常也 Ack，避免死信循环（根据业务需求也可改为 Nack/Requeue）
                 await message.ack()
             except Exception:
                 pass

{sycommon_python_lib-0.2.0b4 → sycommon_python_lib-0.2.0b6}/src/sycommon/rabbitmq/rabbitmq_service_core.py

@@ -41,7 +41,7 @@ class RabbitMQCoreService:
             f"端口: {cls._config.get('port')}, "
             f"虚拟主机: {cls._config.get('virtual-host')}, "
             f"应用名: {cls._config.get('APP_NAME')}, "
-            f"心跳: {cls._config.get('heartbeat', 30)}s"
+            f"心跳: {cls._config.get('heartbeat', 60)}s"
         )
         cls._is_shutdown = False
 
@@ -70,8 +70,8 @@ class RabbitMQCoreService:
                 virtualhost=cls._config.get('virtual-host', "/"),
                 app_name=cls._config.get("APP_NAME", ""),
                 prefetch_count=global_prefetch_count,
-                heartbeat=cls._config.get('heartbeat', 15),
-                connection_timeout=cls._config.get('connection_timeout', 15),
+                heartbeat=cls._config.get('heartbeat', 60),
+                connection_timeout=cls._config.get('connection_timeout', 30),
                 reconnect_interval=cls._config.get('reconnect_interval', 5),
             )
 

{sycommon_python_lib-0.2.0b4 → sycommon_python_lib-0.2.0b6}/src/sycommon_python_lib.egg-info/PKG-INFO

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