Commit graph

3 commits

Author SHA1 Message Date
d3d21b92f5 fix(ptica): scope=manual_list перестаёт создавать задание из пустоты (#2464)
All checks were successful
CI Trade-In / changes (pull_request) Successful in 9s
CI Trade-In / backend-tests (pull_request) Has been skipped
CI / changes (pull_request) Successful in 9s
CI Trade-In / browser-tests (pull_request) Has been skipped
CI Trade-In / frontend-checks (pull_request) Has been skipped
CI / frontend-tests (pull_request) Has been skipped
CI / openapi-codegen-check (pull_request) Successful in 1m55s
CI / backend-tests (pull_request) Successful in 17m14s
Проверка непустоты стояла ДО очистки:

    if not quarters:                       # ["  "] — непустой, проходит
        raise HTTPException(400, ...)
    return [q.strip() for q in quarters if q.strip()]   # → []

Список из одних пробелов проходил как непустой, а после strip оставался пустым.
Дальше по коду это молча создавало job с нулём кварталов, ставило его в очередь
Celery и возвращало targets_total=0 с estimate_minutes=0.0 — пустышку,
неотличимую в списке заданий от настоящей.

Правка: сначала чистим, потом проверяем. Прежние отказы (None, []) сохраняются.

Тест проверяет ПОВЕДЕНИЕ: на пробельном вводе функция обязана отказать. Против
origin/main три случая падают с «DID NOT RAISE» — то есть по отсутствию отказа,
а не по отсутствию символа.

  ["   "], ["", "  ", "\t"], ["\n"]   → DID NOT RAISE  → падает
  None и []                          — контроль, зелёный с обеих сторон
  годный список проходит и чистится  — контроль, зелёный с обеих сторон
  смешанный список сохраняет живые   — контроль, зелёный с обеих сторон

Третий и четвёртый контроли не для симметрии: они ловят «починку», которая
отказывала бы на любом вводе с пробелами или отбрасывала бы смешанный список
целиком.

Прогоны: tests/api/v1 -k cadastre — 7 passed rc=0.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-20 14:33:31 +05:00
b233bf91cc refactor(security): убрать X-Admin-Token (Caddy basic_auth достаточен) (#437)
All checks were successful
Deploy / changes (push) Successful in 5s
Deploy / build-frontend (push) Has been skipped
Deploy / build-backend (push) Successful in 1m20s
Deploy / build-worker (push) Successful in 2m21s
Deploy / deploy (push) Successful in 1m7s
2026-05-23 10:41:22 +00:00
lekss361
5da66bbc93
feat(cadastre): bulk_harvest worker + grid-walker + admin API (#168 PR3/5) (#171)
* feat(cadastre): bulk_harvest_quarter Celery task + grid-walker + saga state (#168 PR3/5)

Add bulk cadastre harvest pipeline:
- services/cadastre/bulk_harvest.py: async harvest_quarter() orchestrator (4 phases)
  + 7 upsert helpers (parcels/buildings/constructions/oncs/enks/zouit/quarter_stats)
  using CAST(:x AS jsonb) pattern, begin_nested() SAVEPOINT per grid-walk upsert
- services/cadastre/grid_geometry.py: quarter_bbox_3857 (PostGIS ST_Extent)
  + generate_grid_click_points (15x15 = 225 sub-bbox grid)
- workers/tasks/scrape_cadastre.py: bulk_harvest_quarter_task (acks_late=True,
  dont_autoretry_for NspdBulkWafError), enqueue_cadastre_harvest, cleanup_zombies
- api/v1/admin_cadastre.py: 5 endpoints behind AdminTokenAuth — create/list/get/cancel/resume
- Tests: 13 service unit + 8 API tests

* fixup(cadastre): drop importorskip (PR2 merged) — imports now top-level (#168 PR3)

* fixup(cadastre): tile_size unified param + register slow marker (#168 PR3)

Blocker #1: rename tile_width/tile_height → tile_size in generate_grid_click_points.
Callers in bulk_harvest.py and test_cadastre_bulk.py used tile_size; def had
tile_width+tile_height → TypeError at runtime.

Blocker #2 (10 failures in test_admin_cadastre.py) was side-effect of #1:
TypeError at import chain (app.main → admin_cadastre → bulk_harvest)
broke FastAPI app load → dependency_overrides AttributeError. Now resolved.

Also register `slow` pytest marker in pyproject.toml to suppress
PytestUnknownMarkWarning.

* fixup(cadastre): use importlib.util.find_spec instead of import (#168 PR3)

Root cause Blocker #2: `import app.workers.tasks.scrape_cadastre` at module
top-level REBOUND `app` from FastAPI instance (line 14) to the Python package.
All subsequent `app.dependency_overrides[get_db] = ...` failed with
AttributeError because `app` was now the namespace module.

Fix: probe module availability with importlib.util.find_spec — does not
import or rebind names. FastAPI `app` instance stays intact.

All 28 cadastre tests pass locally.

---------

Co-authored-by: lekss361 <claudestars@proton.me>
2026-05-15 13:31:32 +03:00