refactor: small refactoring changes (#251)

Author: sdn4z

justfile

@@ -12,11 +12,11 @@ alias t := test
 help:
     just --list --unsorted
 
-# Cleans all artifacts generated while running this project, including the virtualenv.
+# Create a new venv with all the dependencies groups
 venv: 
     @if ! {{ venv-exists }}; \
     then \
-    uv sync --frozen --group dev; \
+    uv sync --frozen --all-groups; \
     fi
 
 # Cleans all artifacts generated while running this project, including the virtualenv.

pyproject.toml

@@ -49,14 +49,16 @@ dev = [
     "pytest<9.0.0,>=7.1.3",
     "mypy<1.17,>=0.982",
     "pytest-cov<7,>=4",
+
+    "ruff<0.12.4,>=0.5.1",
+    "types-requests<3.0.0.0,>=2.32.4.20250611",
+]
+local = [
     "ipdb<1.0.0,>=0.13.9",
     "commitizen<5.0,>=2.38",
     "pdbpp<1.0.0,>=0.11.6",
-    "ruff<0.12.4,>=0.5.1",
-    "types-requests<3.0.0.0,>=2.32.4.20250611",
 ]
 
-
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -66,26 +68,41 @@ target-version = "py39"
 line-length = 120
 
 src = ["twyn", "tests"]
-
 [tool.ruff.lint]
 select = [
-    "C9",  # mccabe
-    "E",   # pycodestyle error
-    "W",   # pycodestyle warning
-    "F",   # pyflakes
-    "B",   # bugbear
-    "D",   # pydocstyle
-    "I",   # isort
-    "C4",  # comprehensions
-    "SIM", # simplify
-    "N",   # pep8-naming
-    "TRY", # tryceratops
+  "B",   # flake8-bugbear
+  "C",   # mccabe
+  "E",   # pycodestyle
+  "W",   # pycodestyle warnings
+  "F",   # pyflakes
+  "I",   # isort
+  "B",   # bugbear
+  "D",   # pydocstyle
+  "I",   # isort
+  "C4",  # comprehensions
+  "SIM", # simplify
+  "N",   # pep8-naming
+  "TRY", # tryceratops
+  "UP",  # pyupgrade
+  "PT",  # pytest-style
+  "TCH", # type-checking
+  "PL",  # pylint
+  "G",   # logging format
+  "TID", # tidy-imports
 ]
-
 ignore = [
-    'D1',     # pydocstyle enforcement of docstrings everywhere
-    'TRY003', # tryceratops too noisy
-    "E501",   # line length (black handles it)
+  "E501",    # line-length (enforced by black instead)
+  'D1',      # pydocstyle enforces docstrings everywhere
+  'TRY003',  # tryceratops rule not useful
+  "PLR0913", # pylint rule not useful
+  "B008",    # checks for function calls in default function arguments.
+  'D206',    # conflicts with formatter
+  'W191',    # conflicts with formatter
+  'D203',    # conflicts with formatter
+  'D211',    # conflicts with formatter
+  'D212',    # conflicts with formatter
+  'UP031',   # allow strings formated with %s
+  'PLR2004'  # magic value
 ]
 
 [tool.ruff.lint.pydocstyle]

src/twyn/base/constants.py

@@ -3,7 +3,7 @@
 import enum
 from typing import TYPE_CHECKING
 
-import twyn.dependency_parser as dependency_parser
+from twyn import dependency_parser
 from twyn.trusted_packages import selectors
 
 if TYPE_CHECKING:

src/twyn/config/config_handler.py

@@ -84,7 +84,7 @@ def add_package_to_allowlist(self, package_name: str) -> None:
 
         config.allowlist.add(package_name)
         self._write_config(toml, config)
-        logger.info(f"Package '{package_name}' successfully added to allowlist")
+        logger.info("Package '%s' successfully added to allowlist", package_name)
 
     def remove_package_from_allowlist(self, package_name: str) -> None:
         """Remove a package from the allowlist configuration in the toml file."""
@@ -95,7 +95,7 @@ def remove_package_from_allowlist(self, package_name: str) -> None:
 
         config.allowlist.remove(package_name)
         self._write_config(toml, config)
-        logger.info(f"Package '{package_name}' successfully removed from allowlist")
+        logger.info("Package '%s' successfully removed from allowlist", package_name)
 
     def _get_read_config(self, toml: TOMLDocument) -> ReadTwynConfiguration:
         """Read the twyn configuration from a provided toml document."""

src/twyn/dependency_parser/dependency_selector.py

@@ -16,7 +16,7 @@ def __init__(self, dependency_file: Optional[str] = None) -> None:
         self.dependency_file = dependency_file or ""
 
     @staticmethod
-    def _raise_for_selected_parsers(parsers) -> None:
+    def _raise_for_selected_parsers(parsers: list[type[AbstractParser]]) -> None:
         if len(parsers) > 1:
             raise MultipleParsersError
 
@@ -45,7 +45,7 @@ def get_dependency_file_parser_from_file_name(
         return parsers[0]
 
     def get_dependency_parser(self) -> AbstractParser:
-        logger.debug(f"Dependency file: {self.dependency_file}")
+        logger.debug("Dependency file: %s", self.dependency_file)
 
         if self.dependency_file:
             logger.debug("Dependency file provided. Assigning a parser.")
@@ -56,6 +56,6 @@ def get_dependency_parser(self) -> AbstractParser:
             dependency_file_parser = self.auto_detect_dependency_file_parser()
             file_parser = dependency_file_parser()
 
-        logger.debug(f"Assigned {file_parser} parser for local dependencies file.")
+        logger.debug("Assigned %s parser for local dependencies file.", file_parser)
 
         return file_parser

src/twyn/dependency_parser/lock_parser.py

@@ -11,23 +11,23 @@
     import tomli as tomllib
 
 
-class LockParser(AbstractParser):
-    """Parser for poetry.lock and uv.lock files."""
+class TomlLockParser(AbstractParser):
+    """Parser for TOML-based lock files."""
 
     def parse(self) -> set[str]:
         """Parse dependencies names and map them to a set."""
         data = tomllib.loads(self._read())
         return {dependency["name"] for dependency in data["package"]}
 
 
-class PoetryLockParser(LockParser):
+class PoetryLockParser(TomlLockParser):
     """Parser for poetry.lock files."""
 
     def __init__(self, file_path: str = filetypes.poetry_lock) -> None:
         super().__init__(file_path)
 
 
-class UvLockParser(LockParser):
+class UvLockParser(TomlLockParser):
     """Parser for uv.lock files."""
 
     def __init__(self, file_path: str = UV_LOCK) -> None:

src/twyn/dependency_parser/requirements_txt_parser.py

@@ -1,10 +1,14 @@
 """Parser for requirements.txt dependencies."""
 
+from typing import TYPE_CHECKING
+
 from dparse import filetypes, parse
-from dparse.dependencies import Dependency, DependencyFile
 
 from twyn.dependency_parser.abstract_parser import AbstractParser
 
+if TYPE_CHECKING:
+    from dparse.dependencies import Dependency, DependencyFile
+
 
 class RequirementsTxtParser(AbstractParser):
     """Parser for requirements.txt dependencies."""

src/twyn/main.py

@@ -57,10 +57,10 @@ def check_dependencies(
     errors: list[TyposquatCheckResult] = []
     for dependency in track(normalized_dependencies, description="Processing..."):
         if dependency in normalized_allowlist_packages:
-            logger.info(f"Dependency {dependency} is in the allowlist")
+            logger.info("Dependency %s is in the allowlist", dependency)
             continue
 
-        logger.info(f"Analyzing {dependency}")
+        logger.info("Analyzing %s", dependency)
         if dependency not in trusted_packages and (typosquat_results := trusted_packages.get_typosquat(dependency)):
             errors.append(typosquat_results)
 
@@ -79,14 +79,13 @@ def check_dependencies(
 
 def _set_logging_level(logging_level: AvailableLoggingLevels) -> None:
     logger.setLevel(logging_level.value)
-    logger.debug(f"Logging level: {logging_level.value}")
+    logger.debug("Logging level: %s", logging_level.value)
 
 
 def get_candidate_selector(selector_method_name: str) -> AbstractSelector:
-    logger.debug(f"Selector method received {selector_method_name}")
-    selector_method_name = selector_method_name
+    logger.debug("Selector method received %s", selector_method_name)
     selector_method = SELECTOR_METHOD_MAPPING[selector_method_name]()
-    logger.debug(f"Instantiated {selector_method} selector")
+    logger.debug("Instantiated %s selector", selector_method)
     return selector_method
 
 

src/twyn/similarity/algorithm.py

@@ -27,9 +27,9 @@ def __init__(self, max: float) -> None:
     def from_name(cls, name: str) -> SimilarityThreshold:
         name_length = len(name)
         if name_length <= cls.LENGTH_CUTOFF:
-            logger.debug(f"max length of {cls.MAX_FOR_SHORT_WORDS} selected for {name}")
+            logger.debug("max length of %s selected for %s", cls.MAX_FOR_SHORT_WORDS, name)
             return cls(max=cls.MAX_FOR_SHORT_WORDS)
-        logger.debug(f"max length of {cls.MAX_FOR_LONG_WORDS} selected for {name}")
+        logger.debug("max length of {cls.MAX_FOR_LONG_WORDS} selected for %s", name)
         return cls(max=cls.MAX_FOR_LONG_WORDS)  # we allow more typos if the name is longer
 
     def is_inside_threshold(self, value: float) -> bool:

src/twyn/trusted_packages/references.py

@@ -40,7 +40,7 @@ def _download(self) -> dict[str, Any]:
         except requests.exceptions.JSONDecodeError as err:
             raise InvalidJSONError from err
 
-        logger.debug(f"Successfully downloaded trusted packages list from {self.source}")
+        logger.debug("Successfully downloaded trusted packages list from %s", self.source)
 
         return packages_json