fixed mypy issues

Author: eadwinCode

README.md

@@ -4,10 +4,8 @@
 
 <p align="center"> Ellar CLI Tool for Scaffolding Ellar Projects and Modules and also running Ellar Commands</p>
 
-![Test](https://github.com/eadwinCode/ellar/actions/workflows/test_full.yml/badge.svg)
-![Coverage](https://img.shields.io/codecov/c/github/eadwinCode/ellar)
-[![PyPI version](https://badge.fury.io/py/ellar.svg)](https://badge.fury.io/py/ellar)
-[![PyPI version](https://img.shields.io/pypi/v/ellar.svg)](https://pypi.python.org/pypi/ellar)
-[![PyPI version](https://img.shields.io/pypi/pyversions/ellar.svg)](https://pypi.python.org/pypi/ellar)
-
-
+![Test](https://github.com/eadwinCode/ellar-cli/actions/workflows/test_full.yml/badge.svg)
+![Coverage](https://img.shields.io/codecov/c/github/eadwinCode/ellar-cli)
+[![PyPI version](https://badge.fury.io/py/ellar.svg)](https://badge.fury.io/py/ellar-cli)
+[![PyPI version](https://img.shields.io/pypi/v/ellar.svg)](https://pypi.python.org/pypi/ellar-cli)
+[![PyPI version](https://img.shields.io/pypi/pyversions/ellar.svg)](https://pypi.python.org/pypi/ellar-cli)

ellar_cli/file_scaffolding.py

@@ -12,7 +12,7 @@
 
 
 class ProjectScaffoldContext(dict):
-    def __init__(self, environment: Environment, **kwargs):
+    def __init__(self, environment: Environment, **kwargs: t.Any) -> None:
         super().__init__(kwargs)
         self.environment = environment
         self.environment.globals.update(kwargs)
@@ -27,7 +27,7 @@ def __init__(
         working_directory: str,
         scaffold_ellar_template_root_path: str,
         ellar_cli_service: EllarCLIService,
-    ):
+    ) -> None:
         self._schema = schema
         self._working_project_name = working_project_name
         self._ctx = ProjectScaffoldContext(
@@ -78,7 +78,10 @@ def on_scaffold_started(self) -> None:
             assert self._ctx[context], f"{context} template context is missing."
 
     def create_directory(
-        self, file: EllarScaffoldList, scaffold_ellar_template_path, working_directory
+        self,
+        file: EllarScaffoldList,
+        scaffold_ellar_template_path: str,
+        working_directory: str,
     ) -> None:
         name = file.name
         if name in self._ctx:

ellar_cli/main.py

@@ -3,13 +3,12 @@
 import typing as t
 
 import typer
-from typer import Typer
-from typer.models import CommandInfo
-
 from ellar.commands import EllarTyper
 from ellar.constants import CALLABLE_COMMAND_INFO, ELLAR_META, MODULE_METADATA
 from ellar.core.factory import AppFactory
 from ellar.services import Reflector
+from typer import Typer
+from typer.models import CommandInfo
 
 from .manage_commands import create_module, create_project, runserver
 from .service import EllarCLIService
@@ -35,7 +34,7 @@ def typer_callback(
         help="Run Specific Command on a specific project",
     ),
 ) -> None:
-    meta_: EllarCLIService = EllarCLIService.import_project_meta(project)
+    meta_: t.Optional[EllarCLIService] = EllarCLIService.import_project_meta(project)
     ctx.meta[ELLAR_META] = meta_
 
 
@@ -54,7 +53,7 @@ def build_typers() -> None:
     except Exception:
         raise typer.Abort()
 
-    meta_: EllarCLIService = EllarCLIService.import_project_meta(app_name)
+    meta_: t.Optional[EllarCLIService] = EllarCLIService.import_project_meta(app_name)
 
     if meta_ and meta_.has_meta:
         modules = AppFactory.get_all_modules(meta_.import_root_module())

ellar_cli/manage_commands/create_module.py

@@ -4,14 +4,14 @@
 from importlib import import_module
 
 import typer
-
 from ellar.constants import ELLAR_META
+from ellar.helper.module_loading import module_dir
+
 from ellar_cli import scaffolding
 from ellar_cli.schema import EllarScaffoldSchema
-from ellar.helper.module_loading import module_dir
 
-from ..service import EllarCLIException, EllarCLIService
 from ..file_scaffolding import FileTemplateScaffold
+from ..service import EllarCLIException, EllarCLIService
 
 __all__ = ["create_module"]
 

ellar_cli/manage_commands/create_project.py

@@ -4,14 +4,14 @@
 from importlib import import_module
 
 import typer
-
 from ellar.constants import ELLAR_META
+from ellar.helper.module_loading import module_dir
+
 from ellar_cli import scaffolding
 from ellar_cli.schema import EllarScaffoldSchema
-from ellar.helper.module_loading import module_dir
 
-from ..service import EllarCLIException, EllarCLIService
 from ..file_scaffolding import FileTemplateScaffold
+from ..service import EllarCLIException, EllarCLIService
 
 __all__ = ["create_project"]
 

ellar_cli/manage_commands/runserver.py

@@ -5,6 +5,9 @@
 from pathlib import Path
 
 import typer
+from ellar.constants import ELLAR_CONFIG_MODULE, ELLAR_META, LOG_LEVELS
+from ellar.core import Config
+from ellar.helper.enums import create_enums_from_list
 from h11._connection import DEFAULT_MAX_INCOMPLETE_EVENT_SIZE
 from uvicorn.config import (
     HTTP_PROTOCOLS,
@@ -17,10 +20,6 @@
 )
 from uvicorn.main import run as uvicorn_run
 
-from ellar.constants import ELLAR_CONFIG_MODULE, ELLAR_META, LOG_LEVELS
-from ellar.core import Config
-from ellar.helper.enums import create_enums_from_list
-
 from ..service import EllarCLIException, EllarCLIService
 
 __all__ = ["runserver"]

ellar_cli/schema.py

@@ -1,8 +1,7 @@
 import typing as t
 
-from pydantic import Field
-
 from ellar.serializer import Serializer
+from pydantic import Field
 
 
 class EllarPyProjectSerializer(Serializer):
@@ -43,4 +42,4 @@ def schema_example(cls) -> "EllarScaffoldSchema":
                     ],
                 ),
             ],
-        )
+        )

ellar_cli/service.py

@@ -2,14 +2,14 @@
 import typing as t
 
 from click import ClickException
+from ellar.constants import ELLAR_PY_PROJECT
+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.constants import ELLAR_PY_PROJECT
-from ellar.core import App, Config, ModuleBase, schema
 from ellar_cli.schema import EllarPyProjectSerializer
-from ellar.helper.importer import import_from_string, module_import
-from ellar.helper.module_loading import module_dir
 
 PY_PROJECT_TOML = "pyproject.toml"
 ELLAR_DEFAULT_KEY = "default"
@@ -23,7 +23,9 @@ class EllarCLIException(ClickException):
 class EllarPyProject:
     def __init__(self, ellar: Table = None) -> None:
         self._ellar = ellar if ellar is not None else table()
-        self._projects = self._ellar.setdefault(ELLAR_PROJECTS_KEY, table())
+        self._projects = t.cast(
+            Table, self._ellar.setdefault(ELLAR_PROJECTS_KEY, table())
+        )
         self._default_project = self._ellar.get(ELLAR_DEFAULT_KEY, None)
 
     @classmethod
@@ -49,11 +51,11 @@ def get_projects(self) -> Table:
         return self._projects
 
     def get_project(self, project_name: str) -> Table:
-        return self._projects.get(project_name)
+        return t.cast(Table, self._projects.get(project_name))
 
     def get_or_create_project(self, project_name: str) -> Table:
         project = self._projects.setdefault(project_name.lower(), table())
-        return project
+        return t.cast(Table, project)
 
     def has_project(self, project_name: t.Optional[str]) -> bool:
         if not project_name:
@@ -65,7 +67,7 @@ def get_root_node(self) -> Table:
 
 
 class EllarCLIService:
-    schema_cls: t.Type[schema.Serializer] = EllarPyProjectSerializer
+    schema_cls: t.Type[EllarPyProjectSerializer] = EllarPyProjectSerializer
 
     def __init__(
         self,
@@ -101,7 +103,7 @@ def import_project_meta(
         cls, project: t.Optional[str] = None
     ) -> t.Optional["EllarCLIService"]:
         cwd = os.getcwd()
-        project_to_load: t.Optional[str] = None
+        project_to_load: str = "ellar"
         ellar_py_projects = None
 
         py_project_file_path = os.path.join(cwd, PY_PROJECT_TOML)
@@ -118,16 +120,13 @@ def import_project_meta(
                     project
                 ) or ellar_py_projects.has_project(ellar_py_projects.default_project):
                     project_to_load = (
-                        project
+                        project  # type: ignore
                         if ellar_py_projects.has_project(project)
                         else ellar_py_projects.default_project
                     )
 
-                    _ellar_pyproject_serializer = t.cast(
-                        EllarPyProjectSerializer,
-                        cls.schema_cls.parse_obj(
-                            ellar_py_projects.get_project(project_to_load)
-                        ),
+                    _ellar_pyproject_serializer = cls.schema_cls.parse_obj(
+                        ellar_py_projects.get_project(project_to_load)
                     )
 
             return cls(
@@ -137,6 +136,7 @@ def import_project_meta(
                 app_name=project_to_load,
                 ellar_py_projects=ellar_py_projects,
             )
+        return None
 
     def create_ellar_project_meta(self, project_name: str) -> None:
         pyproject_table = EllarCLIService.read_py_project(self.py_project_path)
@@ -173,32 +173,40 @@ def read_py_project(path: str) -> t.Optional[Table]:
             with open(path, mode="r") as fp:
                 table_content = tomlkit_parse(fp.read())
                 return table_content
+        return None
 
     @staticmethod
     def write_py_project(path: str, content: Table) -> None:
         with open(path, mode="w") as fw:
             fw.writelines(tomlkit_dumps(content))
 
     def import_application(self) -> "App":
-        application_module = import_from_string(self._meta.application)
+        assert self._meta
+        application_module = t.cast("App", import_from_string(self._meta.application))
         return application_module
 
     def import_configuration(self) -> t.Type["Config"]:
-        config = import_from_string(self._meta.config)
+        assert self._meta
+        config = t.cast(t.Type["Config"], import_from_string(self._meta.config))
         return config
 
     def get_application_config(self) -> "Config":
+        assert self._meta
         config = Config(self._meta.config)
         return config
 
     def import_root_module(self) -> t.Type["ModuleBase"]:
-        root_module = import_from_string(self._meta.root_module)
+        assert self._meta
+        root_module = t.cast(
+            t.Type["ModuleBase"], import_from_string(self._meta.root_module)
+        )
         return root_module
 
     def import_apps_module(self) -> t.Any:
+        assert self._meta
         apps_module = module_import(self._meta.apps_module)
         return apps_module
 
     def get_apps_module_path(self) -> str:
         apps_module = self.import_apps_module()
-        return module_dir(apps_module)
+        return module_dir(apps_module)  # type: ignore

mypy.ini

@@ -18,17 +18,20 @@ disallow_untyped_defs = True
 check_untyped_defs = True
 implicit_reexport = False
 
-[mypy-ellar.compatible.*]
+[mypy-ellar_cli.compatible.*]
 ignore_errors = True
 
-[mypy-ellar.cli.*]
+[mypy-ellar_cli.cli.*]
 ignore_errors = True
 
-[mypy-ellar.core.schema.*]
+[mypy-ellar_cli.schema.*]
 ignore_errors = True
 
-[mypy-ellar.__main__.*]
+[mypy-ellar_cli.__main__.*]
 ignore_errors = True
 
-[mypy-ellar.samples.*]
+[mypy-ellar_cli.manage_commands.*]
+ignore_errors = True
+
+[mypy-ellar_cli.testing.*]
 ignore_errors = True

pyproject.toml

@@ -50,9 +50,9 @@ dependencies = [
 ellar = "ellar_cli.cli:main"
 
 [project.urls]
-Documentation = "https://github.com/eadwinCode/ellar"
-Source = "https://github.com/eadwinCode/ellar"
-Homepage = "https://eadwincode.github.io/ellar/"
+Documentation = "https://github.com/eadwinCode/ellar-cli"
+Source = "https://github.com/eadwinCode/ellar-cli"
+Homepage = "https://eadwincode.github.io/ellar-cli/"
 
 [project.optional-dependencies]
 test = [