python-constricter 0.4.2__tar.gz → 0.4.4__tar.gz

{python_constricter-0.4.2 → python_constricter-0.4.4}/.gitignore

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 # Everything generated on this machine (scratch, tool caches, local builds).
 local/
 

{python_constricter-0.4.2 → python_constricter-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-constricter
-Version: 0.4.2
+Version: 0.4.4
 Import-Name: constricter
 Summary: Lint rules: every local variable is typed where it's first bound. A flake8 plugin, a pylint plugin and a standalone CLI.
 Author: Ivy Duggan
@@ -105,6 +105,9 @@ class bodies too. Statements are read in source order, and only a name's first b
 | `LVA010` | with every value known: a union member no value is                                        | drop the member                                |
 | `LVA011` | an annotation listing a fixed-length tuple of more than `max-length` types (4 by default) | name the fields (a `NamedTuple`, a dataclass)  |
 | `LVA012` | opt-in: a local bound once, outside any loop, and never rebound                           | `name: Final = ...`                            |
+| `LVA013` | opt-in: an instance attribute a plain class's method first stores, declared nowhere in it | `self.x: T = ...`                              |
+| `LVA014` | opt-in: a plain function that declares no return type                                     | `def f(...) -> T:`                             |
+| `LVA015` | opt-in: a parameter with no annotation                                                    | `def f(x: T):`                                 |
 
 Exempt: comprehensions, `except ... as`, imports, `def`/`class`, `type` aliases, parameters,
 `global`/`nonlocal`, and `_`; in module and class bodies, dunder names (`__all__`, `__slots__`) and
@@ -117,7 +120,8 @@ type checker: `T = TypeVar("T")`, a `ParamSpec`, a `TypeVarTuple`, a `NewType`,
 A `# type:` comment (`x = 1  # type: int`, `with f() as x:  # type: T`) counts as an annotation with
 `type-comments`, or automatically in a module written to run on Python 2: one that imports
 `print_function`, `unicode_literals`, `absolute_import`, `division`, `with_statement`, `generators`
-or `nested_scopes` from `__future__`.
+or `nested_scopes` from `__future__`. Otherwise it's `LVA001`, and `--fix` writes the comment's type
+as the annotation and drops the comment.
 
 `LVA007` compares a block on its own: an `if`'s body and its `orelse`, a `try`'s body and its
 `except`s, and the like, are different blocks, since they don't both run in the same pass.
@@ -154,29 +158,51 @@ or SARIF `warning` in those formats) but exits 0; flake8 and pylint report error
 at every level, and an error only at `suffocate`: on the corpus, 45–70% of every codebase's first
 bindings qualify, so it suits a codebase that wants `Final` everywhere it can go, not a default.
 
+`LVA013` is opt-in the same way (pylint's `enable = unannotated-instance-attribute`), and an error
+from `strict`, as `LVA001` is. It reports an instance attribute a plain class's method stores
+(`self.count = 0`) that no annotation in the class declares, at its first plain `self.x = value`:
+a class the module defines once, with no keyword (a metaclass), on no base but `object` or another
+such class, since another file's base may declare the attribute itself. Dunders, stores in a
+nested function, and names the class's body or a base of the module's binds are left out.
+
+`LVA014` is opt-in too (pylint's `enable = missing-return-type`), an error from `strict`. It
+reports a plain function or method (not decorated) with no return annotation, as ruff's `ANN201`
+does; its fix is what the function's own `return`s give (`-> int`, a method's a guess, as is a
+function's whose `return`s' values are guessed), or `-> None` for one that returns nothing, or what
+a traced run saw it return (`--infer-from`, a guess), where the type names only what the module
+already binds. `LVA015` is opt-in the same way (pylint's
+`enable = missing-parameter-type`): a parameter with no annotation, as ruff's `ANN001` reports it,
+but a method's receiver; its fix, a guess, is what typed the parameter for the function's own
+check: what every call passes it, the one class with every member the function reads of it, its
+pytest fixture's value, or the one type the checked files annotate its name with. A signature is
+written whole or not at all: a return on bare parameters, or one parameter's type among bare ones,
+is an error to a checker held to complete signatures where none was. A signature `--fix` writes
+reaches the other files in the same run.
+
 Python 3.11+, no runtime dependencies.
 
 ## Use
 
 | Tool   | Setup                                                 | Reports                         | Suppress                                         |
 | ------ | ----------------------------------------------------- | ------------------------------- | ------------------------------------------------ |
-| CLI    | `constricter [PATH...] [--level L] [--format F] [-q]` | `LVA001`–`LVA012`               | `# noqa: LVA001`                                 |
-| flake8 | install it (on by default)                            | `LVA001`–`LVA012`               | `# noqa: LVA001`                                 |
-| pylint | `load-plugins = ["constricter.plugins.pylint"]`       | `C9101`–`C9112` (symbols below) | `# noqa: LVA001` or `# pylint: disable=<symbol>` |
-| ruff   | run the CLI after ruff; set `lint.external = ["LVA"]` | `LVA001`–`LVA012`               | `# noqa: LVA001`                                 |
+| CLI    | `constricter [PATH...] [--level L] [--format F] [-q]` | `LVA001`–`LVA015`               | `# noqa: LVA001`                                 |
+| flake8 | install it (on by default)                            | `LVA001`–`LVA015`               | `# noqa: LVA001`                                 |
+| pylint | `load-plugins = ["constricter.plugins.pylint"]`       | `C9101`–`C9115` (symbols below) | `# noqa: LVA001` or `# pylint: disable=<symbol>` |
+| ruff   | run the CLI after ruff; set `lint.external = ["LVA"]` | `LVA001`–`LVA015`               | `# noqa: LVA001`                                 |
 
 pylint symbols: `unannotated-local-variable`, `untyped-for-or-match-variable`,
 `comment-typed-for-variable`, `unannotated-module-or-class-variable`, `vague-annotation`,
 `deeply-nested-annotation`, `redundant-annotation`, `narrowable-annotation`,
-`mismatched-value-type`, `unused-union-member`, `long-tuple-annotation`, `could-be-final` (off until
-enabled).
+`mismatched-value-type`, `unused-union-member`, `long-tuple-annotation`, and, off until enabled,
+`could-be-final`, `unannotated-instance-attribute`, `missing-return-type` and
+`missing-parameter-type`.
 
 Options:
 
 | Option           | CLI                                                                                                                                                                                                                                                                                                                        | `[tool.constricter]`                            | flake8 (CLI or config)          | pylint                            |
 | ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | ------------------------------- | --------------------------------- |
 | level            | `--level`                                                                                                                                                                                                                                                                                                                  | `level`                                         | `--constricter-level`           | `constricter-level`               |
-| strictest        | `--max`: `--level=suffocate` for every path, `--all-scopes`, and the opt-in `LVA012`                                                                                                                                                                                                                                       | —                                               | —                               | —                                 |
+| strictest        | `--max`: `--level=suffocate` for every path, `--all-scopes`, and the opt-in `LVA012` and `LVA013`                                                                                                                                                                                                                          | —                                               | —                               | —                                 |
 | every fix        | `--max-fix`: `--max`, `--fix --unsafe-fixes`, and `--infer-with` each of basedpyright, ty and pyrefly that's installed and runs                                                                                                                                                                                            | —                                               | —                               | —                                 |
 | type comments    | `--type-comments`                                                                                                                                                                                                                                                                                                          | `type-comments`                                 | `--constricter-type-comments`   | `constricter-type-comments = yes` |
 | all scopes       | `--all-scopes`                                                                                                                                                                                                                                                                                                             | `all-scopes`                                    | `--constricter-all-scopes`      | `constricter-all-scopes = yes`    |
@@ -369,7 +395,7 @@ it to code scanning (the job needs `security-events: write`; the
 ```yaml
 - run: constricter --format=sarif src > constricter.sarif
 - if: ${{ !cancelled() }} # upload the findings even when the step above failed on them
-  uses: github/codeql-action/upload-sarif@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+  uses: github/codeql-action/upload-sarif@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
   with:
     sarif_file: constricter.sarif
     category: constricter
@@ -386,8 +412,10 @@ are in
 
 ## Roadmap
 
-What's done and what's next, by scope:
+What's next, by size:
 [docs/ROADMAP.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/ROADMAP.md).
+What's done, by scope:
+[docs/COMPLETED.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/COMPLETED.md).
 
 ## AI usage
 

{python_constricter-0.4.2 → python_constricter-0.4.4}/README.md

@@ -78,6 +78,9 @@ class bodies too. Statements are read in source order, and only a name's first b
 | `LVA010` | with every value known: a union member no value is                                        | drop the member                                |
 | `LVA011` | an annotation listing a fixed-length tuple of more than `max-length` types (4 by default) | name the fields (a `NamedTuple`, a dataclass)  |
 | `LVA012` | opt-in: a local bound once, outside any loop, and never rebound                           | `name: Final = ...`                            |
+| `LVA013` | opt-in: an instance attribute a plain class's method first stores, declared nowhere in it | `self.x: T = ...`                              |
+| `LVA014` | opt-in: a plain function that declares no return type                                     | `def f(...) -> T:`                             |
+| `LVA015` | opt-in: a parameter with no annotation                                                    | `def f(x: T):`                                 |
 
 Exempt: comprehensions, `except ... as`, imports, `def`/`class`, `type` aliases, parameters,
 `global`/`nonlocal`, and `_`; in module and class bodies, dunder names (`__all__`, `__slots__`) and
@@ -90,7 +93,8 @@ type checker: `T = TypeVar("T")`, a `ParamSpec`, a `TypeVarTuple`, a `NewType`,
 A `# type:` comment (`x = 1  # type: int`, `with f() as x:  # type: T`) counts as an annotation with
 `type-comments`, or automatically in a module written to run on Python 2: one that imports
 `print_function`, `unicode_literals`, `absolute_import`, `division`, `with_statement`, `generators`
-or `nested_scopes` from `__future__`.
+or `nested_scopes` from `__future__`. Otherwise it's `LVA001`, and `--fix` writes the comment's type
+as the annotation and drops the comment.
 
 `LVA007` compares a block on its own: an `if`'s body and its `orelse`, a `try`'s body and its
 `except`s, and the like, are different blocks, since they don't both run in the same pass.
@@ -127,29 +131,51 @@ or SARIF `warning` in those formats) but exits 0; flake8 and pylint report error
 at every level, and an error only at `suffocate`: on the corpus, 45–70% of every codebase's first
 bindings qualify, so it suits a codebase that wants `Final` everywhere it can go, not a default.
 
+`LVA013` is opt-in the same way (pylint's `enable = unannotated-instance-attribute`), and an error
+from `strict`, as `LVA001` is. It reports an instance attribute a plain class's method stores
+(`self.count = 0`) that no annotation in the class declares, at its first plain `self.x = value`:
+a class the module defines once, with no keyword (a metaclass), on no base but `object` or another
+such class, since another file's base may declare the attribute itself. Dunders, stores in a
+nested function, and names the class's body or a base of the module's binds are left out.
+
+`LVA014` is opt-in too (pylint's `enable = missing-return-type`), an error from `strict`. It
+reports a plain function or method (not decorated) with no return annotation, as ruff's `ANN201`
+does; its fix is what the function's own `return`s give (`-> int`, a method's a guess, as is a
+function's whose `return`s' values are guessed), or `-> None` for one that returns nothing, or what
+a traced run saw it return (`--infer-from`, a guess), where the type names only what the module
+already binds. `LVA015` is opt-in the same way (pylint's
+`enable = missing-parameter-type`): a parameter with no annotation, as ruff's `ANN001` reports it,
+but a method's receiver; its fix, a guess, is what typed the parameter for the function's own
+check: what every call passes it, the one class with every member the function reads of it, its
+pytest fixture's value, or the one type the checked files annotate its name with. A signature is
+written whole or not at all: a return on bare parameters, or one parameter's type among bare ones,
+is an error to a checker held to complete signatures where none was. A signature `--fix` writes
+reaches the other files in the same run.
+
 Python 3.11+, no runtime dependencies.
 
 ## Use
 
 | Tool   | Setup                                                 | Reports                         | Suppress                                         |
 | ------ | ----------------------------------------------------- | ------------------------------- | ------------------------------------------------ |
-| CLI    | `constricter [PATH...] [--level L] [--format F] [-q]` | `LVA001`–`LVA012`               | `# noqa: LVA001`                                 |
-| flake8 | install it (on by default)                            | `LVA001`–`LVA012`               | `# noqa: LVA001`                                 |
-| pylint | `load-plugins = ["constricter.plugins.pylint"]`       | `C9101`–`C9112` (symbols below) | `# noqa: LVA001` or `# pylint: disable=<symbol>` |
-| ruff   | run the CLI after ruff; set `lint.external = ["LVA"]` | `LVA001`–`LVA012`               | `# noqa: LVA001`                                 |
+| CLI    | `constricter [PATH...] [--level L] [--format F] [-q]` | `LVA001`–`LVA015`               | `# noqa: LVA001`                                 |
+| flake8 | install it (on by default)                            | `LVA001`–`LVA015`               | `# noqa: LVA001`                                 |
+| pylint | `load-plugins = ["constricter.plugins.pylint"]`       | `C9101`–`C9115` (symbols below) | `# noqa: LVA001` or `# pylint: disable=<symbol>` |
+| ruff   | run the CLI after ruff; set `lint.external = ["LVA"]` | `LVA001`–`LVA015`               | `# noqa: LVA001`                                 |
 
 pylint symbols: `unannotated-local-variable`, `untyped-for-or-match-variable`,
 `comment-typed-for-variable`, `unannotated-module-or-class-variable`, `vague-annotation`,
 `deeply-nested-annotation`, `redundant-annotation`, `narrowable-annotation`,
-`mismatched-value-type`, `unused-union-member`, `long-tuple-annotation`, `could-be-final` (off until
-enabled).
+`mismatched-value-type`, `unused-union-member`, `long-tuple-annotation`, and, off until enabled,
+`could-be-final`, `unannotated-instance-attribute`, `missing-return-type` and
+`missing-parameter-type`.
 
 Options:
 
 | Option           | CLI                                                                                                                                                                                                                                                                                                                        | `[tool.constricter]`                            | flake8 (CLI or config)          | pylint                            |
 | ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | ------------------------------- | --------------------------------- |
 | level            | `--level`                                                                                                                                                                                                                                                                                                                  | `level`                                         | `--constricter-level`           | `constricter-level`               |
-| strictest        | `--max`: `--level=suffocate` for every path, `--all-scopes`, and the opt-in `LVA012`                                                                                                                                                                                                                                       | —                                               | —                               | —                                 |
+| strictest        | `--max`: `--level=suffocate` for every path, `--all-scopes`, and the opt-in `LVA012` and `LVA013`                                                                                                                                                                                                                          | —                                               | —                               | —                                 |
 | every fix        | `--max-fix`: `--max`, `--fix --unsafe-fixes`, and `--infer-with` each of basedpyright, ty and pyrefly that's installed and runs                                                                                                                                                                                            | —                                               | —                               | —                                 |
 | type comments    | `--type-comments`                                                                                                                                                                                                                                                                                                          | `type-comments`                                 | `--constricter-type-comments`   | `constricter-type-comments = yes` |
 | all scopes       | `--all-scopes`                                                                                                                                                                                                                                                                                                             | `all-scopes`                                    | `--constricter-all-scopes`      | `constricter-all-scopes = yes`    |
@@ -342,7 +368,7 @@ it to code scanning (the job needs `security-events: write`; the
 ```yaml
 - run: constricter --format=sarif src > constricter.sarif
 - if: ${{ !cancelled() }} # upload the findings even when the step above failed on them
-  uses: github/codeql-action/upload-sarif@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+  uses: github/codeql-action/upload-sarif@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
   with:
     sarif_file: constricter.sarif
     category: constricter
@@ -359,8 +385,10 @@ are in
 
 ## Roadmap
 
-What's done and what's next, by scope:
+What's next, by size:
 [docs/ROADMAP.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/ROADMAP.md).
+What's done, by scope:
+[docs/COMPLETED.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/COMPLETED.md).
 
 ## AI usage
 

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/__init__.py

@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: MIT
 """Every local variable typed where it's first bound."""
 
 from constricter._version import __version__  # written by the build, from the git tag

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/__main__.py

@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: MIT
 """`python -m constricter`, and the `constricter` script."""
 
 import contextlib
@@ -13,9 +12,10 @@ def run() -> None:
 
     Not by the interpreter's own exit, which frees every parsed file and the index an object at a
     time: a fifth of a check of a thousand files. What the command wrote is flushed first; nothing
-    else waits on the exit (its workers have ended, its output file is closed).
+    else waits on the exit (its workers have ended, its output file is closed). Nor is the collector
+    turned on again for it (`leaving`).
     """
-    status: int = main()
+    status: int = main(leaving=True)
     with contextlib.suppress(OSError, ValueError):  # a reader that left, a stream closed already
         _ = sys.stdout.flush()
         _ = sys.stderr.flush()

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/_version.py

@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: MIT
 """The version this was built as, from its git tag (written by the build, not tracked)."""
 
-__version__ = "0.4.2"
+__version__ = "0.4.4"

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/cli/__init__.py

@@ -1,2 +1 @@
-# SPDX-License-Identifier: MIT
 """The `constricter` command (`command.main`): its options, the files it checks, and how it reports."""

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/cli/baseline.py

@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: MIT
 """Baseline files: the offences a codebase already has, so only new ones are reported.
 
 An entry is a file, a code and a variable name, with how many times it occurs; line numbers aren't

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/cli/collecting.py

@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: MIT
 """The garbage collector, as the command runs it: by hand, once per file checked.
 
 A check keeps every file's tree (see `parsed`), and allocates a great deal for each file, little of it
@@ -24,9 +23,12 @@ _YOUNGER: Final = not sysconfig.get_config_var("Py_GIL_DISABLED")
 
 
 @contextlib.contextmanager
-def by_hand() -> Generator[None]:
+def by_hand(*, leaving: bool = False) -> Generator[None]:
     """Turn automatic collection off for the command's run, and back as it was after.
 
+    Not for a process that leaves once the run's done (`leaving`): turned on again, the collector
+    looked through all the run left alive, at once (a check of pandas: 3.4s, for nothing).
+
     Yields:
       Nothing: the run.
 
@@ -36,9 +38,9 @@ def by_hand() -> Generator[None]:
     try:
         yield
     finally:
-        if _FREEZES:
+        if _FREEZES and not leaving:
             gc.unfreeze()
-        if was:
+        if was and not leaving:
             gc.enable()
 
 

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/cli/command.py

@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: MIT
 """The `constricter` command (see README)."""
 
 import codecs
@@ -18,7 +17,7 @@ from constricter.cli import baseline, collecting, schedule
 from constricter.cli.lsp.protocol import HintError
 from constricter.cli.options import Mode, Options, Output
 from constricter.cli.paths import STDIN, python_files
-from constricter.cli.reading import encoding_of, read_text
+from constricter.cli.reading import READ_ERRORS, encoding_of, read_text
 from constricter.cli.report import Format, Result, fix_reasons, render, statistics
 from constricter.cli.rounds import checked_all, settled
 from constricter.cli.runs import Added, BaselineRun, CheckRun, CoverageRun, FileRun
@@ -32,16 +31,17 @@ from constricter.offences import (
     Edit,
     Offence,
 )
-from constricter.rules import parsed
 from constricter.rules.checker import Checked, Coverage, annotation_coverage, checked_source
+from constricter.source import parsed
 
 if TYPE_CHECKING:  # slow to import, and only needed for `--infer-with`
+    from types import ModuleType
+
     from constricter.cli.lsp import hints
 
 EXIT_CLEAN: Final = 0
 EXIT_FOUND: Final = 1
 EXIT_ERROR: Final = 2
-_ALL: Final = 100  # percent
 
 
 def _source(raw: str, name: Path) -> tuple[str, list[notebook.Line]]:
@@ -198,11 +198,21 @@ def _read_checked(
     checked: Checked
     try:
         raw, checked = _checked(path, name, checks, outside)
-    except (OSError, ValueError, SyntaxError) as error:  # UnicodeDecodeError is a ValueError
-        return "", Checked([], Returns()), f"{name}: error: {error}"
+    except READ_ERRORS as error:
+        return "", Checked([], Returns()), _error(name, error)
     return raw, checked, ""
 
 
+def _error(name: Path, error: Exception) -> str:
+    """Say why a file couldn't be read or parsed.
+
+    Returns:
+      The message.
+
+    """
+    return f"{name}: error: {error}"
+
+
 def _results(raw: str, name: Path, offences: Sequence[Offence], options: Options) -> list[Result]:
     """Turn the offences in `raw`, the text of `name`, into the results to report.
 
@@ -325,8 +335,8 @@ def _cover_path(path: Path, _outside: Outside, options: Options) -> CoverageRun:
     name: Path = options.input.name(path)
     try:
         return CoverageRun(annotation_coverage(_source(read_text(path), name)[0], options.checks))
-    except (OSError, ValueError, SyntaxError) as error:
-        return CoverageRun(error=f"{name}: error: {error}")
+    except READ_ERRORS as error:
+        return CoverageRun(error=_error(name, error))
 
 
 def _check_all(options: Options) -> tuple[list[Path], list[FileRun]]:
@@ -370,12 +380,17 @@ def _check_rounds(options: Options) -> tuple[list[Path], list[FileRun]]:
         return names, settled(paths, check, options, None)
     session: hints.Session
     # Imported only for `--infer-with`: it's slow to import, for every run's start.
-    with cast("type[hints.Session]", importlib.import_module("constricter.cli.lsp.hints").Session)(
+    hinting: ModuleType = importlib.import_module("constricter.cli.lsp.hints")
+    asking: hints.Asking = cast("type[hints.Asking]", hinting.Asking)(
+        kept=not options.infer_fresh,
+        in_turn=options.infer_in_turn,
+    )
+    with cast("type[hints.Session]", hinting.Session)(
         options.infer_with,
         Path.cwd(),
         options.jobs,
         options.infer_memory,
-        kept=not options.infer_fresh,
+        asking,
     ) as session:
         runs: list[FileRun] = settled(paths, check, options, session)
         checker: str
@@ -383,6 +398,11 @@ def _check_rounds(options: Options) -> tuple[list[Path], list[FileRun]]:
         for checker, path in session.abandoned:
             name: Path = options.input.name(path)
             _ = sys.stderr.write(f"constricter: warning: {checker} hung on {name} twice: no hints for it\n")
+        read: int
+        rounds: int
+        for checker, read, rounds in session.reused:
+            told: str = f"{checker}'s hints for {read} of {rounds} rounds were read from the store"
+            _ = sys.stderr.write(f"constricter: note: {told} (`--infer-fresh` asks again)\n")
     return names, runs
 
 
@@ -485,8 +505,8 @@ def _typed(found: Coverage) -> str:
     return f"{found.typed}/{found.total} typed ({found.percent:.1f}%){wider}"
 
 
-def _run(options: Options) -> int:
-    """Check, fix, diff, count or baseline, printing what that finds.
+def _run(options: Options, *, leaving: bool) -> int:
+    """Check, fix, diff, count or baseline, printing what that finds (`leaving`: see `main`).
 
     Returns:
       The exit status.
@@ -494,7 +514,7 @@ def _run(options: Options) -> int:
     """
     names: list[Path]
     runs: list[FileRun]
-    with collecting.by_hand():
+    with collecting.by_hand(leaving=leaving):
         try:
             names, runs = _check_all(options)
         except HintError as error:
@@ -527,9 +547,12 @@ def _run(options: Options) -> int:
     return EXIT_ERROR if failed else status
 
 
-def main(argv: Sequence[str] | None = None) -> int:
+def main(argv: Sequence[str] | None = None, *, leaving: bool = False) -> int:
     """Run the command.
 
+    `leaving`: the process leaves once it's done (`constricter.__main__.run`), its collector as the
+    run left it (see `collecting.by_hand`).
+
     Returns:
       Its exit status.
 
@@ -543,5 +566,5 @@ def main(argv: Sequence[str] | None = None) -> int:
         else contextlib.nullcontext(sys.stdout) as stream,
         contextlib.redirect_stdout(stream),
     ):
-        status: int = _run(options)
+        status: int = _run(options, leaving=leaving)
     return EXIT_CLEAN if options.output.exit_zero and status == EXIT_FOUND else status

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/cli/config.py

@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: MIT
 """The command's defaults, from the nearest `pyproject.toml`'s `[tool.constricter]` table."""
 
 import re
@@ -221,11 +220,13 @@ def _checkers(value: _Toml) -> list[str] | None:
     """Read `infer-with`: a checker, or a list of them, each one it knows.
 
     Returns:
-      Them, or `None` for anything else.
+      Them, each once in the order they're preferred, as `--infer-with` gives them; `None` for
+      anything else.
 
     """
     checkers: list[str] | None = [value] if isinstance(value, str) else _strings(value)
-    return checkers if checkers and all(checker in SERVERS for checker in checkers) else None
+    known: bool = bool(checkers) and all(checker in SERVERS for checker in checkers or ())
+    return list(dict.fromkeys(checkers)) if checkers and known else None
 
 
 def _levels(value: _Toml) -> dict[str, str] | None:
@@ -248,7 +249,7 @@ def _lists(value: _Toml, read: Callable[[_Toml], list[str] | None]) -> dict[str,
     return None if None in lists.values() else {key: list(item or []) for key, item in lists.items()}
 
 
-def _baseline(value: _Toml, root: Path) -> str | None:
+def _path(value: _Toml, root: Path) -> str | None:
     """Read a baseline's or a trace's path, relative to `root` (the pyproject.toml that names it).
 
     Returns:
@@ -303,8 +304,8 @@ def config_defaults(start: Path) -> dict[str, Default]:
         return {}
     readers: dict[str, Callable[[_Toml], Default | None]] = {
         **_READERS,
-        "baseline": partial(_baseline, root=path.parent),
-        "infer-from": partial(_baseline, root=path.parent),
+        "baseline": partial(_path, root=path.parent),
+        "infer-from": partial(_path, root=path.parent),
     }
     defaults: dict[str, Default] = {}
     key: str

{python_constricter-0.4.2 → python_constricter-0.4.4}/constricter/cli/explain.py

@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: MIT
 """Each code's rationale and fix, for `constricter --explain`."""
 
 from typing import Final
@@ -14,7 +13,10 @@ from constricter.offences import (
     OPT_IN,
     REDUNDANT_TYPE,
     UNANNOTATED,
+    UNANNOTATED_ATTRIBUTE,
     UNANNOTATED_MEMBER,
+    UNANNOTATED_PARAMETER,
+    UNANNOTATED_RETURN,
     UNTYPED_TARGET,
     UNUSED_UNION_MEMBER,
     VAGUE_TYPE,
@@ -83,6 +85,24 @@ _WHY: Final = {
         "(not from a nested function either) could say so: `limit: Final = 10`. Off unless selected\n"
         "by its full code (`--extend-select LVA012`): most locals are bound once."
     ),
+    UNANNOTATED_ATTRIBUTE: (
+        "An instance attribute a plain class's method first stores (`self.count = 0`), declared\n"
+        "nowhere in the class, is typed by whatever a type checker infers from that store. Annotate\n"
+        "it there: `self.count: int = 0`. Off unless selected by its full code (`--extend-select LVA013`)."
+    ),
+    UNANNOTATED_RETURN: (
+        "A plain function with no return annotation leaves its callers to whatever a type checker\n"
+        "infers. `--fix` writes what its own `return`s give (`-> int`), or `-> None` for one that\n"
+        "returns nothing. Off unless selected by its full code (`--extend-select LVA014`): ruff's ANN201\n"
+        "reports it too; this is for the fix."
+    ),
+    UNANNOTATED_PARAMETER: (
+        "A parameter with no annotation leaves the function's body to whatever a type checker\n"
+        "infers of it. `--fix` writes what typed it from outside, a guess: what every call passes it,\n"
+        "the one class with every member the function reads of it, its pytest fixture's value, or\n"
+        "the one type the checked files annotate its name with. Off unless selected by its full code\n"
+        "(`--extend-select LVA015`): ruff's ANN001 reports it too; this is for the fix."
+    ),
 }
 
 

python_constricter-0.4.4/constricter/cli/lsp/__init__.py

@@ -0,0 +1 @@
+"""constricter.cli.lsp."""