Merge pull request #167 from python-ellar/async_application_context

Async application context

Author: eadwinCode

ellar/__init__.py

@@ -1,3 +1,3 @@
 """ Ellar - Python ASGI web framework for building fast, efficient, and scalable RESTful APIs and server-side applications. """
 
-__version__ = "0.6.2"
+__version__ = "0.6.4"

ellar/app/context.py

@@ -48,7 +48,7 @@ def injector(self) -> EllarInjector:
     def config(self) -> Config:
         return self._config
 
-    def __enter__(self) -> "ApplicationContext":
+    async def __aenter__(self) -> "ApplicationContext":
         app_context = app_context_var.get(empty)
         if app_context is empty:
             # If app_context exist
@@ -57,16 +57,16 @@ def __enter__(self) -> "ApplicationContext":
                 # ensure current_config is in sync with running application context.
                 current_config._wrapped = self.config
             app_context = self
-            app_context_started_events.run()
+            await app_context_started_events.run()
         return app_context  # type:ignore[return-value]
 
-    def __exit__(
+    async def __aexit__(
         self,
         exc_type: t.Optional[t.Any],
         exc_value: t.Optional[BaseException],
         tb: t.Optional[TracebackType],
     ) -> None:
-        app_context_teardown_events.run()
+        await app_context_teardown_events.run()
         app_context_var.set(empty)
 
         current_app._wrapped = empty  # type:ignore[attr-defined]

ellar/app/factory.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from uuid import uuid4
 
-from ellar.common import EllarTyper
+import click
 from ellar.common.constants import MODULE_METADATA, MODULE_WATERMARK
 from ellar.common.models import GuardCanActivate
 from ellar.core import Config, DynamicModule, LazyModuleImport, ModuleBase, ModuleSetup
@@ -185,7 +185,7 @@ def create_app(
         global_guards: t.Optional[
             t.List[t.Union[t.Type["GuardCanActivate"], "GuardCanActivate"]]
         ] = None,
-        commands: t.Sequence[t.Union[t.Callable, "EllarTyper"]] = (),
+        commands: t.Sequence[t.Union[click.Command, click.Group, t.Any]] = (),
         config_module: t.Union[str, t.Dict, None] = None,
     ) -> App:
         from ellar.common import Module

ellar/app/main.py

@@ -246,7 +246,7 @@ def application_context(self) -> ApplicationContext:
         return ApplicationContext.create(app=self)
 
     async def __call__(self, scope: TScope, receive: TReceive, send: TSend) -> None:
-        with self.application_context() as ctx:
+        async with self.application_context() as ctx:
             scope["app"] = ctx.app
             if self.middleware_stack is None:
                 self.middleware_stack = self.build_middleware_stack()

ellar/common/__init__.py

@@ -1,6 +1,5 @@
 import typing as t
 
-from .commands import EllarTyper, command
 from .datastructures import UploadFile
 from .decorators import (
     Controller,
@@ -105,7 +104,6 @@
     "serialize_object",
     "ControllerType",
     "GuardCanActivate",
-    "EllarTyper",
     "GlobalGuard",
     "Serializer",
     "WebSocketException",
@@ -120,7 +118,6 @@
     "MethodNotAllowed",
     "render_template",
     "render_template_string",
-    "command",
     "ModuleRouter",
     "render",
     "Module",

ellar/common/commands/__init__.py

@@ -51,7 +51,6 @@
 CONTROLLER_OPERATION_HANDLER_KEY = "CONTROLLER_OPERATION_HANDLER"
 CONTROLLER_CLASS_KEY = "CONTROLLER_CLASS_KEY"
 
-CALLABLE_COMMAND_INFO = "__CALLABLE_COMMAND_INFO__"
 GROUP_METADATA = "GROUP_METADATA"
 SKIP_AUTH = "SKIP_AUTH"
 

ellar/common/commands/base.py

@@ -3,6 +3,7 @@
 from functools import partial
 from pathlib import Path
 
+import click
 from ellar.common.compatible import AttributeDict
 from ellar.common.constants import MODULE_METADATA, MODULE_WATERMARK
 from ellar.common.exceptions import ImproperConfiguration
@@ -13,9 +14,6 @@
 from ellar.reflect import reflect
 from starlette.routing import Host, Mount
 
-if t.TYPE_CHECKING:  # pragma: no cover
-    from ellar.common.commands import EllarTyper
-
 
 def _wrapper(
     target: t.Type,
@@ -50,7 +48,7 @@ def Module(
     base_directory: t.Optional[t.Union[Path, str]] = None,
     static_folder: str = "static",
     modules: t.Sequence[t.Union[t.Type, t.Any]] = (),
-    commands: t.Sequence[t.Union[t.Callable, "EllarTyper"]] = (),
+    commands: t.Sequence[t.Union[click.Command, click.Group, t.Any]] = (),
 ) -> t.Callable:
     """
     ========= MODULE DECORATOR ==============