Merge pull request #25 from eadwinCode/ellar_refactor_fix

eadwinCode · web-flow · commit cdb3e274b38a · 2023-05-11T22:27:25.000+01:00
Ellar refactor fix
diff --git a/ellar_cli/constants.py b/ellar_cli/constants.py
@@ -1 +1,2 @@
 ELLAR_META = "ELLAR_META"
+ELLAR_PY_PROJECT = "ellar"
diff --git a/ellar_cli/main.py b/ellar_cli/main.py
@@ -3,11 +3,11 @@
 import typing as t
 
 import typer
-from ellar.commands import EllarTyper
-from ellar.constants import CALLABLE_COMMAND_INFO, MODULE_METADATA
+from ellar.common.commands import EllarTyper
+from ellar.common.constants import CALLABLE_COMMAND_INFO, MODULE_METADATA
 from ellar.core.factory import AppFactory
 from ellar.core.modules import ModuleSetup
-from ellar.services import Reflector
+from ellar.core.services import Reflector
 from typer import Typer
 from typer.models import CommandInfo
 
@@ -61,7 +61,7 @@ def build_typers() -> t.Any:
 
     if meta_ and meta_.has_meta:
         module_configs = AppFactory.get_all_modules(
-            ModuleSetup(meta_.import_root_module())  # type: ignore
+            ModuleSetup(meta_.import_root_module())  # type:ignore
         )
         reflector = Reflector()
 
diff --git a/ellar_cli/manage_commands/create_module.py b/ellar_cli/manage_commands/create_module.py
@@ -4,7 +4,7 @@
 from importlib import import_module
 
 import typer
-from ellar.helper.module_loading import module_dir
+from ellar.common.helper.module_loading import module_dir
 
 from ellar_cli import scaffolding
 from ellar_cli.constants import ELLAR_META
diff --git a/ellar_cli/manage_commands/create_project.py b/ellar_cli/manage_commands/create_project.py
@@ -4,7 +4,7 @@
 from importlib import import_module
 
 import typer
-from ellar.helper.module_loading import module_dir
+from ellar.common.helper.module_loading import module_dir
 
 from ellar_cli import scaffolding
 from ellar_cli.constants import ELLAR_META
diff --git a/ellar_cli/manage_commands/new.py b/ellar_cli/manage_commands/new.py
@@ -4,7 +4,7 @@
 import typing as t
 
 import typer
-from ellar.helper.module_loading import module_dir
+from ellar.common.helper.module_loading import module_dir
 
 from ellar_cli import scaffolding
 from ellar_cli.schema import EllarScaffoldSchema
diff --git a/ellar_cli/manage_commands/runserver.py b/ellar_cli/manage_commands/runserver.py
@@ -4,7 +4,8 @@
 from pathlib import Path
 
 import typer
-from ellar.helper.enums import create_enums_from_list
+from ellar.common.constants import LOG_LEVELS
+from ellar.common.helper.enums import create_enums_from_list
 from h11._connection import DEFAULT_MAX_INCOMPLETE_EVENT_SIZE
 from uvicorn.config import (
     HTTP_PROTOCOLS,
diff --git a/ellar_cli/scaffolding/module_template/module_name/controllers.ellar b/ellar_cli/scaffolding/module_template/module_name/controllers.ellar
@@ -8,8 +8,7 @@ class MyController(ControllerBase):
     def index(self):
         return {'detail': "Welcome Dog's Resources"}
 """
-from ellar.common import Controller, get
-from ellar.core import ControllerBase
+from ellar.common import Controller, ControllerBase, get
 
 
 @Controller
diff --git a/ellar_cli/scaffolding/module_template/module_name/schemas.ellar b/ellar_cli/scaffolding/module_template/module_name/schemas.ellar
@@ -13,5 +13,4 @@ class ASampleDTO(DataclassSerializer):
     name: str
     age: t.Optional[int] = None
 """
-from ellar.serializer import DataclassSerializer, Serializer
-
+from ellar.common import DataclassSerializer, Serializer
diff --git a/ellar_cli/scaffolding/new_template/folder_name/tests/conftest.ellar b/ellar_cli/scaffolding/new_template/folder_name/tests/conftest.ellar
@@ -1,2 +1 @@
-from ellar.core import TestClientFactory, TestClient
-
+from ellar.testing import Test, TestClient
diff --git a/ellar_cli/scaffolding/project_template/project_name/config.ellar b/ellar_cli/scaffolding/project_template/project_name/config.ellar
@@ -10,8 +10,8 @@ import typing as t
 
 from pydantic.json import ENCODERS_BY_TYPE as encoders_by_type
 from starlette.middleware import Middleware
-from ellar.core.exceptions import IExceptionHandler
-from ellar.core import ConfigDefaultTypesMixin, JSONResponse
+from ellar.common import IExceptionHandler, JSONResponse
+from ellar.core import ConfigDefaultTypesMixin
 from ellar.core.versioning import BaseAPIVersioning, DefaultAPIVersioning
 
 
@@ -68,4 +68,3 @@ class BaseConfig(ConfigDefaultTypesMixin):
 
 class DevelopmentConfig(BaseConfig):
     DEBUG: bool = True
-
diff --git a/ellar_cli/scaffolding/project_template/project_name/root_module.ellar b/ellar_cli/scaffolding/project_template/project_name/root_module.ellar
@@ -1,7 +1,5 @@
-from ellar.common import Module, exception_handler
+from ellar.common import Module, exception_handler, IExecutionContext, JSONResponse, Response
 from ellar.core import ModuleBase
-from ellar.core.context import IExecutionContext
-from ellar.core.response import JSONResponse, Response
 from ellar.samples.modules import HomeModule
 
 
@@ -10,4 +8,3 @@ class ApplicationModule(ModuleBase):
     @exception_handler(404)
     def exception_404_handler(cls, ctx: IExecutionContext, exc: Exception) -> Response:
         return JSONResponse(dict(detail="Resource not found."))
-
diff --git a/ellar_cli/scaffolding/project_template/project_name/server.ellar b/ellar_cli/scaffolding/project_template/project_name/server.ellar
@@ -1,6 +1,6 @@
 import os
 
-from ellar.constants import ELLAR_CONFIG_MODULE
+from ellar.common.constants import ELLAR_CONFIG_MODULE
 from ellar.core.factory import AppFactory
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder, SwaggerDocumentGenerator
 from .root_module import ApplicationModule
diff --git a/ellar_cli/schema.py b/ellar_cli/schema.py
@@ -1,6 +1,6 @@
 import typing as t
 
-from ellar.serializer import Serializer
+from ellar.common.serializer import Serializer
 from pydantic import Field
 
 
diff --git a/ellar_cli/service.py b/ellar_cli/service.py
@@ -2,13 +2,14 @@
 import typing as t
 
 from click import ClickException
-from ellar.constants import ELLAR_CONFIG_MODULE, ELLAR_PY_PROJECT
+from ellar.common.constants import ELLAR_CONFIG_MODULE
+from ellar.common.helper.importer import import_from_string, module_import
+from ellar.common.helper.module_loading import module_dir
 from ellar.core import App, Config, ModuleBase
-from ellar.helper.importer import import_from_string, module_import
-from ellar.helper.module_loading import module_dir
 from tomlkit import dumps as tomlkit_dumps, parse as tomlkit_parse, table
 from tomlkit.items import Table
 
+from ellar_cli.constants import ELLAR_PY_PROJECT
 from ellar_cli.schema import EllarPyProjectSerializer
 
 PY_PROJECT_TOML = "pyproject.toml"
diff --git a/pyproject.toml b/pyproject.toml
@@ -44,7 +44,7 @@ dependencies = [
     # exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225
     "tomlkit >=0.11.1,<1.0.0,!=0.11.2,!=0.11.3",
     "uvicorn[standard] == 0.22.0",
-    "ellar >= 0.3.4"
+    "ellar >= 0.3.8"
 ]
 
 [project.scripts]
diff --git a/tests/sample_app/example_project/commands.py b/tests/sample_app/example_project/commands.py
@@ -1,5 +1,4 @@
-from ellar.commands import EllarTyper
-from ellar.common import command
+from ellar.common import EllarTyper, command
 
 db = EllarTyper(name="db")
 
diff --git a/tests/sample_app/example_project/config.py b/tests/sample_app/example_project/config.py
@@ -8,7 +8,8 @@
 
 import typing as t
 
-from ellar.core import ConfigDefaultTypesMixin, JSONResponse
+from ellar.common import JSONResponse
+from ellar.core import ConfigDefaultTypesMixin
 from ellar.core.versioning import BaseAPIVersioning, DefaultAPIVersioning
 from pydantic.json import ENCODERS_BY_TYPE as encoders_by_type
 from starlette.middleware import Middleware
diff --git a/tests/sample_app/example_project/root_module.py b/tests/sample_app/example_project/root_module.py
@@ -1,7 +1,6 @@
-from ellar.common import Module, exception_handler
+from ellar.common import JSONResponse, Module, Response, exception_handler
 from ellar.core import ModuleBase
 from ellar.core.connection import Request
-from ellar.core.response import JSONResponse, Response
 
 from .commands import db, whatever_you_want
 
diff --git a/tests/sample_app/example_project/server.py b/tests/sample_app/example_project/server.py
@@ -1,6 +1,6 @@
 import os
 
-from ellar.constants import ELLAR_CONFIG_MODULE
+from ellar.common.constants import ELLAR_CONFIG_MODULE
 from ellar.core.factory import AppFactory
 
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder
diff --git a/tests/sample_app/example_project_2/commands.py b/tests/sample_app/example_project_2/commands.py
@@ -1,5 +1,4 @@
-from ellar.commands import EllarTyper
-from ellar.common import command
+from ellar.common import EllarTyper, command
 
 db = EllarTyper(name="db")
 
diff --git a/tests/sample_app/example_project_2/config.py b/tests/sample_app/example_project_2/config.py
@@ -8,7 +8,8 @@
 
 import typing as t
 
-from ellar.core import ConfigDefaultTypesMixin, JSONResponse
+from ellar.common import JSONResponse
+from ellar.core import ConfigDefaultTypesMixin
 from ellar.core.versioning import BaseAPIVersioning, DefaultAPIVersioning
 from pydantic.json import ENCODERS_BY_TYPE as encoders_by_type
 from starlette.middleware import Middleware
diff --git a/tests/sample_app/example_project_2/root_module.py b/tests/sample_app/example_project_2/root_module.py
@@ -1,7 +1,6 @@
-from ellar.common import Module, exception_handler
+from ellar.common import JSONResponse, Module, Response, exception_handler
 from ellar.core import ModuleBase
 from ellar.core.connection import Request
-from ellar.core.response import JSONResponse, Response
 
 from .commands import db, project_2_command, whatever_you_want
 
diff --git a/tests/sample_app/example_project_2/server.py b/tests/sample_app/example_project_2/server.py
@@ -1,6 +1,6 @@
 import os
 
-from ellar.constants import ELLAR_CONFIG_MODULE
+from ellar.common.constants import ELLAR_CONFIG_MODULE
 from ellar.core.factory import AppFactory
 
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder
diff --git a/tests/test_ellar_py_project.py b/tests/test_ellar_py_project.py
@@ -1,7 +1,7 @@
-from ellar.constants import ELLAR_PY_PROJECT
 from tomlkit import table
 from tomlkit.items import Table
 
+from ellar_cli.constants import ELLAR_PY_PROJECT
 from ellar_cli.service import EllarPyProject
 
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`ELLAR_META = "ELLAR_META"`
	`2`	`+ELLAR_PY_PROJECT = "ellar"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-from ellar.core import TestClientFactory, TestClient`
`2`		`-`
	`1`	`+from ellar.testing import Test, TestClient`