Merge fix/100-ruff-autofixes -> main #137

Closed

Mark wants to merge 8 commits from fix/100-ruff-autofixes into main

pull from: fix/100-ruff-autofixes

merge into: Mark:main

Mark:main

Conversation 0 Commits 8 Files changed 22 +54 -46

Mark commented 2026-09-12 18:01:43 +00:00

Owner

Copy link

Auto-opened batch merger.

Auto-opened batch merger.

Mark added 8 commits 2026-09-12 18:01:43 +00:00

Fix #97: hoist PLC0415 imports to top-level 40efd97a0f

fix(#100): ruff I001 — sort imports (alembic merge migration) ... 77acfdd92c

Reorder the import block in the merge-head migration so third-party
imports follow first-party imports, satisfying I001 (unsorted-imports).

The 14 I001 violations the upstream inventory reported under
`ruff check app/ --config ../pyproject.toml` are config-resolution
artifacts: the canonical project-root config (`ruff check .` from
backend/) reports these files as already sorted. Leaving those
unchanged to avoid introducing diff noise that CI does not enforce.

Baseline: 270 repo-root / 368 app/ errors
Post-I001: 269 repo-root (-1) / 368 app/ (config-artifact unchanged)

fix(#100): ruff UP007 — Union[X, Y] → X | Y (PEP 604) ... b8103d3f19

Replace 3 occurrences of `typing.Union` annotations in the alembic
merge-head migration with PEP 604 union syntax. Mechanical, semantic
equivalent; Python 3.12+ supports `X | Y` natively.

Note: this leaves `from typing import Union` orphaned (one new F401
in this same file). Intentional — the F401 cleanup is part of the
manual-fix lane per task spec (registry pattern, intentional
re-exports), so it stays untouched here.

Baseline: 270 repo-root
Post-I001:   269 repo-root (-1 I001)
Post-UP007:  267 repo-root (-2 UP007; -1 newly-orphaned Union becomes F401)

fix(#100): ruff UP042 — replace (str, Enum) with StrEnum (PEP 663) ... 0fe1ddfe1d

Convert 3 `class X(str, Enum)` declarations to `class X(StrEnum)`:
- app/services/execution.py:ErrorType
- app/services/execution.py:ModuleStatus
- app/services/investigations/entity_module_map.py:EntityType

`--unsafe-fixes` required because ruff treats (str, Enum)→StrEnum as
semantically meaningful (StrEnum members are typed strings, not str+
Enum subclasses, but the runtime behavior is equivalent for our usage).
Verified no isinstance(_, X) checks or .value accesses exist at any
call site that would be sensitive to the representation change.

Baseline: 270 repo-root
Post-UP042: 264 repo-root (-3)

fix(#100): ruff UP047 — PEP 695 generic syntax ... abd28ab554

Convert two legacy TypeVar-based generic functions to PEP 695 native
syntax (`def f[T](...)` and `def f[T: BaseModel](...)`):
- app/services/investigations/retry_handler.py:retry_with_backoff
- app/services/llm/parsing.py:safe_parse_llm_json

`--unsafe-fixes` required. Verified callers do not introspect the
type parameter at runtime (only call-site usage of return values).

Baseline: 270 repo-root
Post-UP047: 264 repo-root (-2)

fix(#100): ruff UP035 — typing.Sequence → collections.abc.Sequence ... 0ee17f88d6

Move `Sequence` from the deprecated `typing` namespace to `collections.abc`
in the alembic merge-head migration. `--unsafe-fixes` required because
ruff treats `typing.Sequence` as deprecated when used purely as a
generic alias in annotations (PEP 585). Equivalent at type-check time
on Python 3.9+; the merge migration body is empty (`pass`) and
`branch_labels`/`depends_on` are read by alembic as values, not
introspected as annotations.

Note: this leaves `from typing import Union` orphaned (one more F401
in this file, cumulative). Deferred to the manual-fix lane per task
spec.

Baseline: 270 repo-root
Post-UP035: 263 repo-root (-1)

fix(#100): ruff F401 — remove genuinely unused imports ... f72457009b

Clean up F401 violations that are safe to auto-remove:
- alembic merge migration: `typing.Union` (orphaned by UP007),
  `sqlalchemy as sa` and `alembic.op` (pre-existing in the
  pass-body merge revision — never referenced).
- app/services/execution.py: `enum.Enum` (orphaned by UP042 —
  both ErrorType and ModuleStatus now inherit StrEnum directly).
- app/services/investigations/entity_module_map.py: `enum.Enum`
  (orphaned by UP042 — EntityType now inherits StrEnum directly).

Explicitly SKIPPED (deferred to manual lane, see task body):
- app/modules/registry.py:76 F401 — intentional side-effect imports
  for `@ModuleRegistry.register` decorator pattern. Removing them
  would break optional-module registration.
- app/routers/__init__.py:21 F401 — intentional `__init__` re-exports.
- app/services/llm/__init__.py:5 F401 — intentional `__init__` re-exports.
- app/modules/ocr_extractor.py:188 — `pytesseract` inside `try:` at
  function scope; ruff refuses to auto-fix (soft-import pattern) so
  deferred with the other manual-cleanup items.

Baseline: 270 repo-root / 368 app/
Post-F401-cleanup: 264 repo-root (-6) / 368 app/ (registry/__init__ clusters deferred)

fix(#100): ruff I001 — sort imports in app/services (CI config) ... f749c0bb9e

CI runs `ruff check app/ --config ../pyproject.toml`, which resolves
`app` as a first-party package (alembic install mode). The canonical
`ruff check .` from backend/ uses a different first-party heuristic
and reports the same files as already-sorted. Apply the CI-correct
ordering so the strict lint job passes locally and on the runner.

14 files re-shuffled in app/services/, putting `app.*` imports
before third-party (`sqlmodel`, `sqlalchemy`) imports. Mechanical,
no semantic change.

Combined with the earlier alembic I001 commit, all 15 I001
violations under the CI config are resolved. The canonical-config
oscillation noted in the alembic commit is left for the next lane.

Baseline: 270 repo-root / 368 app/
Post-I001-full: 269 repo-root (-1) / 354 app/ (-14)

Mark closed this pull request 2026-09-21 01:06:39 +00:00

Some checks failed

Hide all checks

CI / Backend Lint & Format (pull_request) Failing after 4s

Details

CI / Golden Fixture Validation (pull_request) Has been skipped

Details

CI / Backend Tests (pull_request) Has been skipped

Details

CI / Backend Security Tests (pull_request) Has been skipped

Details

CI / Frontend Lint (pull_request) Failing after 22s

Details

CI / Frontend Tests (pull_request) Has been skipped

Details

CI / Dependency Security Scan (pull_request) Has been skipped

Details

Stress Tests / Stress & Pipeline Tests (pull_request) Failing after 7s

Details

Stress Tests / Full Data Pipeline Validation (pull_request) Has been skipped

Details

Performance Regression Tests / Performance Regression Detection (pull_request) Failing after 2m15s

Details

CI / Frontend E2E Tests (pull_request) Has been skipped

Details

Performance Regression Tests / Compare with Baseline (pull_request) Has been skipped

Details

CI / All Checks Passed (pull_request) Failing after 1s

Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

agentic-osint

Agentic OSINT features

  

audit

  

blocked:commit-ready-failed

  

blocked:gate-fetch

  

blocked:gate-fetch

  

blocked:gate-lint

  

blocked:gate-plan

  

blocked:gate-research

  

blocked:needs-decision

  

blocked:needs-human

  

blocked:no-changes

  

blocked:preflight

Repo has dirty lint; kilo-gsd preflight refuses to dispatch until lint-cleanup lands

  

blocked:verify-failed

  

bug

Something is not working

  

chore

Config/cleanup item

  

deferred

Deferred — will revisit later

  

enhancement

Enhancement request

  

feature-request

  

in-progress

  

lint-baseline

  

lint-cleanup

kilo-gsd preflight lint gate: repo has dirty ruff state, cleanup required before fixer dispatch

  

needs-decompose

Issue needs decompose processing

  

needs-triage

  

performance

  

quickfix

  

security/medium

Medium severity security issue

  

triage-approved

Approved by triage

No labels

agentic-osint

audit

blocked:commit-ready-failed

blocked:gate-fetch

blocked:gate-fetch

blocked:gate-lint

blocked:gate-plan

blocked:gate-research

blocked:needs-decision

blocked:needs-human

blocked:no-changes

blocked:preflight

blocked:verify-failed

bug

chore

deferred

enhancement

feature-request

in-progress

lint-baseline

lint-cleanup

needs-decompose

needs-triage

performance

quickfix

security/medium

triage-approved

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

Mark/osint-hub!137

No description provided.