onestep 0.3.8__py3-none-any.whl → 0.3.9__py3-none-any.whl

onestep/__init__.py

@@ -23,8 +23,6 @@ __all__ = [
     # broker
     'BaseBroker',
     'BaseConsumer',
-    'BaseLocalBroker',
-    'BaseLocalConsumer',
     'MemoryBroker',
     'RabbitMQBroker',
     'WebHookBroker',
@@ -61,4 +59,4 @@ __all__ = [
     '__version__'
 ]
 
-__version__ = '0.3.8'
+__version__ = '0.3.9'

onestep/exception.py

@@ -25,3 +25,11 @@ class RetryInLocal(RetryException):
 
 class DropMessage(Exception):
     """从 Brokers 中 丢弃该消息"""
+
+
+class RejectMessage(DropMessage):
+    """从 Brokers 中 丢弃该消息"""
+
+
+class RequeueMessage(Exception):
+    """重新入队该消息"""

onestep/onestep.py

@@ -241,6 +241,7 @@ class step:
         }
 
     def __call__(self, func, *_args, **_kwargs):
+        func.__step_params__ = self.params
         if iscoroutinefunction(func) or isasyncgenfunction(func):
             os = AsyncOneStep(fn=func, **self.params)
         else:

onestep/signal.py

@@ -8,3 +8,4 @@ message_sent = signal("message_sent")
 message_consumed = signal("message_consumed")
 message_error = signal("message_error")
 message_drop = signal("message_drop")
+message_requeue = signal("message_requeue")

onestep/worker.py

@@ -14,8 +14,8 @@ from asgiref.sync import async_to_sync
 from .message import Message
 from .retry import RetryStatus
 from .broker import BaseBroker
-from .exception import DropMessage
-from .signal import message_received, message_consumed, message_error, message_drop
+from . import exception
+from .signal import message_received, message_consumed, message_error, message_drop, message_requeue
 
 logger = logging.getLogger(__name__)
 
@@ -82,10 +82,14 @@ class BaseWorker:
             message.confirm()
 
             self.instance.after_emit("consume", message=message)
-        except DropMessage as e:
+        except (exception.DropMessage, exception.RejectMessage) as e:
             message_drop.send(self, message=message, reason=e)
             logger.warning(f"{self.instance.name} dropped <{type(e).__name__}: {str(e)}>")
             message.reject()
+        except exception.RequeueMessage as e:
+            message_requeue.send(self, message=message, reason=e)
+            logger.warning(f"{self.instance.name} requeue <{type(e).__name__}: {str(e)}>")
+            message.requeue(is_source=True)
         except Exception as e:
             message_error.send(self, message=message, error=e)
             if self.instance.state.debug:

{onestep-0.3.8.dist-info → onestep-0.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: onestep
-Version: 0.3.8
+Version: 0.3.9
 Summary: 
 Author: miclon
 Author-email: jcnd@163.com

{onestep-0.3.8.dist-info → onestep-0.3.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onestep/__init__.py,sha256=M3-7fjCTuxBsnbAw-HWpEiegii-vhlUmAVuoAkgT8SA,1465
+onestep/__init__.py,sha256=i2ggViIkU4GyPITpeRDv88PSMfqxXdWnyGpCwtc3I6c,1417
 onestep/_utils.py,sha256=ySYmy-o2o3BurvLfuLWKGXR8TLwug6aTDNMvA3_QjKM,414
 onestep/broker/__init__.py,sha256=L-roNwPZVKsjytOlKCOlyAyvfejI28FyOj9uzfyXcrk,257
 onestep/broker/base.py,sha256=Ryo-0YekdZfpfSSqdmh7jsmNONc_GmlYFYadt_n5bds,4141
@@ -10,18 +10,18 @@ onestep/broker/redis/pubsub.py,sha256=_p2bKqXu0gYjKz2DsS8UdpkN5dCy94xf_xYx5NFuKp
 onestep/broker/redis/stream.py,sha256=uQJncD93Fz8pdP_NdgyQ1UAXwIouh7AFA9_naXaeiJM,3470
 onestep/broker/webhook.py,sha256=Zg22QxKPqJzdxjBsglUcL7P1RcM8FltcHpHXJiJPYgM,2392
 onestep/cli.py,sha256=KfJFpccpfNrhULJmDymrW5bFBGXapdL57ESZdgaFbG8,1399
-onestep/exception.py,sha256=5nd2iD2tWpewxLs4UKhxBCdN5cSiCwC1pO-Lpwm-0Dw,608
+onestep/exception.py,sha256=T-tqfRrJZT9Y85qe-1l-1PcHZzV2jxv-61HAhOc4AKE,753
 onestep/message.py,sha256=W37HKnIDxpd5UmtDbPTw2DTb3lfxu9Vs2KYIiCr5b2s,4057
 onestep/middleware/__init__.py,sha256=MP_45lqr4pecmbzQBnn2-AODQ0N_Fss8nl2SA7Zzljo,347
 onestep/middleware/base.py,sha256=adWQ_Lx2Nkaw4ySojIaa3lwUIUu97pHR_l5YMr0lrbw,975
 onestep/middleware/config.py,sha256=WZIvGXhpdSQRAFTbEWXcZdnhFcbvhGkLdkFIj-_QuZM,2438
 onestep/middleware/unique.py,sha256=e3nWHW2yxHFWT9PqiA96sOA1CZZVTbC3bOwUgxN9iaQ,1351
-onestep/onestep.py,sha256=cUuBSHJPucXFu86wxDFkXeetBJS7Fxu9r1c3OFfsgS4,9329
+onestep/onestep.py,sha256=IQGOfhfbneXCaINqMzO-5wjWpmE5dISEZQtmG3bZ3EU,9372
 onestep/retry.py,sha256=_bl_-0FEMai9KLZ0DkamYwUoUVPf6BjUDpn8SrfqQV4,3009
-onestep/signal.py,sha256=o8KD58jL6lM35gDHVgr1lEspZqFdkMUNJAD-wuouUVo,293
+onestep/signal.py,sha256=tz9bGzTFZeBviG_iaGLfy4OyFKlWat6szEI6kWEGfTA,337
 onestep/state.py,sha256=UVG91CXCabU64X6qgcO0S7RzbBP8ut0ID7aTMww94us,618
-onestep/worker.py,sha256=sHA_XQs5EEyzsgy42m--jUPSkhcBV40OZ31_HCpMAMU,6159
-onestep-0.3.8.dist-info/METADATA,sha256=ZoNHOChg0003FmHofl9RIU0sGw4c_IkqtxgSMhxpz5w,2522
-onestep-0.3.8.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-onestep-0.3.8.dist-info/entry_points.txt,sha256=ZfWnNQqiGujz2PPLjSlKPocOFRryL7Ot0vQ41TU1xw0,44
-onestep-0.3.8.dist-info/RECORD,,
+onestep/worker.py,sha256=A-XKvWz7ceRodMItjHKSN9DVTk3OoA0jsfmmBZ9z19U,6449
+onestep-0.3.9.dist-info/METADATA,sha256=vHgxQhvMs0XjQ1JSKL0AjUddc0XPmk8tXlomZ51isuY,2522
+onestep-0.3.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+onestep-0.3.9.dist-info/entry_points.txt,sha256=ZfWnNQqiGujz2PPLjSlKPocOFRryL7Ot0vQ41TU1xw0,44
+onestep-0.3.9.dist-info/RECORD,,

{onestep-0.3.8.dist-info → onestep-0.3.9.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.8.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any