onestep 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

onestep/broker/base.py

@@ -43,15 +43,15 @@ class BaseBroker:
     def add_middleware(self, middleware: BaseMiddleware):
         self.middlewares.append(middleware)
 
-    def send(self, message):
+    def send(self, message, *args, **kwargs):
         """对消息进行预处理，然后再发送"""
         if not isinstance(message, Message):
             message = self.message_cls(body=message)
         # TODO: 对消息发送进行N次重试，确保消息发送成功。
-        return self.publish(message.to_json())
+        return self.publish(message.to_json(), *args, **kwargs)
 
     @abc.abstractmethod
-    def publish(self, message: Any):
+    def publish(self, message: Any, *args, **kwargs):
         """
         将消息原样发布到 broker 中。如果当前Broker是Job的to_broker, 则必须实现此方法
         """

onestep/broker/memory.py

@@ -36,7 +36,7 @@ class MemoryBroker(BaseBroker):
         super().__init__(*args, **kwargs)
         self.queue = Queue(maxsize)
 
-    def publish(self, message: Any):
+    def publish(self, message: Any, *args, **kwargs):
         try:
             self.queue.put_nowait(message)
         except FullException:

onestep/broker/rabbitmq.py

@@ -30,15 +30,43 @@ class _RabbitMQMessage(Message):
 class RabbitMQBroker(BaseBroker):
     message_cls = _RabbitMQMessage
 
-    def __init__(self, queue_name, params: Optional[Dict] = None, prefetch: Optional[int] = 1, auto_create=True, *args,
-                 **kwargs):
+    def __init__(
+        self,
+        queue_name,
+        params: Optional[Dict] = None,
+        prefetch: Optional[int] = 1,
+        auto_create: Optional[bool]=True,
+        queue_params: Optional[Dict]=None,
+        *args,
+        **kwargs
+        ):
+        """
+        Initializes the RabbitMQ broker.
+
+        Args:
+            queue_name (str): The name of the queue.
+            params (Optional[Dict], optional): Parameters for RabbitMQStore. Defaults to None.
+            prefetch (Optional[int], optional): Number of messages to prefetch. Defaults to 1.
+            auto_create (Optional[bool], optional): Whether to automatically create the queue. Defaults to True.
+            queue_params (Optional[Dict], optional): Parameters for queue declaration. Defaults to None.
+            *args: Variable length argument list.
+            **kwargs: Arbitrary keyword arguments.
+
+        Attributes:
+            queue_name (str): The name of the queue.
+            queue (Queue): The queue instance.
+            client (RabbitMQStore): The RabbitMQ client instance.
+            prefetch (int): Number of messages to prefetch.
+            threads (list): List of threads.
+        """
+        
         super().__init__(*args, **kwargs)
         self.queue_name = queue_name
         self.queue = Queue()
         params = params or {}
         self.client = RabbitMQStore(**params)
         if auto_create:
-            self.client.declare_queue(self.queue_name)
+            self.client.declare_queue(self.queue_name, **(queue_params or {}))
         self.prefetch = prefetch
         self.threads = []
 
@@ -57,8 +85,9 @@ class RabbitMQBroker(BaseBroker):
         self.threads.append(thread)
         return RabbitMQConsumer(self)
 
-    def publish(self, message: Any):
-        self.client.send(self.queue_name, message)
+    def publish(self, message: Any, properties: Optional[dict] = None, **kwargs):
+        """发布消息"""
+        self.client.send(self.queue_name, message, properties=properties, **kwargs)
 
     def confirm(self, message: Message):
         """确认消息"""

onestep/broker/redis/pubsub.py

@@ -59,12 +59,12 @@ class RedisPubSubBroker(BaseBroker):
         self.threads.append(thread)
         return RedisPubSubConsumer(self)
 
-    def send(self, message: Any):
+    def send(self, message: Any, *args, **kwargs):
         """Publish message to the Redis channel"""
         if not isinstance(message, Message):
             message = self.message_cls(body=message)
 
-        self.client.publish(self.channel, message.to_json())
+        self.client.publish(self.channel, message.to_json(), *args, **kwargs)
 
     publish = send
 

onestep/broker/redis/stream.py

@@ -75,12 +75,12 @@ class RedisStreamBroker(BaseBroker):
         self.threads.append(thread)
         return RedisStreamConsumer(self)
 
-    def send(self, message: Any):
+    def send(self, message: Any, *args, **kwargs):
         """对消息进行预处理，然后再发送"""
         if not isinstance(message, Message):
             message = self.message_cls(body=message)
 
-        self.client.send({"_message": message.to_json()})
+        self.client.send({"_message": message.to_json()}, *args, **kwargs)
 
     publish = send
 

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-0.4.0.dist-info → onestep-0.4.2.dist-info}/METADATA

@@ -1,7 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: onestep
-Version: 0.4.0
-Summary: 
+Version: 0.4.2
+Summary: 仅需一步，轻松实现分布式异步任务。
 Author: miclon
 Author-email: jcnd@163.com
 Requires-Python: >=3.8,<4.0
@@ -11,11 +11,12 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 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.4.0.dist-info → onestep-0.4.2.dist-info}/RECORD

@@ -1,15 +1,15 @@
 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
+onestep/broker/base.py,sha256=G_MzKIbpDSPDx2rx-Q2rwourbcI_faBXQdQZRxjgx8s,4192
 onestep/broker/cron.py,sha256=wKOm4k0IBPgZIq5gHC6ITVFUZwgCQ91AXzgL1eFT1WE,1135
-onestep/broker/memory.py,sha256=X7DDiEOiJE3WtocEC_NtSNfL8Jpo7BVQVSG_BJfNGNQ,2053
-onestep/broker/rabbitmq.py,sha256=LFlcpOV36D6bme5nUVsZ3WzJVFQazlKDKBcA9aQONRM,2928
+onestep/broker/memory.py,sha256=ycOWWHhWhiuNPMDqsbxKbMh8rpt84FlRsJkINLJNX1U,2070
+onestep/broker/rabbitmq.py,sha256=KR1Zn4ciMzrwE5XVCtWvayqmsgAUdu-CW6N_PPlQSO4,4108
 onestep/broker/redis/__init__.py,sha256=lqjvBKpMGf6I34nyJTEAq7XU2a8aQemhMGCbb5aByFI,236
-onestep/broker/redis/pubsub.py,sha256=_p2bKqXu0gYjKz2DsS8UdpkN5dCy94xf_xYx5NFuKpY,2674
-onestep/broker/redis/stream.py,sha256=uQJncD93Fz8pdP_NdgyQ1UAXwIouh7AFA9_naXaeiJM,3470
+onestep/broker/redis/pubsub.py,sha256=m0QzBT--rftfTXSc6D3wTzfQrwUgv5mEEDnnER7nB9A,2708
+onestep/broker/redis/stream.py,sha256=yUOD-Z0gzU5zNjRW1ZxNwl35i2pbJKTw33xIj0ga3vY,3504
 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
@@ -21,7 +21,7 @@ onestep/retry.py,sha256=fPO139hQrcMjXZuQ4QfFaQR57VEqv_EKS2WSz92Ayvc,3706
 onestep/signal.py,sha256=tz9bGzTFZeBviG_iaGLfy4OyFKlWat6szEI6kWEGfTA,337
 onestep/state.py,sha256=UVG91CXCabU64X6qgcO0S7RzbBP8ut0ID7aTMww94us,618
 onestep/worker.py,sha256=8Bmbie-KrZxnHbne1RvNL3v8j1PObfd12Yp9jmzAFYg,6855
-onestep-0.4.0.dist-info/METADATA,sha256=KMQt0aJiyk2J0K-sz0Vbo_2jAE6gyppvVq-P4Y14zp4,2522
-onestep-0.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-onestep-0.4.0.dist-info/entry_points.txt,sha256=ZfWnNQqiGujz2PPLjSlKPocOFRryL7Ot0vQ41TU1xw0,44
-onestep-0.4.0.dist-info/RECORD,,
+onestep-0.4.2.dist-info/METADATA,sha256=eM1gdjRSpr6zMzxunuv0aa-3KPghbsv14Kql-GOzxC8,2624
+onestep-0.4.2.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+onestep-0.4.2.dist-info/entry_points.txt,sha256=ZfWnNQqiGujz2PPLjSlKPocOFRryL7Ot0vQ41TU1xw0,44
+onestep-0.4.2.dist-info/RECORD,,

{onestep-0.4.0.dist-info → onestep-0.4.2.dist-info}/WHEEL

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