feat: create cli extra group

BREAKING CHANGE

Author: sdn4z

.github/workflows/build-test.yml

@@ -34,9 +34,13 @@ jobs:
           WHEEL_FILE=$(ls dist/*.whl | head -1)
           echo "Installing wheel: $WHEEL_FILE"
           uv pip install "$WHEEL_FILE"
+        
+      - name: Test twyn as a library
+        run: uv run python -c "import twyn; twyn.check_dependencies"
 
-      - name: Test --version flag
+      - name: Test twyn as a cli tool
         run: |
+          uv pip install "$WHEEL_FILE[cli]"
           # Test that the CLI is available and --version works
           uv run twyn --version
 

.github/workflows/security.yml

@@ -39,7 +39,7 @@ jobs:
         uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
 
       - name: Install the project
-        run: uv sync --locked
+        run: uv sync --locked --extra cli
 
       - name: Run Twyn against our dependencies
         run: |

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
         uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
 
       - name: Install the dependencies
-        run: uv sync --locked --group dev --python ${{ matrix.python-version }}
+        run: uv sync --locked --group dev --all-extras --python ${{ matrix.python-version }}
 
       - name: Run tests
         run: uv run pytest tests

justfile

@@ -16,7 +16,7 @@ help:
 venv: 
     @if ! {{ venv-exists }}; \
     then \
-    uv sync --frozen --all-groups; \
+    uv sync --frozen --all-extras --all-groups; \
     fi
 
 # Cleans all artifacts generated while running this project, including the virtualenv.

pyproject.toml

@@ -12,8 +12,6 @@ maintainers = [
 requires-python = "<4,>=3.9"
 dependencies = [
     "requests<3.0.0,>=2.32.4",
-    "click<9.0.0,>=8.1.8",
-    "rich<15.0.0,>=14.0.0",
     "rapidfuzz<4.0.0,>=2.13.7",
     "pyparsing<4.0.0,>=3.2.3",
     "tomlkit<0.14.0,>=0.11.6",
@@ -26,6 +24,13 @@ description = "Security tool against dependency typosquatting attacks"
 readme = "README.md"
 dynamic = ["version"]
 
+[project.optional-dependencies]
+cli = [
+    "click<9.0.0,>=8.1.8",
+    "rich<15.0.0,>=14.0.0",
+]
+
+
 [tool.hatch.version]
 path = "VERSION"
 pattern = "v(?P<version>[^\\s]+)"

src/twyn/base/exceptions.py

@@ -1,8 +1,6 @@
 import logging
 from typing import IO, Any, Optional
 
-import click
-
 logger = logging.getLogger("twyn")
 
 
@@ -19,14 +17,20 @@ def __init__(self, message: str = "") -> None:
         super().__init__(message or self.message)
 
 
-class CliError(click.ClickException):
-    """Error that will populate application errors to stdout. It does not inherit from `TwynError`."""
+try:
+    import click
 
-    message = "CLI error"
+    class CliError(click.ClickException):
+        """Error that will populate application errors to stdout. It does not inherit from `TwynError`."""
 
-    def __init__(self, message: str = "") -> None:
-        super().__init__(message)
+        message = "CLI error"
+
+        def __init__(self, message: str = "") -> None:
+            super().__init__(message)
+
+        def show(self, file: Optional[IO[Any]] = None) -> None:
+            logger.debug(self.format_message(), exc_info=True)
+            logger.error(self.format_message(), exc_info=False)
 
-    def show(self, file: Optional[IO[Any]] = None) -> None:
-        logger.debug(self.format_message(), exc_info=True)
-        logger.error(self.format_message(), exc_info=False)
+except ModuleNotFoundError:
+    pass

src/twyn/cli.py

@@ -2,29 +2,38 @@
 import sys
 from typing import Optional
 
-import click
-from rich.console import Console
-from rich.logging import RichHandler
-
 from twyn.__version__ import __version__
 from twyn.base.constants import (
     DEFAULT_PROJECT_TOML_FILE,
     DEPENDENCY_FILE_MAPPING,
     SELECTOR_METHOD_MAPPING,
 )
-from twyn.base.exceptions import CliError, TwynError
+from twyn.base.exceptions import TwynError
 from twyn.config.config_handler import ConfigHandler
 from twyn.file_handler.file_handler import FileHandler
 from twyn.main import check_dependencies
 from twyn.trusted_packages.cache_handler import CacheHandler
 from twyn.trusted_packages.constants import CACHE_DIR
 
+try:
+    import click
+    from rich.console import Console
+    from rich.logging import RichHandler
+
+    from twyn.base.exceptions import CliError
+except ImportError:
+    print("Could not run twyn as a cli tool, some dependencies are missing! Run `pip install twyn[cli]`.")
+    import sys
+
+    sys.exit(1)
+
+logger = logging.getLogger("twyn")
+
 logging.basicConfig(
     format="%(message)s",
     datefmt="[%X]",
     handlers=[RichHandler(rich_tracebacks=True, show_path=False, console=Console(stderr=True))],
 )
-logger = logging.getLogger("twyn")
 
 
 @click.group()

src/twyn/main.py

@@ -1,8 +1,7 @@
 import logging
+from collections.abc import Iterable
 from typing import Optional, Union
 
-from rich.progress import track
-
 from twyn.base.constants import (
     SELECTOR_METHOD_MAPPING,
     PackageEcosystems,
@@ -59,6 +58,7 @@ def check_dependencies(
     Returns:
         TyposquatCheckResultList: A list of results indicating which dependencies, if any, are suspected typosquats.
     """
+
     config = _get_config(
         load_config_from_file=load_config_from_file,
         config_file=config_file,
@@ -88,21 +88,31 @@ def check_dependencies(
     normalized_dependencies = top_package_reference.normalize_packages(dependencies_to_check)
 
     typos_list = TyposquatCheckResultList()
-    dependencies_list = (
-        track(normalized_dependencies, description="Processing...") if show_progress_bar else normalized_dependencies
-    )
-    for dependency in dependencies_list:
+
+    for dependency in _get_dependencies_list(normalized_dependencies, show_progress_bar):
         if dependency in normalized_allowlist_packages:
             logger.info("Dependency %s is in the allowlist", dependency)
             continue
 
         logger.info("Analyzing %s", dependency)
         if dependency not in trusted_packages and (typosquat_results := trusted_packages.get_typosquat(dependency)):
             typos_list.errors.append(typosquat_results)
-
     return typos_list
 
 
+def _get_dependencies_list(normalized_dependencies: set[str], show_progress_bar: bool) -> Iterable[str]:
+    try:
+        from rich.progress import track  # noqa: PLC0415
+
+        return (
+            track(normalized_dependencies, description="Processing...")
+            if show_progress_bar
+            else normalized_dependencies
+        )
+    except ImportError:
+        return normalized_dependencies
+
+
 def _get_selector_method(selector_method: str) -> SelectorMethod:
     if selector_method not in SELECTOR_METHOD_MAPPING:
         InvalidSelectorMethodError("Invalid selector method")

tests/main/conftest.py

@@ -8,6 +8,6 @@
 @pytest.fixture(scope="module")
 def disable_track() -> Generator[None, Any, None]:
     """Disables the track UI for running tests."""
-    with patch("twyn.main.track") as m_track:
+    with patch("rich.progress.track") as m_track:
         m_track.side_effect = lambda iterable, description: iterable
         yield

tests/main/test_main.py

@@ -312,7 +312,7 @@ def test_track_is_disabled_by_default_when_used_as_package(
             package_ecosystem=None,
         )
         mock_get_packages.return_value = {"requests"}
-        with patch("twyn.main.track") as m_track:
+        with patch("rich.progress.track") as m_track:
             check_dependencies()
         assert m_track.call_count == 0
 
@@ -328,7 +328,7 @@ def test_track_is_shown_when_enabled(self, mock_config: Mock, mock_get_packages:
             package_ecosystem=None,
         )
         mock_get_packages.return_value = {"requests"}
-        with patch("twyn.main.track") as m_track:
+        with patch("rich.progress.track") as m_track:
             check_dependencies(show_progress_bar=True)
         assert m_track.call_count == 1