Update app.py, geocode_tool.py and tools.js

app.py

@@ -68,6 +68,37 @@ from core.memory_system import memory_manager
 from core.database import set_user_env_current, add_user_env_snapshot
 
 
+# -----------------------------
+# 工具函式
+# -----------------------------
+def serialize_for_json(obj: Any) -> Any:
+    """
+    遞迴序列化物件，將不可 JSON 序列化的型別轉換為可序列化格式
+    - DatetimeWithNanoseconds → ISO 字串
+    - datetime → ISO 字串
+    - bytes → base64 字串
+    - 其他物件 → str()
+    """
+    from google.cloud.firestore_v1._helpers import DatetimeWithNanoseconds
+    from datetime import datetime, date
+    
+    if isinstance(obj, (DatetimeWithNanoseconds, datetime, date)):
+        return obj.isoformat()
+    elif isinstance(obj, bytes):
+        return base64.b64encode(obj).decode('utf-8')
+    elif isinstance(obj, dict):
+        return {k: serialize_for_json(v) for k, v in obj.items()}
+    elif isinstance(obj, (list, tuple)):
+        return [serialize_for_json(item) for item in obj]
+    elif isinstance(obj, (str, int, float, bool, type(None))):
+        return obj
+    else:
+        # 未知型別：嘗試轉字串
+        try:
+            return str(obj)
+        except Exception:
+            return None
+
 # -----------------------------
 # Pydantic 模型
 # -----------------------------
@@ -812,6 +843,10 @@ async def websocket_endpoint_with_jwt(websocket: WebSocket, token: str = Query(N
                             emotion = response.get('emotion')  # 新增：提取情緒
                             care_mode = response.get('care_mode', False)  # 新增：提取關懷模式
 
+                            # 序列化 tool_data（避免 DatetimeWithNanoseconds 等不可序列化物件）
+                            if tool_data is not None:
+                                tool_data = serialize_for_json(tool_data)
+
                             # 先發送情緒資訊（如果有）
                             if emotion:
                                 await websocket.send_json({
@@ -840,8 +875,11 @@ async def websocket_endpoint_with_jwt(websocket: WebSocket, token: str = Query(N
                                 "title": new_chat_info["title"]
                             })
 
+                        # 保存訊息（只儲存文字內容）
                         await save_message_to_db(user_id, chat_id, "user", user_message)
-                        await save_message_to_db(user_id, chat_id, "assistant", response)
+                        # 如果 response 是 dict，只保存 message 欄位
+                        message_to_save = response.get('message', response) if isinstance(response, dict) else response
+                        await save_message_to_db(user_id, chat_id, "assistant", message_to_save)
 
                     import asyncio as _asyncio
                     _asyncio.create_task(_do_process_and_send())

features/mcp/tools/geocode_tool.py

@@ -57,6 +57,20 @@ class ReverseGeocodeTool(MCPTool):
         # 記憶體快取
         cached = await db_cache.get_geo_cached(geokey)
         if cached:
+            # 補齊缺失欄位（兼容舊版快取）
+            cached.setdefault("lat", lat)  # ← 補上座標
+            cached.setdefault("lon", lon)  # ← 補上座標
+            cached.setdefault("name", "")
+            cached.setdefault("detailed_address", cached.get("label") or cached.get("display_name") or "")
+            cached.setdefault("postcode", "")
+            cached.setdefault("city_district", "")
+            cached.setdefault("amenity", "")
+            cached.setdefault("shop", "")
+            cached.setdefault("building", "")
+            cached.setdefault("office", "")
+            cached.setdefault("leisure", "")
+            cached.setdefault("tourism", "")
+            
             return cls.create_success_response(
                 content=cached.get("display_name") or f"{cached.get('city')}, {cached.get('admin')}",
                 data=cached
@@ -65,6 +79,20 @@ class ReverseGeocodeTool(MCPTool):
         # DB 快取
         db_cached = await get_geo_cache(geokey)
         if db_cached:
+            # 補齊缺失欄位（兼容舊版快取）
+            db_cached.setdefault("lat", lat)  # ← 補上座標
+            db_cached.setdefault("lon", lon)  # ← 補上座標
+            db_cached.setdefault("name", "")
+            db_cached.setdefault("detailed_address", db_cached.get("label") or db_cached.get("display_name") or "")
+            db_cached.setdefault("postcode", "")
+            db_cached.setdefault("city_district", "")
+            db_cached.setdefault("amenity", "")
+            db_cached.setdefault("shop", "")
+            db_cached.setdefault("building", "")
+            db_cached.setdefault("office", "")
+            db_cached.setdefault("leisure", "")
+            db_cached.setdefault("tourism", "")
+            
             await db_cache.set_geo_cache(geokey, db_cached)
             return cls.create_success_response(
                 content=db_cached.get("display_name") or f"{db_cached.get('city')}, {db_cached.get('admin')}",
@@ -176,6 +204,8 @@ class ReverseGeocodeTool(MCPTool):
                 detailed_address = " | ".join(detailed_address_parts) if detailed_address_parts else label
                 
                 payload = {
+                    "lat": lat,  # ← 新增：補上座標
+                    "lon": lon,  # ← 新增：補上座標
                     "city": city or "",
                     "admin": admin or "",
                     "country_code": country_code,

static/frontend/js/tools.js

@@ -522,7 +522,9 @@ function renderExchangeRate(data) {
  * 渲染地理定位數據（forward_geocode / reverse_geocode）
  */
 function renderLocationData(data) {
-  const bestMatch = data.best_match || {};
+  // reverse_geocode: 扁平結構（欄位在第一層）
+  // forward_geocode: 巢狀結構（best_match + results）
+  const bestMatch = data.best_match || data;  // ← 兼容兩種結構
   const results = data.results || [];
   const query = data.query || '';
   
@@ -538,32 +540,42 @@ function renderLocationData(data) {
     `;
   }
 
-  // 最佳匹配地點
-  if (bestMatch.label || bestMatch.display_name) {
+  // 地點名稱（POI、建築物等）
+  if (bestMatch.name && bestMatch.name !== bestMatch.road) {
     html += `
       <div class="data-row">
-        <span class="data-label">📍 地點</span>
-        <span class="data-value">${bestMatch.label || bestMatch.display_name}</span>
+        <span class="data-label">� 地點</span>
+        <span class="data-value">${bestMatch.name}</span>
       </div>
     `;
   }
 
-  // 座標
-  if (bestMatch.lat !== undefined && bestMatch.lon !== undefined) {
+  // 地址（路名 + 門牌號）
+  if (bestMatch.road) {
+    const address = bestMatch.house_number 
+      ? `${bestMatch.road}${bestMatch.house_number}號`
+      : bestMatch.road;
     html += `
       <div class="data-row">
-        <span class="data-label">🌐 座標</span>
-        <span class="data-value">${bestMatch.lat.toFixed(6)}, ${bestMatch.lon.toFixed(6)}</span>
+        <span class="data-label">� 地址</span>
+        <span class="data-value">${address}</span>
       </div>
     `;
   }
 
-  // 詳細地址（如果與 label 不同）
-  if (bestMatch.detailed_address && bestMatch.detailed_address !== bestMatch.label) {
+  // 區域 + 城市
+  const locationParts = [];
+  if (bestMatch.suburb) locationParts.push(bestMatch.suburb);
+  if (bestMatch.city_district && bestMatch.city_district !== bestMatch.suburb) {
+    locationParts.push(bestMatch.city_district);
+  }
+  if (bestMatch.city) locationParts.push(bestMatch.city);
+  
+  if (locationParts.length > 0) {
     html += `
       <div class="data-row">
-        <span class="data-label">🏠 詳細</span>
-        <span class="data-value" style="font-size: 0.9em;">${bestMatch.detailed_address}</span>
+        <span class="data-label">📍 位置</span>
+        <span class="data-value">${locationParts.join(', ')}</span>
       </div>
     `;
   }