async-task-kit 0.1.13__tar.gz → 0.1.15__tar.gz

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: async-task-kit
-Version: 0.1.13
+Version: 0.1.15
 Summary: A powerful async task processing kit based on RabbitMQ with Coroutine, Thread, and Process support.
 Author-email: realwrtoff <realwrtoff@gmail.com>
 Classifier: Programming Language :: Python :: 3
@@ -223,6 +223,10 @@ await rmq.pop("my_queue", durable=False)
 
 `queue_length` 使用 passive 模式，无需传 `durable`。
 
+## Changelog
+
+各版本变更说明见 [CHANGELOG.md](CHANGELOG.md)。
+
 ## License
 
 MIT

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/README.md

@@ -207,6 +207,10 @@ await rmq.pop("my_queue", durable=False)
 
 `queue_length` 使用 passive 模式，无需传 `durable`。
 
+## Changelog
+
+各版本变更说明见 [CHANGELOG.md](CHANGELOG.md)。
+
 ## License
 
 MIT

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/async_task_kit/consumer/coroutine.py

@@ -18,6 +18,7 @@ class CoroutineConsumer(BaseConsumer):
         concurrency: int = 1,
         max_retry: int = 3,
         retry_delay: int = 30,
+        rmq: RabbitMQ | None = None,
     ):
         self.amqp_url = amqp_url
         self.queue_name = queue_name
@@ -26,7 +27,8 @@ class CoroutineConsumer(BaseConsumer):
         self.max_retry = max_retry
         self.retry_delay = retry_delay
 
-        self._rmq = RabbitMQ(amqp_url)
+        self._owns_rmq = rmq is None
+        self._rmq = rmq or RabbitMQ(amqp_url)
         self._stop_event = asyncio.Event()
 
     async def start(self):
@@ -93,5 +95,6 @@ class CoroutineConsumer(BaseConsumer):
 
     async def stop(self):
         self._stop_event.set()
-        await self._rmq.close()
-        logger.info(f"[CoroutineConsumer] stopped | queue={self.queue_name}")
+        if self._owns_rmq:
+            await self._rmq.close()
+        logger.info(f"[CoroutineConsumer] stopped | queue={self.queue_name}")

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/async_task_kit/consumer/process.py

@@ -104,4 +104,4 @@ class ProcessConsumer(BaseConsumer):
 
     async def stop(self):
         self._stop_event.set()
-        logger.info(f"[ProcessConsumer] stopped | queue={self.queue_name}")
+        logger.info(f"[ProcessConsumer] stopped | queue={self.queue_name}")

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/async_task_kit/consumer/thread.py

@@ -104,4 +104,4 @@ class ThreadConsumer(BaseConsumer):
 
     async def stop(self):
         self._stop_event.set()
-        logger.info(f"[ThreadConsumer] stopped | queue={self.queue_name}")
+        logger.info(f"[ThreadConsumer] stopped | queue={self.queue_name}")

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/async_task_kit/core/rabbitmq.py

@@ -12,6 +12,7 @@ from aio_pika.exceptions import (
     ChannelClosed,
     AMQPError
 )
+from aiormq.exceptions import ChannelInvalidStateError
 from aio_pika.pool import Pool
 
 logger = logging.getLogger(__name__)
@@ -63,6 +64,7 @@ class RabbitMQ(BasicQueue):
         channel_size: int = DEFAULT_CHANNEL_SIZE,
         heartbeat: int = 60,
         max_retry_count: int = DEFAULT_MAX_RETRY_COUNT,
+        
     ):
         self.rabbit_url = rabbit_url
         self.pool_size = pool_size
@@ -157,6 +159,10 @@ class RabbitMQ(BasicQueue):
             logger.warning("[PUSH] 连接断开，准备重连")
             await self._invalidate_pools()
             return None
+        except ChannelInvalidStateError:
+            logger.warning("[PUSH] 信道 RPC 异常，准备重建 pool")
+            await self._invalidate_pools()
+            return None
         except Exception as e:
             logger.error(f"[PUSH] 异常 queue={queue_name}: {e}", exc_info=True)
             return None
@@ -172,13 +178,15 @@ class RabbitMQ(BasicQueue):
         try:
             async with self._channel_pool.acquire() as channel:
                 queue = await channel.declare_queue(queue_name, durable=durable)
-                return await asyncio.wait_for(
-                    queue.get(), timeout=self.DEFAULT_POP_TIMEOUT
+                # 使用 aio_pika 自带 timeout，勿用 asyncio.wait_for 取消 get（会关闭 channel）
+                return await queue.get(
+                    timeout=self.DEFAULT_POP_TIMEOUT,
+                    fail=False,
                 )
         except (QueueEmpty, asyncio.TimeoutError):
             return None
-        except (ConnectionClosed, ChannelClosed):
-            logger.warning("[POP] 连接断开，准备重连")
+        except (ConnectionClosed, ChannelClosed, ChannelInvalidStateError):
+            logger.warning("[POP] 连接/信道异常，准备重建 pool")
             await self._invalidate_pools()
             return None
         except Exception as e:
@@ -201,6 +209,10 @@ class RabbitMQ(BasicQueue):
             logger.warning("[QUEUE_LENGTH] 连接断开，准备重连")
             await self._invalidate_pools()
             return self.QUEUE_LENGTH_UNAVAILABLE
+        except ChannelInvalidStateError:
+            logger.warning("[QUEUE_LENGTH] 信道 RPC 异常，准备重建 pool")
+            await self._invalidate_pools()
+            return self.QUEUE_LENGTH_UNAVAILABLE
         except Exception as e:
             logger.error(f"[QUEUE_LENGTH] 异常 queue={queue_name}: {e}", exc_info=True)
             return self.QUEUE_LENGTH_UNAVAILABLE

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/async_task_kit/utils/logger.py

@@ -2,34 +2,41 @@ import logging
 import os
 from logging.handlers import TimedRotatingFileHandler
 
+
 def setup_logger(
-    name: str = "app",
+    name: str | None = None,
     log_dir: str = "logs",
-    backup_count: int = 7 * 24  # 7天 * 24小时
-):
+    backup_count: int = 7 * 24,  # 7天 * 24小时
+    level: int = logging.INFO,
+) -> logging.Logger:
+    """Configure logging handlers.
+
+    By default configures the **root** logger so ``logging.getLogger(__name__)``
+    works everywhere. Pass ``name="app"`` to configure a named logger only.
+    """
     os.makedirs(log_dir, exist_ok=True)
     logger = logging.getLogger(name)
-    logger.setLevel(logging.INFO)
+    logger.setLevel(level)
     logger.handlers.clear()
+    logger.propagate = name is not None
+
+    formatter = logging.Formatter(
+        "%(asctime)s | %(levelname)-8s | %(name)s | %(message)s"
+    )
 
-    # 按小时切割，保留7天
     file_handler = TimedRotatingFileHandler(
         when="H",
         interval=1,
         backupCount=backup_count,
         encoding="utf-8",
-        filename=f"{log_dir}/app.log"
-    )
-
-    # 可观测格式：结构化纯文本（对接日志平台最舒服）
-    formatter = logging.Formatter(
-        "%(asctime)s | %(levelname)-8s | %(name)s | %(message)s"
+        filename=f"{log_dir}/app.log",
     )
     file_handler.setFormatter(formatter)
+    file_handler.setLevel(level)
 
-    # 控制台输出
     console = logging.StreamHandler()
     console.setFormatter(formatter)
+    console.setLevel(level)
 
     logger.addHandler(file_handler)
     logger.addHandler(console)

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/async_task_kit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: async-task-kit
-Version: 0.1.13
+Version: 0.1.15
 Summary: A powerful async task processing kit based on RabbitMQ with Coroutine, Thread, and Process support.
 Author-email: realwrtoff <realwrtoff@gmail.com>
 Classifier: Programming Language :: Python :: 3
@@ -223,6 +223,10 @@ await rmq.pop("my_queue", durable=False)
 
 `queue_length` 使用 passive 模式，无需传 `durable`。
 
+## Changelog
+
+各版本变更说明见 [CHANGELOG.md](CHANGELOG.md)。
+
 ## License
 
 MIT

{async_task_kit-0.1.13 → async_task_kit-0.1.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "async-task-kit"
-version = "0.1.13"
+version = "0.1.15"
 description = "A powerful async task processing kit based on RabbitMQ with Coroutine, Thread, and Process support."
 readme = "README.md"
 requires-python = ">=3.12"