onestep 0.3.8__tar.gz → 0.3.9__tar.gz

{onestep-0.3.8 → onestep-0.3.9}/PKG-INFO

@@ -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 → onestep-0.3.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "onestep"
-version = "0.3.8"
+version = "0.3.9"
 description = ""
 authors = ["miclon <jcnd@163.com>"]
 readme = "README.md"

{onestep-0.3.8 → onestep-0.3.9}/src/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-0.3.8 → onestep-0.3.9}/src/onestep/exception.py

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

{onestep-0.3.8 → onestep-0.3.9}/src/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-0.3.8 → onestep-0.3.9}/src/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-0.3.8 → onestep-0.3.9}/src/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: