Merge remote-tracking branches 'origin/main_laptop_1' and 'origin/sub_laptop_3' into sub_laptop_7

B04_PreProcess/B04_PreProcess_Engine_Watershed_Analyze.py

@@ -23,6 +23,7 @@ from __future__ import annotations
 import logging
 import math
 import time
+from collections.abc import Callable
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
@@ -31,7 +32,10 @@ import numpy as np
 from shapely.geometry import LineString
 
 from B04_PreProcess.B04_PreProcess_Engine_Watershed_Descent import ContourDescent
-from B04_PreProcess.B04_PreProcess_Engine_Watershed_Expand import expand_by_red_boundary
+from B04_PreProcess.B04_PreProcess_Engine_Watershed_Expand import (
+    AnalysisStopped,
+    expand_by_red_boundary,
+)
 from B04_PreProcess.B04_PreProcess_Engine_Watershed_Flow import (
     FlowClassification,
     RoadRaster,
@@ -154,6 +158,7 @@ def preview_stages(
     contour_features: list[dict[str, Any]],
     stream_features: list[dict[str, Any]],
     descent_store: tuple[Path, str] | None = None,
+    should_stop: Callable[[], bool] | None = None,
 ) -> StagePreview | None:
     """지금까지 구현·검증된 단계를 순서대로 돌려 결과를 모은다.
 
@@ -176,6 +181,8 @@ def preview_stages(
     marks.append(("1차 영역(resolve_primary_region)", time.perf_counter()))
     if region is None:
         return None
+    if should_stop is not None and should_stop():
+        raise AnalysisStopped
 
     started = time.perf_counter()
     floor = route_elevation_floor([vertex.z for vertex in vertices])
@@ -187,6 +194,7 @@ def preview_stages(
         region.split.upstream,
         floor,
         descent_store=descent_store,
+        should_stop=should_stop,
     )
     if expansion is None:
         logger.warning("배수유역: 등고선 하강 방향을 세우지 못해 흐름 판정을 건너뜁니다.")

B04_PreProcess/B04_PreProcess_Engine_Watershed_Expand.py

@@ -21,6 +21,7 @@ from __future__ import annotations
 
 import logging
 import time
+from collections.abc import Callable
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
@@ -58,6 +59,10 @@ logger = logging.getLogger(__name__)
 DESCENT_SPARE_M = 400.0
 
 
+class AnalysisStopped(Exception):
+    """새 차례가 와서 계산을 그만둠(「지금 노선으로 셈」 · 347-2) — 단계 사이에서만 확인."""
+
+
 @dataclass
 class GridAnalysis:
     """한 회차 분석 결과 — 격자·해석 영역·방향·색까지 한 묶음."""
@@ -142,6 +147,7 @@ def expand_by_red_boundary(
     band_m: float = DRAINAGE_RED_EXPAND_BAND_M,
     max_rounds: int = DRAINAGE_RED_EXPAND_MAX_ROUNDS,
     descent_store: tuple[Path, str] | None = None,
+    should_stop: Callable[[], bool] | None = None,
 ) -> RedExpansion | None:
     """최외곽 적색 셀 주변으로 넓히며, 새로 추가한 셀에 적색이 없을 때까지 반복한다."""
     _expand_started = time.perf_counter()
@@ -194,6 +200,8 @@ def expand_by_red_boundary(
     rounds = 0
     closed = False
     for attempt in range(max_rounds):
+        if should_stop is not None and should_stop():
+            raise AnalysisStopped
         _round_started = time.perf_counter()
         current = analysis.spec
         reaches = analysis.flow.reaches_road.reshape(current.n_rows, current.n_cols)

B04_PreProcess/B04_PreProcess_Router_Basins.py

@@ -73,7 +73,11 @@ STALE_MESSAGE = (
 
 
 def _build(
-    stored_path: str, context: DrainageContext, points: list[PipePoint] | None
+    stored_path: str,
+    context: DrainageContext,
+    points: list[PipePoint] | None,
+    routing: Any = None,
+    upstream_lonlat: list | None = None,
 ) -> tuple[DrainageDetail | None, list[PipePoint]]:
     """세부유역을 계산하고, 그 결과에 쓰인 관 목록을 함께 돌려준다.
 
@@ -83,7 +87,7 @@ def _build(
     """
     directory = drainage_dir(stored_path)
     chainages = [point.chainage_m for point in points] if points is not None else None
-    detail = build_detail(directory, context.vertices, chainages)
+    detail = build_detail(directory, context.vertices, chainages, routing, upstream_lonlat)
     if detail is None:
         return None, []
     if points is not None:
@@ -377,6 +381,11 @@ def _raw_payload(
             for basin in detail.basins
         ],
         "pipe_count": len(points),
+        # 관 자리 후보(347-3) — 제안만 · [적용] 때 화면이 관 초안에 더함.
+        "pipe_candidates": [
+            {"chainage_m": round(pipe.chainage_m, 2), "lonlat": list(to_lonlat(pipe.x, pipe.y))}
+            for pipe in detail.pipe_candidates
+        ],
     }
 
 
@@ -479,6 +488,13 @@ async def _resolve(
     return context, detail, resolved, saved, False
 
 
+async def _analysis_stale(project_id: UUID) -> bool:
+    context, _ = await load_drainage_context(project_id)
+    if context is None:
+        return False
+    return analysis_route_signature(context.stored_path) != route_signature(context.vertices)
+
+
 @router.get("/{project_id}/drainage/pipe-points", response_model=None)
 async def get_pipe_points(project_id: UUID) -> dict[str, Any] | JSONResponse:
     """저장된 관 지점과 그 세부유역을 돌려준다. 저장분이 없으면 자동 생성한 목록."""
@@ -529,8 +545,17 @@ async def put_pipe_points(
     project_id: UUID,
     payload: dict[str, Any] | None = None,
     session: dict[str, Any] | None = Depends(get_optional_session),  # 가져온이(142-2)
+    recompute: bool = False,
 ) -> dict[str, Any] | JSONResponse:
     """관 지점을 정본으로 확정하고 세부유역 산출물까지 함께 남긴다(모델 확정 시점)."""
+    # [확정](recompute) = 낡았으면 지금 노선으로 배수유역부터 다시 셈(정본 · 작업본에 씀 · 347-2) ·
+    # [저장] = 낡음 표시 달고 관만 저장.
+    if recompute and await _analysis_stale(project_id):
+        from B04_PreProcess.B04_PreProcess_Router_Watershed import get_primary_region
+
+        region = await get_primary_region(project_id, refresh=True)
+        if isinstance(region, JSONResponse):
+            return region
     resolved = await _resolve(project_id, payload, use_stored=True, fresh=True)
     if isinstance(resolved, JSONResponse):
         return resolved

B04_PreProcess/B04_PreProcess_Router_Watershed.py

@@ -569,3 +569,7 @@ async def get_primary_region(
     _log_steps("배수유역 분석 내부", marks)
     _save_response(prepared["stored_path"], payload)
     return payload
+
+
+# 「지금 노선으로 셈」(347-2) — 같은 router 에 붙임(그 파일이 이 router 를 읽음).
+from B04_PreProcess import B04_PreProcess_Router_Watershed_Live  # noqa: E402, F401

B04_PreProcess/B04_PreProcess_Router_Watershed_Live.py

@@ -0,0 +1,152 @@
+"""「지금 노선으로 셈」(347-2) — 노선 초안 + 관 자리로 배수유역 · 세부 유역을 한 요청에 셈.
+
+서버 단독(③) · **작업본에 안 씀** — `00_watershed_response.json` · 격자 배열 · 관 지점은 그대로이고
+답으로만 돌려준다(파생 저장본 = 흐름 방향 · 도엽 좌표만 · 347-1). 세부 유역 나눔까지 같은 요청에서
+메모리 격자로 해 격자를 화면에 넘기지 않는다.
+
+프로젝트마다 「마지막 차례」를 적어 두고 단계 사이(1차 영역 뒤 · 확장 회차마다 · 세부 유역 앞)에서
+차례가 바뀌었으면 그만둔다(`superseded`). 화면은 늦은 답을 차례 · 노선 지문으로 한 번 더 거른다.
+라우터는 `B04_PreProcess_Router_Watershed.router` 에 붙는다(그 파일 끝에서 읽음).
+"""
+
+from __future__ import annotations
+
+import asyncio
+import math
+from dataclasses import replace
+from typing import Any
+from uuid import UUID
+
+from fastapi.responses import JSONResponse
+
+from B04_PreProcess.B04_PreProcess_Engine_Watershed_Analyze import preview_stages
+from B04_PreProcess.B04_PreProcess_Engine_Watershed_Expand import AnalysisStopped
+from B04_PreProcess.B04_PreProcess_Engine_Watershed_Export import drainage_dir
+from B04_PreProcess.B04_PreProcess_Router_Basins import _build, _payload
+from B04_PreProcess.B04_PreProcess_Router_Watershed import _prepare, router
+from common_util.common_util_drainage_context import _open_sampler, load_drainage_context
+from common_util.common_util_drainage_detail import RoadRouting
+from common_util.common_util_drainage_pipes import parse_pipe_points
+from common_util.common_util_route_geometry import RouteVertex, build_route_vertices
+from common_util.common_util_route_polyline import build_planned_polyline
+from common_util.common_util_route_profile import resolve_route_profile
+from config.config_system import DRAINAGE_ARROW_SPACING_M
+
+# 프로젝트 → 마지막으로 받은 차례 번호. ponytail: 서버 프로세스 하나 전제(여럿이면 DB · 파일로).
+_LATEST_GENERATION: dict[str, int] = {}
+SUPERSEDED = {"status": "superseded"}
+
+
+def draft_vertices(draft: dict[str, Any], min_radius_m: float) -> list[RouteVertex]:
+    """노선 초안(RouteDraft) → 그린 노선 정점(z 없음) — 노선 [확인]과 같은 폴리라인 규칙.
+
+    ponytail: 붙든 곡선 길이(curveLock · curveArc) · 측점 스냅은 안 봄 — 곡선 중점이 조금 다를 뿐
+    배수유역 결과엔 셀 몇 개 차이. 필요하면 노선 [확인] 길과 같이 넘김.
+    """
+    nodes = [(float(x), float(y)) for x, y in draft["nodes"]]
+    flags = [bool(flag) for flag in draft.get("curveOn") or [True] * len(nodes)]
+    radii = [None if r is None else float(r) for r in draft.get("curveRadius") or []]
+    polyline = build_planned_polyline(
+        nodes, min_radius_m=min_radius_m, simplify=False, curve_flags=flags, radii=radii or None
+    )
+    return build_route_vertices([{"x": x, "y": y} for x, y in polyline.vertices])
+
+
+def live_routing(preview: Any, route_xy: list[tuple[float, float]], to_lonlat: Any) -> RoadRouting:
+    """분석 결과(메모리) → 세부 유역 나눔 입력 — 파일 길(`_write_road_routing` → 읽기)과 같은 값."""
+    routing, road = preview.routing, preview.road
+    return RoadRouting(
+        spec=preview.spec,
+        road_slot=routing.road_slot,
+        path_length=routing.path_length,
+        elevation=preview.terrain.elevation.reshape(-1),
+        road_cell_index=road.cell_index,
+        road_chainage=road.chainage,
+        strength=routing.strength,
+        route_lonlat=[list(to_lonlat(x, y)) for x, y in route_xy],
+        basin_lonlat=[list(to_lonlat(x, y)) for x, y in preview.basin_boundary_xy],
+        base_pipes=list(preview.pipes),
+        flow_arrows=[
+            [round(x, 2), round(y, 2), round(math.degrees(angle), 1), reaches, cells]
+            for x, y, angle, reaches, cells in preview.flow_arrows
+        ],
+        arrow_spacing_m=DRAINAGE_ARROW_SPACING_M,
+    )
+
+
+@router.post("/{project_id}/drainage/live", response_model=None)
+async def post_drainage_live(
+    project_id: UUID, payload: dict[str, Any] | None = None
+) -> dict[str, Any] | JSONResponse:
+    """몸통 = {generation, route: RouteDraft | null(저장 노선), points: 관 목록 | null(자동)}."""
+    body = payload or {}
+    generation = int(body.get("generation") or 0)
+    key = str(project_id)
+    _LATEST_GENERATION[key] = generation
+
+    def superseded() -> bool:
+        return _LATEST_GENERATION.get(key) != generation
+
+    try:
+        raw = body.get("points")
+        points = None if raw is None else parse_pipe_points(raw)
+    except ValueError as error:
+        return JSONResponse(status_code=400, content={"status": "error", "message": str(error)})
+    prepared = await _prepare(project_id)
+    if isinstance(prepared, JSONResponse):
+        return prepared
+    context, reason = await load_drainage_context(project_id)
+    if context is None:
+        return JSONResponse(status_code=404, content={"status": "error", "message": reason})
+
+    vertices = context.vertices
+    draft = body.get("route")
+    if draft and len(draft.get("nodes") or []) >= 2:
+        from B05_Profile.B05_Profile_Router_Replan import _plan_criteria
+
+        radius_m, *_ = await _plan_criteria(project_id)
+        drawn = await asyncio.to_thread(draft_vertices, draft, radius_m)
+        sampler = await asyncio.to_thread(
+            _open_sampler, context.project_root, context.surface_params
+        )
+        vertices, _ = await asyncio.to_thread(resolve_route_profile, drawn, sampler=sampler)
+    if superseded():
+        return SUPERSEDED
+
+    try:
+        preview = await asyncio.to_thread(
+            preview_stages,
+            vertices,
+            prepared["contours"],
+            prepared["streams"],
+            (drainage_dir(context.stored_path), prepared["contour_key"]),
+            superseded,
+        )
+    except AnalysisStopped:
+        return SUPERSEDED
+    if preview is None or preview.routing is None:
+        return JSONResponse(
+            status_code=400,
+            content={"status": "error", "message": "지금 노선으로 배수유역을 정하지 못했습니다."},
+        )
+    if superseded():
+        return SUPERSEDED
+
+    live = replace(context, vertices=vertices)
+    to_lonlat = context.to_lonlat
+    routing = live_routing(preview, [(v.x, v.y) for v in vertices], to_lonlat)
+    upstream = [
+        [list(to_lonlat(x, y)) for x, y in line.coords] for line in preview.region.split.upstream
+    ]
+    detail, carried = await asyncio.to_thread(
+        _build, context.stored_path, live, points, routing, upstream
+    )
+    if detail is None:
+        return JSONResponse(
+            status_code=400,
+            content={"status": "error", "message": "세부 유역을 나누지 못했습니다."},
+        )
+    result = _payload(project_id, live, detail, carried, False)
+    result["generation"] = generation
+    result["live"] = True
+    return result