fix: simplify conditional logic check for libraries (#3016)

* fix: simplify conditional logic check for libraries

* fix: correct spelling error in test case as well

Author: cofin

Diff for: codecov.yml

@@ -3,5 +3,9 @@ coverage:
     project:
       default:
         target: auto
+        threshold: 0.1%
+    patch:
+      default:
+        target: auto
 comment:
   require_changes: true

Diff for: litestar/cli/_utils.py

@@ -9,11 +9,13 @@
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
 from functools import wraps
+from importlib.util import find_spec
 from itertools import chain
 from os import getenv
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, Generator, Iterable, Sequence, TypeVar, cast
 
+from click import ClickException, Command, Context, Group, pass_context
 from rich import get_console
 from rich.table import Table
 from typing_extensions import ParamSpec, get_type_hints
@@ -22,28 +24,21 @@
 from litestar.middleware import DefineMiddleware
 from litestar.utils import get_name
 
-RICH_CLICK_INSTALLED = False
-with contextlib.suppress(ImportError):
-    import rich_click  # noqa: F401
+if sys.version_info >= (3, 10):
+    from importlib.metadata import entry_points
+else:
+    from importlib_metadata import entry_points
 
-    RICH_CLICK_INSTALLED = True
-UVICORN_INSTALLED = False
-with contextlib.suppress(ImportError):
-    import uvicorn  # noqa: F401
 
-    UVICORN_INSTALLED = True
-JSBEAUTIFIER_INSTALLED = False
-with contextlib.suppress(ImportError):
-    import jsbeautifier  # noqa: F401
+if TYPE_CHECKING:
+    from litestar.openapi import OpenAPIConfig
+    from litestar.routes import ASGIRoute, HTTPRoute, WebSocketRoute
+    from litestar.types import AnyCallable
 
-    JSBEAUTIFIER_INSTALLED = True
 
-if TYPE_CHECKING or not RICH_CLICK_INSTALLED:  # pragma: no cover
-    from click import ClickException, Command, Context, Group, pass_context
-else:
-    from rich_click import ClickException, Context, pass_context
-    from rich_click.rich_command import RichCommand as Command
-    from rich_click.rich_command import RichGroup as Group
+RICH_CLICK_INSTALLED = find_spec("rich-click") is not None
+UVICORN_INSTALLED = find_spec("uvicorn") is not None
+JSBEAUTIFIER_INSTALLED = find_spec("jsbeautifier") is not None
 
 
 __all__ = (
@@ -59,18 +54,6 @@
 )
 
 
-if sys.version_info >= (3, 10):
-    from importlib.metadata import entry_points
-else:
-    from importlib_metadata import entry_points
-
-
-if TYPE_CHECKING:
-    from litestar.openapi import OpenAPIConfig
-    from litestar.routes import ASGIRoute, HTTPRoute, WebSocketRoute
-    from litestar.types import AnyCallable
-
-
 P = ParamSpec("P")
 T = TypeVar("T")
 
@@ -506,7 +489,7 @@ def _generate_self_signed_cert(certfile_path: Path, keyfile_path: Path, common_n
         from cryptography.x509.oid import NameOID
     except ImportError as err:
         raise LitestarCLIException(
-            "Cryptogpraphy must be installed when using --create-self-signed-cert\nPlease install the litestar[cryptography] extras"
+            "Cryptography must be installed when using --create-self-signed-cert\nPlease install the litestar[cryptography] extras"
         ) from err
 
     subject = x509.Name(

Diff for: litestar/cli/commands/core.py

@@ -8,11 +8,12 @@
 from contextlib import AbstractContextManager, ExitStack, contextmanager
 from typing import TYPE_CHECKING, Any, Iterator
 
+import click
+from click import Context, command, option
 from rich.tree import Tree
 
 from litestar.app import DEFAULT_OPENAPI_CONFIG
 from litestar.cli._utils import (
-    RICH_CLICK_INSTALLED,
     UVICORN_INSTALLED,
     LitestarEnv,
     console,
@@ -25,16 +26,6 @@
 from litestar.routes import ASGIRoute, HTTPRoute, WebSocketRoute
 from litestar.utils.helpers import unwrap_partial
 
-if UVICORN_INSTALLED:
-    import uvicorn
-
-if TYPE_CHECKING or not RICH_CLICK_INSTALLED:  # pragma: no cover
-    import click
-    from click import Context, command, option
-else:
-    import rich_click as click
-    from rich_click import Context, command, option
-
 __all__ = ("info_command", "routes_command", "run_command")
 
 if TYPE_CHECKING:
@@ -226,6 +217,8 @@ def run_command(
     show_app_info(app)
     with _server_lifespan(app):
         if workers == 1 and not reload:
+            import uvicorn
+
             # A guard statement at the beginning of this function prevents uvicorn from being unbound
             # See "reportUnboundVariable in:
             # https://microsoft.github.io/pyright/#/configuration?id=type-check-diagnostics-settings

Diff for: litestar/cli/commands/schema.py

@@ -1,29 +1,17 @@
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 import msgspec
+from click import Path as ClickPath
+from click import group, option
 from yaml import dump as dump_yaml
 
 from litestar import Litestar
 from litestar._openapi.typescript_converter.converter import (
     convert_openapi_to_typescript,
 )
-from litestar.cli._utils import JSBEAUTIFIER_INSTALLED, RICH_CLICK_INSTALLED, LitestarCLIException, LitestarGroup
+from litestar.cli._utils import JSBEAUTIFIER_INSTALLED, LitestarCLIException, LitestarGroup
 from litestar.serialization import encode_json, get_serializer
 
-if TYPE_CHECKING or not RICH_CLICK_INSTALLED:  # pragma: no cover
-    from click import Path as ClickPath
-    from click import group, option
-else:
-    from rich_click import Path as ClickPath
-    from rich_click import group, option
-
-if JSBEAUTIFIER_INSTALLED:  # pragma: no cover
-    from jsbeautifier import Beautifier
-
-    beautifier = Beautifier()
-
-
 __all__ = ("generate_openapi_schema", "generate_typescript_specs", "schema_group")
 
 
@@ -77,11 +65,17 @@ def generate_openapi_schema(app: Litestar, output: Path) -> None:
 @option("--namespace", help="namespace to use for the typescript specs", type=str, default="API")
 def generate_typescript_specs(app: Litestar, output: Path, namespace: str) -> None:
     """Generate TypeScript specs from the OpenAPI schema."""
+    if JSBEAUTIFIER_INSTALLED:  # pragma: no cover
+        from jsbeautifier import Beautifier
+
+        beautifier = Beautifier()
+    else:
+        beautifier = None
     try:
         specs = convert_openapi_to_typescript(app.openapi_schema, namespace)
         # beautifier will be defined if JSBEAUTIFIER_INSTALLED is True
         specs_output = (
-            beautifier.beautify(specs.write()) if JSBEAUTIFIER_INSTALLED else specs.write()  # pyright: ignore
+            beautifier.beautify(specs.write()) if JSBEAUTIFIER_INSTALLED and beautifier else specs.write()  # pyright: ignore
         )
         output.write_text(specs_output)
     except OSError as e:  # pragma: no cover

Diff for: litestar/cli/commands/sessions.py

@@ -1,20 +1,13 @@
-from typing import TYPE_CHECKING
-
+from click import argument, group
 from rich.prompt import Confirm
 
 from litestar import Litestar
-from litestar.cli._utils import RICH_CLICK_INSTALLED, LitestarCLIException, LitestarGroup, console
+from litestar.cli._utils import LitestarCLIException, LitestarGroup, console
 from litestar.middleware import DefineMiddleware
 from litestar.middleware.session import SessionMiddleware
 from litestar.middleware.session.server_side import ServerSideSessionBackend
 from litestar.utils import is_class_and_subclass
 
-if TYPE_CHECKING or not RICH_CLICK_INSTALLED:  # pragma: no cover
-    from click import argument, group
-else:
-    from rich_click import argument, group
-
-
 __all__ = ("clear_sessions_command", "delete_session_command", "get_session_backend", "sessions_group")
 
 

Diff for: litestar/cli/main.py

@@ -10,7 +10,7 @@
     import click
     from click import Context, group, option, pass_context
     from click import Path as ClickPath
-else:
+else:  # pragma: no cover
     import rich_click as click
     from rich_click import Context, group, option, pass_context
     from rich_click import Path as ClickPath

Diff for: tests/unit/test_cli/test_ssl.py

@@ -243,7 +243,7 @@ def test_without_cryptography_installed(
 
     assert isinstance(result.exception, SystemExit)
     exc = get_click_exception(result.exception)
-    assert "Cryptogpraphy must be installed when using --create-self-signed-cert" in exc.message
+    assert "Cryptography must be installed when using --create-self-signed-cert" in exc.message
 
 
 @pytest.mark.usefixtures("mock_uvicorn_run")