fix: lint issues

Author: lukasniessen-bain

src/archunitpython/files/fluentapi/files.py

@@ -10,6 +10,8 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
+
 from archunitpython.common.assertion.violation import EmptyTestViolation, Violation
 from archunitpython.common.extraction.extract_graph import extract_graph
 from archunitpython.common.fluentapi.checkable import CheckOptions
@@ -18,6 +20,7 @@
 from archunitpython.common.projection.project_cycles import project_cycles
 from archunitpython.common.projection.project_edges import project_edges
 from archunitpython.common.projection.project_nodes import project_to_nodes
+from archunitpython.common.projection.types import ProjectedNode
 from archunitpython.common.regex_factory import RegexFactory
 from archunitpython.common.types import Filter, Pattern
 from archunitpython.files.assertion.custom_file_logic import (
@@ -257,7 +260,11 @@ def in_path(self, path: Pattern) -> "DependOnFileCondition":
         )
 
 
-def _get_filtered_nodes(project_path, filters, options):
+def _get_filtered_nodes(
+    project_path: str | None,
+    filters: list[Filter],
+    options: CheckOptions | None,
+) -> list[ProjectedNode]:
     """Extract graph and get nodes matching filters."""
     graph = extract_graph(project_path, options=options)
     nodes = project_to_nodes(graph)
@@ -266,7 +273,12 @@ def _get_filtered_nodes(project_path, filters, options):
     return [n for n in nodes if matches_all_patterns(n.label, filters)]
 
 
-def _check_empty_test(filtered_items, filters, is_negated, options):
+def _check_empty_test(
+    filtered_items: Sequence[object],
+    filters: list[Filter],
+    is_negated: bool,
+    options: CheckOptions | None,
+) -> list[Violation] | None:
     """Check for empty test condition."""
     if not filtered_items and not (options and options.allow_empty_tests):
         return [

src/archunitpython/metrics/fluentapi/export_utils.py

@@ -22,7 +22,7 @@ class MetricsExporter:
 
     @staticmethod
     def export_as_html(
-        data: dict,
+        data: dict[str, object],
         options: ExportOptions | None = None,
     ) -> str:
         """Export metric data as an HTML report.

src/archunitpython/metrics/fluentapi/metrics.py

@@ -8,7 +8,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from typing import Any, Callable
 
 from archunitpython.common.assertion.violation import Violation
 from archunitpython.common.fluentapi.checkable import CheckOptions
@@ -155,7 +155,7 @@ def functions(self) -> "FileMetricThresholdBuilder":
 
 
 class ClassMetricThresholdBuilder:
-    def __init__(self, project_path, filters, metric) -> None:
+    def __init__(self, project_path: str | None, filters: list[Filter], metric: Any) -> None:
         self._project_path = project_path
         self._filters = filters
         self._metric = metric
@@ -189,12 +189,19 @@ def should_be_above_or_equal(self, threshold: float) -> "ClassMetricCondition":
 class ClassMetricCondition:
     """Checkable that verifies a class-level metric threshold."""
 
-    def __init__(self, project_path, filters, metric, threshold, comparison) -> None:
+    def __init__(
+        self,
+        project_path: str | None,
+        filters: list[Filter],
+        metric: Any,
+        threshold: float,
+        comparison: MetricComparison,
+    ) -> None:
         self._project_path = project_path
         self._filters = filters
         self._metric = metric
         self._threshold = threshold
-        self._comparison: MetricComparison = comparison
+        self._comparison = comparison
 
     def check(self, options: CheckOptions | None = None) -> list[Violation]:
         classes = _get_filtered_classes(self._project_path, self._filters)
@@ -218,7 +225,7 @@ def check(self, options: CheckOptions | None = None) -> list[Violation]:
 
 
 class FileMetricThresholdBuilder:
-    def __init__(self, project_path, filters, metric) -> None:
+    def __init__(self, project_path: str | None, filters: list[Filter], metric: Any) -> None:
         self._project_path = project_path
         self._filters = filters
         self._metric = metric
@@ -242,7 +249,14 @@ def should_be_below_or_equal(self, threshold: float) -> "FileMetricCondition":
 class FileMetricCondition:
     """Checkable that verifies a file-level metric threshold."""
 
-    def __init__(self, project_path, filters, metric, threshold, comparison) -> None:
+    def __init__(
+        self,
+        project_path: str | None,
+        filters: list[Filter],
+        metric: Any,
+        threshold: float,
+        comparison: MetricComparison,
+    ) -> None:
         self._project_path = project_path
         self._filters = filters
         self._metric = metric
@@ -288,7 +302,7 @@ def check(self, options: CheckOptions | None = None) -> list[Violation]:
 
 
 class LCOMMetricsBuilder:
-    def __init__(self, project_path, filters) -> None:
+    def __init__(self, project_path: str | None, filters: list[Filter]) -> None:
         self._project_path = project_path
         self._filters = filters
 
@@ -321,7 +335,7 @@ def lcomstar(self) -> "ClassMetricThresholdBuilder":
 
 
 class DistanceMetricsBuilder:
-    def __init__(self, project_path, filters) -> None:
+    def __init__(self, project_path: str | None, filters: list[Filter]) -> None:
         self._project_path = project_path
         self._filters = filters
 
@@ -348,7 +362,7 @@ def not_in_zone_of_uselessness(self) -> "ZoneCondition":
 
 
 class DistanceThresholdBuilder:
-    def __init__(self, project_path, filters, metric_attr) -> None:
+    def __init__(self, project_path: str | None, filters: list[Filter], metric_attr: str) -> None:
         self._project_path = project_path
         self._filters = filters
         self._metric_attr = metric_attr
@@ -375,7 +389,14 @@ def should_be_above(self, threshold: float) -> "DistanceCondition":
 class DistanceCondition:
     """Checkable for distance metric thresholds."""
 
-    def __init__(self, project_path, filters, metric_attr, threshold, comparison) -> None:
+    def __init__(
+        self,
+        project_path: str | None,
+        filters: list[Filter],
+        metric_attr: str,
+        threshold: float,
+        comparison: MetricComparison,
+    ) -> None:
         self._project_path = project_path
         self._filters = filters
         self._metric_attr = metric_attr
@@ -408,7 +429,7 @@ def check(self, options: CheckOptions | None = None) -> list[Violation]:
 class ZoneCondition:
     """Checkable for zone detection (pain/uselessness)."""
 
-    def __init__(self, project_path, filters, zone_type) -> None:
+    def __init__(self, project_path: str | None, filters: list[Filter], zone_type: str) -> None:
         self._project_path = project_path
         self._filters = filters
         self._zone_type = zone_type
@@ -444,7 +465,14 @@ def check(self, options: CheckOptions | None = None) -> list[Violation]:
 
 
 class CustomMetricsBuilder:
-    def __init__(self, project_path, filters, name, description, calculation) -> None:
+    def __init__(
+        self,
+        project_path: str | None,
+        filters: list[Filter],
+        name: str,
+        description: str,
+        calculation: Callable[[ClassInfo], float],
+    ) -> None:
         self._project_path = project_path
         self._filters = filters
         self._name = name
@@ -486,13 +514,21 @@ def should_satisfy(
 class CustomMetricCondition:
     """Checkable for custom metric thresholds."""
 
-    def __init__(self, project_path, filters, name, calculation, threshold, comparison) -> None:
+    def __init__(
+        self,
+        project_path: str | None,
+        filters: list[Filter],
+        name: str,
+        calculation: Callable[[ClassInfo], float],
+        threshold: float,
+        comparison: MetricComparison,
+    ) -> None:
         self._project_path = project_path
         self._filters = filters
         self._name = name
         self._calculation = calculation
         self._threshold = threshold
-        self._comparison: MetricComparison = comparison
+        self._comparison = comparison
 
     def check(self, options: CheckOptions | None = None) -> list[Violation]:
         classes = _get_filtered_classes(self._project_path, self._filters)
@@ -518,7 +554,14 @@ def check(self, options: CheckOptions | None = None) -> list[Violation]:
 class CustomAssertionCondition:
     """Checkable for custom metric assertions."""
 
-    def __init__(self, project_path, filters, name, calculation, assertion) -> None:
+    def __init__(
+        self,
+        project_path: str | None,
+        filters: list[Filter],
+        name: str,
+        calculation: Callable[[ClassInfo], float],
+        assertion: Callable[[float, ClassInfo], bool],
+    ) -> None:
         self._project_path = project_path
         self._filters = filters
         self._name = name

src/archunitpython/slices/fluentapi/slices.py

@@ -16,17 +16,17 @@
 from archunitpython.common.extraction.extract_graph import extract_graph
 from archunitpython.common.fluentapi.checkable import CheckOptions
 from archunitpython.common.projection.project_edges import project_edges
+from archunitpython.common.projection.types import MapFunction
 from archunitpython.slices.assertion.admissible_edges import (
     CoherenceOptions,
-    Rule,
     gather_positive_violations,
     gather_violations,
 )
 from archunitpython.slices.projection.slicing_projections import (
     slice_by_pattern,
     slice_by_regex,
 )
-from archunitpython.slices.uml.generate_rules import generate_rule
+from archunitpython.slices.uml.generate_rules import Rule, generate_rule
 
 
 def project_slices(project_path: str | None = None) -> "SliceConditionBuilder":
@@ -174,7 +174,7 @@ def check(self, options: CheckOptions | None = None) -> list[Violation]:
             edges, rules, contained_nodes, self._coherence_options
         )
 
-    def _get_mapper(self):
+    def _get_mapper(self) -> MapFunction:
         if self._pattern:
             return slice_by_pattern(self._pattern)
         elif self._regex:
@@ -210,7 +210,7 @@ def check(self, options: CheckOptions | None = None) -> list[Violation]:
         forbidden_rule = Rule(source=self._source, target=self._target)
         return gather_violations(edges, [forbidden_rule])
 
-    def _get_mapper(self):
+    def _get_mapper(self) -> MapFunction:
         if self._pattern:
             return slice_by_pattern(self._pattern)
         elif self._regex:

src/archunitpython/testing/assertion.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from archunitpython.common.assertion.violation import Violation
-from archunitpython.common.fluentapi.checkable import CheckOptions
+from archunitpython.common.fluentapi.checkable import Checkable, CheckOptions
 from archunitpython.testing.common.violation_factory import ViolationFactory
 
 
@@ -30,7 +30,7 @@ def format_violations(violations: list[Violation]) -> str:
 
 
 def assert_passes(
-    checkable: object,
+    checkable: Checkable,
     options: CheckOptions | None = None,
 ) -> None:
     """Assert that an architecture rule passes (no violations).
@@ -42,6 +42,6 @@ def assert_passes(
     Raises:
         AssertionError: If the rule has violations.
     """
-    violations = checkable.check(options)  # type: ignore[union-attr]
+    violations = checkable.check(options)
     if violations:
         raise AssertionError(format_violations(violations))