sarj-python-lint 0.81.3__tar.gz → 0.81.5__tar.gz

{sarj_python_lint-0.81.3 → sarj_python_lint-0.81.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sarj-python-lint
-Version: 0.81.3
+Version: 0.81.5
 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-0.81.3 → sarj_python_lint-0.81.5}/pyproject.toml

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

{sarj_python_lint-0.81.3 → sarj_python_lint-0.81.5}/src/sarj_python_lint/rules/prefer_class_row.py

@@ -36,6 +36,7 @@ _SCOPE_NODES = (ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef, ast.Lambda)
 class _BoundCursor(NamedTuple):
     variable: str
     factory: ast.expr
+    active_nodes: tuple[ast.AST, ...]
 
 
 class _FetchedValue(NamedTuple):
@@ -73,7 +74,7 @@ class PreferClassRow(Rule):
                 files=(
                     ExampleFile.python(
                         "app/task_store.py",
-                        "from psycopg.rows import dict_row\n\nasync def load(conn):\n    async with conn.cursor(row_factory=dict_row) as cursor:\n        row = await cursor.fetchone()\n        return Task.model_validate(row)\n",
+                        'from psycopg.rows import dict_row\n\nasync def load(conn):\n    async with conn.cursor(row_factory=dict_row) as cursor:\n        await cursor.execute("SELECT id, state FROM task")\n        row = await cursor.fetchone()\n        return Task.model_validate(row)\n',
                     ),
                 ),
                 focus_path=PurePosixPath("app/task_store.py"),
@@ -112,7 +113,7 @@ class PreferClassRow(Rule):
             for cursor in _bound_cursors(function):
                 if not imports.is_dict_row(cursor.factory, shadowed):
                     continue
-                models = _models_built_from_cursor(function, cursor.variable)
+                models = _models_built_from_cursor(cursor)
                 if len(models) != 1:
                     continue
                 model = next(iter(models))
@@ -247,37 +248,78 @@ def _functions(tree: ast.Module) -> Iterator[ast.FunctionDef | ast.AsyncFunction
     return (node for node in ast.walk(tree) if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)))
 
 
-def _scope_nodes(function: ast.FunctionDef | ast.AsyncFunctionDef) -> Iterator[ast.AST]:
-    pending: list[ast.AST] = list(reversed(function.body))
-    while pending:
-        node = pending.pop()
-        yield node
-        if isinstance(node, _SCOPE_NODES):
-            continue
-        pending.extend(reversed(list(ast.iter_child_nodes(node))))
-
-
 def _bound_cursors(function: ast.FunctionDef | ast.AsyncFunctionDef) -> list[_BoundCursor]:
+    scoped_nodes = tuple(_nodes_in(function.body))
     cursors: list[_BoundCursor] = []
-    for node in _scope_nodes(function):
+    for node in scoped_nodes:
         if isinstance(node, (ast.With, ast.AsyncWith)):
             for item in node.items:
                 if isinstance(item.optional_vars, ast.Name):
-                    cursor = _cursor(item.context_expr, item.optional_vars.id)
+                    active_nodes = _active_nodes(tuple(_nodes_in(node.body)), item.optional_vars.id, node.lineno)
+                    cursor = _cursor(item.context_expr, item.optional_vars.id, active_nodes)
                     if cursor is not None:
                         cursors.append(cursor)
         elif isinstance(node, ast.Assign) and len(node.targets) == 1 and isinstance(node.targets[0], ast.Name):
-            cursor = _cursor(node.value, node.targets[0].id)
+            variable = node.targets[0].id
+            cursor = _cursor(node.value, variable, _active_nodes(scoped_nodes, variable, node.lineno))
             if cursor is not None:
                 cursors.append(cursor)
         elif isinstance(node, ast.AnnAssign) and isinstance(node.target, ast.Name) and node.value is not None:
-            cursor = _cursor(node.value, node.target.id)
+            cursor = _cursor(
+                node.value,
+                node.target.id,
+                _active_nodes(scoped_nodes, node.target.id, node.lineno),
+            )
             if cursor is not None:
                 cursors.append(cursor)
     return cursors
 
 
-def _cursor(expression: ast.expr, variable: str) -> _BoundCursor | None:
+def _nodes_in(statements: Iterable[ast.stmt]) -> Iterator[ast.AST]:
+    pending: list[ast.AST] = list(reversed(tuple(statements)))
+    while pending:
+        node = pending.pop()
+        yield node
+        if isinstance(node, _SCOPE_NODES):
+            continue
+        pending.extend(reversed(list(ast.iter_child_nodes(node))))
+
+
+def _active_nodes(nodes: tuple[ast.AST, ...], variable: str, start: int) -> tuple[ast.AST, ...]:
+    rebound_lines = [
+        node.lineno
+        for node in nodes
+        if isinstance(node, ast.stmt) and node.lineno > start and _binds_name(node, variable)
+    ]
+    end = min(rebound_lines, default=None)
+    return tuple(
+        node
+        for node in nodes
+        if getattr(node, "lineno", start) > start and (end is None or getattr(node, "lineno", end) < end)
+    )
+
+
+def _binds_name(node: ast.stmt, name: str) -> bool:
+    if _writes_name(node, name):
+        return True
+    match node:
+        case ast.FunctionDef() | ast.AsyncFunctionDef() | ast.ClassDef():
+            return node.name == name
+        case ast.For() | ast.AsyncFor():
+            return _target_root(node.target) == name
+        case ast.With() | ast.AsyncWith():
+            return any(
+                item.optional_vars is not None and _target_root(item.optional_vars) == name for item in node.items
+            )
+        case ast.Import():
+            return any((alias.asname or alias.name.partition(".")[0]) == name for alias in node.names)
+        case ast.ImportFrom():
+            return any((alias.asname or alias.name) == name for alias in node.names)
+        case _:
+            return False
+
+
+def _cursor(expression: ast.expr, variable: str, active_nodes: tuple[ast.AST, ...]) -> _BoundCursor | None:
     if not (
         isinstance(expression, ast.Call)
         and isinstance(expression.func, ast.Attribute)
@@ -285,18 +327,15 @@ def _cursor(expression: ast.expr, variable: str) -> _BoundCursor | None:
     ):
         return None
     factory = next((keyword.value for keyword in expression.keywords if keyword.arg == _ROW_FACTORY), None)
-    return None if factory is None else _BoundCursor(variable, factory)
+    return None if factory is None else _BoundCursor(variable, factory, active_nodes)
 
 
 def _models_built_from_cursor(
-    function: ast.FunctionDef | ast.AsyncFunctionDef,
-    cursor: str,
+    cursor: _BoundCursor,
 ) -> frozenset[str]:
-    scoped_nodes = list(_scope_nodes(function))
-    fetched_values = _fetched_values(scoped_nodes, cursor)
-    if not fetched_values:
-        return frozenset()
-    models: set[str] = set()
+    scoped_nodes = list(cursor.active_nodes)
+    fetched_values = _fetched_values(scoped_nodes, cursor.variable)
+    models = _models_from_direct_fetch(scoped_nodes, cursor.variable)
     for fetched in fetched_values:
         if fetched.many:
             converted = _models_from_collection(scoped_nodes, fetched)
@@ -308,6 +347,27 @@ def _models_built_from_cursor(
     return frozenset(models)
 
 
+def _models_from_direct_fetch(scoped_nodes: list[ast.AST], cursor: str) -> set[str]:
+    models: set[str] = set()
+    for node in scoped_nodes:
+        if not isinstance(node, ast.Call):
+            continue
+        if isinstance(node.func, ast.Attribute) and node.func.attr == _MODEL_VALIDATE:
+            if len(node.args) != 1 or node.keywords or _fetch_method(node.args[0], cursor) != "fetchone":
+                continue
+            model = _model_name(node.func.value)
+        else:
+            direct_rows = [
+                keyword.value
+                for keyword in node.keywords
+                if keyword.arg is None and _fetch_method(keyword.value, cursor) == "fetchone"
+            ]
+            model = _model_name(node.func) if len(direct_rows) == 1 else None
+        if model is not None:
+            models.add(model)
+    return models
+
+
 def _fetched_values(scoped_nodes: list[ast.AST], cursor: str) -> list[_FetchedValue]:
     fetched: list[_FetchedValue] = []
     for node in scoped_nodes:

{sarj_python_lint-0.81.3 → sarj_python_lint-0.81.5}/src/sarj_python_lint/rules/stepdown.py

@@ -34,7 +34,7 @@ _SELF_NAMES = frozenset({"self", "cls"})
 
 # These decorators preserve an ordinary callable definition and do not register
 # it through user code at definition time. Unknown decorators are movement barriers.
-_ORDER_TRANSPARENT_DECORATORS = frozenset({"classmethod", "staticmethod", "final", "override"})
+_ORDER_TRANSPARENT_DECORATORS = frozenset({"classmethod", "staticmethod"})
 
 #: A repeated singledispatch implementation name cannot identify one movable target.
 _DISCARD_NAME = "_"
@@ -65,6 +65,7 @@ class Stepdown(Rule):
         limitations=(
             "Generated files, tests, `__main__.py`, mutual recursion, and helpers with multiple callers are excluded.",
             "Decorated definitions and dynamic references that cannot prove a sole caller are not reported.",
+            "Only bare builtin classmethod/staticmethod decorators without any visible rebinding are treated as transparent; other decorators remain ordering barriers.",
         ),
         examples=(
             RuleExample(
@@ -108,11 +109,14 @@ class Stepdown(Rule):
         tree = parse_or_none(path, source)
         if tree is None:
             return []
-        diags = _check_module_scope(path, tree, self.code)
+        transparent = _unshadowed_builtin_decorators(tree)
+        diags = _check_module_scope(path, tree, self.code, transparent)
         classes = [node for node in _walk(tree) if isinstance(node, ast.ClassDef)]
         family_external = _family_external_refs(classes)
         for cls in classes:
-            diags.extend(_check_class_scope(path, cls, self.code, family_external.get(id(cls), frozenset())))
+            diags.extend(
+                _check_class_scope(path, cls, self.code, family_external.get(id(cls), frozenset()), transparent)
+            )
         diags.sort(key=lambda d: (d.line, d.col))
         return diags
 
@@ -121,7 +125,7 @@ def _last_by_name[DefT: _Def](defs: Sequence[DefT]) -> dict[str, DefT]:
     return {definition.name: definition for definition in defs}
 
 
-def _check_module_scope(path: Path, tree: ast.Module, code: str) -> list[Diagnostic]:
+def _check_module_scope(path: Path, tree: ast.Module, code: str, transparent: frozenset[str]) -> list[Diagnostic]:
     defs = [n for n in tree.body if isinstance(n, _SCOPE_NODES)]
     counts = Counter(d.name for d in defs)
     unique_defs = {name: d for d in defs if counts[name := d.name] == 1}
@@ -156,15 +160,19 @@ def _check_module_scope(path: Path, tree: ast.Module, code: str) -> list[Diagnos
     for name, d in unique_defs.items():
         if not isinstance(d, _DEF_NODES) or not _is_private_helper_name(name):
             continue
-        if name in pinned or name in shadowed or _has_order_sensitive_decorator(d):
+        if name in pinned or name in shadowed or _has_order_sensitive_decorator(d, transparent):
             continue
         diags.extend(
-            _flag_if_above_single_caller(path, code, name, node=d, graph=graph, defs=all_defs, ref_lines=ref_lines)
+            _flag_if_above_single_caller(
+                path, code, name, node=d, graph=graph, defs=all_defs, ref_lines=ref_lines, transparent=transparent
+            )
         )
     return diags
 
 
-def _check_class_scope(path: Path, cls: ast.ClassDef, code: str, external_callers: frozenset[str]) -> list[Diagnostic]:
+def _check_class_scope(
+    path: Path, cls: ast.ClassDef, code: str, external_callers: frozenset[str], transparent: frozenset[str]
+) -> list[Diagnostic]:
     methods = [n for n in cls.body if isinstance(n, _DEF_NODES)]
     counts = Counter(m.name for m in methods)
     unique = {name: m for m in methods if counts[name := m.name] == 1}
@@ -197,10 +205,17 @@ def _check_class_scope(path: Path, cls: ast.ClassDef, code: str, external_caller
     for name, m in unique.items():
         if not _is_private_helper_name(name):
             continue
-        if name in pinned or name in shadowed or name in external_callers or _has_order_sensitive_decorator(m):
+        if (
+            name in pinned
+            or name in shadowed
+            or name in external_callers
+            or _has_order_sensitive_decorator(m, transparent)
+        ):
             continue
         diags.extend(
-            _flag_if_above_single_caller(path, code, name, node=m, graph=graph, defs=all_methods, ref_lines=ref_lines)
+            _flag_if_above_single_caller(
+                path, code, name, node=m, graph=graph, defs=all_methods, ref_lines=ref_lines, transparent=transparent
+            )
         )
     return diags
 
@@ -214,6 +229,7 @@ def _flag_if_above_single_caller(
     graph: dict[str, set[str]],
     defs: Mapping[str, ast.stmt],
     ref_lines: dict[tuple[str, str], int],
+    transparent: frozenset[str],
 ) -> list[Diagnostic]:
     callers = [c for c, callees in graph.items() if name in callees]
     if len(callers) != 1:
@@ -224,7 +240,9 @@ def _flag_if_above_single_caller(
     if isinstance(defs[caller], ast.ClassDef):
         return []
     caller_node = defs[caller]
-    if isinstance(caller_node, (ast.FunctionDef, ast.AsyncFunctionDef)) and _has_order_sensitive_decorator(caller_node):
+    if isinstance(caller_node, (ast.FunctionDef, ast.AsyncFunctionDef)) and _has_order_sensitive_decorator(
+        caller_node, transparent
+    ):
         return []
     if _reaches(graph, name, caller):
         return []
@@ -338,15 +356,38 @@ def _is_private_helper_name(name: str) -> bool:
     return not (name.startswith("__") and name.endswith("__"))
 
 
-def _has_order_sensitive_decorator(node: ast.FunctionDef | ast.AsyncFunctionDef) -> bool:
-    for decorator in node.decorator_list:
-        target = decorator.func if isinstance(decorator, ast.Call) else decorator
-        match target:
-            case ast.Name(id=name) | ast.Attribute(attr=name) if name in _ORDER_TRANSPARENT_DECORATORS:
-                continue
+def _unshadowed_builtin_decorators(tree: ast.Module) -> frozenset[str]:
+    bound: set[str] = set()
+    for node in _walk(tree):
+        match node:
+            case ast.ImportFrom(names=names) if any(alias.name == "*" for alias in names):
+                return frozenset()
+            case (
+                ast.Name(id=name, ctx=ast.Store() | ast.Del())
+                | ast.arg(arg=name)
+                | ast.FunctionDef(name=name)
+                | ast.AsyncFunctionDef(name=name)
+                | ast.ClassDef(name=name)
+            ):
+                bound.add(name)
+            case ast.alias(name=name, asname=asname):
+                bound.add(asname or name.split(".")[0])
+            case (
+                ast.ExceptHandler(name=str() as name)
+                | ast.MatchAs(name=str() as name)
+                | ast.MatchStar(name=str() as name)
+                | ast.MatchMapping(rest=str() as name)
+            ):
+                bound.add(name)
             case _:
-                return True
-    return False
+                pass
+    return _ORDER_TRANSPARENT_DECORATORS - bound
+
+
+def _has_order_sensitive_decorator(node: ast.FunctionDef | ast.AsyncFunctionDef, transparent: frozenset[str]) -> bool:
+    return any(
+        not isinstance(decorator, ast.Name) or decorator.id not in transparent for decorator in node.decorator_list
+    )
 
 
 def _deferred_body(node: ast.stmt) -> list[ast.stmt]:
@@ -626,7 +667,18 @@ def _direct_scope_bindings(node: ast.FunctionDef | ast.AsyncFunctionDef) -> set[
 
 
 def _lambda_bindings(node: ast.Lambda) -> set[str]:
-    return _argument_names(node.args)
+    bound = _argument_names(node.args)
+    stack: list[ast.AST] = [node.body]
+    while stack:
+        current = stack.pop()
+        if isinstance(current, ast.Lambda):
+            stack.extend(current.args.defaults)
+            stack.extend(default for default in current.args.kw_defaults if default is not None)
+            continue
+        if isinstance(current, ast.NamedExpr):
+            bound.update(_target_names(current.target))
+        stack.extend(_child_nodes(current))
+    return bound
 
 
 def _argument_names(args: ast.arguments) -> set[str]:

{sarj_python_lint-0.81.3 → sarj_python_lint-0.81.5}/src/sarj_python_lint/rules/typed_error_reasons.py

@@ -32,23 +32,54 @@ class TypedErrorReasons(Rule):
     id = "typed-error-reasons"
     code = "SARJ435"
     documentation: ClassVar[RuleDocumentation | None] = RuleDocumentation(
-        summary="Exception aggregates presentation strings instead of typed error reasons.",
+        summary="Review joined exception strings for fixed reason identities versus dynamic context.",
         rationale=(
-            "A collection of rendered sentences has no stable identity for API clients, UI formatting, telemetry, "
-            "or exhaustive handling; consumers must display or parse text that should be presentation-only."
+            "Fixed reason identities benefit from stable codes for API clients, UI formatting, telemetry, and "
+            "exhaustive handling. Open-ended values such as file paths remain typed context, not an enum domain."
         ),
         remediation=(
-            "Replace `list[str]` with a nominal reason type: usually a record containing a `StrEnum` code and typed "
-            "context. Format that structure only at the presentation boundary."
+            "If the strings are fixed reason identities, use a `StrEnum` code with typed context. Keep dynamic "
+            "paths and messages as typed context; format presentation separately."
         ),
         category=RuleCategory.ARCHITECTURE,
         autofix=AutofixPolicy.NONE,
         limitations=(
-            "Only an Error/Exception subclass whose direct Error/Exception base is visible in the class declaration is checked.",
-            "The constructor must have exactly one non-self parameter, annotated exactly `list[str]`, and join that same parameter inside `super().__init__(...)`.",
+            "The class name and a direct base name must end in Error or Exception; this naming convention does not prove exception inheritance or resolve shadowed bases.",
+            "The constructor must have exactly one non-self parameter and no variadic parameters, annotated exactly `list[str]`, and a literal string separator must join it inside `super().__init__(...)`.",
+            "This warning requests manual review; joining strings does not prove a finite reason domain, so contextual string lists may also match and must not automatically become enums.",
             "Formatting delegated to another function, legacy `typing.List`, mixed constructor context, tests, and generated files are intentionally not inferred.",
         ),
         examples=(
+            RuleExample(
+                example_id="dynamic-context-review",
+                title="Review a contextual list without converting paths to enum values",
+                outcome=ExampleOutcome.MATCH,
+                files=(
+                    ExampleFile.python(
+                        "app/errors.py",
+                        "class MissingFilesError(Exception):\n    def __init__(self, paths: list[str]) -> None:\n        super().__init__(', '.join(paths))\n",
+                    ),
+                ),
+                focus_path=PurePosixPath("app/errors.py"),
+                expected_count=1,
+                public=True,
+                scenario="dynamic-context",
+            ),
+            RuleExample(
+                example_id="dynamic-context-kept-typed",
+                title="Keep arbitrary paths as typed context without an enum",
+                outcome=ExampleOutcome.NO_MATCH,
+                files=(
+                    ExampleFile.python(
+                        "app/errors.py",
+                        "class MissingFilesError(Exception):\n    def __init__(self, paths: list[str]) -> None:\n        self.paths = paths\n        super().__init__('Files are missing')\n\ndef render_error(error: MissingFilesError) -> str:\n    return ', '.join(error.paths)\n",
+                    ),
+                ),
+                focus_path=PurePosixPath("app/errors.py"),
+                expected_count=0,
+                public=True,
+                scenario="dynamic-context",
+            ),
             RuleExample(
                 example_id="rendered-reason-list",
                 title="An exception renders raw reason strings",
@@ -135,8 +166,9 @@ class TypedErrorReasons(Rule):
                     code=self.code,
                     severity=Severity.WARNING,
                     message=(
-                        f"`{error_class.name}` joins `{parameter.arg}: list[str]` into its message; carry nominal "
-                        "reason codes with typed context and format them at the presentation boundary"
+                        f"`{error_class.name}` joins `{parameter.arg}: list[str]` into its message; if these are "
+                        "fixed reason identities, carry typed codes. Keep dynamic context such as paths or messages "
+                        "as typed context and format presentation separately"
                     ),
                 )
             )
@@ -156,6 +188,8 @@ def _tail(node: ast.expr) -> str:
 
 
 def _sole_string_list_parameter(function: ast.FunctionDef) -> ast.arg | None:
+    if function.args.vararg is not None or function.args.kwarg is not None:
+        return None
     parameters = [
         argument
         for argument in (
@@ -221,6 +255,8 @@ def _joins_parameter(node: ast.AST, parameter: str) -> TypeGuard[ast.Call]:
         isinstance(node, ast.Call)
         and isinstance(node.func, ast.Attribute)
         and node.func.attr == "join"
+        and isinstance(node.func.value, ast.Constant)
+        and isinstance(node.func.value.value, str)
         and len(node.args) == 1
         and not node.keywords
         and isinstance(node.args[0], ast.Name)