sycommon-python-lib 0.2.5a24__tar.gz → 0.2.5a25__tar.gz

{sycommon_python_lib-0.2.5a24 → sycommon_python_lib-0.2.5a25}/PKG-INFO

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

{sycommon_python_lib-0.2.5a24 → sycommon_python_lib-0.2.5a25}/pyproject.toml

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

{sycommon_python_lib-0.2.5a24 → sycommon_python_lib-0.2.5a25}/src/sycommon/models/mqlistener_config.py

@@ -32,6 +32,8 @@ class RabbitMQListenerConfig(BaseModel):
     auto_delete: bool = Field(False, description="是否自动删除队列")
     auto_parse_json: bool = Field(True, description="是否自动解析JSON消息")
     prefetch_count: int = Field(2, description="同时消费并发数（控制MQ预取与handler并发上限）")
+    max_priority: Optional[int] = Field(
+        None, description="队列支持的最大优先级（对应 x-max-priority）")
 
     class Config:
         """模型配置"""

{sycommon_python_lib-0.2.5a24 → sycommon_python_lib-0.2.5a25}/src/sycommon/rabbitmq/rabbitmq_client.py

@@ -42,6 +42,7 @@ class RabbitMQClient:
         auto_delete: bool = False,
         auto_parse_json: bool = True,
         create_if_not_exists: bool = True,
+        max_priority: Optional[int] = None,
         **kwargs,
     ):
         self.connection_pool = connection_pool
@@ -60,6 +61,7 @@ class RabbitMQClient:
         self.auto_delete = auto_delete
         self.auto_parse_json = auto_parse_json
         self.create_if_not_exists = create_if_not_exists
+        self.max_priority = max_priority
 
         # 资源状态
         self._channel: Optional[AbstractChannel] = None
@@ -91,6 +93,97 @@ class RabbitMQClient:
         except Exception:
             return False
 
+    async def _try_migrate_queue(self, original_error: Exception) -> bool:
+        """尝试迁移队列以支持 x-max-priority。
+
+        当队列已存在但参数不匹配（PRECONDITION_FAILED）时，检查队列是否为空，
+        为空则删除重建，否则跳过迁移。
+
+        Returns:
+            True 迁移成功，False 未迁移（需由调用方处理）
+        """
+        from aiormq.exceptions import ChannelPreconditionFailed
+
+        if not isinstance(original_error, ChannelPreconditionFailed):
+            return False
+
+        if self.max_priority is None:
+            return False
+
+        try:
+            # PRECONDITION_FAILED 会关闭当前 channel，需要用新 channel 检查队列状态
+            channel, _ = await self.connection_pool.acquire_channel()
+            try:
+                queue = await channel.declare_queue(
+                    name=self.queue_name, passive=True
+                )
+                if queue.declaration_result:
+                    message_count = queue.declaration_result.message_count
+                    consumer_count = queue.declaration_result.consumer_count
+                else:
+                    message_count = 0
+                    consumer_count = 0
+            finally:
+                await channel.close()
+
+            if message_count > 0:
+                logger.warning(
+                    f"队列 '{self.queue_name}' 迁移跳过: "
+                    f"存在 {message_count} 条消息"
+                )
+                return False
+
+            logger.info(
+                f"开始迁移队列 '{self.queue_name}'，添加 x-max-priority={self.max_priority}")
+
+            # 删除旧队列
+            channel, _ = await self.connection_pool.acquire_channel()
+            try:
+                await channel.queue_delete(
+                    queue_name=self.queue_name,
+                    if_unused=False,
+                    if_empty=False,
+                )
+            finally:
+                await channel.close()
+
+            # 清理旧 channel（被 PRECONDITION_FAILED 关闭后残留）
+            if self._channel and not self._channel.is_closed:
+                try:
+                    await self._channel.close()
+                except Exception:
+                    pass
+            self._channel = None
+            self._exchange = None
+            self._queue = None
+
+            # 重建 self._channel（旧 channel 已被 PRECONDITION_FAILED 关闭）
+            self._channel, self._channel_conn = await self.connection_pool.acquire_channel()
+
+            # 重新声明交换机
+            self._exchange = await self._channel.declare_exchange(
+                name=self.exchange_name,
+                type=self.exchange_type,
+                durable=self.durable,
+                auto_delete=self.auto_delete,
+            )
+
+            # 重新声明带 priority 的队列
+            self._queue = await self._channel.declare_queue(
+                name=self.queue_name,
+                durable=self.durable,
+                auto_delete=self.auto_delete,
+                arguments={"x-max-priority": self.max_priority},
+            )
+            await self._queue.bind(exchange=self._exchange, routing_key=self.routing_key)
+            logger.info(
+                f"队列 '{self.queue_name}' 迁移成功，已添加 x-max-priority={self.max_priority}")
+            return True
+
+        except Exception as migrate_error:
+            logger.error(f"队列 '{self.queue_name}' 迁移失败: {migrate_error}")
+            return False
+
     async def _rebuild_resources(self) -> None:
         if not self._channel or self._channel.is_closed:
             raise RuntimeError("无有效通道，无法重建资源")
@@ -112,26 +205,32 @@ class RabbitMQClient:
         # 2. 声明队列 (仅消费者需要)
         # 【核心保留逻辑】只有当 queue_name 存在且符合消费者命名规范时，才初始化队列
         if self.queue_name and self.queue_name.endswith(f".{self.app_name}"):
+            queue_args = {}
+            if self.max_priority is not None:
+                queue_args["x-max-priority"] = self.max_priority
+
             try:
                 self._queue = await self._channel.declare_queue(
                     name=self.queue_name,
                     durable=self.durable,
                     auto_delete=self.auto_delete,
                     passive=not self.create_if_not_exists,
+                    arguments=queue_args or None,
                 )
                 await self._queue.bind(exchange=self._exchange, routing_key=self.routing_key)
                 logger.debug(f"队列就绪: {self.queue_name}")
             except Exception as e:
-                # === 关键处理逻辑 ===
-                if self.create_if_not_exists:
-                    # 模式：自动创建。如果失败说明权限不足或服务器限制，属于严重错误
-                    logger.error(f"❌ 无法自动创建队列 '{self.queue_name}': {e}")
-                    raise
-                else:
-                    # 模式：仅检查。队列不存在是预期内的（如生产者启动时队列未创建），跳过
+                if not self.create_if_not_exists:
                     self._queue = None
                     logger.warning(
                         f"⚠️ 队列 '{self.queue_name}' 不存在或无权访问 (Passive模式)，跳过绑定。")
+                    return
+
+                # 尝试自动迁移：参数不匹配时删除重建
+                migrated = await self._try_migrate_queue(e)
+                if not migrated:
+                    # 迁移失败（非参数不匹配 / 队列非空 / 有消费者），抛出原始异常
+                    raise
         else:
             # 不符合命名规范或无队列名，清空队列引用
             self._queue = None
@@ -145,7 +244,8 @@ class RabbitMQClient:
                     t.cancel()
             try:
                 await asyncio.wait_for(
-                    asyncio.gather(*self._running_tasks, return_exceptions=True),
+                    asyncio.gather(*self._running_tasks,
+                                   return_exceptions=True),
                     timeout=5.0
                 )
             except asyncio.TimeoutError:
@@ -350,16 +450,21 @@ class RabbitMQClient:
         if not self._queue and self.queue_name and self.queue_name.endswith(f".{self.app_name}"):
             logger.warning(f"队列对象在消费前为空，尝试强制初始化: {self.queue_name}")
             try:
+                queue_args = {}
+                if self.max_priority is not None:
+                    queue_args["x-max-priority"] = self.max_priority
                 self._queue = await self._channel.declare_queue(
                     name=self.queue_name,
                     durable=self.durable,
                     auto_delete=self.auto_delete,
-                    passive=False,  # 强制确保队列存在
+                    passive=False,
+                    arguments=queue_args or None,
                 )
                 await self._queue.bind(exchange=self._exchange, routing_key=self.routing_key)
             except Exception as e:
-                logger.error(f"强制初始化队列失败: {e}")
-                raise RuntimeError(f"无法初始化队列 {self.queue_name}")
+                migrated = await self._try_migrate_queue(e)
+                if not migrated:
+                    raise RuntimeError(f"无法初始化队列 {self.queue_name}")
 
         if not self._queue:
             raise RuntimeError("未配置队列名或队列初始化失败")
@@ -396,6 +501,7 @@ class RabbitMQClient:
         content_type: str = "application/json",
         delivery_mode: DeliveryMode = DeliveryMode.PERSISTENT,
         retry_count: int = 3,
+        priority: Optional[int] = None,
     ) -> None:
         if self._closed:
             raise RuntimeError("客户端已关闭，无法发布消息")
@@ -415,8 +521,11 @@ class RabbitMQClient:
             logger.error(f"消息体序列化失败: {e}")
             raise
 
-        message = Message(body=body, headers=headers or {},
+        msg_kwargs = dict(body=body, headers=headers or {},
                           content_type=content_type, delivery_mode=delivery_mode)
+        if priority is not None:
+            msg_kwargs["priority"] = priority
+        message = Message(**msg_kwargs)
         last_exception = None
 
         for attempt in range(retry_count):
@@ -471,11 +580,13 @@ class RabbitMQClient:
             logger.info(f"等待 {len(self._running_tasks)} 个后台任务完成...")
             try:
                 await asyncio.wait_for(
-                    asyncio.gather(*self._running_tasks, return_exceptions=True),
+                    asyncio.gather(*self._running_tasks,
+                                   return_exceptions=True),
                     timeout=15.0
                 )
             except asyncio.TimeoutError:
-                logger.warning(f"等待后台任务超时，剩余 {len(self._running_tasks)} 个任务将被丢弃")
+                logger.warning(
+                    f"等待后台任务超时，剩余 {len(self._running_tasks)} 个任务将被丢弃")
             self._running_tasks.clear()
 
         if self._channel and not self._channel.is_closed:

{sycommon_python_lib-0.2.5a24 → sycommon_python_lib-0.2.5a25}/src/sycommon/rabbitmq/rabbitmq_service_client_manager.py

@@ -183,6 +183,7 @@ class RabbitMQClientManager(RabbitMQCoreService):
             auto_parse_json=kwargs.get('auto_parse_json', True),
             create_if_not_exists=create_if_not_exists,
             prefetch_count=kwargs.get('prefetch_count', 2),
+            max_priority=kwargs.get('max_priority'),
         )
 
         # 4. 连接客户端
@@ -238,6 +239,9 @@ class RabbitMQClientManager(RabbitMQCoreService):
                             client.queue_name = input_qn
 
                 if await client.is_connected:
+                    # 更新 max_priority（发送器先创建客户端时没有此参数）
+                    if client_type == "listener" and 'max_priority' in kwargs:
+                        client.max_priority = kwargs['max_priority']
                     return client
                 else:
                     logger.info(f"客户端 '{client_name}' 连接已断开，重新创建")

{sycommon_python_lib-0.2.5a24 → sycommon_python_lib-0.2.5a25}/src/sycommon/rabbitmq/rabbitmq_service_producer_manager.py

@@ -218,7 +218,8 @@ class RabbitMQProducerManager(RabbitMQClientManager):
             await sender.publish(
                 message_body=mq_message.model_dump_json(),
                 headers=mq_header,
-                content_type="application/json"
+                content_type="application/json",
+                priority=kwargs.get('priority')
             )
             logger.info(f"消息发送成功 (队列: {queue_name})")
         except Exception as e:

{sycommon_python_lib-0.2.5a24 → sycommon_python_lib-0.2.5a25}/src/sycommon_python_lib.egg-info/PKG-INFO

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