sarj-python-lint 1.25.2__tar.gz → 1.25.4__tar.gz

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sarj-python-lint
-Version: 1.25.2
+Version: 1.25.4
 Summary: Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults
 Project-URL: Homepage, https://code-standards.sarj.ai/rules/python/
 Project-URL: Documentation, https://code-standards.sarj.ai/rules/python/

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sarj-python-lint"
-version = "1.25.2"
+version = "1.25.4"
 description = "Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults"
 readme = "README.md"
 authors = [{ name = "sarj-ai" }]

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/__main__.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import ast
 from collections import Counter
+from contextlib import suppress
 from dataclasses import dataclass
 from fnmatch import fnmatch
 import json
@@ -16,6 +17,7 @@ from sarj_python_lint import __version__
 from sarj_python_lint._analysis_session import AnalysisSession
 from sarj_python_lint._file_context import PythonFileContext
 from sarj_python_lint._filesystem import atomic_write_text
+from sarj_python_lint._source import read_python_source
 from sarj_python_lint.json_boundary import is_object_mapping, parse_json
 from sarj_python_lint.rule_base import Diagnostic, ProjectRule, Rule, Severity, is_suppressed
 from sarj_python_lint.rules import REGISTRY
@@ -110,7 +112,7 @@ def _check(rule_ids: list[str], paths: list[Path]) -> list[Diagnostic]:
     loaded: dict[Path, str] = {}
     for path in expanded:
         try:
-            loaded[path] = path.read_text(encoding="utf-8", errors="replace")
+            loaded[path] = read_python_source(path)
         except OSError:
             continue
     project_rules = [rule for rule in rules if isinstance(rule, ProjectRule)]
@@ -138,6 +140,7 @@ def check_source(
             if diagnostic.code == "SARJ419" or not is_suppressed(source_lines, diagnostic.line, diagnostic.code)
         ],
         source=source,
+        context=context,
     )
 
 
@@ -187,21 +190,27 @@ class _OwnerLocation(NamedTuple):
     column: int
 
 
-def deduplicate_diagnostics(diags: list[Diagnostic], *, source: str | None = None) -> list[Diagnostic]:
-    diags = _deduplicate_test_composition(diags, source)
+def deduplicate_diagnostics(
+    diags: list[Diagnostic], *, source: str | None = None, context: PythonFileContext | None = None
+) -> list[Diagnostic]:
     codes = frozenset(diagnostic.code for diagnostic in diags)
     needs_docstring_owners = ("SARJ092" in codes and not codes.isdisjoint(_DIAGNOSTIC_PRECEDENCE["SARJ092"])) or (
         "SARJ420" in codes and not codes.isdisjoint(_DOCSTRING_PRECEDENCE_CODES)
     )
-    docstring_owners = _docstring_owner_locations(source) if source is not None and needs_docstring_owners else {}
     needs_signature_owners = (
         ("SARJ093" in codes and "SARJ034" in codes)
         or ("SARJ447" in codes and "SARJ008" in codes)
         or ("SARJ094" in codes and not codes.isdisjoint(_DIAGNOSTIC_PRECEDENCE["SARJ094"]))
     )
-    signature_owners = (
-        _function_signature_owner_locations(source) if source is not None and needs_signature_owners else {}
+    needs_composition_owners = {"SARJ066", "SARJ457"} <= codes
+    tree = (
+        _diagnostic_owner_tree(source, context)
+        if needs_docstring_owners or needs_signature_owners or needs_composition_owners
+        else None
     )
+    diags = _deduplicate_test_composition(diags, tree)
+    docstring_owners = _docstring_owner_locations(tree) if needs_docstring_owners else {}
+    signature_owners = _function_signature_owner_locations(tree) if needs_signature_owners else {}
 
     def owner_location(diagnostic: Diagnostic) -> _OwnerLocation:
         if diagnostic.code in {"SARJ008", "SARJ034", "SARJ093", "SARJ094", "SARJ447"}:
@@ -236,13 +245,19 @@ def deduplicate_diagnostics(diags: list[Diagnostic], *, source: str | None = Non
     ]
 
 
-def _deduplicate_test_composition(diags: list[Diagnostic], source: str | None) -> list[Diagnostic]:
+def _diagnostic_owner_tree(source: str | None, context: PythonFileContext | None) -> ast.Module | None:
+    if source is None:
+        return None
+    if context is not None and context.source == source:
+        return context.tree
+    with suppress(SyntaxError):
+        return ast.parse(source)
+    return None
+
+
+def _deduplicate_test_composition(diags: list[Diagnostic], tree: ast.Module | None) -> list[Diagnostic]:
     codes = {diagnostic.code for diagnostic in diags}
-    if source is None or not {"SARJ066", "SARJ457"} <= codes:
-        return diags
-    try:
-        tree = ast.parse(source)
-    except SyntaxError:
+    if tree is None or not {"SARJ066", "SARJ457"} <= codes:
         return diags
     whole_tests = {
         (diagnostic.path, diagnostic.line): diagnostic.severity for diagnostic in diags if diagnostic.code == "SARJ066"
@@ -312,10 +327,8 @@ def _typed_docstring_warning_is_superseded(codes: dict[str, set[Severity]]) -> b
     return any(Severity.ERROR in codes.get(generic, set()) for generic in ("SARJ086", "SARJ087"))
 
 
-def _function_signature_owner_locations(source: str) -> dict[int, _OwnerLocation]:
-    try:
-        tree = ast.parse(source)
-    except SyntaxError:
+def _function_signature_owner_locations(tree: ast.Module | None) -> dict[int, _OwnerLocation]:
+    if tree is None:
         return {}
     owners: dict[int, _OwnerLocation] = {}
     for node in ast.walk(tree):
@@ -327,11 +340,7 @@ def _function_signature_owner_locations(source: str) -> dict[int, _OwnerLocation
     return owners
 
 
-def _docstring_owner_locations(source: str) -> dict[int, _OwnerLocation]:
-    try:
-        tree = ast.parse(source)
-    except SyntaxError:
-        tree = None
+def _docstring_owner_locations(tree: ast.Module | None) -> dict[int, _OwnerLocation]:
     if tree is None:
         return {}
     owners: dict[int, _OwnerLocation] = {}

sarj_python_lint-1.25.4/src/sarj_python_lint/_source.py

@@ -0,0 +1,14 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Final
+
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+PYTHON_SOURCE_ENCODING: Final = "utf-8-sig"
+
+
+def read_python_source(path: Path) -> str:
+    return path.read_text(encoding=PYTHON_SOURCE_ENCODING, errors="replace")

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/ratchet.py

@@ -9,6 +9,7 @@ import tokenize
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Final, NamedTuple, TypeGuard
 
+from sarj_python_lint._source import PYTHON_SOURCE_ENCODING
 from sarj_python_lint.json_boundary import is_object_mapping, parse_json
 
 
@@ -329,7 +330,7 @@ def _python_files(root: Path, excluded_dir_names: frozenset[str]) -> Iterator[Pa
 
 def _read(path: Path) -> str:
     try:
-        return path.read_text(encoding="utf-8")
+        return path.read_text(encoding=PYTHON_SOURCE_ENCODING)
     except UnicodeDecodeError, OSError:
         return ""
 

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/rules/_fastapi.py

@@ -5,6 +5,7 @@ from collections import Counter
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Literal, NamedTuple
 
+from sarj_python_lint._source import read_python_source
 from sarj_python_lint.rules._ast_index import walk as walk_ast
 from sarj_python_lint.rules._imports import ImportIndex
 
@@ -839,7 +840,7 @@ def _read_module(path: Path, cache: dict[Path, ast.Module | None]) -> ast.Module
         if path.stat().st_size > _MAX_IMPORTED_MODULE_BYTES:
             tree = None
         else:
-            tree = ast.parse(path.read_text(encoding="utf-8", errors="replace"), filename=str(path))
+            tree = ast.parse(read_python_source(path), filename=str(path))
     except OSError, SyntaxError:
         tree = None
     cache[path] = tree

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/rules/_local_source.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING, final
 
+from sarj_python_lint._source import PYTHON_SOURCE_ENCODING
 from sarj_python_lint.rules._imports import ImportIndex
 
 
@@ -113,7 +114,7 @@ def _read_module(path: Path) -> LocalModule | None:
             data = stream.read(_MAX_MODULE_BYTES + 1)
         if len(data) > _MAX_MODULE_BYTES:
             return None
-        source = data.decode("utf-8")
+        source = data.decode(PYTHON_SOURCE_ENCODING)
         tree = ast.parse(source, filename=str(path))
     except OSError, UnicodeError, SyntaxError:
         return None

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/rules/_nominal_project.py

@@ -11,6 +11,7 @@ from typing import TYPE_CHECKING, TypeGuard, final
 from packaging.requirements import InvalidRequirement, Requirement
 from packaging.utils import canonicalize_name
 
+from sarj_python_lint._source import PYTHON_SOURCE_ENCODING
 from sarj_python_lint.rules._first_party import distribution_root
 from sarj_python_lint.rules._imports import ImportIndex
 from sarj_python_lint.rules._paths import is_generated
@@ -264,7 +265,7 @@ def _source(path: Path) -> NominalSource | None:
     try:
         if path.is_symlink() or path.stat().st_size > _MAX_BYTES:
             return None
-        text = path.read_text(encoding="utf-8")
+        text = path.read_text(encoding=PYTHON_SOURCE_ENCODING)
         if is_generated(path, text):
             return None
     except OSError, UnicodeError:

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/rules/_project_index.py

@@ -11,6 +11,7 @@ import re
 from types import MappingProxyType
 from typing import TYPE_CHECKING, final
 
+from sarj_python_lint._source import read_python_source
 from sarj_python_lint.rules._ast_index import walk as walk_ast
 from sarj_python_lint.rules._first_party import FirstPartyFacts, project_root
 from sarj_python_lint.rules._paths import is_generated
@@ -532,7 +533,7 @@ def _read_bounded_source(root: Path, path: Path) -> LoadedSource | None:
             return None
         resolved = path.resolve()
         resolved.relative_to(root.resolve())
-        return LoadedSource(resolved, resolved.read_text(encoding="utf-8", errors="replace"))
+        return LoadedSource(resolved, read_python_source(resolved))
     except OSError, ValueError:
         return None
 

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/rules/invalid_pydantic_field_default.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from pathlib import Path, PurePosixPath
 from typing import TYPE_CHECKING, NamedTuple, final, override
 
+from sarj_python_lint._source import read_python_source
 from sarj_python_lint.rule_base import (
     AutofixPolicy,
     Diagnostic,
@@ -688,7 +689,7 @@ def _read_module(path: Path) -> ast.Module | None:
     try:
         if path.stat().st_size > _MAX_IMPORTED_MODULE_BYTES:
             return None
-        tree = ast.parse(path.read_text(encoding="utf-8", errors="replace"), filename=str(path))
+        tree = ast.parse(read_python_source(path), filename=str(path))
     except OSError, SyntaxError:
         return None
     return tree

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/rules/no_hidden_constructor_fallback.py

@@ -7,6 +7,7 @@ import os
 from pathlib import Path, PurePosixPath
 from typing import TYPE_CHECKING, ClassVar, NamedTuple, final, override
 
+from sarj_python_lint._source import read_python_source
 from sarj_python_lint.rule_base import (
     Diagnostic,
     ExampleFile,
@@ -718,7 +719,7 @@ def _read_module(path: Path, facts: RuntimeConfigFacts) -> ast.Module:
     if cached is not None:
         return cached
     try:
-        tree = ast.parse(path.read_text(encoding="utf-8", errors="replace"), filename=str(path))
+        tree = ast.parse(read_python_source(path), filename=str(path))
     except OSError, SyntaxError:
         tree = ast.Module(body=[], type_ignores=[])
     facts.modules[path] = tree
@@ -781,7 +782,7 @@ def _candidate_calls_class(
     if is_test_path(candidate):
         return False
     try:
-        source = candidate.read_text(encoding="utf-8", errors="replace")
+        source = read_python_source(candidate)
     except OSError:
         return False
     if class_name not in source or is_generated(candidate, source):

{sarj_python_lint-1.25.2 → sarj_python_lint-1.25.4}/src/sarj_python_lint/rules/require_port_for_service.py

@@ -369,7 +369,7 @@ class RequirePortForService(ProjectRule):
         source_lines = context.source_lines
         data_names = {node.name for node in classes if is_data_type(node)}
         local_class_names = {node.name for node in classes}
-        local_port_names = _local_port_names(classes)
+        local_port_names = _local_port_names(classes, imports)
         factory_facts = _factory_class_facts(tree, classes, context.module_imports)
 
         diags: list[Diagnostic] = []
@@ -823,7 +823,9 @@ def _factory_class_identity(node: ast.ClassDef, imports: ImportIndex) -> bool:
 
 def _factory_interface(node: ast.ClassDef, imports: ImportIndex) -> bool:
     return any(
-        imports.resolves(base, sources=TYPING_SOURCES, symbol="Protocol")
+        imports.resolves(
+            base.value if isinstance(base, ast.Subscript) else base, sources=TYPING_SOURCES, symbol="Protocol"
+        )
         or imports.resolves(base, sources=ABC_SOURCES, symbol="ABC")
         for base in node.bases
     ) or any(
@@ -1246,12 +1248,17 @@ def _dotted_tail(node: ast.expr) -> str | None:
             return None
 
 
-def _local_port_names(classes: list[ast.ClassDef]) -> set[str]:
+def _local_port_names(classes: list[ast.ClassDef], imports: ImportIndex) -> set[str]:
     local_port_names = {
         node.name
         for node in classes
         if _BASE_NAME_RE.match(node.name)
         or _declares_interface(node)
+        or _factory_interface(node, imports)
+        or any(
+            keyword.arg == "metaclass" and imports.resolves(keyword.value, sources=ABC_SOURCES, symbol="ABCMeta")
+            for keyword in node.keywords
+        )
         or any(_dotted_tail(base) in {"ABC", "Protocol"} for base in node.bases)
         or any(keyword.arg == "metaclass" and _dotted_tail(keyword.value) == "ABCMeta" for keyword in node.keywords)
     }