pydantic upgrade: Added support for pydantic v2 and bumped up ellar version

Author: eadwinCode

Makefile

@@ -23,7 +23,7 @@ lint: ## Run code linters
 	mypy ellar_cli
 
 fmt format: ## Run code formatters
-	black ellar_cli tests
+	ruff format ellar_cli tests
 	ruff check --fix ellar_cli tests
 
 test: ## Run tests

ellar_cli/scaffolding/project_template/project_name/config.ellar

@@ -8,7 +8,7 @@ export ELLAR_CONFIG_MODULE={{project_name}}.config:DevelopmentConfig
 
 import typing as t
 
-from pydantic.json import ENCODERS_BY_TYPE as encoders_by_type
+from ellar.pydantic import ENCODERS_BY_TYPE as encoders_by_type
 from starlette.middleware import Middleware
 from ellar.common import IExceptionHandler, JSONResponse
 from ellar.core import ConfigDefaultTypesMixin

ellar_cli/scaffolding/project_template/project_name/root_module.ellar

@@ -7,4 +7,4 @@ from ellar.samples.modules import HomeModule
 class ApplicationModule(ModuleBase):
     @exception_handler(404)
     def exception_404_handler(cls, ctx: IExecutionContext, exc: Exception) -> Response:
-        return JSONResponse(dict(detail="Resource not found."))
+        return JSONResponse(dict(detail="Resource not found."), status_code=404)

ellar_cli/schema.py

@@ -1,7 +1,7 @@
 import typing as t
 
 from ellar.common.serializer import Serializer
-from pydantic import Field
+from ellar.pydantic import Field
 
 
 class EllarPyProjectSerializer(Serializer):
@@ -18,9 +18,6 @@ class EllarScaffoldList(Serializer):
     files: t.List["EllarScaffoldList"] = Field(default=[])
 
 
-EllarScaffoldList.update_forward_refs()
-
-
 class EllarScaffoldSchema(Serializer):
     context: t.List[str]
     files: t.List[EllarScaffoldList]
@@ -37,3 +34,6 @@ def schema_example(cls) -> "EllarScaffoldSchema":
                 },
             ],
         )
+
+
+EllarScaffoldList.model_rebuild()

ellar_cli/service.py

@@ -29,7 +29,8 @@ def _wrap(self: "EllarCLIService", *args: t.Any, **kwargs: t.Any) -> t.Any:
         if os.environ.get(ELLAR_CONFIG_MODULE) is None and self.has_meta:
             # export ELLAR_CONFIG_MODULE module
             os.environ.setdefault(
-                ELLAR_CONFIG_MODULE, self._meta.config  # type:ignore[union-attr]
+                ELLAR_CONFIG_MODULE,
+                self._meta.config,  # type:ignore[union-attr]
             )
         return func(self, *args, **kwargs)
 

mypy.ini

@@ -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.7"
+    "ellar >= 0.5.8"
 ]
 
 [project.scripts]
@@ -58,10 +58,8 @@ Homepage = "https://eadwincode.github.io/ellar-cli/"
 test = [
     "pytest >=7.1.3,<8.0.0",
     "pytest-cov >=2.12.0,<5.0.0",
-    "ruff ==0.1.6",
     "mypy == 1.7.1",
     "ruff ==0.1.7",
-    "black ==23.11.0",
     "pytest-asyncio",
     "autoflake",
 ]
@@ -89,3 +87,46 @@ ignore = [
 
 [tool.ruff.isort]
 known-third-party = ["ellar",]
+
+[tool.mypy]
+
+show_column_numbers = true
+
+follow_imports = 'normal'
+ignore_missing_imports = true
+
+# be strict
+disallow_untyped_calls = true
+warn_return_any = true
+strict_optional = true
+warn_no_return = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+
+disallow_untyped_defs = true
+check_untyped_defs = true
+implicit_reexport = false
+
+[[tool.mypy.overrides]]
+module = "ellar_cli.compatible.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "ellar_cli.cli.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "ellar_cli.schema.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "ellar_cli.__main__.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "ellar_cli.manage_commands.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "ellar_cli.testing.*"
+ignore_errors = true

pyproject.toml

@@ -11,7 +11,7 @@
 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 ellar.pydantic import ENCODERS_BY_TYPE as encoders_by_type
 from starlette.middleware import Middleware
 
 

tests/sample_app/example_project/config.py

@@ -11,7 +11,7 @@
 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 ellar.pydantic import ENCODERS_BY_TYPE as encoders_by_type
 from starlette.middleware import Middleware
 
 

tests/sample_app/example_project_2/config.py

@@ -37,7 +37,7 @@ def test_import_project_meta_returns_default_project_when_project_is_none(
 
     ellar_cli_service = EllarCLIService.import_project_meta()
 
-    assert ellar_cli_service._meta.dict() == {
+    assert ellar_cli_service._meta.dict(by_alias=False) == {
         "project_name": "some-project",
         "application": "some-project.server:application",
         "config": "some-project.config:DevelopmentConfig",
@@ -55,7 +55,7 @@ def test_import_project_meta_returns_meta_for_a_project(
     add_ellar_project_to_py_project("some-other-project")
 
     ellar_cli_service = EllarCLIService.import_project_meta("some-other-project")
-    assert ellar_cli_service._meta.dict() == {
+    assert ellar_cli_service._meta.dict(by_alias=False) == {
         "project_name": "some-other-project",
         "application": "some-other-project.server:application",
         "config": "some-other-project.config:DevelopmentConfig",
@@ -102,7 +102,7 @@ def test_create_ellar_project_meta_work(
     )
     cli_service.create_ellar_project_meta("new-project")
     ellar_cli_service = EllarCLIService.import_project_meta("new-project")
-    assert ellar_cli_service._meta.dict() == {
+    assert ellar_cli_service._meta.dict(by_alias=False) == {
         "project_name": "new-project",
         "application": "new-project.server:application",
         "config": "new-project.config:DevelopmentConfig",
@@ -142,7 +142,7 @@ def test_import_application_works(tmp_path, write_empty_py_project, process_runn
     result = process_runner(["ellar", "create-project", "new_project_one"])
     assert result.returncode == 0
     ellar_cli_service = EllarCLIService.import_project_meta()
-    assert ellar_cli_service._meta.dict() == {
+    assert ellar_cli_service._meta.dict(by_alias=False) == {
         "project_name": "new_project_one",
         "application": "new_project_one.server:application",
         "config": "new_project_one.config:DevelopmentConfig",