From cd0d80b6265629a2c2894f403d73dce194afa990 Mon Sep 17 00:00:00 2001 From: lekss361 Date: Sat, 23 May 2026 13:32:12 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20admin=5Fetl.py=20+=20rebase=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Worker предыдущей задачи (PR #437) ошибочно пропустил admin_etl.py — 2 endpoints оставались под AdminTokenAuth. Также исправлены 2 оставшихся AdminTokenAuth параметра в admin_scrape.py (ekburg-permits, kn-catalog-objects) у которых import уже был удалён — NameError при запросе. Rebase на main HEAD 0e29464. Total: 6 файлов, 47 endpoints без AdminTokenAuth. --- backend/app/api/v1/admin_etl.py | 6 ++---- backend/app/api/v1/admin_scrape.py | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/backend/app/api/v1/admin_etl.py b/backend/app/api/v1/admin_etl.py index 4490c989..97d38942 100644 --- a/backend/app/api/v1/admin_etl.py +++ b/backend/app/api/v1/admin_etl.py @@ -9,7 +9,8 @@ POST /api/v1/admin/etl/objective-backfill POST /api/v1/admin/etl/nspd-denorm-backfill Запустить backfill nspd_parcels/nspd_buildings из всех nspd_quarter_dumps. -Header: X-Admin-Token: +Auth: gendsgn.ru-wide Caddy basic_auth gate (PR #426). App-level X-Admin-Token +header removed 2026-05-23 — двойная auth избыточна для pilot. """ from __future__ import annotations @@ -21,7 +22,6 @@ from fastapi import APIRouter, Depends, Query from sqlalchemy.orm import Session from app.core.db import get_db -from app.core.deps import AdminTokenAuth from app.services.etl.objective_backfill import ( AUTO_ACCEPT_THRESHOLD, AUTO_ACCEPT_THRESHOLD_V2, @@ -38,7 +38,6 @@ router = APIRouter() @router.post("/objective-backfill") def run_objective_backfill( db: Annotated[Session, Depends(get_db)], - _: AdminTokenAuth, dry_run: Annotated[bool, Query(description="Preview без insertions")] = False, refresh_mv: Annotated[ bool, Query(description="REFRESH mv_layout_velocity после backfill") @@ -107,7 +106,6 @@ def run_objective_backfill( @router.post("/nspd-denorm-backfill") def run_nspd_denorm_backfill( - _: AdminTokenAuth, limit: Annotated[ int | None, Query(description="Максимум кварталов для обработки (None = все)"), diff --git a/backend/app/api/v1/admin_scrape.py b/backend/app/api/v1/admin_scrape.py index f075b910..d5bc4a95 100644 --- a/backend/app/api/v1/admin_scrape.py +++ b/backend/app/api/v1/admin_scrape.py @@ -1202,7 +1202,6 @@ class TriggerEkburgPermitsRequest(BaseModel): @router.post("/ekburg-permits") def trigger_ekburg_permits( payload: TriggerEkburgPermitsRequest, - _: AdminTokenAuth, ) -> dict[str, Any]: """Manual trigger для синхронизации РНС/РВЭ ЕКБ из екатеринбург.рф (xlsx). @@ -1240,7 +1239,6 @@ class TriggerKnCatalogObjectsRequest(BaseModel): @router.post("/kn-catalog-objects") def trigger_kn_catalog_objects( payload: TriggerKnCatalogObjectsRequest, - _: AdminTokenAuth, ) -> dict[str, Any]: """Manual trigger для catalog-OBJECT scraper (заполняет wall_type, energy_eff, ceiling_height_m, parking_*, playground_*, scores из SSR __NEXT_DATA__).