sarj-python-lint 0.76.0__tar.gz → 0.77.1__tar.gz

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.5
 Name: sarj-python-lint
-Version: 0.76.0
+Version: 0.77.1
 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/
-Project-URL: Changelog, https://github.com/sarj-ai/standards/releases
-Project-URL: Repository, https://github.com/sarj-ai/standards
-Project-URL: Issues, https://github.com/sarj-ai/standards/issues
+Project-URL: Changelog, https://github.com/sarj-ai/code-standards/releases
+Project-URL: Repository, https://github.com/sarj-ai/code-standards
+Project-URL: Issues, https://github.com/sarj-ai/code-standards/issues
 Author: sarj-ai
 License-Expression: MIT
 License-File: LICENSE
@@ -19,7 +19,7 @@ Classifier: Topic :: Software Development :: Quality Assurance
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 
-<!-- Generated by `sarj-standards maintain docs sync`; do not edit. -->
+<!-- Generated by `code-standards maintain docs sync`; do not edit. -->
 
 # sarj-python-lint
 
@@ -33,4 +33,4 @@ uv tool install sarj-python-lint
 sarj-python-lint --help
 ```
 
-[Documentation](https://code-standards.sarj.ai/rules/python/) · [Source](https://github.com/sarj-ai/standards)
+[Documentation](https://code-standards.sarj.ai/rules/python/) · [Source](https://github.com/sarj-ai/code-standards)

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/README.md

@@ -1,4 +1,4 @@
-<!-- Generated by `sarj-standards maintain docs sync`; do not edit. -->
+<!-- Generated by `code-standards maintain docs sync`; do not edit. -->
 
 # sarj-python-lint
 
@@ -12,4 +12,4 @@ uv tool install sarj-python-lint
 sarj-python-lint --help
 ```
 
-[Documentation](https://code-standards.sarj.ai/rules/python/) · [Source](https://github.com/sarj-ai/standards)
+[Documentation](https://code-standards.sarj.ai/rules/python/) · [Source](https://github.com/sarj-ai/code-standards)

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sarj-python-lint"
-version = "0.76.0"
+version = "0.77.1"
 description = "Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults"
 readme = "README.md"
 authors = [{ name = "sarj-ai" }]
@@ -24,9 +24,9 @@ sarj-ratchet = "sarj_python_lint._ratchet_cli:main"
 [project.urls]
 Homepage = "https://code-standards.sarj.ai/rules/python/"
 Documentation = "https://code-standards.sarj.ai/rules/python/"
-Changelog = "https://github.com/sarj-ai/standards/releases"
-Repository = "https://github.com/sarj-ai/standards"
-Issues = "https://github.com/sarj-ai/standards/issues"
+Changelog = "https://github.com/sarj-ai/code-standards/releases"
+Repository = "https://github.com/sarj-ai/code-standards"
+Issues = "https://github.com/sarj-ai/code-standards/issues"
 
 [dependency-groups]
 dev = [

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/src/sarj_python_lint/__main__.py

@@ -10,6 +10,7 @@ from types import MappingProxyType
 from typing import NamedTuple
 
 from sarj_python_lint import __version__
+from sarj_python_lint._analysis_session import AnalysisSession
 from sarj_python_lint._filesystem import atomic_write_text
 from sarj_python_lint.rule_base import Diagnostic, ProjectRule, Severity, is_suppressed
 from sarj_python_lint.rules import REGISTRY
@@ -77,6 +78,9 @@ def _check(rule_ids: list[str], paths: list[Path]) -> list[Diagnostic]:
         sys.stderr.write(f"available: {', '.join(sorted(REGISTRY))}\n")
         raise SystemExit(2)
     rules = [REGISTRY[rid]() for rid in rule_ids]
+    session = AnalysisSession()
+    for rule in rules:
+        rule.prepare_session(session)
     clear_path_caches()
     expanded = _expand_paths(paths)
     loaded: dict[Path, str] = {}
@@ -87,7 +91,7 @@ def _check(rule_ids: list[str], paths: list[Path]) -> list[Diagnostic]:
             continue
     project_rules = [rule for rule in rules if isinstance(rule, ProjectRule)]
     if project_rules:
-        indexes = ProjectIndexSet.build(expanded, loaded)
+        indexes = ProjectIndexSet.build(expanded, loaded, facts=session.first_party)
         for rule in project_rules:
             rule.prepare(indexes)
     diags: list[Diagnostic] = []

sarj_python_lint-0.77.1/src/sarj_python_lint/_analysis_session.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+from typing import final
+
+from sarj_python_lint.rules._first_party import FirstPartyFacts
+
+
+@final
+class AnalysisSession:
+    def __init__(self) -> None:
+        self.first_party = FirstPartyFacts()

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/src/sarj_python_lint/rule_base.py

@@ -12,11 +12,12 @@ from typing import TYPE_CHECKING, ClassVar, Final, Self
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
+    from sarj_python_lint._analysis_session import AnalysisSession
     from sarj_python_lint.rules._project_index import ProjectIndexSet
 
 
 # Each rule points directly to its executable examples.
-REPO_BLOB: Final = "https://github.com/sarj-ai/standards/blob/main"
+REPO_BLOB: Final = "https://github.com/sarj-ai/code-standards/blob/main"
 TESTS_DIR: Final = "packages/python/tests/rules"
 
 
@@ -237,6 +238,10 @@ class Rule(ABC):
     code: str
     description: str
     documentation: ClassVar[RuleDocumentation | None] = None
+    _analysis_session: AnalysisSession | None = None
+
+    def prepare_session(self, session: AnalysisSession) -> None:
+        self._analysis_session = session
 
     @abstractmethod
     def check(self, path: Path, source: str) -> list[Diagnostic]:

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/src/sarj_python_lint/rules/_first_party.py

@@ -2,9 +2,8 @@
 
 from __future__ import annotations
 
-from functools import lru_cache
 import sys
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, final
 
 
 if TYPE_CHECKING:
@@ -53,22 +52,78 @@ _MAX_DIRS_SCANNED = 3000
 _MAX_ANCESTORS = 24
 
 
-def is_first_party_module(module: str, path: Path) -> bool:
+@final
+class FirstPartyFacts:
+    def __init__(self) -> None:
+        self._project_roots: dict[Path, Path | None] = {}
+        self._roots: dict[Path, frozenset[str]] = {}
+        self._packages: dict[Path, tuple[tuple[str, Path], ...]] = {}
+
+    def project_root(self, path: Path) -> Path | None:
+        if path in self._project_roots:
+            return self._project_roots[path]
+        resolved = _resolved(path)
+        if resolved is None:
+            self._project_roots[path] = None
+            return None
+        ancestors = list(resolved.parents)[:_MAX_ANCESTORS]
+        for ancestor in ancestors:
+            if (ancestor / _GIT_MARKER).exists():
+                self._project_roots[path] = ancestor
+                return ancestor
+        # No VCS boundary: take the OUTERMOST directory of the unbroken run of
+        # pyproject.toml ancestors, which is the workspace root in a uv workspace.
+        outermost: Path | None = None
+        for ancestor in ancestors:
+            if not (ancestor / _PROJECT_MARKER).exists():
+                if outermost is not None:
+                    break
+                continue
+            outermost = ancestor
+        self._project_roots[path] = outermost
+        return outermost
+
+    def first_party_roots(self, root: Path) -> frozenset[str]:
+        cached = self._roots.get(root)
+        if cached is not None:
+            return cached
+        roots = frozenset(name for name, _ in self.first_party_packages(root))
+        self._roots[root] = roots
+        return roots
+
+    def first_party_packages(self, root: Path) -> tuple[tuple[str, Path], ...]:
+        cached = self._packages.get(root)
+        if cached is not None:
+            return cached
+        packages = _scan_first_party_packages(root)
+        self._packages[root] = packages
+        return packages
+
+
+def _fresh_facts(facts: FirstPartyFacts | None) -> FirstPartyFacts:
+    # Compatibility helper calls are independent requests. The CLI supplies one
+    # explicit instance so scans are still shared within a full analysis.
+    return facts if facts is not None else FirstPartyFacts()
+
+
+def is_first_party_module(module: str, path: Path, *, facts: FirstPartyFacts | None = None) -> bool:
+    facts = _fresh_facts(facts)
     top = module.partition(".")[0]
     if not top or top in sys.stdlib_module_names:
         return False
-    root = _project_root(path)
+    root = facts.project_root(path)
     if root is None:
         # Unresolved ownership biases to third-party to avoid unfixable findings.
         return False
-    return top in _first_party_roots(root)
+    return top in facts.first_party_roots(root)
 
 
-def own_top_package(path: Path) -> str | None:
+def own_top_package(path: Path, *, facts: FirstPartyFacts | None = None) -> str | None:
+    facts = _fresh_facts(facts)
     resolved = _resolved(path)
     if resolved is None:
         return None
-    root = _project_root(resolved)
+    root = facts.project_root(resolved)
     top: str | None = None
     for ancestor in list(resolved.parents)[:_MAX_ANCESTORS]:
         if (ancestor / "__init__.py").exists():
@@ -76,30 +131,33 @@ def own_top_package(path: Path) -> str | None:
         if ancestor == root:
             break
     if top is None and root is not None:
-        roots = _first_party_roots(root)
+        roots = facts.first_party_roots(root)
         if len(roots) == 1:
             return next(iter(roots))
     return top
 
 
-def same_distribution(module: str, path: Path) -> bool:
-    ours = distribution_root(path)
+def same_distribution(module: str, path: Path, *, facts: FirstPartyFacts | None = None) -> bool:
+    facts = _fresh_facts(facts)
+    ours = distribution_root(path, facts=facts)
     if ours is None:
         return False
-    root = _project_root(path)
+    root = facts.project_root(path)
     if root is None:
         return False
     top = module.partition(".")[0]
     return any(
-        name == top and distribution_root(package_dir) == ours for name, package_dir in _first_party_packages(root)
+        name == top and distribution_root(package_dir, facts=facts) == ours
+        for name, package_dir in facts.first_party_packages(root)
     )
 
 
-def distribution_root(path: Path) -> Path | None:
+def distribution_root(path: Path, *, facts: FirstPartyFacts | None = None) -> Path | None:
+    facts = _fresh_facts(facts)
     resolved = _resolved(path)
     if resolved is None:
         return None
-    root = _project_root(resolved)
+    root = facts.project_root(resolved)
     for ancestor in list(resolved.parents)[:_MAX_ANCESTORS]:
         if any((ancestor / marker).exists() for marker in _DISTRIBUTION_MARKERS):
             return ancestor
@@ -108,19 +166,21 @@ def distribution_root(path: Path) -> Path | None:
     return None
 
 
-def has_first_party_source(module: str, path: Path) -> bool:
+def has_first_party_source(module: str, path: Path, *, facts: FirstPartyFacts | None = None) -> bool:
+    facts = _fresh_facts(facts)
     top, _, rest = module.partition(".")
-    root = _project_root(path)
+    root = facts.project_root(path)
     if root is None:
         return False
     segments = rest.split(".") if rest else []
     return any(
-        name == top and _declares_module(package_dir, segments) for name, package_dir in _first_party_packages(root)
+        name == top and _declares_module(package_dir, segments)
+        for name, package_dir in facts.first_party_packages(root)
     )
 
 
-def project_root(path: Path) -> Path | None:
-    return _project_root(path)
+def project_root(path: Path, *, facts: FirstPartyFacts | None = None) -> Path | None:
+    return _fresh_facts(facts).project_root(path)
 
 
 def _declares_module(package_dir: Path, segments: list[str]) -> bool:
@@ -138,34 +198,7 @@ def _resolved(path: Path) -> Path | None:
         return None
 
 
-@lru_cache(maxsize=256)
-def _project_root(path: Path) -> Path | None:
-    resolved = _resolved(path)
-    if resolved is None:
-        return None
-    ancestors = list(resolved.parents)[:_MAX_ANCESTORS]
-    for ancestor in ancestors:
-        if (ancestor / _GIT_MARKER).exists():
-            return ancestor
-    # No VCS boundary: take the OUTERMOST directory of the unbroken run of
-    # pyproject.toml ancestors, which is the workspace root in a uv workspace.
-    outermost: Path | None = None
-    for ancestor in ancestors:
-        if not (ancestor / _PROJECT_MARKER).exists():
-            if outermost is not None:
-                break
-            continue
-        outermost = ancestor
-    return outermost
-
-
-@lru_cache(maxsize=32)
-def _first_party_roots(root: Path) -> frozenset[str]:
-    return frozenset(name for name, _ in _first_party_packages(root))
-
-
-@lru_cache(maxsize=32)
-def _first_party_packages(root: Path) -> tuple[tuple[str, Path], ...]:
+def _scan_first_party_packages(root: Path) -> tuple[tuple[str, Path], ...]:
     found: list[tuple[str, Path]] = []
     queue: list[tuple[Path, int]] = [(root, 0)]
     scanned = 0

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/src/sarj_python_lint/rules/_paths.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import ast
-from functools import lru_cache
 from io import StringIO
 import re
 import tokenize
@@ -103,16 +102,6 @@ def _leading_header_bodies(source: str) -> list[str]:
     return bodies
 
 
-@lru_cache(maxsize=256)
-def _is_codegen_root(directory: Path) -> bool:
-    return any((directory / name).exists() for name in _CODEGEN_MARKER_NAMES)
-
-
-@lru_cache(maxsize=256)
-def _is_repo_root(directory: Path) -> bool:
-    return any((directory / name).exists() for name in _REPO_ROOT_MARKERS)
-
-
 def is_generated_path(path: Path) -> bool:
     if any(part.lower() in _GENERATED_DIR_NAMES for part in path.parts):
         return True
@@ -128,9 +117,16 @@ def is_generated_path(path: Path) -> bool:
     return False
 
 
+def _is_codegen_root(directory: Path) -> bool:
+    return any((directory / name).exists() for name in _CODEGEN_MARKER_NAMES)
+
+
+def _is_repo_root(directory: Path) -> bool:
+    return any((directory / name).exists() for name in _REPO_ROOT_MARKERS)
+
+
 def clear_path_caches() -> None:
-    _is_codegen_root.cache_clear()
-    _is_repo_root.cache_clear()
+    """Compatibility no-op; path topology is intentionally observed fresh."""
 
 
 def is_generated(path: Path, source: str) -> bool:

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/src/sarj_python_lint/rules/_project_index.py

@@ -10,7 +10,7 @@ import re
 from types import MappingProxyType
 from typing import TYPE_CHECKING, final
 
-from sarj_python_lint.rules._first_party import project_root
+from sarj_python_lint.rules._first_party import FirstPartyFacts, project_root
 
 
 if TYPE_CHECKING:
@@ -111,8 +111,14 @@ class ProjectIndexSet:
         self._nominals = MappingProxyType({key: frozenset(value) for key, value in nominals.items()})
 
     @classmethod
-    def build(cls, paths: Sequence[Path], loaded: Mapping[Path, str]) -> Self:
-        roots = _project_roots(paths)
+    def build(
+        cls,
+        paths: Sequence[Path],
+        loaded: Mapping[Path, str],
+        *,
+        facts: FirstPartyFacts | None = None,
+    ) -> Self:
+        roots = _project_roots(paths, facts=facts)
         sources: dict[Path, str] = {}
         for path, source in loaded.items():
             try:
@@ -283,11 +289,11 @@ def _module_name(path: Path, roots: Sequence[Path]) -> str | None:
     return ".".join(parts)
 
 
-def _project_roots(paths: Sequence[Path]) -> tuple[Path, ...]:
+def _project_roots(paths: Sequence[Path], *, facts: FirstPartyFacts | None = None) -> tuple[Path, ...]:
     candidates: set[Path] = set()
     for path in paths:
         try:
-            root = project_root(path.resolve())
+            root = project_root(path.resolve(), facts=facts)
         except OSError:
             continue
         if root is not None:

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/src/sarj_python_lint/rules/_registry.py

@@ -38,6 +38,7 @@ from sarj_python_lint.rules.no_cors_wildcard_with_credentials import (
     NoCorsWildcardWithCredentials,
 )
 from sarj_python_lint.rules.no_duplicate_dunder_all_entry import NoDuplicateDunderAllEntry
+from sarj_python_lint.rules.no_fastapi_on_event import NoFastapiOnEvent
 from sarj_python_lint.rules.no_file_level_escape_hatch_noqa import NoFileLevelEscapeHatchNoqa
 from sarj_python_lint.rules.no_first_party_private_import import (
     NoFirstPartyPrivateImport,
@@ -205,6 +206,7 @@ REGISTRY: Mapping[str, type[Rule]] = MappingProxyType(
         NoGenRandomUuidInSql.id: NoGenRandomUuidInSql,
         NoHiddenConstructorFallback.id: NoHiddenConstructorFallback,
         NoFileLevelEscapeHatchNoqa.id: NoFileLevelEscapeHatchNoqa,
+        NoFastapiOnEvent.id: NoFastapiOnEvent,
         NoOptionalTenantPredicate.id: NoOptionalTenantPredicate,
         NoTautologicalExpect.id: NoTautologicalExpect,
         PreferLibraryFake.id: PreferLibraryFake,

sarj_python_lint-0.77.1/src/sarj_python_lint/rules/no_fastapi_on_event.py

@@ -0,0 +1,168 @@
+from __future__ import annotations
+
+import ast
+from pathlib import PurePosixPath
+from typing import TYPE_CHECKING, final, override
+
+from sarj_python_lint.rule_base import (
+    AutofixPolicy,
+    Diagnostic,
+    ExampleFile,
+    ExampleOutcome,
+    Rule,
+    RuleCategory,
+    RuleDocumentation,
+    RuleExample,
+    parse_or_none,
+)
+from sarj_python_lint.rules._imports import ImportIndex
+
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+_APP_TYPES = frozenset({("fastapi", "FastAPI"), ("starlette.applications", "Starlette")})
+_EVENT_NAMES = frozenset({"startup", "shutdown"})
+
+
+@final
+class NoFastapiOnEvent(Rule):
+    id = "no-fastapi-on-event"
+    code = "SARJ427"
+    documentation = RuleDocumentation(
+        summary="Deprecated FastAPI or Starlette on_event lifecycle registration.",
+        rationale=(
+            "The on_event API is deprecated and splits related startup and shutdown state across callbacks; lifespan "
+            "keeps acquisition and cleanup in one async context manager and is the supported lifecycle contract."
+        ),
+        remediation="Define an async lifespan context manager and pass it as FastAPI(lifespan=...) or Starlette(lifespan=...).",
+        category=RuleCategory.CORRECTNESS,
+        autofix=AutofixPolicy.NONE,
+        limitations=(
+            "Only decorators on a directly constructed FastAPI/Starlette application or a parameter annotated with one are checked.",
+            "Factory-returned applications and dynamically selected event names are intentionally not inferred.",
+        ),
+        examples=(
+            RuleExample(
+                example_id="deprecated-startup-event",
+                title="Do not register startup through on_event",
+                outcome=ExampleOutcome.MATCH,
+                files=(
+                    ExampleFile.python(
+                        "app/main.py",
+                        'from fastapi import FastAPI\napp = FastAPI()\n\n@app.on_event("startup")\nasync def start() -> None:\n    pass\n',
+                    ),
+                ),
+                focus_path=PurePosixPath("app/main.py"),
+                expected_count=1,
+                public=True,
+            ),
+            RuleExample(
+                example_id="lifespan-context-manager",
+                title="Pair startup and shutdown in lifespan",
+                outcome=ExampleOutcome.NO_MATCH,
+                files=(
+                    ExampleFile.python(
+                        "app/main.py",
+                        "from contextlib import asynccontextmanager\nfrom fastapi import FastAPI\n\n"
+                        "@asynccontextmanager\nasync def lifespan(app: FastAPI):\n    yield\n\napp = FastAPI(lifespan=lifespan)\n",
+                    ),
+                ),
+                focus_path=PurePosixPath("app/main.py"),
+                expected_count=0,
+                public=True,
+            ),
+        ),
+    )
+    description = documentation.summary
+
+    @override
+    def check(self, path: Path, source: str) -> list[Diagnostic]:
+        tree = parse_or_none(path, source)
+        if tree is None:
+            return []
+        imports = ImportIndex.from_tree(tree)
+        return _scope_diagnostics(path, tree.body, imports)
+
+
+def _scope_diagnostics(
+    path: Path,
+    statements: list[ast.stmt],
+    imports: ImportIndex,
+    *,
+    extra_app_names: frozenset[str] = frozenset(),
+) -> list[Diagnostic]:
+    app_names = _assigned_app_names(statements, imports) | extra_app_names
+    findings: list[Diagnostic] = []
+    for statement in statements:
+        if not isinstance(statement, (ast.FunctionDef, ast.AsyncFunctionDef)):
+            continue
+        findings.extend(
+            Diagnostic(
+                path=path,
+                line=decorator.lineno,
+                col=decorator.col_offset + 1,
+                code="SARJ427",
+                message=(
+                    "FastAPI/Starlette on_event is deprecated. Put startup and shutdown work in an async lifespan "
+                    "context manager and pass it to the application constructor."
+                ),
+            )
+            for decorator in statement.decorator_list
+            if _is_on_event_decorator(decorator, app_names)
+        )
+        findings.extend(
+            _scope_diagnostics(
+                path,
+                statement.body,
+                imports,
+                extra_app_names=_annotated_app_parameters(statement.args, imports),
+            )
+        )
+    return findings
+
+
+def _assigned_app_names(statements: list[ast.stmt], imports: ImportIndex) -> frozenset[str]:
+    names: set[str] = set()
+    for statement in statements:
+        if not isinstance(statement, (ast.Assign, ast.AnnAssign)):
+            continue
+        value = statement.value
+        if not isinstance(value, ast.Call) or not any(
+            imports.resolves(value.func, sources=frozenset({source}), symbol=symbol) for source, symbol in _APP_TYPES
+        ):
+            continue
+        targets = statement.targets if isinstance(statement, ast.Assign) else [statement.target]
+        names.update(target.id for target in targets if isinstance(target, ast.Name))
+    return frozenset(names)
+
+
+def _annotated_app_parameters(arguments: ast.arguments, imports: ImportIndex) -> frozenset[str]:
+    parameters = [*arguments.posonlyargs, *arguments.args, *arguments.kwonlyargs]
+    if arguments.vararg is not None:
+        parameters.append(arguments.vararg)
+    if arguments.kwarg is not None:
+        parameters.append(arguments.kwarg)
+    return frozenset(
+        parameter.arg
+        for parameter in parameters
+        if parameter.annotation is not None
+        and any(
+            imports.resolves(parameter.annotation, sources=frozenset({source}), symbol=symbol)
+            for source, symbol in _APP_TYPES
+        )
+    )
+
+
+def _is_on_event_decorator(node: ast.expr, app_names: frozenset[str]) -> bool:
+    return (
+        isinstance(node, ast.Call)
+        and isinstance(node.func, ast.Attribute)
+        and node.func.attr == "on_event"
+        and isinstance(node.func.value, ast.Name)
+        and node.func.value.id in app_names
+        and len(node.args) == 1
+        and isinstance(node.args[0], ast.Constant)
+        and node.args[0].value in _EVENT_NAMES
+    )

{sarj_python_lint-0.76.0 → sarj_python_lint-0.77.1}/src/sarj_python_lint/rules/no_first_party_private_import.py

@@ -17,6 +17,7 @@ from sarj_python_lint.rule_base import (
 )
 from sarj_python_lint.rules._ast_index import nodes
 from sarj_python_lint.rules._first_party import (
+    FirstPartyFacts,
     has_first_party_source,
     is_first_party_module,
     own_top_package,
@@ -84,11 +85,12 @@ class NoFirstPartyPrivateImport(Rule):
         tree = parse_or_none(path, source)
         if tree is None:
             return []
-        own_top = own_top_package(path)
+        facts = self._analysis_session.first_party if self._analysis_session is not None else FirstPartyFacts()
+        own_top = own_top_package(path, facts=facts)
         diags = [
             Diagnostic(path=path, line=hit.line, col=hit.col, code=self.code, message=_message(hit.module, hit.name))
             for hit in _private_imports(tree)
-            if _is_ours(hit.module, path, own_top) and not _is_our_own_internals(hit, path)
+            if _is_ours(hit.module, path, own_top, facts) and not _is_our_own_internals(hit, path, facts)
         ]
         diags.sort(key=lambda d: (d.line, d.col))
         return diags
@@ -106,12 +108,12 @@ class _PrivateImport:
     names_public: bool
 
 
-def _is_our_own_internals(hit: _PrivateImport, path: Path) -> bool:
+def _is_our_own_internals(hit: _PrivateImport, path: Path, facts: FirstPartyFacts) -> bool:
     if not hit.is_segment:
         return False
-    if not has_first_party_source(hit.module, path):
+    if not has_first_party_source(hit.module, path, facts=facts):
         return True
-    return hit.names_public and same_distribution(hit.module, path)
+    return hit.names_public and same_distribution(hit.module, path, facts=facts)
 
 
 def _message(module: str, name: str) -> str:
@@ -122,11 +124,11 @@ def _message(module: str, name: str) -> str:
     )
 
 
-def _is_ours(module: str, path: Path, own_top: str | None) -> bool:
+def _is_ours(module: str, path: Path, own_top: str | None, facts: FirstPartyFacts) -> bool:
     top = module.partition(".")[0]
     if own_top is not None and top == own_top:
         return False
-    return is_first_party_module(module, path)
+    return is_first_party_module(module, path, facts=facts)
 
 
 def _private_imports(tree: ast.Module) -> list[_PrivateImport]: