Merge pull request #57 from python-ellar/scaffold_with_lazy

Enhancement: Scaffolding with lazy loaded modules

Author: eadwinCode

ellar_cli/scaffolding/project_template/project_name/server.ellar

@@ -1,12 +1,12 @@
 import os
 
-from ellar.common.constants import ELLAR_CONFIG_MODULE
 from ellar.app import AppFactory
+from ellar.common.constants import ELLAR_CONFIG_MODULE
+from ellar.core import LazyModuleImport as lazyLoad
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder, SwaggerUI
-from .root_module import ApplicationModule
 
 application = AppFactory.create_from_app_module(
-    ApplicationModule,
+    lazyLoad("{{project_name}}.root_module:ApplicationModule"),
     config_module=os.environ.get(
         ELLAR_CONFIG_MODULE, "{{config_prefix}}{{project_name}}.config:DevelopmentConfig"
     ),

ellar_cli/service.py

@@ -145,7 +145,7 @@ def import_project_meta(
                         else ellar_py_projects.default_project
                     )
 
-                    _ellar_pyproject_serializer = cls.schema_cls.parse_obj(
+                    _ellar_pyproject_serializer = cls.schema_cls.model_validate(
                         ellar_py_projects.get_project(project_to_load)
                     )
 

pyproject.toml

@@ -43,7 +43,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.23.2",
-    "ellar >= 0.5.8"
+    "ellar >= 0.6.0"
 ]
 
 [project.scripts]

tests/sample_app/example_project/server.py

@@ -2,12 +2,12 @@
 
 from ellar.app import AppFactory
 from ellar.common.constants import ELLAR_CONFIG_MODULE
+from ellar.core import LazyModuleImport as lazyLoad
 
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder
-from .root_module import ApplicationModule
 
 application = AppFactory.create_from_app_module(
-    ApplicationModule,
+    lazyLoad("example_project.root_module:ApplicationModule"),
     config_module=os.environ.get(
         ELLAR_CONFIG_MODULE, "example_project.config:DevelopmentConfig"
     ),

tests/sample_app/example_project_2/server.py

@@ -2,12 +2,12 @@
 
 from ellar.app import AppFactory
 from ellar.common.constants import ELLAR_CONFIG_MODULE
+from ellar.core import LazyModuleImport as lazyLoad
 
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder
-from .root_module import ApplicationModule
 
 application = AppFactory.create_from_app_module(
-    ApplicationModule,
+    lazyLoad("example_project_2.root_module:ApplicationModule"),
     config_module=os.environ.get(
         ELLAR_CONFIG_MODULE, "example_project_2.config:DevelopmentConfig"
     ),

tests/test_ellar_cli_service.py

@@ -155,7 +155,7 @@ def test_import_application_works(tmp_path, write_empty_py_project, process_runn
 
 def test_import_configuration_works(tmpdir, write_empty_py_project, process_runner):
     result = process_runner(["ellar", "create-project", "new_project_two"])
-    assert result.returncode == 0
+    assert result.returncode == 0, result.stderr
 
     ellar_cli_service = EllarCLIService.import_project_meta()
     config = ellar_cli_service.import_configuration()
@@ -165,7 +165,7 @@ def test_import_configuration_works(tmpdir, write_empty_py_project, process_runn
 
 def test_import_root_module_works(write_empty_py_project, process_runner):
     result = process_runner(["ellar", "create-project", "new_project_three"])
-    assert result.returncode == 0
+    assert result.returncode == 0, result.stderr
 
     ellar_cli_service = EllarCLIService.import_project_meta()
     root_module = ellar_cli_service.import_root_module()