修復 app.py 縮排錯誤並更新 requirements.txt

app.py

@@ -62,6 +62,8 @@ from services.voice_login import VoiceAuthService, VoiceLoginConfig
 from services.welcome import compose_welcome
 from core.pipeline import ChatPipeline, PipelineResult
 from core.memory_system import memory_manager
+# 環境 Context 寫入 API
+from core.database import set_user_env_current, add_user_env_snapshot
 
 
 # -----------------------------
@@ -457,6 +459,32 @@ class ConnectionManager:
 manager = ConnectionManager()
 
 
+# 地理工具函式（內部使用）
+def _haversine_m(lat1: float, lon1: float, lat2: float, lon2: float) -> float:
+    from math import radians, sin, cos, asin, sqrt
+    if None in (lat1, lon1, lat2, lon2):
+        return 0.0
+    R = 6371000.0
+    dlat = radians(lat2 - lat1)
+    dlon = radians(lon2 - lon1)
+    a = sin(dlat/2)**2 + cos(radians(lat1))*cos(radians(lat2))*sin(dlon/2)**2
+    c = 2 * asin(sqrt(a))
+    return R * c
+
+
+def _heading_to_cardinal(deg: float) -> str:
+    try:
+        val = float(deg)
+    except Exception:
+        return ""
+    dirs = [
+        "N","NNE","NE","ENE","E","ESE","SE","SSE",
+        "S","SSW","SW","WSW","W","WNW","NW","NNW"
+    ]
+    ix = int((val % 360) / 22.5 + 0.5) % 16
+    return dirs[ix]
+
+
 # -----------------------------
 # 語音綁定狀態管理器（關鍵字匹配，無 GPT）
 # -----------------------------
@@ -1178,90 +1206,70 @@ async def websocket_endpoint_with_jwt(websocket: WebSocket, token: str = Query(N
                                                 "timestamp": time.time()
                                             })
                                             
-                    else:
+                        finally:
+                            pass
+                    elif message_type == "env_snapshot":
                         # ===== 環境快照上報 =====
-                        if message_type == "env_snapshot":
-                            try:
-                                lat = float(message_data.get("lat")) if message_data.get("lat") is not None else None
-                                lon = float(message_data.get("lon")) if message_data.get("lon") is not None else None
-                                acc = message_data.get("accuracy_m")
-                                acc = float(acc) if acc is not None else None
-                                heading_deg = message_data.get("heading_deg")
-                                heading_deg = float(heading_deg) if heading_deg is not None else None
-                                tz = message_data.get("tz")
-                                locale = message_data.get("locale")
-                                device = message_data.get("device")
-
-                                # 後端節流：距離<100m且方位差<25度則忽略
-                                do_write_snapshot = False
-                                last = manager.last_env.get(user_id)
-                                if last and lat is not None and lon is not None and last.get("lat") is not None:
-                                    dist = _haversine_m(last.get("lat",0), last.get("lon",0), lat, lon)
-                                    deg_diff = abs((heading_deg or 0) - (last.get("heading_deg") or 0))
-                                    if dist >= 100 or deg_diff >= 25:
-                                        do_write_snapshot = True
-                                else:
+                        try:
+                            lat = float(message_data.get("lat")) if message_data.get("lat") is not None else None
+                            lon = float(message_data.get("lon")) if message_data.get("lon") is not None else None
+                            acc = message_data.get("accuracy_m")
+                            acc = float(acc) if acc is not None else None
+                            heading_deg = message_data.get("heading_deg")
+                            heading_deg = float(heading_deg) if heading_deg is not None else None
+                            tz = message_data.get("tz")
+                            locale = message_data.get("locale")
+                            device = message_data.get("device")
+
+                            # 後端節流：距離<100m且方位差<25度則忽略
+                            do_write_snapshot = False
+                            last = manager.last_env.get(user_id)
+                            if last and lat is not None and lon is not None and last.get("lat") is not None:
+                                dist = _haversine_m(last.get("lat",0), last.get("lon",0), lat, lon)
+                                deg_diff = abs((heading_deg or 0) - (last.get("heading_deg") or 0))
+                                if dist >= 100 or deg_diff >= 25:
                                     do_write_snapshot = True
+                            else:
+                                do_write_snapshot = True
+
+                            from geohash2 import encode as gh_encode
+                            geohash7 = gh_encode(lat, lon, precision=7) if (lat is not None and lon is not None) else None
+                            heading_cardinal = _heading_to_cardinal(heading_deg) if heading_deg is not None else None
+                            env_payload = {
+                                "lat": lat,
+                                "lon": lon,
+                                "accuracy_m": acc,
+                                "heading_deg": heading_deg,
+                                "heading_cardinal": heading_cardinal,
+                                "tz": tz,
+                                "locale": locale,
+                                "device": device,
+                                "geohash_7": geohash7,
+                            }
+
+                            # 更新會話暫存
+                            manager.last_env[user_id] = env_payload
+                            info = manager.get_client_info(user_id) or {}
+                            info['env_context'] = env_payload
+                            manager.set_client_info(user_id, info)
 
-                                from geohash2 import encode as gh_encode
-                                geohash7 = gh_encode(lat, lon, precision=7) if (lat is not None and lon is not None) else None
-                                heading_cardinal = _heading_to_cardinal(heading_deg) if heading_deg is not None else None
-                                env_payload = {
-                                    "lat": lat,
-                                    "lon": lon,
-                                    "accuracy_m": acc,
-                                    "heading_deg": heading_deg,
-                                    "heading_cardinal": heading_cardinal,
-                                    "tz": tz,
-                                    "locale": locale,
-                                    "device": device,
-                                    "geohash_7": geohash7,
-                                }
-
-                                # 更新會話暫存
-                                manager.last_env[user_id] = env_payload
-                                info = manager.get_client_info(user_id) or {}
-                                info['env_context'] = env_payload
-                                manager.set_client_info(user_id, info)
+                            try:
+                                await set_user_env_current(user_id, env_payload)
+                            except Exception as e:
+                                logger.warning(f"寫入環境現況失敗: {e}")
 
+                            if do_write_snapshot:
                                 try:
-                                    await set_user_env_current(user_id, env_payload)
+                                    snap = env_payload.copy()
+                                    snap['reason'] = 'threshold'
+                                    await add_user_env_snapshot(user_id, snap)
                                 except Exception as e:
-                                    logger.warning(f"寫入環境現況失敗: {e}")
-
-                                if do_write_snapshot:
-                                    try:
-                                        snap = env_payload.copy()
-                                        snap['reason'] = 'threshold'
-                                        await add_user_env_snapshot(user_id, snap)
-                                    except Exception as e:
-                                        logger.warning(f"寫入環境快照失敗: {e}")
-
-                                await websocket.send_json({"type": "env_ack", "success": True, "geohash_7": geohash7, "heading": heading_cardinal})
-                            except Exception as e:
-                                logger.error(f"處理 env_snapshot 失敗: {e}")
-                                await websocket.send_json({"type": "env_ack", "success": False, "error": str(e)})
-                                            # 保存 Agent 回應（已在 handle_message 中保存）
-
-                                    _async_lib.create_task(_process_voice_chat())
-                                else:
-                                    await websocket.send_json({
-                                        "type": "error",
-                                        "message": "未找到音頻 session"
-                                    })
-                            else:
-                                await websocket.send_json({
-                                    "type": "error",
-                                    "message": "語音服務未初始化"
-                                })
+                                    logger.warning(f"寫入環境快照失敗: {e}")
 
+                            await websocket.send_json({"type": "env_ack", "success": True, "geohash_7": geohash7, "heading": heading_cardinal})
                         except Exception as e:
-                            logger.exception(f"❌ 語音對話處理失敗: {e}")
-                            await websocket.send_json({
-                                "type": "error",
-                                "message": f"語音對話處理失敗: {str(e)}"
-                            })
-
+                            logger.error(f"處理 env_snapshot 失敗: {e}")
+                            await websocket.send_json({"type": "env_ack", "success": False, "error": str(e)})
                 else:
                     await manager.send_message(f"未知的消息類型: {message_type}", user_id, "error")
 

requirements.txt

@@ -24,7 +24,7 @@ matplotlib==3.7.1
 jsonschema>=4.17.0
 
 # Geospatial / directions
-geohash2==1.1
+geohash2
 
 # Machine Learning dependencies
 numpy>=1.24.0,<2.0.0