sycommon-python-lib 0.1.50__py3-none-any.whl → 0.1.52__py3-none-any.whl

sycommon/rabbitmq/rabbitmq_client.py

@@ -53,7 +53,7 @@ class RabbitMQClient:
             self.exchange_type = ExchangeType(exchange_type.lower())
         except ValueError:
             logger.warning(f"无效的exchange_type: {exchange_type}，默认使用'topic'")
-            self.exchange_type = ExchangeType.TOPIC.name.lower()
+            self.exchange_type = ExchangeType.TOPIC
 
         # 队列配置
         self.queue_name = queue_name.strip() if queue_name else None
@@ -176,10 +176,6 @@ class RabbitMQClient:
                     self._channel_conn.close_callbacks.add(
                         self._conn_close_callback)
 
-                # 单通道池已设置prefetch_count，无需重复设置
-                logger.debug(f"使用连接池预配置的prefetch_count")
-
-                # 默认启用异步发布确认
                 # 重建交换机/队列资源
                 await self._rebuild_resources()
 
@@ -311,16 +307,31 @@ class RabbitMQClient:
             return self._consumer_tag
 
     async def stop_consuming(self) -> None:
-        """停止消息消费"""
+        """停止消息消费（适配 RobustChannel）"""
         async with self._consume_lock:
             try:
-                if self._consumer_tag and self._queue and not self._queue.is_closed:
+                # 校验核心条件：消费标签、队列、通道均有效
+                if self._consumer_tag and self._queue and self._channel and not self._channel.is_closed:
+                    # 使用队列的 cancel 方法（适配 RobustChannel）
                     await self._queue.cancel(self._consumer_tag)
-                    logger.info(f"停止消费成功，consumer_tag: {self._consumer_tag}")
+                    logger.info(
+                        f"停止消费成功，consumer_tag: {self._consumer_tag}，队列: {self._queue.name}"
+                    )
+                elif self._consumer_tag:
+                    # 部分资源无效时的日志提示
+                    if not self._queue:
+                        logger.warning(
+                            f"消费标签存在但队列为空，无法取消消费（consumer_tag: {self._consumer_tag}）")
+                    elif not self._channel or self._channel.is_closed:
+                        logger.warning(
+                            f"通道已关闭，消费已自动停止（consumer_tag: {self._consumer_tag}，队列: {self._queue.name if self._queue else '未知'}）"
+                        )
             except Exception as e:
-                logger.error(f"停止消费失败: {str(e)}", exc_info=True)
+                logger.error(
+                    f"停止消费者 '{self._queue.name if self._queue else '未知队列'}' 时出错: {str(e)}", exc_info=True
+                )
             finally:
-                self._consumer_tag = None
+                self._consumer_tag = None  # 无论成败，清理消费标签
 
     async def publish(
         self,

sycommon/services.py

@@ -70,7 +70,7 @@ class Services(metaclass=SingletonMeta):
         app.state.config = {
             "host": cls._config.get('Host', '0.0.0.0'),
             "port": cls._config.get('Port', 8080),
-            "workers": cls._config.get('Workers', 2),
+            "workers": cls._config.get('Workers', 1),
             "h11_max_incomplete_event_size": cls._config.get('H11MaxIncompleteEventSize', 1024 * 1024 * 10)
         }
 

{sycommon_python_lib-0.1.50.dist-info → sycommon_python_lib-0.1.52.dist-info}/METADATA

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

{sycommon_python_lib-0.1.50.dist-info → sycommon_python_lib-0.1.52.dist-info}/RECORD

@@ -1,6 +1,6 @@
 command/cli.py,sha256=bP2LCLkRvfETIwWkVD70q5xFxMI4D3BpH09Ws1f-ENc,5849
 sycommon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/services.py,sha256=6FfvwSbwfS0VydrZqK_tmC2HDS1qjIcvIocjc8fmCzU,11121
+sycommon/services.py,sha256=SFMXZpVh4nGTocpdhu77qBWyFhLc-m95IV8CC4mh2ec,11121
 sycommon/config/Config.py,sha256=9yO5b8WfvEDvkyrGrlwrLFasgh_-MjcEvGF20Gz5Xo4,3041
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
 sycommon/config/EmbeddingConfig.py,sha256=gPKwiDYbeu1GpdIZXMmgqM7JqBIzCXi0yYuGRLZooMI,362
@@ -35,7 +35,7 @@ sycommon/models/mqlistener_config.py,sha256=vXp2uMmd0XQ5B9noSRXWHewTy-juQ2y7IsWt
 sycommon/models/mqmsg_model.py,sha256=cxn0M5b0utQK6crMYmL-1waeGYHvK3AlGaRy23clqTE,277
 sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6D7I,268
 sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2702
-sycommon/rabbitmq/rabbitmq_client.py,sha256=0lelVl9ILwrDw-xw9O1zSZfGJi40XQ_2eqrmriRlPRU,19410
+sycommon/rabbitmq/rabbitmq_client.py,sha256=GkuYILMZJnvgZs4ID46I-w_UGzzI28YUydKgkTIDhIs,20226
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=QtUcK4HuepRqRmy5XkUQo8gDgj74fr77CX7T5rN0y4I,15640
 sycommon/rabbitmq/rabbitmq_service.py,sha256=wpEJynP0gzbnmMyB02sfR9nTWB4hfTTP00xQxDJu644,38119
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -52,8 +52,8 @@ sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/snowflake.py,sha256=DdEj3T5r5OEvikp3puxqmmmz6BrggxomoSlnsRFb5dM,1174
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.50.dist-info/METADATA,sha256=Au96zy-nuoNUTrQeV2vgY267eyDVeSm4WP8j0I858zw,7037
-sycommon_python_lib-0.1.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.50.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.50.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.50.dist-info/RECORD,,
+sycommon_python_lib-0.1.52.dist-info/METADATA,sha256=1ucpOddKw2gFQLUJPp2k_kJZ6M03xqVtvLbPSdnVcGQ,7037
+sycommon_python_lib-0.1.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.52.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.52.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.52.dist-info/RECORD,,