onestep 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

onestep/__init__.py

@@ -1,10 +1,14 @@
 from .onestep import step
-from .retry import NeverRetry, AlwaysRetry, TimesRetry, RetryIfException, NackErrorCallBack
+from .retry import NeverRetry, AlwaysRetry, TimesRetry, RetryIfException, NackErrorCallBack, LocalAndQueueRetry
 from .broker import (
     BaseBroker, BaseConsumer, BaseLocalBroker, BaseLocalConsumer,
     MemoryBroker, RabbitMQBroker, WebHookBroker, CronBroker
 )
-from .middleware import BaseMiddleware, BaseConfigMiddleware, RedisConfigMiddleware, NacosConfigMiddleware
+from .middleware import (
+    BaseMiddleware, BaseConfigMiddleware,
+    NacosPublishConfigMiddleware, NacosConsumeConfigMiddleware,
+    RedisPublishConfigMiddleware, RedisConsumeConfigMiddleware,
+)
 
 __all__ = [
     'step',
@@ -24,12 +28,15 @@ __all__ = [
     'AlwaysRetry',
     'TimesRetry',
     'RetryIfException',
+    'LocalAndQueueRetry',
     #
     'NackErrorCallBack',
 
     # middleware
     'BaseMiddleware',
     'BaseConfigMiddleware',
-    'RedisConfigMiddleware',
-    'NacosConfigMiddleware',
+    'NacosPublishConfigMiddleware',
+    'NacosConsumeConfigMiddleware',
+    'RedisPublishConfigMiddleware',
+    'RedisConsumeConfigMiddleware',
 ]

onestep/broker/cron.py

@@ -19,10 +19,13 @@ class CronBroker(BaseLocalBroker):
         self.kwargs = kwargs
         self._scheduler()
 
+    def _real_task(self):
+        self.queue.put_nowait(self.kwargs)
+
     def _scheduler(self):
         if self.next_fire_time <= datetime.now():
             self.next_fire_time = self.itr.get_next(datetime)
-            self.queue.put_nowait(self.kwargs)
+            self._real_task()
 
         threading.Timer(interval=1, function=self._scheduler).start()
 

onestep/middleware/__init__.py

@@ -1,4 +1,6 @@
+from .base import BaseMiddleware
 from .config import (
-    NacosConfigMiddleware, RedisConfigMiddleware, BaseConfigMiddleware
+    BaseConfigMiddleware, PublishConfigMixin, ConsumeConfigMixin,
+    NacosConfigMixin, NacosPublishConfigMiddleware, NacosConsumeConfigMiddleware,
+    RedisConfigMixin, RedisPublishConfigMiddleware, RedisConsumeConfigMiddleware
 )
-from .base import BaseMiddleware

onestep/middleware/base.py

@@ -1,13 +1,17 @@
 class BaseMiddleware:
 
-    def before_send(self, *args, **kwargs):
+    def before_send(self, step, message, *args, **kwargs):
         """消息发送之前"""
+        pass
 
-    def after_send(self, *args, **kwargs):
+    def after_send(self, step, message, *args, **kwargs):
         """消息发送之后"""
+        pass
 
-    def before_receive(self, *args, **kwargs):
+    def before_receive(self, step, message, *args, **kwargs):
         """消息接收之前"""
+        pass
 
-    def after_receive(self, *args, **kwargs):
+    def after_receive(self, step, message, *args, **kwargs):
         """消息接收之后"""
+        pass

onestep/middleware/config.py

@@ -1,50 +1,77 @@
-import redis
-
 from .base import BaseMiddleware
 
 
 class BaseConfigMiddleware(BaseMiddleware):
 
     def __init__(self, client, *args, **kwargs):
-        self.config_key = kwargs.pop('config_key')
+        self.config_key = kwargs.pop('config_key', None)
         self.client = client
 
-    def before_send(self, message):
-        """消息发送之前，给消息添加配置"""
+    def process(self, step, message, *args, **kwargs):
+        """实际获取配置的逻辑"""
         config = self.get(self.config_key)
-        message.config = config
+        return config
 
     def get(self, key):
         raise NotImplementedError
 
 
-class NacosConfigMiddleware(BaseConfigMiddleware):
+class PublishConfigMixin:
+    def before_receive(self, step, message, *args, **kwargs):
+        """消息发送之前，给消息添加配置"""
+        config = self.process(step, message, *args, **kwargs)  # noqa
+        # 持久性，会跟随消息传递到其他 broker
+        message.extra['config'] = config
+
+
+class ConsumeConfigMixin:
+    def before_receive(self, step, message, *args, **kwargs):
+        """消息消费之前，给消息附加配置"""
+        config = self.process(step, message, *args, **kwargs)  # noqa
+        # 一次性，不跟随消息传递到其他 broker
+        message.config = config
+
+
+class NacosConfigMixin:
 
     def __init__(self, client, *args, **kwargs):
         super().__init__(client, *args, **kwargs)
         self.config_group = kwargs.pop("config_group", "DEFAULT_GROUP")
 
+    def get(self, key):
+        pass
+
+    def set(self, key, value):
+        pass
+
+
+class NacosPublishConfigMiddleware(NacosConfigMixin, PublishConfigMixin, BaseConfigMiddleware):
+    """发布前附加来自 Nacos 的配置"""
 
-class RedisConfigMiddleware(BaseConfigMiddleware):
+
+class NacosConsumeConfigMiddleware(NacosConfigMixin, ConsumeConfigMixin, BaseConfigMiddleware):
+    """消费前附加来自 Nacos 的配置"""
+
+
+class RedisConfigMixin:
 
     def __init__(self, client, *args, **kwargs):
         super().__init__(client, *args, **kwargs)
         self.config_group = kwargs.pop('config_group', 'onestep:config')
 
     def get(self, key):
-        value = self.client.hget(name=self.config_group, key=key)
+        value = self.client.hget(name=self.config_group, key=key)  # noqa
         if isinstance(value, bytes):
             value = value.decode()
         return value
 
     def set(self, key, value):
-        return self.client.hset(name=self.config_group, key=key, value=value)
+        return self.client.hset(name=self.config_group, key=key, value=value)  # noqa
+
 
+class RedisPublishConfigMiddleware(RedisConfigMixin, PublishConfigMixin, BaseConfigMiddleware):
+    """发布前附加来自 Redis 的配置"""
 
-if __name__ == '__main__':
-    rds_params = {
-    }
-    rds_client = redis.Redis(**rds_params)
 
-    rc = RedisConfigMiddleware(client=rds_client)
-    print(rc.get("name"))
+class RedisConsumeConfigMiddleware(RedisConfigMixin, ConsumeConfigMixin, BaseConfigMiddleware):
+    """消费前附加来自 Redis 的配置"""

onestep/onestep.py

@@ -120,7 +120,7 @@ class BaseOneStep:
             if not hasattr(middleware, signal):
                 continue
             try:
-                getattr(middleware, signal)(self, *args, **kwargs)
+                getattr(middleware, signal)(step=self, *args, **kwargs)
             except StopMiddleware:
                 break
 

{onestep-0.1.4.dist-info → onestep-0.1.6.dist-info}/METADATA

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

{onestep-0.1.4.dist-info → onestep-0.1.6.dist-info}/RECORD

@@ -1,22 +1,22 @@
-onestep/__init__.py,sha256=9XR_iLa6T-Tp8T80c7zB800hgOcSnnXz_GJzThgHZi4,832
+onestep/__init__.py,sha256=IUElKqBNhQLtKYQHwYdk67bLeavgb-D9hX0EhY1vdf0,1055
 onestep/broker/__init__.py,sha256=_u2FH9lFKcqau4tTFuj4V3NaVEH0EjImIedl_nlrU7U,221
 onestep/broker/base.py,sha256=HFZ4d0zi5DvwksZDIB7h01kwvY4f8wsEjNbht9uTt7U,4310
-onestep/broker/cron.py,sha256=8N5eAZV6u-0JQesMqc_B7AvMBlMHwaWVgKoWewkf4Uo,904
+onestep/broker/cron.py,sha256=D782X0bY3AxeL2-NCSEUPkSh591VMgQUYwYaH8c9ZT8,957
 onestep/broker/memory.py,sha256=ILDfYCbMuMmYcZW09jVCdkAg3IQcC-dHkGHIgd8Wh4Q,151
 onestep/broker/rabbitmq.py,sha256=gatzaaRPANaMWVgc9zyupFVTM7xuDWm9GjmFeukWarY,1997
 onestep/broker/webhook.py,sha256=zt__4Lp7jX8B3xo2v64DAqLGnd8aV7ElBsgQZqN2i1w,2144
 onestep/exception.py,sha256=ymwSA_EvHT4Kavs-w0RMmyMrqx4aGZtttAsN8StXj5c,715
 onestep/message.py,sha256=5im6gcH8BWv0Fq6LOxwOZ5DzySC7Ur0jeljPzUQBPNs,2874
-onestep/middleware/__init__.py,sha256=DUs1BrA86s82xLCdMn9Hsle-Bcc98HWkSGvz8A0X2B8,128
-onestep/middleware/base.py,sha256=tyw5LkceYesUXN9q5cVONsjs42F9pW9eXgndDz9uSMY,338
-onestep/middleware/config.py,sha256=GPGJoApL4pvsf2jcr1PI5j8BSgBfNKZWQgk0dIw-ZTo,1370
-onestep/onestep.py,sha256=9p60GFfA7LcaL3X2jpwDnDp_ltU6HVxlEccGamsqoZg,6257
+onestep/middleware/__init__.py,sha256=Lv8DbJTgym0ckSKXz_Qfc6we3SUupMt5feHy0gnDi8Q,286
+onestep/middleware/base.py,sha256=JzpSV69LvZXz9b6TyihKjJqO3b-dWzj9Y24jBwIyrEI,450
+onestep/middleware/config.py,sha256=WZIvGXhpdSQRAFTbEWXcZdnhFcbvhGkLdkFIj-_QuZM,2438
+onestep/onestep.py,sha256=vCc5rP75IndID5JBB1-dVfxhNFvbXTf1B1WTxaCtpqo,6262
 onestep/retry.py,sha256=UOrakSV5z97L1VzMRo8p1G6Zmvglu7tJp98vIXdZj40,1904
 onestep/signal.py,sha256=o8KD58jL6lM35gDHVgr1lEspZqFdkMUNJAD-wuouUVo,293
 onestep/state.py,sha256=UVG91CXCabU64X6qgcO0S7RzbBP8ut0ID7aTMww94us,618
 onestep/store/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onestep/store/rabbitmq.py,sha256=if3fXp_CBK-b4i0Qsb4owfiPPYtQ1biF2OFU6iTRRAE,4170
 onestep/worker.py,sha256=SsowMZSav0f5ocL5RfnwdF2DlN0UNvxO4RK574OWrU0,3517
-onestep-0.1.4.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-onestep-0.1.4.dist-info/METADATA,sha256=ZEx5CiCub7bZVJeLkbwidm9SKQ6qY1SY7ZiCcWe0kFA,1992
-onestep-0.1.4.dist-info/RECORD,,
+onestep-0.1.6.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+onestep-0.1.6.dist-info/METADATA,sha256=CajYNhwdtMzZv1qTWtNae67XkCLO9P6gaP6iM3VjshE,1992
+onestep-0.1.6.dist-info/RECORD,,