onestep 0.3.81__py3-none-any.whl → 0.4.1__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.81'
+__version__ = '0.4.0'

onestep/cli.py

@@ -22,8 +22,9 @@ def parse_args():
     parser = argparse.ArgumentParser(
         description='run onestep'
     )
-    parser.add_argument(
-        "step",
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument(
+        "step", nargs='?',
         help="the run step",
     )
     parser.add_argument(
@@ -39,6 +40,11 @@ def parse_args():
         "--path", "-P", default=".", nargs="*", type=str,
         help="the step import path (default: current running directory)"
     )
+    group.add_argument(
+        "--cron",
+        help="the cron expression to test",
+        type=str
+    )
     return parser.parse_args()
 
 
@@ -46,10 +52,20 @@ def main():
     args = parse_args()
     for path in args.path:
         sys.path.insert(0, path)
+    if args.cron:
+        from croniter import croniter
+        from datetime import datetime
+        cron = croniter(args.cron, datetime.now())
+        for _ in range(10):
+            print(cron.get_next(datetime))
+        return
+
     logger.info(f"OneStep {__version__} is start up.")
     try:
         importlib.import_module(args.step)
         step.start(group=args.group, block=True, print_jobs=args.print)
+    except ModuleNotFoundError:
+        logger.error(f"Module `{args.step}` not found.")
     except KeyboardInterrupt:
         step.shutdown()
 

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/retry.py

@@ -31,6 +31,30 @@ class AlwaysRetry(BaseRetry):
         return RetryStatus.CONTINUE
 
 
+class AllRetry(BaseRetry):
+    def __init__(self, *retries):
+        self.retries = retries
+
+    def __call__(self, message) -> Optional[RetryStatus]:
+        for retry in self.retries:
+            status = retry(message)
+            if status != RetryStatus.CONTINUE:
+                return status
+        return RetryStatus.CONTINUE
+
+
+class AnyRetry(BaseRetry):
+    def __init__(self, *retries):
+        self.retries = retries
+
+    def __call__(self, message) -> Optional[RetryStatus]:
+        for retry in self.retries:
+            status = retry(message)
+            if status == RetryStatus.CONTINUE:
+                return RetryStatus.CONTINUE
+        return RetryStatus.END_WITH_CALLBACK
+
+
 class TimesRetry(BaseRetry):
 
     def __init__(self, times: int = 3):

onestep/worker.py

@@ -74,42 +74,58 @@ class BaseWorker:
         message.broker = message.broker or self.broker
         logger.debug(f"{self.instance.name} receive message<{message}> from {self.broker!r}")
         message_received.send(self, message=message)
+
         try:
             self.instance.before_emit("consume", message=message)
-
             self._run_real_instance(message)
-            message_consumed.send(self, message=message)
-            message.confirm()
-
+            self.handle_success(message)
             self.instance.after_emit("consume", message=message)
         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()
+            self.handle_drop(message, e)
         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)
+            self.handle_requeue(message, e)
         except Exception as e:
             message_error.send(self, message=message, error=e)
-            if self.instance.state.debug:
-                logger.exception(f"{self.instance.name} run error <{type(e).__name__}: {str(e)}>")
-            else:
-                logger.error(f"{self.instance.name} run error <{type(e).__name__}: {str(e)}>")
-            message.set_exception()
-
-            retry_status = self.retry(message)
-            if retry_status is RetryStatus.END_WITH_CALLBACK:
-                if self.error_callback:
-                    self.error_callback(message)
-                message.reject()
-            elif retry_status is RetryStatus.END_IGNORE_CALLBACK:
-                # 由于是队列内重试，不会触发错误回调
-                message.requeue()
+            self.handle_error(message, e)
+            self.handle_retry(message)
         finally:
-            # When message is triggered by cancel_consume, it will be shutdown
-            if self.broker.cancel_consume and self.broker.cancel_consume(message):
-                self.shutdown()
+            self.handle_cancel_consume(message)
+
+    def handle_success(self, message):
+        message_consumed.send(self, message=message)
+        message.confirm()
+
+    def handle_drop(self, message, reason):
+        message_drop.send(self, message=message, reason=reason)
+        logger.warning(f"{self.instance.name} dropped <{type(reason).__name__}: {str(reason)}>")
+        message.reject()
+
+    def handle_requeue(self, message, reason):
+        message_requeue.send(self, message=message, reason=reason)
+        logger.warning(f"{self.instance.name} requeue <{type(reason).__name__}: {str(reason)}>")
+        message.requeue(is_source=True)
+
+    def handle_error(self, message, error):
+        if self.instance.state.debug:
+            logger.exception(f"{self.instance.name} run error <{type(error).__name__}: {str(error)}>")
+        else:
+            logger.error(f"{self.instance.name} run error <{type(error).__name__}: {str(error)}>")
+        message.set_exception()
+
+    def handle_cancel_consume(self, message):
+        if self.broker.cancel_consume and self.broker.cancel_consume(message):
+            self.shutdown()
+
+    def handle_retry(self, message):
+        retry_status = self.retry(message)
+        if retry_status is RetryStatus.END_WITH_CALLBACK:
+            if self.error_callback:
+                self.error_callback(message)
+            message.reject()
+        elif retry_status is RetryStatus.END_IGNORE_CALLBACK:
+            message.requeue()
+        elif retry_status is RetryStatus.CONTINUE:
+            message.requeue()
 
     def __repr__(self):
         return f"<{self.__class__.__name__} {self.instance.name}>"

{onestep-0.3.81.dist-info → onestep-0.4.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: onestep
-Version: 0.3.81
-Summary: 
+Version: 0.4.1
+Summary: 仅需一步，轻松实现分布式异步任务。
 Author: miclon
 Author-email: jcnd@163.com
 Requires-Python: >=3.8,<4.0
@@ -15,7 +15,7 @@ Provides-Extra: redis
 Requires-Dist: asgiref (>=3.6.0,<4.0.0)
 Requires-Dist: blinker (>=1.5,<2.0)
 Requires-Dist: croniter (>=1.3.8,<2.0.0)
-Requires-Dist: use-rabbitmq (>=0.1.6,<0.2.0)
+Requires-Dist: use-rabbitmq (>=0.2.1,<0.3.0)
 Requires-Dist: use-redis (>=0.1.6,<0.2.0) ; extra == "redis"
 Description-Content-Type: text/markdown
 

{onestep-0.3.81.dist-info → onestep-0.4.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onestep/__init__.py,sha256=GnX4nALDbR8LcbwMEaeZKUQl9f7cnYAVEVWLUQXfgcY,1466
+onestep/__init__.py,sha256=F38-j9JgPMyUe0zBf-ao-f2ailidPI_DJQE4ddGCOX0,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
@@ -9,19 +9,19 @@ onestep/broker/redis/__init__.py,sha256=lqjvBKpMGf6I34nyJTEAq7XU2a8aQemhMGCbb5aB
 onestep/broker/redis/pubsub.py,sha256=_p2bKqXu0gYjKz2DsS8UdpkN5dCy94xf_xYx5NFuKpY,2674
 onestep/broker/redis/stream.py,sha256=uQJncD93Fz8pdP_NdgyQ1UAXwIouh7AFA9_naXaeiJM,3470
 onestep/broker/webhook.py,sha256=Zg22QxKPqJzdxjBsglUcL7P1RcM8FltcHpHXJiJPYgM,2392
-onestep/cli.py,sha256=KfJFpccpfNrhULJmDymrW5bFBGXapdL57ESZdgaFbG8,1399
+onestep/cli.py,sha256=JU3xQCy0Zc8Ou6AH4j37_bqw5GQ7C2wll9MWQZFo5jY,1902
 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/retry.py,sha256=_bl_-0FEMai9KLZ0DkamYwUoUVPf6BjUDpn8SrfqQV4,3009
+onestep/onestep.py,sha256=IQGOfhfbneXCaINqMzO-5wjWpmE5dISEZQtmG3bZ3EU,9372
+onestep/retry.py,sha256=fPO139hQrcMjXZuQ4QfFaQR57VEqv_EKS2WSz92Ayvc,3706
 onestep/signal.py,sha256=tz9bGzTFZeBviG_iaGLfy4OyFKlWat6szEI6kWEGfTA,337
 onestep/state.py,sha256=UVG91CXCabU64X6qgcO0S7RzbBP8ut0ID7aTMww94us,618
-onestep/worker.py,sha256=A-XKvWz7ceRodMItjHKSN9DVTk3OoA0jsfmmBZ9z19U,6449
-onestep-0.3.81.dist-info/METADATA,sha256=khDghCE0BG8tvoUWBlVn8xtArfzkE-h65orC1eNyq_4,2523
-onestep-0.3.81.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-onestep-0.3.81.dist-info/entry_points.txt,sha256=ZfWnNQqiGujz2PPLjSlKPocOFRryL7Ot0vQ41TU1xw0,44
-onestep-0.3.81.dist-info/RECORD,,
+onestep/worker.py,sha256=8Bmbie-KrZxnHbne1RvNL3v8j1PObfd12Yp9jmzAFYg,6855
+onestep-0.4.1.dist-info/METADATA,sha256=WoZmHjd1LmL9MvamCVyUsEakOTmReNSg2FSBHBCqd2w,2573
+onestep-0.4.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+onestep-0.4.1.dist-info/entry_points.txt,sha256=ZfWnNQqiGujz2PPLjSlKPocOFRryL7Ot0vQ41TU1xw0,44
+onestep-0.4.1.dist-info/RECORD,,