穩定版本

.gitignore

@@ -1 +1,2 @@
-/myenv
+/myenv
+/docs/assets

app.py

@@ -1,268 +1,226 @@
 import gradio as gr
 import requests
-import re
 import json
 import os
 import pandas as pd
-from xml.etree import ElementTree
 from geopy.distance import geodesic
 
-# =============== 檔案路徑設定 (你可依需要修改) ===============
-DATA_DIR = "docs/assets"  # 或 "./data" 等
-os.makedirs(DATA_DIR, exist_ok=True)
+# =============== 7-11 所需常數 ===============
+# 請確認此處的 MID_V 是否有效，若過期請更新
+MID_V = "W0_DiF4DlgU5OeQoRswrRcaaNHMWOL7K3ra3385ocZcv-bBOWySZvoUtH6j-7pjiccl0C5h30uRUNbJXsABCKMqiekSb7tdiBNdVq8Ro5jgk6sgvhZla5iV0H3-8dZfASc7AhEm85679LIK3hxN7Sam6D0LAnYK9Lb0DZhn7xeTeksB4IsBx4Msr_VI"  # 請填入有效的 mid_v
+USER_AGENT_7_11 = "Mozilla/5.0 (iPhone; CPU iPhone OS 17_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148"
+API_7_11_BASE = "https://lovefood.openpoint.com.tw/LoveFood/api"
 
-SEVEN_ELEVEN_PRODUCTS_FILE = os.path.join(DATA_DIR, "seven_eleven_products.json")
-FAMILY_MART_STORES_FILE = os.path.join(DATA_DIR, "family_mart_stores.json")
-FAMILY_MART_PRODUCTS_FILE = os.path.join(DATA_DIR, "family_mart_products.json")
+# =============== FamilyMart 所需常數 ===============
+FAMILY_PROJECT_CODE = "202106302"  # 若有需要請自行調整
+API_FAMILY = "https://stamp.family.com.tw/api/maps/MapProductInfo"
 
 # 3 公里範圍
 MAX_DISTANCE = 3000
 
 # -----------------------------------------------------------
-# 1. 下載或更新 7-11 商品資料 (目前只示範商品，若要店家需另尋API)
+# 7-11: 取得 AccessToken
 # -----------------------------------------------------------
-def fetch_seven_eleven_products(force_update=False):
+def get_7_11_token():
     """
-    從 https://www.7-11.com.tw/freshfoods/Read_Food_xml_hot.aspx
-    以各種 category 抓取商品資料(XML)，轉成 JSON 存檔。
-    force_update=True 時，強制重新抓取。
+    POST /Auth/FrontendAuth/AccessToken?mid_v=$mid_v
+    回傳 JWT token
     """
-    if os.path.exists(SEVEN_ELEVEN_PRODUCTS_FILE) and not force_update:
-        print("7-11 商品 JSON 已存在，跳過下載 (如要強制更新請設 force_update=True)")
-        return
-
-    base_url = "https://www.7-11.com.tw/freshfoods/Read_Food_xml_hot.aspx"
+    url = f"{API_7_11_BASE}/Auth/FrontendAuth/AccessToken?mid_v={MID_V}"
     headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"
+        "user-agent": USER_AGENT_7_11
     }
-
-    categories = [
-        "19_star", "1_Ricerolls", "16_sandwich", "2_Light", "3_Cuisine",
-        "4_Snacks", "5_ForeignDishes", "6_Noodles", "7_Oden", "8_Bigbite",
-        "9_Icecream", "10_Slurpee", "11_bread", "hot", "12_steam",
-        "13_luwei", "15_health", "17_ohlala", "18_veg", "20_panini", "21_ice", "22_ice"
-    ]
-
-    data_list = []
-
-    # 按照分類依序爬取
-    for index, cat in enumerate(categories):
-        # 注意：實際參數可能需要你自行測試
-        params = {"": index}
-        try:
-            resp = requests.get(base_url, headers=headers, params=params, timeout=10)
-            if resp.status_code == 200:
-                try:
-                    root = ElementTree.fromstring(resp.content)
-                    # 解析 XML
-                    for item in root.findall(".//Item"):
-                        data_list.append({
-                            "category": cat,
-                            "name": item.findtext("name", ""),
-                            "kcal": item.findtext("kcal", ""),
-                            "price": item.findtext("price", ""),
-                            "image": f'https://www.7-11.com.tw/freshfoods/{cat}/' + item.findtext("image", ""),
-                            "special_sale": item.findtext("special_sale", ""),
-                            "new": item.findtext("new", ""),
-                            "content": item.findtext("content", ""),
-                            # 如果你另外有店家經緯度資訊，請自行加上:
-                            # "latitude": ...,
-                            # "longitude": ...
-                        })
-                except ElementTree.ParseError:
-                    print(f"分類 {cat} 返回非 XML 格式資料，略過。")
-            else:
-                print(f"分類 {cat} 請求失敗，HTTP 狀態碼: {resp.status_code}")
-        except Exception as e:
-            print(f"分類 {cat} 請求錯誤: {e}")
-
-    # 儲存到 JSON
-    with open(SEVEN_ELEVEN_PRODUCTS_FILE, "w", encoding="utf-8") as jf:
-        json.dump(data_list, jf, ensure_ascii=False, indent=4)
-
-    print(f"✅ 7-11 商品資料抓取完成，共 {len(data_list)} 筆，已存為 {SEVEN_ELEVEN_PRODUCTS_FILE}")
+    resp = requests.post(url, headers=headers, data="")
+    resp.raise_for_status()
+    js = resp.json()
+    if not js.get("isSuccess"):
+        raise RuntimeError(f"取得 7-11 token 失敗: {js}")
+    token = js["element"]
+    return token
 
 # -----------------------------------------------------------
-# 2. 下載或更新 全家門市資料 (內含經緯度 py_wgs84, px_wgs84)
+# 7-11: 取得附近門市清單 (含剩餘即期品總數量)
 # -----------------------------------------------------------
-def fetch_family_stores(force_update=False):
+def get_7_11_nearby_stores(token, lat, lon):
     """
-    從 https://family.map.com.tw/famiport/api/dropdownlist/Select_StoreName
-    下載所有全家門市資料(含經緯度 py_wgs84, px_wgs84)並存檔。
-    force_update=True 時，強制重新抓取。
+    POST /Search/FrontendStoreItemStock/GetNearbyStoreList?token=$token
+    取得附近門市的「即期品」總數量
     """
-    if os.path.exists(FAMILY_MART_STORES_FILE) and not force_update:
-        print("全家門市 JSON 已存在，跳過下載 (如要強制更新請設 force_update=True)")
-        return
-
-    url = "https://family.map.com.tw/famiport/api/dropdownlist/Select_StoreName"
-    post_data = {"store": ""}
-    try:
-        resp = requests.post(url, json=post_data, timeout=10)
-        if resp.status_code == 200:
-            data = resp.json()
-            with open(FAMILY_MART_STORES_FILE, "w", encoding="utf-8") as f:
-                json.dump(data, f, ensure_ascii=False, indent=4)
-            print(f"✅ 全家門市資料抓取完成，共 {len(data)} 筆，已存為 {FAMILY_MART_STORES_FILE}")
-        else:
-            print(f"❌ 全家門市 API 請求失敗，HTTP 狀態碼: {resp.status_code}")
-    except Exception as e:
-        print(f"❌ 全家門市 API 請求錯誤: {e}")
+    url = f"{API_7_11_BASE}/Search/FrontendStoreItemStock/GetNearbyStoreList?token={token}"
+    headers = {
+        "user-agent": USER_AGENT_7_11,
+        "content-type": "application/json",
+    }
+    body = {
+        "CurrentLocation": {
+            "Latitude": lat,
+            "Longitude": lon
+        },
+        "SearchLocation": {
+            "Latitude": lat,
+            "Longitude": lon
+        }
+    }
+    resp = requests.post(url, headers=headers, json=body)
+    resp.raise_for_status()
+    js = resp.json()
+    if not js.get("isSuccess"):
+        raise RuntimeError(f"取得 7-11 附近門市失敗: {js}")
+    return js["element"].get("StoreStockItemList", [])
 
 # -----------------------------------------------------------
-# 3. 下載或更新 全家商品資料
+# 7-11: 取得單一門市的即期品清單
 # -----------------------------------------------------------
-def fetch_family_products(force_update=False):
+def get_7_11_store_detail(token, lat, lon, store_no):
     """
-    從 https://famihealth.family.com.tw/Calculator 解析網頁 JS 中的
-    var categories = [...] 取得商品清單。
-    force_update=True 時，強制重新抓取。
+    POST /Search/FrontendStoreItemStock/GetStoreDetail?token=$token
+    回傳該門市的即期品細項 (商品名稱 / 剩餘數量 等)
     """
-    if os.path.exists(FAMILY_MART_PRODUCTS_FILE) and not force_update:
-        print("全家商品 JSON 已存在，跳過下載 (如要強制更新請設 force_update=True)")
-        return
-
-    url = "https://famihealth.family.com.tw/Calculator"
-    headers = {"User-Agent": "Mozilla/5.0"}
-    try:
-        resp = requests.get(url, headers=headers, timeout=10)
-        if resp.status_code == 200:
-            match = re.search(r'var categories = (\[.*?\]);', resp.text, re.S)
-            if match:
-                categories_data = json.loads(match.group(1))
-                results = []
-                for cat in categories_data:
-                    cat_name = cat.get("name", "")
-                    for product in cat.get("products", []):
-                        results.append({
-                            "category": cat_name,
-                            "title": product.get("name"),
-                            "picture_url": product.get("imgurl"),
-                            "protein": product.get("protein", 0),
-                            "carb": product.get("carb", 0),
-                            "calories": product.get("calo", 0),
-                            "fat": product.get("fat", 0),
-                            "description": product.get("description", ""),
-                        })
-                with open(FAMILY_MART_PRODUCTS_FILE, "w", encoding="utf-8") as jf:
-                    json.dump(results, jf, ensure_ascii=False, indent=4)
-                print(f"✅ 全家商品資料抓取完成，共 {len(results)} 筆，已存為 {FAMILY_MART_PRODUCTS_FILE}")
-            else:
-                print("❌ 找不到 var categories = ... 之內容，無法解析全家商品。")
-        else:
-            print(f"❌ 全家商品頁面請求失敗，HTTP 狀態碼: {resp.status_code}")
-    except Exception as e:
-        print(f"❌ 全家商品頁面請求錯誤: {e}")
+    url = f"{API_7_11_BASE}/Search/FrontendStoreItemStock/GetStoreDetail?token={token}"
+    headers = {
+        "user-agent": USER_AGENT_7_11,
+        "content-type": "application/json",
+    }
+    body = {
+        "CurrentLocation": {
+            "Latitude": lat,
+            "Longitude": lon
+        },
+        "StoreNo": store_no
+    }
+    resp = requests.post(url, headers=headers, json=body)
+    resp.raise_for_status()
+    js = resp.json()
+    if not js.get("isSuccess"):
+        raise RuntimeError(f"取得 7-11 門市({store_no})資料失敗: {js}")
+    return js["element"].get("StoreStockItem", {})
 
 # -----------------------------------------------------------
-# 工具：讀取 JSON 檔
+# FamilyMart: 取得附近門市即期品清單 (單次呼叫可拿到所有商品細項)
 # -----------------------------------------------------------
-def load_json(path):
-    if os.path.exists(path):
-        with open(path, "r", encoding="utf-8") as f:
-            return json.load(f)
-    return []
+def get_family_nearby_stores(lat, lon):
+    """
+    POST https://stamp.family.com.tw/api/maps/MapProductInfo
+    查詢附近門市及即期品庫存，回傳資料中 code 應為 1 代表成功
+    """
+    headers = {
+        "Content-Type": "application/json;charset=utf-8",
+    }
+    body = {
+        "ProjectCode": FAMILY_PROJECT_CODE,
+        "latitude": lat,
+        "longitude": lon
+    }
+    resp = requests.post(API_FAMILY, headers=headers, json=body)
+    resp.raise_for_status()
+    js = resp.json()
+    # 修改判斷：根據回傳範例，成功時 code 為 1
+    if js.get("code") != 1:
+        raise RuntimeError(f"取得全家門市資料失敗: {js}")
+    return js["data"]
 
 # -----------------------------------------------------------
-# 4. 主邏輯：依使用者座標，篩選店家並顯示(3 公里內所有店家)
+# Gradio 查詢邏輯
 # -----------------------------------------------------------
 def find_nearest_store(address, lat, lon):
+    """
+    1. 使用者輸入經緯度
+    2. 查詢 7-11 與 FamilyMart 的即期品清單
+    3. 合併結果後顯示
+    """
     print(f"🔍 收到查詢請求: address={address}, lat={lat}, lon={lon}")
-
     if lat == 0 or lon == 0:
         return [["❌ 請輸入地址或提供 GPS 座標", "", "", "", ""]]
 
-    user_coords = (lat, lon)
-
-    # ========== 讀取 7-11 JSON 並印出前 10 筆 (檢查欄位用) ==========
-    seven_data = load_json(SEVEN_ELEVEN_PRODUCTS_FILE)
-    print(f"7-11 JSON 總筆數: {len(seven_data)}")
-    print("===== 7-11 JSON 前 10 筆 =====")
-    print(seven_data[:10])
-
-    # 將 7-11 資料轉成 DataFrame (假設內含 latitude, longitude)
-    seven_df = pd.DataFrame(seven_data)
-    if {"latitude", "longitude"}.issubset(seven_df.columns):
-        seven_df["latitude"] = seven_df["latitude"].astype(float)
-        seven_df["longitude"] = seven_df["longitude"].astype(float)
-        # 計算距離
-        seven_df["distance_m"] = seven_df.apply(
-            lambda row: geodesic(user_coords, (row["latitude"], row["longitude"])).meters,
-            axis=1
-        )
-    else:
-        print("⚠️  7-11 JSON 裡沒有 'latitude' 或 'longitude' 欄位，無法計算距離。")
-        seven_df = pd.DataFrame()  # 清空，代表無法顯示 7-11 門市
-
-    # ========== 讀取 全家門市 JSON 並印出前 10 筆 (檢查欄位用) ==========
-    family_stores = load_json(FAMILY_MART_STORES_FILE)
-    print(f"全家 JSON 總筆數: {len(family_stores)}")
-    print("===== 全家 JSON 前 10 筆 =====")
-    print(family_stores[:10])
+    result_rows = []
 
-    # 轉成 DataFrame (內含 py_wgs84, px_wgs84)
-    family_df = pd.DataFrame(family_stores)
-    if {"py_wgs84", "px_wgs84"}.issubset(family_df.columns):
-        family_df["latitude"] = family_df["py_wgs84"].astype(float)
-        family_df["longitude"] = family_df["px_wgs84"].astype(float)
-        family_df["distance_m"] = family_df.apply(
-            lambda row: geodesic(user_coords, (row["latitude"], row["longitude"])).meters,
-            axis=1
-        )
-    else:
-        print("⚠️  全家 JSON 裡沒有 'py_wgs84' 或 'px_wgs84' 欄位，無法計算距離。")
-        family_df = pd.DataFrame()
-
-    # ========== 篩選 3 公里內的店家 (不只前 5 筆，全部顯示) ==========
-    nearby_seven = pd.DataFrame()
-    if not seven_df.empty and "distance_m" in seven_df.columns:
-        nearby_seven = seven_df[seven_df["distance_m"] <= MAX_DISTANCE].sort_values("distance_m")
-
-    nearby_family = pd.DataFrame()
-    if not family_df.empty and "distance_m" in family_df.columns:
-        nearby_family = family_df[family_df["distance_m"] <= MAX_DISTANCE].sort_values("distance_m")
-
-    # 若都沒資料
-    if nearby_seven.empty and nearby_family.empty:
-        return [["❌ 附近 3 公里內沒有便利商店", "", "", "", ""]]
-
-    # ========== 合併輸出 ==========
-    output = []
+    # ------------------ 7-11 ------------------
+    try:
+        token_711 = get_7_11_token()
+        nearby_stores_711 = get_7_11_nearby_stores(token_711, lat, lon)
+        for store in nearby_stores_711:
+            dist_m = store.get("Distance", 999999)
+            if dist_m <= MAX_DISTANCE:
+                store_no = store.get("StoreNo")
+                store_name = store.get("StoreName", "7-11 未提供店名")
+                remaining_qty = store.get("RemainingQty", 0)
+                if remaining_qty > 0:
+                    detail = get_7_11_store_detail(token_711, lat, lon, store_no)
+                    for cat in detail.get("CategoryStockItems", []):
+                        cat_name = cat.get("Name", "")
+                        for item in cat.get("ItemList", []):
+                            item_name = item.get("ItemName", "")
+                            item_qty = item.get("RemainingQty", 0)
+                            row = [
+                                f"7-11 {store_name}",
+                                f"{dist_m:.1f} m",
+                                f"{cat_name} - {item_name}",
+                                str(item_qty)
+                            ]
+                            result_rows.append(row)
+                else:
+                    row = [
+                        f"7-11 {store_name}",
+                        f"{dist_m:.1f} m",
+                        "即期品 0 項",
+                        "0"
+                    ]
+                    result_rows.append(row)
+    except Exception as e:
+        print(f"❌ 取得 7-11 即期品時發生錯誤: {e}")
 
-    # 7-11 門市
-    if not nearby_seven.empty:
-        for _, row in nearby_seven.iterrows():
-            store_name = row.get("StoreName", "7-11 未提供店名")
-            dist_str = f"{row['distance_m']:.1f} m"
-            # 假設要顯示「即期食品」，可自行加判斷或先示範顯示固定字串
-            output.append([
-                f"7-11 {store_name}",
-                dist_str,
-                "7-11即期食品(示意)",
-                "1"
-            ])
+    # ------------------ FamilyMart ------------------
+    try:
+        nearby_stores_family = get_family_nearby_stores(lat, lon)
+        for store in nearby_stores_family:
+            dist_m = store.get("distance", 999999)
+            if dist_m <= MAX_DISTANCE:
+                store_name = store.get("name", "全家 未提供店名")
+                info_list = store.get("info", [])
+                has_item = False
+                for big_cat in info_list:
+                    big_cat_name = big_cat.get("name", "")
+                    for subcat in big_cat.get("categories", []):
+                        subcat_name = subcat.get("name", "")
+                        for product in subcat.get("products", []):
+                            product_name = product.get("name", "")
+                            qty = product.get("qty", 0)
+                            if qty > 0:
+                                has_item = True
+                                row = [
+                                    f"全家 {store_name}",
+                                    f"{dist_m:.1f} m",
+                                    f"{big_cat_name} - {subcat_name} - {product_name}",
+                                    str(qty)
+                                ]
+                                result_rows.append(row)
+                if not has_item:
+                    row = [
+                        f"全家 {store_name}",
+                        f"{dist_m:.1f} m",
+                        "即期品 0 項",
+                        "0"
+                    ]
+                    result_rows.append(row)
+    except Exception as e:
+        print(f"❌ 取得全家 即期品時發生錯誤: {e}")
 
-    # 全家 門市
-    if not nearby_family.empty:
-        for _, row in nearby_family.iterrows():
-            store_name = row.get("Name", "全家 未提供店名")
-            dist_str = f"{row['distance_m']:.1f} m"
-            output.append([
-                f"全家 {store_name}",
-                dist_str,
-                "全家即期食品(示意)",
-                "1"
-            ])
+    if not result_rows:
+        return [["❌ 附近 3 公里內沒有即期食品", "", "", "", ""]]
 
-    return output
+    return result_rows
 
 # -----------------------------------------------------------
-# 5. 建立 Gradio 介面
+# Gradio 介面
 # -----------------------------------------------------------
 with gr.Blocks() as demo:
-    gr.Markdown("## 便利商店門市與商品搜尋 (示範)")
-    gr.Markdown("1. 按下「使用目前位置」或自行輸入緯度/經度\n2. 點選「搜尋」查詢 3 公里內的所有店家\n3. 請於 Logs 查看 7-11 和全家 JSON 的前 10 筆結構")
-
+    gr.Markdown("## 便利商店「即期食品」搜尋示範")
+    gr.Markdown("""
+    1. 按下「使用目前位置」或自行輸入緯度/經度  
+    2. 點選「搜尋」查詢 3 公里內 7-11 / 全家的即期品  
+    3. 若要執行，需要有效的 mid_v (7-11 愛食記憶官網)  
+    4. 在 Logs 查看詳細錯誤或除錯資訊
+    """)
     address = gr.Textbox(label="輸入地址(可留空)")
     lat = gr.Number(label="GPS 緯度", value=0, elem_id="lat")
     lon = gr.Number(label="GPS 經度", value=0, elem_id="lon")
@@ -306,14 +264,9 @@ with gr.Blocks() as demo:
 
 def main():
     """
-    主程式入口，可在本地端執行 python 檔案時呼叫此函式，
-    先下載/更新資料，再啟動 Gradio。
+    主程式入口，在本地端執行:
+      python your_script.py
     """
-    # 下載 / 更新 所有資料
-    fetch_seven_eleven_products(force_update=False)
-    fetch_family_stores(force_update=False)
-    fetch_family_products(force_update=False)
-
     demo.launch(server_name="0.0.0.0", server_port=7860, debug=True)
 
 if __name__ == "__main__":