refactor(mypy): clear 8 easy rfd3 modules off the ignore ratchet#298
Open
lyskov-ai wants to merge 8 commits into
Open
refactor(mypy): clear 8 easy rfd3 modules off the ignore ratchet#298lyskov-ai wants to merge 8 commits into
lyskov-ai wants to merge 8 commits into
Conversation
Fix each module's single pre-existing type error with a pure annotation or setattr change (no behavior change) and remove it from the [[tool.mypy.overrides]] ignore_errors list: - callbacks/train_logging: loss_trackers: dict[str, MeanMetric] - callbacks/metrics_logging: seen_examples: set[str] - common: setattr(wrapper, "_has_run", True) for the @wraps wrapper - hydra/resolvers: attribute_path: str | None (body already guards) - inference_engines/base: base_overrides: dict[str, Any] 13 modules remain on the ignore list. mypy now type-checks the 5 newly-included modules cleanly. Co-authored-by: Sergey Lyskov <sergey.lyskov@jhu.edu>
Resolve the type errors in and remove from the [[tool.mypy.overrides]] ignore_errors list. Mostly narrowing / annotation fixes; two deliberate type-honesty fixes flagged below. - utils/weights: lowercase `any` -> `Any` in _PatternPolicyMixin (4x); assert-narrow fallback_policy at the call site (matches get_policy idiom) - model/layers/blocks: class-level w/b: torch.Tensor for the registered buffers (avoids nn.Module's Tensor | Module __getattr__ fallback) - utils/components: is-None narrowing + tip_names local in get_name_mask's TIP branch (exists() can't narrow for mypy); drop orphaned exists import - utils/logging: str(field) for the tree key; assign to a new hparams local rather than reassigning the typed cfg param - foundry_cli/download_checkpoints: guard on `hasher is not None`; total_size = 0.0 for the float accumulation - training/schedulers: SchedulerConfig.scheduler is now a required field (was = None, but documented required and assumed non-None everywhere) - utils/xpu/xpu_accelerator: name @Property -> @staticmethod to match lightning's Accelerator ABC 6 hard-tier modules remain on the ignore list. Co-authored-by: Sergey Lyskov <sergey.lyskov@jhu.edu>
Fix the 11 type errors in foundry.metrics.metric and remove it from the [tool.mypy.overrides] ignore_errors list (5 hard-tier modules remain). - str(name) coercion of DictConfig.items() keys (str|bytes|int|... union) - exists() -> 'is not None' narrowing; drop orphaned atomworks import - widen compute_from_kwargs -> dict|list and kwargs_to_compute_args -> dict|None to match the actual returns / documented contract (callers already handle them) - three type: ignore[arg-type] on nested_dict.get/getitem for an upstream atomworks annotation bug (param typed dict[tuple,...] but navigated as nested dict[str,Any]); warn_unused_ignores will flag them if upstream is fixed No behavior change. All gates green (ruff, mypy 41 files, pytest 27 passed). Co-authored-by: Sergey Lyskov <sergey.lyskov@jhu.edu>
Clear the three remaining foundry.utils.* modules off the mypy ignore_errors list (47 errors: ddp 12, rigid 16, datasets 19). Type-honesty and annotation fixes only, no behavior change: narrow DictConfig|dict params to DictConfig where attribute access requires it (item access kept where a plain-dict default is real), honest int|None / Tensor|None widenings, variable renames to avoid type-reuse, str() coercion of DictConfig keys, the file's own if/elif/else narrowing pattern, and documented type: ignore / cast for genuine torch and atomworks stub limitations. Two hard-tier modules remain (callbacks/health_logging, trainers/fabric). Co-authored-by: lyskov-ai <277346777+lyskov-ai@users.noreply.github.com>
Clear foundry.callbacks.health_logging off the mypy ignore_errors list by fixing its 23 type errors (annotation / type-honesty only, no behavior change): - import the stdlib 'types' module directly instead of relying on 'from typing import types' (worked at runtime but fragile/untyped) - replace 'callable'-used-as-a-type with Mapping[str, Callable[..., Any]] on the stat/histogram dict params and Callable[..., bool] | None on the filter params; annotate the two MappingProxyType default constants to match - annotate the _hooks / _temp_cache / _cache instance vars - make implicit-Optional defaults explicit (... | None) on the two plot_tensor_* helpers, matching their is-not-None guards - in plot_tensor_hist, replace two type-changing param reassignments with equivalent always-set locals (display_values, step_labels) Only trainers/fabric remains on the ignore list. Co-authored-by: lyskov-ai <277346777+lyskov-ai@users.noreply.github.com>
Clear foundry.trainers.fabric (the last and largest module) off the mypy ignore_errors list and remove the now-empty override block. The ratchet ignore list is now empty: all of src/foundry + src/foundry_cli type-checks with no per-module exemptions. Fixes are annotation / type-honesty only, no behavior change: - annotate self.state as dict[str, Any] (a heterogeneous, dynamically- keyed training-state bag, also merged with arbitrary checkpoint keys); this collapses ~69 union-attr/operator/arg-type errors. Also annotate default_state and declare _current_train_return (set by subclass training_step implementations). - dataloader types: Fabric.setup_dataloaders is stub-typed to return DataLoader | list[DataLoader], so cast its single-loader results to DataLoader and change train_loop/validation_loop params from _FabricDataLoader to DataLoader (drop the now-unused import). - precision: widen the param to str | int | None (the body sets it None when an XPU plugin takes over), cast to the guarded Literal at the XPUMixedPrecision call, and add one documented type: ignore[arg-type] where our public API is wider than Fabric's precision Literal. - narrow the parameter-freezing guard to direct attribute access; type get_latest_checkpoint as Path | None (matching its returns) with a cast at the single caller; drop a stale type: ignore. Co-authored-by: lyskov-ai <277346777+lyskov-ai@users.noreply.github.com>
…chet Add models/rfd3/src/rfd3 to [tool.mypy].files so the rfd3 model package is type-checked by the standard gate (mypy now covers 99 files: foundry + rfd3). Seed a fresh [[tool.mypy.overrides]] ignore_errors ratchet listing the 32 rfd3 modules with pre-existing type errors (194 total), mirroring the original src/foundry bootstrap; the 26 already-clean rfd3 modules are type-checked immediately. Modules are cleared from the ratchet one slice at a time in follow-up work. Config only, no code changes. rfd3 is an editable install, so imports resolve without an added mypy_path. Co-authored-by: lyskov-ai <277346777+lyskov-ai@users.noreply.github.com>
First slice of clearing the models/rfd3 mypy ratchet: the 8 modules with a single error each (32 -> 24 remaining on the ignore_errors list). mypy now type-checks 34 rfd3 modules. Annotation / type-honesty only, no behavior change: - block_utils: -> torch.LongTensor -> torch.Tensor (.long() is stub-typed Tensor; sibling helpers already return Tensor) - hbonds_hbplus: corrected calculate_hbonds's stale return annotation to match the actual (AtomArray, list[dict], int) return - inference/parsing: malformed pydantic np.ndarray[np.bool_] -> np.ndarray[Any, np.dtype[np.bool_]] - chunked_pairwise: assert _sm_cached is not None in the cache fast path (populated together with the already-narrowed _sl_cached) - rasa: documented type: ignore[list-item] (atomworks Transform types requires_previous_transforms as list[str]; class refs are accepted) - ncaa_transforms / design_metrics / testing_utils: var-annotated dicts (+ a missing 'from typing import Any') Co-authored-by: lyskov-ai <277346777+lyskov-ai@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Type-checking: clear the 8 single-error
rfd3modules off theignore_errorslist seeded formodels/rfd3(32 → 24 remaining), so mypy now type-checks them (34rfd3modules total). No behavior change.Fixes are type-honesty / annotation only — a wrong
LongTensorreturn →Tensor; a stalecalculate_hbondsreturn tuple corrected to match the actual return; a malformed pydanticnp.ndarray[np.bool_]→np.ndarray[Any, np.dtype[np.bool_]]; threevar-annotateddicts; one documented# type: ignore[list-item]for the atomworksTransformbase typingrequires_previous_transformsaslist[str](class refs accepted); and one benignassert _sm_cached is not Nonein a cache fast path.Modules:
rfd3.inference.parsing,rfd3.metrics.design_metrics,rfd3.model.layers.block_utils,rfd3.model.layers.chunked_pairwise,rfd3.testing.testing_utils,rfd3.transforms.hbonds_hbplus,rfd3.transforms.ncaa_transforms,rfd3.transforms.rasa.Per-module details are in the commit message.