onestep 0.4.2__tar.gz → 0.4.4__tar.gz

{onestep-0.4.2 → onestep-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: onestep
-Version: 0.4.2
+Version: 0.4.4
 Summary: 仅需一步，轻松实现分布式异步任务。
 Author: miclon
 Author-email: jcnd@163.com
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: redis
 Requires-Dist: asgiref (>=3.6.0,<4.0.0)
 Requires-Dist: blinker (>=1.5,<2.0)

{onestep-0.4.2 → onestep-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "onestep"
-version = "0.4.2"
+version = "0.4.4"
 description = "仅需一步，轻松实现分布式异步任务。"
 authors = ["miclon <jcnd@163.com>"]
 readme = "README.md"

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/__init__.py

@@ -1,4 +1,5 @@
 from .onestep import step
+from .cron import Cron
 from .retry import (
     BaseRetry, BaseErrorCallback, NackErrorCallBack,
     NeverRetry, AlwaysRetry, TimesRetry, RetryIfException, AdvancedRetry
@@ -11,6 +12,7 @@ from .middleware import (
     BaseMiddleware, BaseConfigMiddleware,
     NacosPublishConfigMiddleware, NacosConsumeConfigMiddleware,
     RedisPublishConfigMiddleware, RedisConsumeConfigMiddleware,
+    UniqueMiddleware, MemoryUniqueMiddleware,
 )
 from .exception import (
     StopMiddleware, DropMessage,
@@ -18,7 +20,7 @@ from .exception import (
 )
 
 __all__ = [
-    'step',
+    'step', 'Cron',
 
     # broker
     'BaseBroker',
@@ -48,6 +50,8 @@ __all__ = [
     'NacosConsumeConfigMiddleware',
     'RedisPublishConfigMiddleware',
     'RedisConsumeConfigMiddleware',
+    'UniqueMiddleware',
+    'MemoryUniqueMiddleware',
 
     # exception
     'StopMiddleware',
@@ -59,4 +63,4 @@ __all__ = [
     '__version__'
 ]
 
-__version__ = '0.4.0'
+__version__ = '0.4.4'

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/broker/__init__.py

@@ -6,3 +6,13 @@ from .webhook import WebHookBroker
 from .rabbitmq import RabbitMQBroker
 from .redis import RedisStreamBroker, RedisPubSubBroker
 from .cron import CronBroker
+
+
+__all__ = [
+    "BaseBroker", "BaseConsumer",
+    "MemoryBroker", "MemoryConsumer",
+    "WebHookBroker",
+    "RabbitMQBroker",
+    "RedisStreamBroker", "RedisPubSubBroker",
+    "CronBroker"
+]

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/broker/base.py

@@ -119,9 +119,17 @@ class BaseConsumer:
 
     def __next__(self):
         try:
-            data = self.queue.get(timeout=self.timeout / 1000)
+            q = self.queue
+            if q is None:
+                return None
+            timeout_ms = self.timeout
+            if isinstance(timeout_ms, (int, float)) and timeout_ms > 0:
+                data = q.get(timeout=timeout_ms / 1000.0)
+            else:
+                # 当超时为0、负数或非数字时，使用非阻塞获取以避免ValueError
+                data = q.get_nowait()
             return self.message_cls.from_broker(broker_message=data)
-        except Empty:
+        except (Empty, ValueError):
             return None
 
     def __iter__(self):

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/broker/cron.py

@@ -1,5 +1,9 @@
 """
-使用CRON表达式触发任务执行
+使用 CRON 表达式触发任务执行
+
+支持人性化 DSL 与宏：
+- DSL：Cron.every(minutes=5)、Cron.daily(at="09:00")、Cron.weekly(on=["mon","fri"], at="10:30") 等
+- 宏：@hourly/@daily/@weekly/@monthly/@yearly 以及扩展 @workdays/@weekends/@every 5m/2h/3d/1mo
 """
 import logging
 import threading
@@ -7,6 +11,7 @@ from datetime import datetime
 from typing import Any
 
 from croniter import croniter
+from ..cron import resolve_cron
 
 from .memory import MemoryBroker, MemoryConsumer
 
@@ -14,14 +19,16 @@ logger = logging.getLogger(__name__)
 
 
 class CronBroker(MemoryBroker):
-    _thread = None
 
-    def __init__(self, cron, name=None, middlewares=None, body: Any = None, *args, **kwargs):
+    def __init__(self, cron, name=None, middlewares=None, body: Any = None, start_time=None, *args, **kwargs):
         super().__init__(name=name, middlewares=middlewares, *args, **kwargs)
-        self.cron = cron
-        self.itr = croniter(cron, datetime.now())
+        # 支持 DSL/宏/原始字符串：统一解析为标准表达式
+        self.cron = resolve_cron(cron)
+        self.start_time = start_time or datetime.now()
+        self.itr = croniter(self.cron, self.start_time)
         self.next_fire_time = self.itr.get_next(datetime)
         self.body = body
+        self._thread = None
 
     def _scheduler(self):
         if self.next_fire_time <= datetime.now():
@@ -36,7 +43,8 @@ class CronBroker(MemoryBroker):
         return CronConsumer(self, *args, **kwargs)
 
     def shutdown(self):
-        self._thread.cancel()
+        if self._thread:
+            self._thread.cancel()
 
 
 class CronConsumer(MemoryConsumer):

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/broker/memory.py

@@ -26,7 +26,10 @@ class MemoryMessage(Message):
         if "body" not in message:
             # 来自 外部的消息 可能没有 body, 故直接认为都是 message.body
             message = {"body": message}
-        return cls(body=message.get("body"), extra=message.get("extra"), message=broker_message)
+        extra_val = message.get("extra")
+        if not isinstance(extra_val, dict):
+            extra_val = None
+        return cls(body=message.get("body"), extra=extra_val, message=broker_message)
 
 
 class MemoryBroker(BaseBroker):

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/broker/rabbitmq.py

@@ -3,17 +3,21 @@ import threading
 from queue import Queue
 from typing import Optional, Dict, Any
 
-import amqpstorm
+try:
+    import amqpstorm
+    from use_rabbitmq import useRabbitMQ as RabbitMQStore
+except ImportError:
+    amqpstorm = None
+    RabbitMQStore = None
 
 from .base import BaseBroker, BaseConsumer
-from use_rabbitmq import useRabbitMQ as RabbitMQStore
 from ..message import Message
 
 
 class _RabbitMQMessage(Message):
 
     @classmethod
-    def from_broker(cls, broker_message: amqpstorm.Message):
+    def from_broker(cls, broker_message):
         try:
             message = json.loads(broker_message.body)
         except json.JSONDecodeError:
@@ -60,6 +64,9 @@ class RabbitMQBroker(BaseBroker):
             threads (list): List of threads.
         """
         
+        if RabbitMQStore is None:
+            raise ImportError("RabbitMQ dependencies not installed. Please install 'use-rabbitmq' package.")
+        
         super().__init__(*args, **kwargs)
         self.queue_name = queue_name
         self.queue = Queue()
@@ -71,7 +78,7 @@ class RabbitMQBroker(BaseBroker):
         self.threads = []
 
     def _consume(self, *args, **kwargs):
-        def callback(message: amqpstorm.Message):
+        def callback(message):
             self.queue.put(message)
 
         prefetch = kwargs.pop("prefetch", self.prefetch)
@@ -79,7 +86,7 @@ class RabbitMQBroker(BaseBroker):
 
     def consume(self, *args, **kwargs):
         daemon = kwargs.pop('daemon', True)
-        thread = threading.Thread(target=self._consume, *args, **kwargs)
+        thread = threading.Thread(target=self._consume, args=args, kwargs=kwargs)
         thread.daemon = daemon
         thread.start()
         self.threads.append(thread)
@@ -91,11 +98,21 @@ class RabbitMQBroker(BaseBroker):
 
     def confirm(self, message: Message):
         """确认消息"""
-        message.message.ack()
+        broker_msg = getattr(message, "message", None)
+        if broker_msg is not None and hasattr(broker_msg, "ack"):
+            broker_msg.ack()
+        else:
+            # 无可确认的原始消息，忽略确认
+            return
 
     def reject(self, message: Message):
         """拒绝消息"""
-        message.message.reject(requeue=False)
+        broker_msg = getattr(message, "message", None)
+        if broker_msg is not None and hasattr(broker_msg, "reject"):
+            broker_msg.reject(requeue=False)
+        else:
+            # 无法拒绝（无原始消息对象），忽略
+            return
 
     def requeue(self, message: Message, is_source=False):
         """
@@ -104,11 +121,20 @@ class RabbitMQBroker(BaseBroker):
         :param message: 消息
         :param is_source: 是否是原始消息，True: 使用原始消息重入当前队列，False: 使用消息的最新数据重入当前队列
         """
-        if is_source:
-            message.message.reject(requeue=True)
+        broker_msg = getattr(message, "message", None)
+        if broker_msg is not None and hasattr(broker_msg, "reject"):
+            if is_source:
+                broker_msg.reject(requeue=True)
+            else:
+                broker_msg.reject(requeue=False)
+                self.send(message)
         else:
-            message.message.reject(requeue=False)
-            self.send(message)
+            # 没有原始消息控制能力，回退为直接发送当前消息状态
+            if is_source and broker_msg is not None and hasattr(broker_msg, "body"):
+                # 尝试使用原始消息体重入队列
+                self.client.send(self.queue_name, broker_msg.body)
+            else:
+                self.send(message)
 
     def shutdown(self):
         self.client.shutdown()

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/broker/redis/stream.py

@@ -69,7 +69,7 @@ class RedisStreamBroker(BaseBroker):
 
     def consume(self, *args, **kwargs):
         daemon = kwargs.pop('daemon', True)
-        thread = threading.Thread(target=self._consume, *args, **kwargs)
+        thread = threading.Thread(target=self._consume, args=args, kwargs=kwargs)
         thread.daemon = daemon
         thread.start()
         self.threads.append(thread)
@@ -85,10 +85,14 @@ class RedisStreamBroker(BaseBroker):
     publish = send
 
     def confirm(self, message: Message):
-        self.client.ack(message.message)
+        broker_msg = getattr(message, "message", None)
+        if broker_msg is not None:
+            self.client.ack(broker_msg)
 
     def reject(self, message: Message):
-        self.client.reject(message.message)
+        broker_msg = getattr(message, "message", None)
+        if broker_msg is not None:
+            self.client.reject(broker_msg)
 
     def requeue(self, message: Message, is_source=False):
         """
@@ -99,8 +103,9 @@ class RedisStreamBroker(BaseBroker):
          """
         self.reject(message)
 
-        if is_source:
-            self.client.send(message.message.body)
+        broker_msg = getattr(message, "message", None)
+        if is_source and broker_msg is not None and hasattr(broker_msg, "body"):
+            self.client.send(broker_msg.body)
         else:
             self.send(message)
 

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/broker/webhook.py

@@ -57,13 +57,15 @@ class WebHookBroker(MemoryBroker):
                 WebHookServer
             )
             self._servers[(self.host, self.port)] = hs
+            # 只有在创建新服务器时才启动线程
+            thread = threading.Thread(target=hs.serve_forever)
+            thread.daemon = True
+            thread.start()
+            self.threads.append(thread)
         else:
             hs = self._servers[(self.host, self.port)]
 
         WebHookServer.servers[(self.host, self.port)].append(Server(self.path, self.queue))
-        thread = threading.Thread(target=hs.serve_forever)
-        thread.start()
-        self.threads.append(thread)
 
     def consume(self, *args, **kwargs):
         self._create_server()
@@ -71,7 +73,7 @@ class WebHookBroker(MemoryBroker):
         return WebHookConsumer(self, *args, **kwargs)
 
     def shutdown(self):
-        hs = self._servers[(self.host, self.port)]
+        hs = self._servers.get((self.host, self.port))
         if hs:
             hs.shutdown()
         for thread in self.threads:

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/cli.py

@@ -8,11 +8,17 @@ LOGFORMAT = "[%(asctime)s] [%(name)s] [%(levelname)s] %(message)s"
 
 
 def setup_logging():
-    logging.basicConfig(level=logging.DEBUG, format=LOGFORMAT, stream=sys.stdout)
+    # 设置全局日志级别为INFO，避免第三方库的DEBUG日志输出
+    logging.basicConfig(level=logging.INFO, format=LOGFORMAT, stream=sys.stdout)
 
     # exclude amqpstorm logs
     logging.getLogger("amqpstorm").setLevel(logging.CRITICAL)
-    return logging.getLogger("onestep")
+    
+    # 获取onestep的logger并设置为DEBUG级别以便调试
+    onestep_logger = logging.getLogger("onestep")
+    onestep_logger.setLevel(logging.DEBUG)
+    
+    return onestep_logger
 
 
 logger = setup_logging()

onestep-0.4.4/src/onestep/cron.py

@@ -0,0 +1,211 @@
+# -*- coding: utf-8 -*-
+"""
+Cron DSL/Builder 与宏解析
+
+提供人性化的 API 来生成 cron 表达式，并支持常用别名/宏：
+- Cron.every(minutes=5) / Cron.every(seconds=10) / Cron.every(hours=2) / Cron.every(days=3) / Cron.every(months=1)
+- Cron.daily(at="09:00")
+- Cron.weekly(on="mon" or ["mon","fri"], at="10:30")
+- Cron.monthly(on_day=1, at="00:00")
+- Cron.yearly(on="01-01", at="00:00")
+- 宏别名：@hourly/@daily/@weekly/@monthly/@yearly
+- 扩展宏：@workdays（1-5）/@weekends（0,6）/@every <n><unit>（unit: s/m/h/d/mo）
+
+注意：
+- 标准 5 字段：minute hour day month day_of_week
+- 当包含 seconds（如 `at` 使用 HH:MM:SS 或 `every(seconds=...)`）时输出 6 字段：second minute hour day month day_of_week
+- `@every <n>d` 等按“日/月字段取模”的语义生成表达式，并非滚动间隔。
+"""
+from __future__ import annotations
+
+from typing import List, Optional, Tuple, Union
+
+DOW_MAP = {
+    "sun": 0, "mon": 1, "tue": 2, "wed": 3, "thu": 4, "fri": 5, "sat": 6,
+}
+
+ALIAS_MAP = {
+    "@hourly": "0 * * * *",
+    "@daily": "0 0 * * *",
+    "@weekly": "0 0 * * 0",
+    "@monthly": "0 0 1 * *",
+    "@yearly": "0 0 1 1 *",
+}
+
+
+def _parse_at(at: Optional[str]) -> Tuple[Optional[int], int, int]:
+    """解析 at 参数，支持 HH:MM 或 HH:MM:SS。
+    返回 (second, minute, hour)。如果不传 at，默认 minute=0, hour=0。
+    """
+    if not at:
+        return None, 0, 0
+    parts = at.strip().split(":")
+    if len(parts) == 2:
+        h, m = parts
+        return None, int(m), int(h)
+    elif len(parts) == 3:
+        h, m, s = parts
+        return int(s), int(m), int(h)
+    raise ValueError(f"Invalid time format for at='{at}', expected HH:MM or HH:MM:SS")
+
+
+def _to_dow_expr(on: Union[str, int, List[Union[str, int]]]) -> str:
+    """将星期输入转换为 day_of_week 字段表达式。
+    支持：字符串缩写（mon...sun）、数字 0-6、列表。
+    """
+    def _to_num(v: Union[str, int]) -> int:
+        if isinstance(v, int):
+            if v < 0 or v > 6:
+                raise ValueError("day_of_week must be in 0-6")
+            return v
+        v = str(v).lower()
+        if v.isdigit():
+            num = int(v)
+            if num < 0 or num > 6:
+                raise ValueError("day_of_week must be in 0-6")
+            return num
+        if v not in DOW_MAP:
+            raise ValueError(f"Unknown day_of_week '{v}'")
+        return DOW_MAP[v]
+
+    if isinstance(on, (list, tuple, set)):
+        vals = sorted({_to_num(v) for v in on})
+        return ",".join(str(x) for x in vals)
+    else:
+        return str(_to_num(on))
+
+
+def _join_fields(second: Optional[int], minute: Union[int, str], hour: Union[int, str], day: Union[int, str], month: Union[int, str], dow: Union[int, str]) -> str:
+    """组合 5/6 字段。若 second 为 None，输出 5 字段，否则输出 6 字段（秒在最后）。"""
+    if second is None:
+        return f"{minute} {hour} {day} {month} {dow}"
+    return f"{minute} {hour} {day} {month} {dow} {second}"
+
+
+class Cron:
+    @staticmethod
+    def every(*, seconds: Optional[int] = None, minutes: Optional[int] = None, hours: Optional[int] = None, days: Optional[int] = None, months: Optional[int] = None) -> str:
+        """每隔指定单位执行。
+        只能指定一个非 None 的单位。
+        - seconds: 6 字段：*/s * * * * *
+        - minutes: 5 字段：*/m * * * *
+        - hours:   5 字段：0 */h * * *
+        - days:    5 字段：0 0 */d * *
+        - months:  5 字段：0 0 1 */mo *
+        """
+        units = [("seconds", seconds), ("minutes", minutes), ("hours", hours), ("days", days), ("months", months)]
+        chosen = [(k, v) for k, v in units if v is not None]
+        if len(chosen) != 1:
+            raise ValueError("Cron.every() must specify exactly one unit")
+        k, v = chosen[0]
+        if not isinstance(v, int) or v <= 0:
+            raise ValueError("Interval must be a positive integer")
+        if k == "seconds":
+            return f"* * * * * */{v}"
+        if k == "minutes":
+            return "*/%d * * * *" % v
+        if k == "hours":
+            return "0 */%d * * *" % v
+        if k == "days":
+            return "0 0 */%d * *" % v
+        if k == "months":
+            return "0 0 1 */%d *" % v
+        raise RuntimeError("unreachable")
+
+    @staticmethod
+    def daily(*, at: Optional[str] = None) -> str:
+        s, m, h = _parse_at(at)
+        day, month, dow = "*", "*", "*"
+        return _join_fields(s, m, h, day, month, dow)
+
+    @staticmethod
+    def weekly(*, on: Union[str, int, List[Union[str, int]]] = "mon", at: Optional[str] = None) -> str:
+        s, m, h = _parse_at(at)
+        dow = _to_dow_expr(on)
+        day, month = "*", "*"
+        return _join_fields(s, m, h, day, month, dow)
+
+    @staticmethod
+    def monthly(*, on_day: Union[int, List[int]] = 1, at: Optional[str] = None) -> str:
+        s, m, h = _parse_at(at)
+        month, dow = "*", "*"
+        def _to_day(v: Union[int, str]) -> int:
+            iv = int(v)
+            if iv < 1 or iv > 31:
+                raise ValueError("day_of_month must be in 1-31")
+            return iv
+        if isinstance(on_day, (list, tuple, set)):
+            day = ",".join(str(_to_day(v)) for v in sorted({int(x) for x in on_day}))
+        else:
+            day = str(_to_day(on_day))
+        return _join_fields(s, m, h, day, month, dow)
+
+    @staticmethod
+    def yearly(*, on: str = "01-01", at: Optional[str] = None) -> str:
+        s, m, h = _parse_at(at)
+        dow = "*"
+        try:
+            mon_str, day_str = on.split("-")
+            month = str(int(mon_str))
+            day = str(int(day_str))
+        except Exception:
+            raise ValueError("yearly(on=...) expects 'MM-DD', e.g., '01-01'")
+        return _join_fields(s, m, h, day, month, dow)
+
+    @staticmethod
+    def alias(name: str) -> str:
+        """返回内置宏别名对应的表达式（如果已知）。未知别名原样返回，以便 croniter 自行处理。"""
+        return ALIAS_MAP.get(name.strip().lower(), name)
+
+
+def resolve_cron(cron_like: str) -> str:
+    """将类似 cron 的输入（字符串/宏）解析为标准 cron 表达式。
+    - 内置关键字直接映射或保留（croniter 也支持）；
+    - 扩展宏：@workdays/@weekends/@every <n><unit>（unit: s/m/h/d/mo）。
+    """
+    s = str(cron_like).strip()
+    if not s.startswith("@"):
+        return s
+    lower = s.lower()
+    # 内置别名
+    if lower in ALIAS_MAP:
+        return ALIAS_MAP[lower]
+    # 扩展：工作日/周末（默认 00:00 执行）
+    if lower == "@workdays":
+        return "0 0 * * 1-5"
+    if lower == "@weekends":
+        return "0 0 * * 0,6"
+    # 扩展：@every <n><unit>
+    if lower.startswith("@every"):
+        tail = lower.replace("@every", "", 1).strip()
+        if not tail:
+            raise ValueError("@every requires an interval, e.g., '@every 5m'")
+        # 支持类似 "5m" / "10 h" / "2d" / "3mo" / "30s"
+        tail = tail.replace(" ", "")
+        # 处理 'mo' 与单位优先级
+        if tail.endswith("mo"):
+            num = int(tail[:-2])
+            if num <= 0:
+                raise ValueError("@every months must be > 0")
+            return "0 0 1 */%d *" % num
+        unit = tail[-1]
+        try:
+            num = int(tail[:-1])
+        except Exception:
+            raise ValueError("@every expects '<n><unit>', units: s/m/h/d/mo")
+        if num <= 0:
+            raise ValueError("@every interval must be > 0")
+        if unit == "s":
+            return "* * * * * */%d" % num
+        if unit == "m":
+            return "*/%d * * * *" % num
+        if unit == "h":
+            return "0 */%d * * *" % num
+        if unit == "d":
+            return "0 0 */%d * *" % num
+        if unit == "w":
+            # Cron 不支持“每 N 周”，仅建议直接使用 weekly(on=..., at=...)
+            raise ValueError("@every <n>w is not supported; use weekly(on=..., at=...) instead")
+        raise ValueError("Unknown unit for @every; use s/m/h/d/mo")
+    # 未知宏直接返回，交由 croniter 处理（可能抛错）
+    return s

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/message.py

@@ -5,20 +5,21 @@ import uuid
 from dataclasses import dataclass
 from traceback import TracebackException
 from typing import Optional, Any, Union
+from types import TracebackType
 
 from onestep._utils import catch_error
 
 
 class MessageTracebackException(TracebackException):
-    def __init__(self, exc_type, exc_value, exc_traceback, **kwargs):
+    def __init__(self, exc_type: type[BaseException], exc_value: BaseException, exc_traceback: Optional[TracebackType], **kwargs):
         super().__init__(exc_type, exc_value, exc_traceback, **kwargs)
         self.exc_value = exc_value
 
 
 @dataclass
 class Extra:
-    task_id: str = None
-    publish_time: float = None
+    task_id: Optional[str] = None
+    publish_time: Optional[float] = None
     failure_count: int = 0
 
     def __post_init__(self):
@@ -70,7 +71,11 @@ class Message:
 
     def set_exception(self):
         """设置异常信息，会自动获取"""
-        self._exception = MessageTracebackException(*sys.exc_info())
+        exc_type, exc_value, exc_tb = sys.exc_info()
+        if exc_type is None or exc_value is None:
+            exc_type = Exception
+            exc_value = Exception("No exception info")
+        self._exception = MessageTracebackException(exc_type, exc_value, exc_tb)
         self.failure_count = self.failure_count + 1
 
     @property
@@ -112,12 +117,16 @@ class Message:
     @catch_error()
     def confirm(self):
         """确认消息"""
-        self.broker.confirm(self)
+        broker = getattr(self, 'broker', None)
+        if broker and hasattr(broker, 'confirm'):
+            broker.confirm(self)
 
     @catch_error()
     def reject(self):
         """拒绝消息"""
-        self.broker.reject(self)
+        broker = getattr(self, 'broker', None)
+        if broker and hasattr(broker, 'reject'):
+            broker.reject(self)
 
     @catch_error()
     def requeue(self, is_source=False):
@@ -126,7 +135,9 @@ class Message:
         
         :param is_source: 是否是源消息，True: 使用消息的最新数据重入当前队列，False: 使用消息的最新数据重入当前队列
         """
-        self.broker.requeue(self, is_source=is_source)
+        broker = getattr(self, 'broker', None)
+        if broker and hasattr(broker, 'requeue'):
+            broker.requeue(self, is_source=is_source)
 
     def __getattr__(self, item):
         return None

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/middleware/unique.py

@@ -1,7 +1,7 @@
 import hashlib
 import json
 
-from . import BaseMiddleware
+from .base import BaseMiddleware
 from ..exception import DropMessage
 
 

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/onestep.py

@@ -28,7 +28,7 @@ class BaseOneStep:
 
     def __init__(self, fn,
                  group: str = "OneStep",
-                 name: str = None,
+                 name: Optional[str] = None,
                  from_broker: Union[BaseBroker, List[BaseBroker], None] = None,
                  to_broker: Union[BaseBroker, List[BaseBroker], None] = None,
                  workers: Optional[int] = None,
@@ -42,7 +42,7 @@ class BaseOneStep:
         self.workers = workers or DEFAULT_WORKERS
         self.worker_class = worker_class or DEFAULT_WORKER_CLASS
         if self.workers > MAX_WORKERS:
-            logger.warning(f"workers[{self.workers}] litter than {MAX_WORKERS}")
+            logger.warning(f"workers[{self.workers}] greater than {MAX_WORKERS}")
             self.workers = MAX_WORKERS
         self.middlewares = middlewares or []
 
@@ -220,7 +220,7 @@ class step:
     def __init__(self,
                  *,
                  group: str = "OneStep",
-                 name: str = None,
+                 name: Optional[str] = None,
                  from_broker: Union[BaseBroker, List[BaseBroker], None] = None,
                  to_broker: Union[BaseBroker, List[BaseBroker], None] = None,
                  workers: Optional[int] = None,

{onestep-0.4.2 → onestep-0.4.4}/src/onestep/worker.py

@@ -169,6 +169,8 @@ class ThreadWorker(BaseWorker):
 
 
 class ThreadPoolWorker(BaseWorker):
+    broker_exit: Dict[BaseBroker, bool] = {}
+    broker_exit_lock = threading.Lock()
 
     def __init__(self, onestep, broker: BaseBroker, workers=None, *args, **kwargs):
         super().__init__(onestep, broker, *args, **kwargs)
@@ -191,7 +193,8 @@ class ThreadPoolWorker(BaseWorker):
                     self.shutdown()
                     break
             for message in self.receive_messages():
-                self.handle_message(message)
+                # 将消息处理提交到线程池中并发执行
+                self.executor.submit(self.handle_message, message)
 
     def shutdown(self):
         """关闭线程池 Worker"""