Merge pull request #139 from python-ellar/core_and_auth_dependency

Fixed Auth And Core pkg Dependency

Author: eadwinCode

README.md

@@ -51,7 +51,7 @@ $(venv) pip install ellar
 ```python
 import uvicorn
 from ellar.common import Body, Controller, ControllerBase, delete, get, post, put, Serializer, Inject
-from ellar.core import AppFactory
+from ellar.app import AppFactory
 from ellar.di import injectable, request_scope
 from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder, SwaggerUI
 from pydantic import Field

docs/basics/lifespan.md

@@ -6,7 +6,7 @@ The lifespan manager must be run before ellar starts serving incoming request.
 ```python
 import uvicorn
 import contextlib
-from ellar.core import App, AppFactory
+from ellar.app import App, AppFactory
 
 @contextlib.asynccontextmanager
 async def some_async_resource():

docs/custom-setup.md

@@ -42,7 +42,7 @@ class MathAPI:
 Create another file `server.py`:
 
 ```Python
-from ellar.core import AppFactory
+from ellar.app import AppFactory
 from ellar.openapi import OpenAPIDocumentBuilder, OpenAPIDocumentModule
 from .controller import router, MathAPI
 

docs/index.md

@@ -57,7 +57,7 @@ $(venv) pip install ellar
 ```python
 import uvicorn
 from ellar.common import Body, Controller, ControllerBase, delete, get, post, put, Serializer, Inject
-from ellar.core import AppFactory
+from ellar.app import AppFactory
 from ellar.di import injectable, request_scope
 from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder, SwaggerUI
 from pydantic import Field

docs/overview/interceptors.md

@@ -121,7 +121,7 @@ If we want to restrict the interceptor's scope to a single method, we simply app
 In order to set up a global interceptor, we use the use_global_interceptors() method of the Ellar application instance:
 
 ```python
-from ellar.core import AppFactory
+from ellar.app import AppFactory
 
 app = AppFactory.create_from_app_module(ApplicationModule)
 app.use_global_interceptors(LoggingInterceptor())

docs/overview/step-one.md

@@ -54,7 +54,7 @@ In `project_name.server`, we create the `application` instance using the `AppFac
 import os
 
 from ellar.common.constants import ELLAR_CONFIG_MODULE
-from ellar.core.factory import AppFactory
+from ellar.app import AppFactory
 from .root_module import ApplicationModule
 
 application = AppFactory.create_from_app_module(

docs/quick-project.md

@@ -244,7 +244,7 @@ then add the following below.
 import os
 
 from ellar.common.constants import ELLAR_CONFIG_MODULE
-from ellar.core import AppFactory
+from ellar.app import AppFactory
 from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder, SwaggerDocumentGenerator
 from .root_module import ApplicationModule
 

docs/security/authentication.md

@@ -270,7 +270,7 @@ from ellar.auth import UserIdentity
 from ellar.common.serializer.guard import (
     HTTPAuthorizationCredentials,
 )
-from ellar.core.guards import GuardHttpBearerAuth
+from ellar.auth.guards import GuardHttpBearerAuth
 from ellar.di import injectable
 from ellar_jwt import JWTService
 from ellar.common import logger, IExecutionContext
@@ -494,7 +494,7 @@ Let us define a mechanism for declaring routes as anonymous or public.
         HTTPAuthorizationCredentials,
     )
     from ellar.common import IExecutionContext, set_metadata, logger
-    from ellar.core.guards import GuardHttpBearerAuth
+    from ellar.auth.guards import GuardHttpBearerAuth
     from ellar.core import Reflector
     from ellar.di import injectable
     from ellar_jwt import JWTService
@@ -543,7 +543,7 @@ Let us define a mechanism for declaring routes as anonymous or public.
         HTTPAuthorizationCredentials,
     )
     from ellar.common import IExecutionContext, set_metadata, constants, GuardCanActivate, logger
-    from ellar.core.guards import GuardHttpBearerAuth
+    from ellar.auth.guards import GuardHttpBearerAuth
     from ellar.di import injectable
     from ellar_jwt import JWTService
 

ellar/app/__init__.py

@@ -0,0 +1,7 @@
+from .factory import AppFactory
+from .main import App
+
+__all__ = [
+    "App",
+    "AppFactory",
+]

ellar/core/factory.py ellar/app/factory.pyellar/core/factory.py renamed to ellar/app/factory.py

@@ -6,14 +6,14 @@
 from ellar.common import EllarTyper
 from ellar.common.constants import MODULE_METADATA, MODULE_WATERMARK
 from ellar.common.models import GuardCanActivate
-from ellar.core.main import App
+from ellar.core.conf import Config
 from ellar.core.modules import DynamicModule, ModuleBase, ModuleSetup
 from ellar.di import EllarInjector, ProviderConfig
 from ellar.reflect import reflect
 from starlette.routing import Host, Mount
 
-from .conf import Config
-from .core_services import EllarCoreService
+from .main import App
+from .services import EllarAppService
 
 if t.TYPE_CHECKING:  # pragma: no cover
     from ellar.common.routing import ModuleMount, ModuleRouter
@@ -132,8 +132,8 @@ def _get_config_kwargs() -> t.Dict:
         config = Config(app_configured=True, **_get_config_kwargs())
         injector = EllarInjector(auto_bind=config.INJECTOR_AUTO_BIND)
         injector.container.register_instance(config, concrete_type=Config)
-        core_service = EllarCoreService(injector, config)
-        core_service.register_core_services()
+        service = EllarAppService(injector, config)
+        service.register_core_services()
 
         cls._build_modules(app_module=module, injector=injector, config=config)