Merge pull request #1 from teamhide/develop

Fix some codes

fastapi_event/__init__.py

@@ -0,0 +1,11 @@
+from fastapi_event.base import BaseEvent
+from fastapi_event.handler import event_handler
+from fastapi_event.listener import EventListener
+from fastapi_event.middleware import EventHandlerMiddleware
+
+__all__ = [
+    "event_handler",
+    "BaseEvent",
+    "EventListener",
+    "EventHandlerMiddleware",
+]

fastapi_event/exceptions.py

@@ -1,8 +1,13 @@
 class InvalidEventTypeException(Exception):
     def __init__(self):
-        super().__init__("event must inherit BaseEvent")
+        super().__init__("Event must inherit BaseEvent")
 
 
 class InvalidParameterTypeException(Exception):
     def __init__(self):
-        super().__init__("parameter must inherit BaseModel")
+        super().__init__("Parameter must inherit BaseModel")
+
+
+class EmptyContextException(Exception):
+    def __init__(self):
+        super().__init__("Event context is empty. check if middleware configured well")

fastapi_event/handler.py

@@ -1,16 +1,17 @@
 from contextvars import ContextVar
-from typing import Type, Dict, Union, Optional
+from typing import Type, Dict, Union, Optional, NoReturn
 
 from pydantic import BaseModel
 
 from fastapi_event.base import BaseEvent
 from fastapi_event.exceptions import (
     InvalidEventTypeException,
     InvalidParameterTypeException,
+    EmptyContextException,
 )
 
 _handler_context: ContextVar[Optional, "EventHandler"] = ContextVar(
-    "_handler", default=None,
+    "_handler_context", default=None,
 )
 
 
@@ -40,20 +41,19 @@ async def publish(self) -> None:
 class EventHandlerMeta(type):
     async def store(
         self, event: Type[BaseEvent], parameter: BaseModel = None,
-    ):
+    ) -> None:
         handler = self._get_event_handler()
         await handler.store(event=event, parameter=parameter)
 
-    async def publish(self):
+    async def publish(self) -> None:
         handler = self._get_event_handler()
         await handler.publish()
 
-    def _get_event_handler(self) -> EventHandler:
-        handler = _handler_context.get()
-        if not handler:
-            raise
-
-        return handler
+    def _get_event_handler(self) -> Union[EventHandler, NoReturn]:
+        try:
+            return _handler_context.get()
+        except LookupError:
+            raise EmptyContextException
 
 
 class EventHandlerDelegator(metaclass=EventHandlerMeta):
@@ -68,4 +68,4 @@ def __exit__(self, exc_type, exc_value, traceback):
         _handler_context.reset(self.token)
 
 
-event_handler: EventHandlerMeta = EventHandlerDelegator
+event_handler: Type[EventHandlerDelegator] = EventHandlerDelegator