refactored all packages and clearly depend flow of dependencies among packages

Author: eadwinCode

ellar/cache/backends/local_cache.py

@@ -6,7 +6,7 @@
 
 from anyio import Lock
 
-from ellar.helper.event_loop import get_or_create_eventloop
+from ellar.common.helper.event_loop import get_or_create_eventloop
 
 from ..interface import IBaseCacheBackendAsync
 from ..make_key_decorator import make_key_decorator, make_key_decorator_and_validate

ellar/cache/backends/redis/backend.py

@@ -2,7 +2,7 @@
 import typing as t
 from abc import ABC
 
-from ellar.helper.event_loop import get_or_create_eventloop
+from ellar.common.helper.event_loop import get_or_create_eventloop
 
 try:
     from redis.asyncio import Redis  # type: ignore

ellar/cache/decorator.py

@@ -3,10 +3,9 @@
 from functools import wraps
 
 from ellar.cache.interface import ICacheService
-from ellar.common import Context, Provide, extra_args
-from ellar.core import ExecutionContext, IExecutionContext
-from ellar.core.params import ExtraEndpointArg
-from ellar.helper import is_async_callable
+from ellar.common import Context, IExecutionContext, Provide, extra_args
+from ellar.common.helper import is_async_callable
+from ellar.common.params import ExtraEndpointArg
 
 
 class _CacheDecorator:
@@ -41,10 +40,14 @@ def __init__(
 
         # create extra args
         self._cache_service_arg = ExtraEndpointArg(
-            name=f"cache_service_{uuid.uuid4().hex[:4]}", annotation=ICacheService, default_value=Provide()  # type: ignore
+            name=f"cache_service_{uuid.uuid4().hex[:4]}",
+            annotation=ICacheService,  # type:ignore[misc]
+            default_value=Provide(),
         )
         self._context_arg = ExtraEndpointArg(
-            name=f"route_context_{uuid.uuid4().hex[:4]}", annotation=IExecutionContext, default_value=Context()  # type: ignore
+            name=f"route_context_{uuid.uuid4().hex[:4]}",
+            annotation=IExecutionContext,  # type:ignore[misc]
+            default_value=Context(),
         )
         # apply extra_args to endpoint
         extra_args(self._cache_service_arg, self._context_arg)(func)
@@ -129,9 +132,7 @@ def cache(
     key_prefix: str = "",
     version: str = None,
     backend: str = "default",
-    make_key_callback: t.Callable[
-        [t.Union[ExecutionContext, IExecutionContext], str], str
-    ] = None,
+    make_key_callback: t.Callable[[IExecutionContext, str], str] = None,
 ) -> t.Callable:
     """
 

ellar/cache/make_key_decorator.py

@@ -1,7 +1,7 @@
 import functools
 import typing as t
 
-from ellar.helper import is_async_callable
+from ellar.common.helper import is_async_callable
 
 if t.TYPE_CHECKING:  # pragma: no cover
     from .model import BaseCacheBackend

ellar/cache/module.py

@@ -1,7 +1,7 @@
 import typing as t
 
-from ellar.common import Module
-from ellar.core import Config, DynamicModule, IModuleSetup, ModuleBase, ModuleSetup
+from ellar.common import IModuleSetup, Module
+from ellar.core import Config, DynamicModule, ModuleBase, ModuleSetup
 from ellar.di import ProviderConfig
 
 from .interface import ICacheService

ellar/common/__init__.py

@@ -1,14 +1,14 @@
 import typing as t
 
-from ellar.core.params.params import Param, ParamTypes
-from ellar.core.routing import ModuleRouter
+from starlette.exceptions import WebSocketException
 
+from .commands import EllarTyper, command
+from .datastructures import UploadFile
 from .decorators import (
     Controller,
     Guards,
     Module,
     Version,
-    command,
     exception_handler,
     extra_args,
     file,
@@ -20,6 +20,52 @@
     template_filter,
     template_global,
 )
+from .exceptions import (
+    APIException,
+    AuthenticationFailed,
+    HTTPException,
+    MethodNotAllowed,
+    NotAcceptable,
+    NotAuthenticated,
+    NotFound,
+    PermissionDenied,
+    UnsupportedMediaType,
+)
+from .interfaces import (
+    IExceptionHandler,
+    IExceptionMiddlewareService,
+    IExecutionContext,
+    IExecutionContextFactory,
+    IHostContext,
+    IHostContextFactory,
+    IHTTPConnectionContextFactory,
+    IHTTPHostContext,
+    IModuleSetup,
+    IModuleTemplateLoader,
+    IResponseModel,
+    IWebSocketContextFactory,
+    IWebSocketHostContext,
+)
+from .models import (
+    BaseAPIKey,
+    BaseAuthGuard,
+    BaseHttpAuth,
+    ControllerBase,
+    ControllerType,
+    GuardCanActivate,
+)
+from .params.params import ParamFieldInfo as Param, ParamTypes
+from .responses import (
+    FileResponse,
+    HTMLResponse,
+    JSONResponse,
+    ORJSONResponse,
+    PlainTextResponse,
+    RedirectResponse,
+    Response,
+    StreamingResponse,
+    UJSONResponse,
+)
 from .routing import (
     Body,
     Context,
@@ -29,13 +75,13 @@
     Header,
     Host,
     Http,
+    ModuleRouter,
     Path,
     Provide,
     Query,
     Req,
     Res,
     Session,
-    UploadFile,
     Ws,
     WsBody,
     delete,
@@ -49,8 +95,32 @@
     trace,
     ws_route,
 )
+from .serializer import DataclassSerializer, Serializer, serialize_object
+from .templating import TemplateResponse, render_template, render_template_string
 
 __all__ = [
+    "ControllerBase",
+    "serialize_object",
+    "ControllerType",
+    "BaseAuthGuard",
+    "BaseAPIKey",
+    "BaseHttpAuth",
+    "GuardCanActivate",
+    "EllarTyper",
+    "Serializer",
+    "DataclassSerializer",
+    "WebSocketException",
+    "APIException",
+    "AuthenticationFailed",
+    "NotAuthenticated",
+    "NotFound",
+    "NotAcceptable",
+    "PermissionDenied",
+    "HTTPException",
+    "UnsupportedMediaType",
+    "MethodNotAllowed",
+    "render_template",
+    "render_template_string",
     "command",
     "ModuleRouter",
     "render",
@@ -96,6 +166,29 @@
     "UploadFile",
     "file",
     "extra_args",
+    "JSONResponse",
+    "UJSONResponse",
+    "ORJSONResponse",
+    "StreamingResponse",
+    "HTMLResponse",
+    "FileResponse",
+    "PlainTextResponse",
+    "RedirectResponse",
+    "TemplateResponse",
+    "Response",
+    "IHostContext",
+    "IExecutionContextFactory",
+    "IExecutionContext",
+    "IHostContextFactory",
+    "IHTTPHostContext",
+    "IWebSocketContextFactory",
+    "IWebSocketHostContext",
+    "IHTTPConnectionContextFactory",
+    "IExceptionMiddlewareService",
+    "IExceptionHandler",
+    "IModuleSetup",
+    "IResponseModel",
+    "IModuleTemplateLoader",
 ]
 
 

ellar/commands/__init__.py renamed to ellar/common/commands/__init__.py

@@ -1,5 +1,7 @@
 from .base import EllarTyper
+from .decorator import command
 
 __all__ = [
     "EllarTyper",
+    "command",
 ]

ellar/commands/base.py renamed to ellar/common/commands/base.py

@@ -4,7 +4,7 @@
 from typer.core import TyperCommand
 from typer.models import CommandFunctionType, CommandInfo
 
-from ellar.constants import CALLABLE_COMMAND_INFO
+from ellar.common.constants import CALLABLE_COMMAND_INFO
 
 
 @t.no_type_check

ellar/common/decorators/command.py renamed to ellar/common/commands/decorator.py

@@ -1,5 +1,4 @@
 from .cache_properties import cached_property
-from .contextmanager import asynccontextmanager
 from .dict import AttributeDict, AttributeDictAccessMixin, DataMapper
 from .emails import EmailStr
 
@@ -8,6 +7,5 @@
     "EmailStr",
     "AttributeDictAccessMixin",
     "DataMapper",
-    "asynccontextmanager",
     "AttributeDict",
 ]