更新了

app.py

@@ -18,6 +18,7 @@ from pathlib import Path
 from contextlib import asynccontextmanager
 import uuid
 import asyncio
+from google.cloud.firestore import FieldFilter
 
 # 本專案整合版：單一 app.py 作為後端入口，前端靜態檔（index.html/app.js/style.css）放在根目錄
 
@@ -1210,71 +1211,68 @@ async def websocket_endpoint_with_jwt(websocket: WebSocket, token: str = Query(N
                                             
                         finally:
                             pass
-                    elif 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:
+                        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:
                                     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)
 
-                            try:
-                                await set_user_env_current(user_id, env_payload)
-                            except Exception as e:
-                                logger.warning(f"寫入環境現況失敗: {e}")
+                                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)
 
-                            if do_write_snapshot:
                                 try:
-                                    snap = env_payload.copy()
-                                    snap['reason'] = 'threshold'
-                                    await add_user_env_snapshot(user_id, snap)
+                                    await set_user_env_current(user_id, env_payload)
                                 except Exception as e:
-                                    logger.warning(f"寫入環境快照失敗: {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)})
-                else:
-                    await manager.send_message(f"未知的消息類型: {message_type}", user_id, "error")
+                                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_cardinal": heading_cardinal})
+                            except Exception as e:
+                                logger.error(f"處理 env_snapshot 失敗: {e}")
+                                await websocket.send_json({"type": "env_ack", "success": False, "error": str(e)})
             except json.JSONDecodeError:
                 await manager.send_message("消息格式錯誤，無法解析", user_id, "error")
             except Exception as e:
@@ -2249,7 +2247,7 @@ async def list_devices(current_user: dict = Depends(get_current_user_optional)):
         device_bindings = firestore_db.collection('device_bindings')
         
         devices = []
-        query = device_bindings.where("user_id", "==", current_user["sub"]).where("status", "==", "active")
+        query = device_bindings.where(filter=FieldFilter("user_id", "==", current_user["sub"])).where(filter=FieldFilter("status", "==", "active"))
         docs = query.get()
         
         for doc in docs:

core/database/base.py

@@ -175,7 +175,7 @@ async def get_user_history(user_id, limit=20):
     try:
         import asyncio as _asyncio
         def _fetch_messages():
-            docs = messages_collection.where("user_id", "==", user_id)\
+            docs = messages_collection.where(filter=FieldFilter("user_id", "==", user_id))\
                                     .order_by("timestamp")\
                                     .limit(limit)\
                                     .stream()
@@ -374,7 +374,7 @@ async def get_user_chats(user_id):
     try:
         import asyncio as _asyncio
         def _fetch_chats():
-            docs = chats_collection.where("user_id", "==", user_id)\
+            docs = chats_collection.where(filter=FieldFilter("user_id", "==", user_id))\
                                  .order_by("updated_at", direction=firestore.Query.DESCENDING)\
                                  .stream()
             chats = []
@@ -422,7 +422,7 @@ async def get_chat(chat_id):
             def _fetch_msgs():
                 q = (
                     messages_collection
-                    .where("chat_id", "==", chat_id)
+                    .where(filter=FieldFilter("chat_id", "==", chat_id))
                     .order_by("timestamp", direction=_fs.Query.ASCENDING)
                 )
                 return [d.to_dict() for d in q.stream()]
@@ -490,7 +490,7 @@ async def get_chat_messages(chat_id: str, limit: int | None = None, ascending: b
         from google.cloud import firestore as _fs
 
         def _query():
-            q = messages_collection.where("chat_id", "==", chat_id)
+            q = messages_collection.where(filter=FieldFilter("chat_id", "==", chat_id))
             direction = _fs.Query.ASCENDING if ascending else _fs.Query.DESCENDING
             q = q.order_by("timestamp", direction=direction)
             if limit and limit > 0:
@@ -731,7 +731,7 @@ async def save_memory(
 
         def _find_existing():
             docs = (
-                col_ref.where("content_hash", "==", content_hash)
+                col_ref.where(filter=FieldFilter("content_hash", "==", content_hash))
                 .limit(1)
                 .stream()
             )
@@ -936,9 +936,9 @@ async def get_user_memories(
 
         def _fetch_memories():
             col_ref = _get_user_memories_collection(user_id)
-            query = col_ref.where("importance", ">=", min_importance)
+            query = col_ref.where(filter=FieldFilter("importance", ">=", min_importance))
             if memory_type:
-                query = query.where("type", "==", memory_type)
+                query = query.where(filter=FieldFilter("type", "==", memory_type))
             docs = (
                 query.order_by("importance", direction=firestore.Query.DESCENDING)
                 .order_by("updated_at", direction=firestore.Query.DESCENDING)
@@ -1112,8 +1112,8 @@ async def cleanup_old_memories(user_id: str, days_old: int = 90, min_importance:
         def _delete_old():
             col_ref = _get_user_memories_collection(user_id)
             docs = (
-                col_ref.where("importance", "<", min_importance)
-                .where("updated_at", "<", cutoff_date)
+                col_ref.where(filter=FieldFilter("importance", "<", min_importance))
+                .where(filter=FieldFilter("updated_at", "<", cutoff_date))
                 .stream()
             )
             deleted_count = 0