Update app.py

app.py

@@ -2,13 +2,25 @@ import requests
 import gradio as gr
 import pandas as pd
 import time
+import json
 
 API_URL = "https://yata.yt/api/v1/travel/export/"
 
 # Simple cache
 _cache = {"data": None, "timestamp": 0, "last_update": "Unknown"}
 
+# Load item category data from your uploaded file
+with open("items.json", "r", encoding="utf-8") as f:
+    items_data = json.load(f)["items"]
+
+# Build lookup tables
+ITEM_TO_TYPE = {v["name"]: v["type"].lower() for v in items_data.values() if "name" in v and "type" in v}
+
+# All available categories
+ALL_CATEGORIES = sorted(set(ITEM_TO_TYPE.values()))
+
 def fetch_yata(force_refresh=False):
+    """Fetch and cache YATA travel data"""
     if not force_refresh and _cache["data"] and (time.time() - _cache["timestamp"] < 300):
         return _cache["data"], _cache["last_update"]
 
@@ -24,35 +36,25 @@ def fetch_yata(force_refresh=False):
     try:
         response = requests.get(API_URL, headers=headers, timeout=10)
         response.raise_for_status()
-
-        # Debug logging: check what we actually got
-        content_type = response.headers.get("Content-Type", "")
-        print(f"ℹ️ Response Content-Type: {content_type}")
-        print(f"ℹ️ First 200 chars of response:\n{response.text[:200]!r}")
-
         data = response.json()
 
-        if "stocks" not in data:
-            print("⚠️ 'stocks' key not found — response may not be valid YATA JSON")
-
         _cache["data"] = data
         _cache["timestamp"] = time.time()
-        _cache["last_update"] = data.get("lastUpdate", "Unknown")
+        _cache["last_update"] = "Updated at " + time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime())
 
-        print(f"✅ Successfully parsed YATA JSON (lastUpdate={_cache['last_update']})")
+        print(f"✅ Successfully fetched YATA data at {_cache['last_update']}")
         return data, _cache["last_update"]
 
     except Exception as e:
         print(f"❌ Error fetching YATA data: {e}")
-        return {"stocks": {}}, "Fetch failed (likely blocked or invalid JSON)"
+        return {"stocks": {}}, "Fetch failed (likely blocked by YATA)"
 
-
-def query_inventory(item_term="", country_name="", refresh=False):
-    data, _ = fetch_yata(force_refresh=refresh)
+def query_inventory(item_term="", category="", country_name="", refresh=False):
+    """Filter and display inventory data"""
+    data, last_update = fetch_yata(force_refresh=refresh)
     stocks = data.get("stocks", {})
     rows = []
 
-    # Mapping of country codes to readable names (you can expand this)
     COUNTRY_NAMES = {
         "arg": "Argentina",
         "mex": "Mexico",
@@ -63,13 +65,11 @@ def query_inventory(item_term="", country_name="", refresh=False):
         "swi": "Switzerland",
         "uae": "United Arab Emirates",
         "chi": "China",
-        "haw": "Hawaii"
+        "haw": "Hawaii",
     }
 
     for country_code, cdata in stocks.items():
         cname = COUNTRY_NAMES.get(country_code, country_code.upper())
-
-        # Handle per-country 'update' timestamp
         update_ts = cdata.get("update")
         update_str = (
             time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(update_ts))
@@ -78,48 +78,59 @@ def query_inventory(item_term="", country_name="", refresh=False):
 
         for item in cdata.get("stocks", []):
             iname = item.get("name", "")
-            match_item = item_term.lower() in iname.lower() if item_term else True
+            itype = ITEM_TO_TYPE.get(iname, "").lower()
+
+            # Match item/category filters
             match_country = country_name.lower() in cname.lower() if country_name else True
+
+            if item_term:
+                match_item = item_term.lower() in iname.lower()
+            elif category:
+                match_item = itype == category.lower()
+            else:
+                match_item = True
+
             if match_item and match_country:
                 rows.append({
                     "Country": cname,
                     "Item": iname,
+                    "Category": itype.title() if itype else "",
                     "Quantity": item.get("quantity", 0),
                     "Cost": item.get("cost", 0),
                     "Updated": update_str
                 })
 
     if not rows:
-        return pd.DataFrame([{"Result": "No inventory found for that query."}]), "No update available"
+        return pd.DataFrame([{"Result": "No inventory found for that query."}]), last_update
 
     df = pd.DataFrame(rows)
     df = df.sort_values(by=["Country", "Item"])
     total_quantity = df["Quantity"].sum()
-    df.loc[len(df)] = {"Country": "—", "Item": "TOTAL", "Quantity": total_quantity, "Cost": "", "Updated": ""}
-    last_update_display = f"Data last updated per country — most recent: {max(r['Updated'] for r in rows if r['Updated'] != 'Unknown')}"
-
-    return df, last_update_display
+    df.loc[len(df)] = {"Country": "—", "Item": "TOTAL", "Category": "", "Quantity": total_quantity, "Cost": "", "Updated": ""}
+    df = df[["Country", "Item", "Category", "Quantity", "Cost", "Updated"]]
 
+    return df, f"Last update: {last_update}"
 
-def run_query(item, country, refresh):
-    df, timestamp = query_inventory(item, country, refresh)
+def run_query(item, category, country, refresh):
+    df, timestamp = query_inventory(item, category, country, refresh)
     return df, timestamp
 
 iface = gr.Interface(
     fn=run_query,
     inputs=[
-        gr.Textbox(label="Item name (e.g. Plushies, Flowers, Alcohol)"),
-        gr.Textbox(label="Country (e.g. UK, Argentina)"),
+        gr.Textbox(label="Item name (e.g. Plushie, Zip Ties, Vodka)", placeholder="Leave blank if using category"),
+        gr.Dropdown(label="Category (from items.json)", choices=[""] + ALL_CATEGORIES, value=""),
+        gr.Textbox(label="Country (e.g. UK, Argentina, Japan)", placeholder="Optional"),
         gr.Checkbox(label="Force refresh (ignore cache)", value=False)
     ],
     outputs=[
         gr.Dataframe(label="Results"),
         gr.Textbox(label="Metadata / Last Update")
     ],
-    title="🧳 Torn Inventory Viewer (YATA Travel Stock)",
+    title="🧳 Torn Inventory Viewer (YATA + Item Categories)",
     description=(
-        "Fetches live data from the Torn YATA API and lets you filter by item name and country.\n"
-        "Uses caching for faster repeated queries. Click 'Force refresh' to reload from YATA."
+        "Fetches live YATA travel stock data and links it to Torn item categories from `items.json`.\n"
+        "You can search by item name or select a category (e.g. 'flower', 'plushie', 'alcohol')."
     ),
 )