Merge pull request #136 from baoj2010/main

Fix the bug of HANDLER is None

bali/__init__.py

@@ -5,7 +5,7 @@
 from bali.decorators import event_handler, init_handler
 from bali.resources import Resource, ModelResource
 
-__version__ = '3.2.1'
+__version__ = '3.2.2'
 
 
 class Schema(BaseModel):

bali/decorators.py

@@ -158,7 +158,7 @@ def event_handler(event_type):
     # find queue by event_type
     def decorator(func):
         @functools.wraps(func)
-        def wrapper(self, body, message):
+        def wrapper(handler, body, message):
             try:
                 if isinstance(body, str):
                     body = json.loads(body)
@@ -175,12 +175,14 @@ def wrapper(self, body, message):
                     ):
                         event = param.annotation(**body)
                         break
-                res = func(self, event or body)
+                if not handler:
+                    handler = HANDLER
+                res = func(handler, event or body)
                 message.ack()
                 return res
             except:
                 logger.error(traceback.format_exc())
-        callback = functools.partial(wrapper, HANDLER)
+        callback = functools.partial(wrapper, None)
         register_callback(event_type, callback)
         return wrapper
 

tests/test_event.py

@@ -6,7 +6,7 @@
 from kombu import Connection, Exchange, Queue
 
 from bali.core import _settings
-from bali.decorators import event_handler
+from bali.decorators import event_handler, init_handler
 from bali.events import Event, dispatch, handle
 
 amqp_uri = os.getenv('AMQP_SERVER_ADDRESS', default='amqp://127.0.0.1:5672')
@@ -38,12 +38,20 @@ class TestHandle:
     @event_handler(event_type='test0')
     def call_test0(self, event: Event):
         handle_test_handler_test0(event)
+        self.instance_fun()
         return event
 
     @event_handler(event_type='test1')
     def call_test1(self, event):
         handle_test_handler_test1(event)
 
+    @staticmethod
+    def instance_fun():
+        print('instance_fun')
+
+
+init_handler(TestHandle)
+
 
 def test_when_message_body_is_str():
     body = '{"type":"hello", "payload":""}'