Update app.py

app.py

@@ -48,31 +48,58 @@ def fetch_yata(force_refresh=False):
 
 
 def query_inventory(item_term="", country_name="", refresh=False):
-    data, last_update = fetch_yata(force_refresh=refresh)
+    data, _ = fetch_yata(force_refresh=refresh)
     stocks = data.get("stocks", {})
     rows = []
 
-    for cdata in stocks.values():
-        cname = cdata.get("countryName", "")
-        for item_name, item_data in cdata.get("items", {}).items():
-            match_item = item_term.lower() in item_name.lower() if item_term else True
+    # Mapping of country codes to readable names (you can expand this)
+    COUNTRY_NAMES = {
+        "arg": "Argentina",
+        "mex": "Mexico",
+        "can": "Canada",
+        "uk": "United Kingdom",
+        "jap": "Japan",
+        "sou": "South Africa",
+        "swi": "Switzerland",
+        "uae": "United Arab Emirates",
+        "chi": "China",
+        "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))
+            if update_ts else "Unknown"
+        )
+
+        for item in cdata.get("stocks", []):
+            iname = item.get("name", "")
+            match_item = item_term.lower() in iname.lower() if item_term else True
             match_country = country_name.lower() in cname.lower() if country_name else True
             if match_item and match_country:
                 rows.append({
                     "Country": cname,
-                    "Item": item_name,
-                    "Quantity": item_data["quantity"],
-                    "Cost": item_data["cost"],
+                    "Item": iname,
+                    "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."}]), f"Last update: {last_update}"
+        return pd.DataFrame([{"Result": "No inventory found for that query."}]), "No update available"
 
     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": ""}
-    return df, f"Last update: {last_update}"
+    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
+
 
 def run_query(item, country, refresh):
     df, timestamp = query_inventory(item, country, refresh)