Sync DemoService 65a98143cc0c4d48a5221f2d90552f7d3a4bc364

api/ai-service/app/api/v1/endpoints/route_generation.py

@@ -47,6 +47,7 @@ class RouteGenerateRequest(BaseModel):
     gatv2Weight: float | None = Field(default=None, ge=0.0, le=1.0)
     routeCount: int = Field(default=8, ge=1, le=100)
     targetDistanceKm: float = Field(default=6.0, ge=0.5, le=30.0)
+    shapePriority: bool = False
     labels: list[str] | None = None
     selectedLabel: str | None = None
     selectedTopK: int = Field(default=0, ge=0, le=20)
@@ -402,6 +403,7 @@ def _run_fast_road_pipeline(
     route_count: int,
     target_distance_km: float,
     selected_label: str | None,
+    shape_priority: bool = False,
 ) -> dict[str, Any]:
     """Create real walkable-road routes without per-route CLIP inference.
 
@@ -425,12 +427,24 @@ def _run_fast_road_pipeline(
     # failed request before it can return any usable road loop.
     examples = getattr(module, "GPX_SHAPE_TEMPLATES", {}).get(selected_label, [])
     candidate_pool = min(16 if examples else 8, max(route_count, route_count + (11 if examples else 1)))
-    candidates = build_candidates(
-        graph=graph,
-        route_count=candidate_pool,
-        target_distance_m=target_distance_km * 1000.0,
-        selected_label=selected_label,
-    )
+    if shape_priority and examples:
+        # Explore multiple physical sizes on the same road graph. The UI did
+        # not request a distance; these are search scales, not length targets.
+        candidates = []
+        for search_distance_km in (6.0, 11.0, 18.0):
+            candidates.extend(build_candidates(
+                graph=graph,
+                route_count=min(6, candidate_pool),
+                target_distance_m=search_distance_km * 1000.0,
+                selected_label=selected_label,
+            ))
+    else:
+        candidates = build_candidates(
+            graph=graph,
+            route_count=candidate_pool,
+            target_distance_m=target_distance_km * 1000.0,
+            selected_label=selected_label,
+        )
     # A selected shape is a preference, not a reason to leave the runner with
     # no route.  Sparse neighbourhoods and long distances do not always have
     # enough roads to satisfy the strict shape-quality gate.  In that case
@@ -458,7 +472,12 @@ def _run_fast_road_pipeline(
         raise RuntimeError("No walkable road routes were generated near this location.")
 
     routes: list[dict[str, Any]] = []
+    seen_nodes: set[tuple[Any, ...]] = set()
     for route in candidates:
+        node_signature = tuple(route["nodes"])
+        if node_signature in seen_nodes:
+            continue
+        seen_nodes.add(node_signature)
         # Simplified OSM edges can bend between intersections. Preserve those
         # bends rather than drawing straight lines across blocks or water.
         coords = _route_nodes_to_coords(graph, route["nodes"])
@@ -499,7 +518,7 @@ def _run_fast_road_pipeline(
     if examples:
         routes.sort(key=lambda route: (
             -route["route_quality"]["gpx_similarity"],
-            abs(route["length_km"] - target_distance_km),
+            abs(route["length_km"] - target_distance_km) if not shape_priority else 0,
         ))
         routes = routes[:route_count]
     if not routes:
@@ -511,7 +530,7 @@ def _run_fast_road_pipeline(
         "candidate_count": len(candidates),
         "requested_count": route_count,
         "generated_count": len(routes),
-        "target_distance_km": target_distance_km,
+        "target_distance_km": 0.0 if shape_priority else target_distance_km,
         "radius_km": radius_km,
         "labels": [selected_label] if selected_label else [],
         "selected_label": selected_label,
@@ -674,11 +693,12 @@ def generate_routes(payload: RouteGenerateRequest) -> dict[str, Any]:
     route_count_cap = 20 if use_current else 100
     route_count = min(route_count_cap, max(1, payload.routeCount))
     target_distance_km = max(0.5, payload.targetDistanceKm)
+    shape_priority = payload.shapePriority and selected_label in {"dog", "symbol_star"}
     # A 1.5 km graph is enough for ordinary short courses, but it cannot make
     # a truthful 16~30 km route.  Grow the road graph only as much as the
     # requested distance needs, up to the request model's safe 10 km limit.
     required_radius_km = target_distance_km / 5.5
-    radius_km = min(10.0, max(1.5, min(10.0, payload.radiusKm), required_radius_km))
+    radius_km = min(10.0, max(5.0 if shape_priority else 1.5, min(10.0, payload.radiusKm), required_radius_km))
 
     if payload.fastRoads:
         module = None
@@ -693,6 +713,7 @@ def generate_routes(payload: RouteGenerateRequest) -> dict[str, Any]:
                 route_count=route_count,
                 target_distance_km=target_distance_km,
                 selected_label=selected_label,
+                shape_priority=shape_priority,
             )
         except Exception as primary_exc:
             logger.exception("fast walk-road route generation failed")
@@ -722,6 +743,7 @@ def generate_routes(payload: RouteGenerateRequest) -> dict[str, Any]:
                             route_count=route_count,
                             target_distance_km=target_distance_km,
                             selected_label=selected_label,
+                            shape_priority=shape_priority,
                         )
                     except Exception:
                         logger.exception("fallback-centre walk-road generation failed")

api/ai-service/tests/test_route_generation_recovery.py

@@ -133,6 +133,30 @@ def test_gpx_guided_fast_routes_are_ranked_by_actual_road_similarity(monkeypatch
     assert result["best_route"] == result["routes"][0]
 
 
+def test_shape_priority_searches_multiple_lengths_and_ranks_by_shape(monkeypatch):
+    searched_distances = []
+
+    def candidates_for_distance(**kwargs):
+        distance = kwargs["target_distance_m"]
+        searched_distances.append(distance)
+        return [{"nodes": [distance, distance + 1], "length_m": distance,
+                 "shape_quality": 0.6, "is_loop": True}]
+
+    module = SimpleNamespace(
+        GPX_SHAPE_TEMPLATES={"dog": [[(0, 0), (1, 0), (0, 1)]]},
+        _build_or_get_walk_graph=lambda *_: (object(), "test"),
+        generate_candidate_routes=candidates_for_distance,
+        route_points=lambda *_: [], simplify_coords=lambda points: points,
+    )
+    monkeypatch.setattr(routes, "_route_nodes_to_coords", lambda _graph, nodes: [[nodes[0], 0], [nodes[1], 1]])
+    monkeypatch.setattr(routes, "best_gpx_shape_match", lambda coords, _examples: (coords[0][0] / 18000, 0))
+    result = routes._run_fast_road_pipeline(module, place=None, center_lat=37, center_lon=127,
+        radius_km=5, route_count=2, target_distance_km=6, selected_label="dog", shape_priority=True)
+    assert searched_distances == [6000, 11000, 18000]
+    assert [route["length_km"] for route in result["routes"]] == [18, 11]
+    assert result["target_distance_km"] == 0
+
+
 def test_place_request_returns_all_100_routes(pipeline):
     pipeline.setattr(routes, "_run_fast_road_pipeline", Mock(side_effect=RuntimeError("All Overpass endpoints failed")))
     result = routes.generate_routes(routes.RouteGenerateRequest(place="서귀포시", fallbackLatitude=33.25, fallbackLongitude=126.56, routeCount=100))

main/app/route-results/page.tsx

@@ -162,6 +162,7 @@ function RouteResultsPageContent() {
   const longitude = Number.isFinite(initialLongitude) ? initialLongitude : null;
   const radiusKm = Number.isFinite(initialRadiusKm) ? initialRadiusKm : 5;
   const selectedTopK = Number.isFinite(initialSelectedTopK) ? initialSelectedTopK : 3;
+  const shapePriority = searchParams.get("shapePriority") === "true" && (selectedLabel === "dog" || selectedLabel === "symbol_star");
   const routeFallbackLatitude = Number.isFinite(fallbackLatitude) ? fallbackLatitude : null;
   const routeFallbackLongitude = Number.isFinite(fallbackLongitude) ? fallbackLongitude : null;
 
@@ -170,7 +171,7 @@ function RouteResultsPageContent() {
     const count = Number(routeCountInput);
     const distance = Number(targetDistanceInput);
     if (!requestPlace || !Number.isFinite(count) || count < 5 || count > 100 ||
-      !Number.isFinite(distance) || distance < 1 || distance > 30) {
+      (!shapePriority && (!Number.isFinite(distance) || distance < 1 || distance > 30))) {
       void fetchRoutes(); // Keep the same field validation messages.
       return;
     }
@@ -205,7 +206,7 @@ function RouteResultsPageContent() {
       setError("경로 수는 5~100 사이로 입력해주세요.");
       return;
     }
-    if (!Number.isFinite(targetDistanceKm) || targetDistanceKm < 1 || targetDistanceKm > 30) {
+    if (!shapePriority && (!Number.isFinite(targetDistanceKm) || targetDistanceKm < 1 || targetDistanceKm > 30)) {
       setError("목표 거리는 1~30km 사이로 입력해주세요.");
       return;
     }
@@ -251,6 +252,7 @@ function RouteResultsPageContent() {
         radiusKm,
         routeCount,
         targetDistanceKm,
+        shapePriority,
         labels: AVAILABLE_LABELS,
         selectedLabel,
         selectedTopK,
@@ -480,7 +482,7 @@ function RouteResultsPageContent() {
         />
 
         <SectionCard>
-          <div className="grid gap-3 sm:grid-cols-[1fr_120px_120px] sm:items-end">
+          <div className={`grid gap-3 sm:items-end ${shapePriority ? "sm:grid-cols-[1fr_120px]" : "sm:grid-cols-[1fr_120px_120px]"}`}>
             <label className="grid gap-2">
               <span className="rts-label">지역</span>
               <input value={place} onChange={(event) => setPlace(event.target.value)} className="rts-input" />
@@ -489,10 +491,10 @@ function RouteResultsPageContent() {
               <span className="rts-label">경로 수</span>
               <input type="number" min={5} max={100} value={routeCountInput} onChange={(event) => setRouteCountInput(event.target.value)} className="rts-input" />
             </label>
-            <label className="grid gap-2">
+            {!shapePriority ? <label className="grid gap-2">
               <span className="rts-label">목표 거리</span>
               <input type="number" min={1} max={30} step={0.5} value={targetDistanceInput} onChange={(event) => setTargetDistanceInput(event.target.value)} className="rts-input" />
-            </label>
+            </label> : null}
           </div>
 
           {error ? <p className="mt-3 text-sm text-red-600">{error}</p> : null}
@@ -517,8 +519,8 @@ function RouteResultsPageContent() {
                 <span>추천 경로</span>
               </div>
               <div>
-                <strong>{formatDistance(result.target_distance_km)}</strong>
-                <span>목표 거리</span>
+                <strong>{shapePriority ? "모양 우선" : formatDistance(result.target_distance_km)}</strong>
+                <span>{shapePriority ? "추천 기준" : "목표 거리"}</span>
               </div>
               <div>
                 <strong>{formatGeneratedRouteLabel(selectedLabel)}</strong>

main/app/route-search/page.tsx

@@ -650,8 +650,11 @@ function RouteSearchPageContent() {
       : [];
   const isWaitingForCurrentLocation = isLocating;
   const summaryPlace = source === "current" ? "현재 위치" : selectedDistrictLabel;
-  const selectedSummary = `${summaryPlace} · ${selectedShape.label} · ${targetDistanceInput || "-"}km`;
-  const routePlanText = `${summaryPlace}에서 ${selectedShape.label} 모양에 가까운 ${targetDistanceInput || "-"}km 경로를 ${routeCountInput || "-"}개 추천합니다.`;
+  const shapePriority = selectedLabel === "dog" || selectedLabel === "symbol_star";
+  const selectedSummary = `${summaryPlace} · ${selectedShape.label}${shapePriority ? " · 모양 우선" : ` · ${targetDistanceInput || "-"}km`}`;
+  const routePlanText = shapePriority
+    ? `${summaryPlace}의 도로에서 ${selectedShape.label} 모양과 가장 닮은 경로를 찾아 ${routeCountInput || "-"}개 추천합니다. 거리는 생성 결과에서 확인할 수 있어요.`
+    : `${summaryPlace}에서 ${selectedShape.label} 모양에 가까운 ${targetDistanceInput || "-"}km 경로를 ${routeCountInput || "-"}개 추천합니다.`;
 
   useEffect(() => {
     const isValid = isUiFlowPermitValid(FLOW_KEYS.routeSearch, flowToken);
@@ -837,11 +840,11 @@ function RouteSearchPageContent() {
       setFormError("추천 경로 수는 5~100 사이 숫자로 입력해 주세요.");
       return;
     }
-    if (
+    if (!shapePriority && (
       !Number.isFinite(targetDistanceKm) ||
       targetDistanceKm < 1 ||
       targetDistanceKm > 30
-    ) {
+    )) {
       setFormError("목표 거리는 1~30km 사이 숫자로 입력해 주세요.");
       return;
     }
@@ -852,6 +855,7 @@ function RouteSearchPageContent() {
       radiusKm: String(radiusKm),
       routeCount: String(routeCount),
       targetDistanceKm: String(targetDistanceKm),
+      shapePriority: String(shapePriority),
       label: selectedLabel,
       selectedTopK: "3",
       // Supply the visible map centre for a server-side recovery attempt when
@@ -1280,7 +1284,7 @@ function RouteSearchPageContent() {
                 </div>
               </label>
 
-              <label className="grid gap-2">
+              {!shapePriority ? <label className="grid gap-2">
                 <span className="text-sm font-bold">목표 거리</span>
                 <div className="relative">
                   <button
@@ -1328,7 +1332,7 @@ function RouteSearchPageContent() {
                       })}
                   </MotionPopover>
                 </div>
-              </label>
+              </label> : null}
 
               <details className="rounded-2xl bg-[#f7f7f7] p-4">
                 <summary className="cursor-pointer text-sm font-bold">세부 설정</summary>