onestep 0.4.1__tar.gz → 0.4.2__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: onestep
-Version: 0.4.1
+Version: 0.4.2
 Summary: 仅需一步，轻松实现分布式异步任务。
 Author: miclon
 Author-email: jcnd@163.com
@@ -11,6 +11,7 @@ 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)

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "onestep"
-version = "0.4.1"
+version = "0.4.2"
 description = "仅需一步，轻松实现分布式异步任务。"
 authors = ["miclon <jcnd@163.com>"]
 readme = "README.md"
@@ -28,6 +28,7 @@ nacos-sdk-python = "^0.1.12"
 redis = "^4.5.1"
 autopep8 = "^2.0.2"
 loguru = "^0.6.0"
+use-redis = "^0.1.92"
 
 
 [tool.poetry.group.test.dependencies]

{onestep-0.4.1 → onestep-0.4.2}/src/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-0.4.1 → onestep-0.4.2}/src/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-0.4.1 → onestep-0.4.2}/src/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-0.4.1 → onestep-0.4.2}/src/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-0.4.1 → onestep-0.4.2}/src/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