Merge pull request #243 from python-ellar/app_dependencies

Fix: Moved Passlib and click package as an optional dependency

Author: eadwinCode

ellar/app/factory.py

@@ -1,7 +1,6 @@
 import typing as t
 from pathlib import Path
 
-import click
 from ellar.common import IApplicationReady, Module
 from ellar.common.constants import MODULE_METADATA
 from ellar.common.exceptions import ImproperConfiguration
@@ -28,6 +27,7 @@
 from .main import App
 
 if t.TYPE_CHECKING:  # pragma: no cover
+    import click
     from ellar.common import ModuleRouter
     from ellar.core.routing import EllarControllerMount
 
@@ -185,7 +185,7 @@ def create_app(
         global_guards: t.Optional[
             t.List[t.Union[t.Type["GuardCanActivate"], "GuardCanActivate"]]
         ] = None,
-        commands: t.Sequence[t.Union[click.Command, click.Group, t.Any]] = (),
+        commands: t.Sequence[t.Union["click.Command", "click.Group", t.Any]] = (),
         config_module: t.Union[str, t.Dict, None] = None,
         injector: t.Optional[EllarInjector] = None,
     ) -> App:

ellar/common/decorators/modules.py

@@ -3,7 +3,6 @@
 import uuid
 from pathlib import Path
 
-import click
 from ellar.common.compatible import AttributeDict
 from ellar.common.constants import MODULE_METADATA, MODULE_WATERMARK
 from ellar.common.exceptions import ImproperConfiguration
@@ -15,6 +14,9 @@
 from ellar.utils.importer import get_main_directory_by_stack
 from starlette.routing import Host, Mount
 
+if t.TYPE_CHECKING:
+    import click
+
 _ModuleClass = t.TypeVar("_ModuleClass", bound=t.Type)
 
 
@@ -60,7 +62,7 @@ def Module(
     base_directory: t.Optional[t.Union[Path, str]] = None,
     static_folder: str = "static",
     modules: t.Sequence[t.Union[t.Type, t.Any]] = (),
-    commands: t.Sequence[t.Union[click.Command, click.Group, t.Any]] = (),
+    commands: t.Sequence[t.Union["click.Command", "click.Group", t.Any]] = (),
 ) -> t.Callable[[_ModuleClass], _ModuleClass]:
     """
     ========= MODULE DECORATOR ==============

ellar/core/modules/config.py

@@ -2,7 +2,6 @@
 import typing as t
 from functools import cached_property
 
-import click
 from ellar.common import ControllerBase, ModuleRouter
 from ellar.common.constants import MODULE_METADATA, MODULE_WATERMARK
 from ellar.common.exceptions import ImproperConfiguration
@@ -23,6 +22,7 @@
 from .ref import ModuleRefBase, create_module_ref_factor
 
 if t.TYPE_CHECKING:  # pragma: no cover
+    import click
     from ellar.common import IModuleSetup
 
 
@@ -43,7 +43,7 @@ class DynamicModule:
         default_factory=lambda: ()
     )
 
-    commands: t.Sequence[t.Union[click.Command, click.Group, t.Any]] = (
+    commands: t.Sequence[t.Union["click.Command", "click.Group", t.Any]] = (
         dataclasses.field(default_factory=lambda: ())
     )
 

ellar/core/security/hashers/__init__.py

@@ -1,3 +1,10 @@
+try:
+    import passlib  # noqa
+except Exception:  # pragma: no cover
+    raise Exception(
+        "passlib package is required. Use `pip install passlib >= 1.7.4`."
+    ) from None
+
 import typing as t
 
 from ellar.utils.crypto import get_random_string

pyproject.toml

@@ -45,9 +45,7 @@ dependencies = [
     "starlette == 0.38.2",
     "pydantic >=2.5.1,<3.0.0",
     "typing-extensions>=4.8.0",
-    "jinja2",
-    "click >= 8.1.7",
-    "passlib >= 1.7.4",
+    "jinja2"
 ]
 
 [project.urls]
@@ -64,7 +62,8 @@ all = [
     "ujson >=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0,<6.0.0",
     "orjson >=3.2.1,<4.0.0",
     "email_validator >=2.0.0",
-    "httpx >= 0.22.0"
+    "httpx >= 0.22.0",
+    "passlib >= 1.7.4",
 ]
 
 [tool.ruff]

requirements-tests.txt

@@ -3,6 +3,7 @@ anyio[trio] >= 3.2.1
 argon2-cffi == 23.1.0
 autoflake
 bcrypt; python_version >= '3.12'
+click >= 8.1.7,<9.0.0,
 email_validator >=1.1.1
 itsdangerous >=1.1.0,<3.0.0
 mypy == 1.11.2