fix missing convenience buttons

app.py

@@ -44,15 +44,13 @@ def load_cached_embeddings():
         with open(META_FILE, "r", encoding="utf-8") as f:
             meta = json.load(f)
         if meta.get("items_mtime") != ITEM_FILE_MTIME:
-            print("⚠️ items.json changed — rebuilding category embeddings.")
             return None, None
         with open(ALIASES_FILE, "r", encoding="utf-8") as f:
             aliases = json.load(f)
         embeds = torch.load(EMB_FILE)
         print("✅ Loaded cached category embeddings.")
         return aliases, embeds
-    except Exception as e:
-        print(f"⚠️ Cache load failed: {e}")
+    except Exception:
         return None, None
 
 def save_cached_embeddings(aliases, embeds):
@@ -62,7 +60,6 @@ def save_cached_embeddings(aliases, embeds):
         torch.save(embeds, EMB_FILE)
         with open(META_FILE, "w", encoding="utf-8") as f:
             json.dump({"items_mtime": ITEM_FILE_MTIME, "time": time.time()}, f)
-        print("💾 Cached category embeddings saved.")
     except Exception as e:
         print(f"⚠️ Cache save failed: {e}")
 
@@ -70,17 +67,11 @@ def auto_alias_categories(embedder, all_categories, all_item_names, top_k=6, thr
     print("🤖 Building category aliases dynamically...")
     cat_embs = {c: embedder.encode(c, convert_to_tensor=True) for c in all_categories}
     item_embs = {i: embedder.encode(i, convert_to_tensor=True) for i in all_item_names}
-
     aliases = {}
     for cat, cat_emb in cat_embs.items():
         sims = {i: float(util.cos_sim(cat_emb, emb)) for i, emb in item_embs.items()}
-        top_related = [
-            i for i, s in sorted(sims.items(), key=lambda x: x[1], reverse=True)[:top_k]
-            if s > threshold
-        ]
+        top_related = [i for i, s in sorted(sims.items(), key=lambda x: x[1], reverse=True)[:top_k] if s > threshold]
         aliases[cat] = list(set([cat] + top_related))
-        preview = ", ".join(top_related[:3])
-        print(f"  🧩 {cat:<10} → {len(top_related)} aliases ({preview})")
     return aliases
 
 CATEGORY_ALIASES, CATEGORY_EMBEDS = load_cached_embeddings()
@@ -121,11 +112,10 @@ def normalize_country_query(q: str) -> str | None:
 
 # ---------------- Helpers ----------------
 def parse_freeform_query(text: str):
-    """Supports 'plushies in uk' and 'uk plushies'."""
     if not text:
         return "", ""
     text = text.strip().lower()
-    m = re.match(r"(.+?)\s+in\s+(.+)", text, flags=re.IGNORECASE)
+    m = re.match(r"(.+?)\\s+in\\s+(.+)", text, flags=re.IGNORECASE)
     if m:
         return m.group(1).strip(), m.group(2).strip()
     parts = text.split()
@@ -137,7 +127,6 @@ def parse_freeform_query(text: str):
             return first, second
     return text, ""
 
-# ---------------- Semantic Match ----------------
 def semantic_match(query, top_k=15):
     if not query:
         return {"category": None, "items": []}
@@ -166,9 +155,8 @@ def fetch_yata(force_refresh=False):
         _cache.update({
             "data": data,
             "timestamp": time.time(),
-            "last_update": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())  # UTC ISO
+            "last_update": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())
         })
-        print(f"✅ Fetched YATA data at {_cache['last_update']}")
         return data, _cache["last_update"]
     except Exception as e:
         print(f"❌ Fetch error: {e}")
@@ -186,7 +174,6 @@ def get_live_categories(data):
 
 # ---------------- Core logic ----------------
 def query_inventory(query_text="", category="", country_name="", capacity=10, refresh=False):
-    print(f"🔎 Query received: '{query_text}', category='{category}', country='{country_name}', cap={capacity}")
     data, last_update = fetch_yata(force_refresh=refresh)
     rows = []
     parsed_item, parsed_country = parse_freeform_query(query_text)
@@ -201,10 +188,9 @@ def query_inventory(query_text="", category="", country_name="", capacity=10, re
         code = code_raw.upper()
         cname = COUNTRY_NAMES.get(code, code)
         if country_name:
-            if user_code:
-                if code != user_code:
-                    continue
-            elif country_name.lower() not in cname.lower():
+            if user_code and code != user_code:
+                continue
+            elif not user_code and country_name.lower() not in cname.lower():
                 continue
         update_ts = cdata.get("update")
         update_str = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime(update_ts)) if update_ts else "Unknown"
@@ -213,16 +199,11 @@ def query_inventory(query_text="", category="", country_name="", capacity=10, re
             itype = ITEM_TO_TYPE.get(iname, "").lower()
             qty = item.get("quantity", 0)
             cost = item.get("cost", 0)
-            if item_term:
-                item_ok = (
-                    item_term.lower() in iname.lower()
-                    or iname in semantic_items
-                    or (semantic_category and itype == semantic_category.lower())
-                )
-            elif category:
-                item_ok = category.lower() == itype
-            else:
-                item_ok = True
+            item_ok = (
+                (item_term and (item_term.lower() in iname.lower() or iname in semantic_items or (semantic_category and itype == semantic_category.lower())))
+                or (category and category.lower() == itype)
+                or (not item_term and not category)
+            )
             if item_ok:
                 rows.append({
                     "Country": cname,
@@ -247,24 +228,62 @@ def run_query(query_text, category, country, capacity, refresh):
     live_categories = get_live_categories(data)
     return df, ts, gr.update(choices=[""] + live_categories)
 
+def run_multi(searches, capacity):
+    dfs = []
+    for q in searches:
+        df, _ = query_inventory(q, "", "", capacity, False)
+        dfs.append(df)
+    merged = pd.concat(dfs, ignore_index=True)
+    total = pd.DataFrame([{
+        "Country": "—", "Item": "TOTAL", "Category": "",
+        "Quantity": merged["Quantity"].replace(",", "", regex=True).astype(float).sum(),
+        "Cost": "", "Max Capacity Cost": "", "Updated": ""
+    }])
+    merged = pd.concat([merged, total])
+    return merged, f"Last update: {time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())}"
+
 # ---------------- Gradio UI ----------------
-with gr.Blocks(title="🧳 Torn Inventory Viewer") as iface:
-    gr.Markdown("## 🧳 Torn Inventory Viewer")
-    gr.Markdown("_Search Torn YATA travel stocks — timestamps shown in your local timezone._")
+with gr.Blocks(title="🧳 Torn Foreign Stocks") as iface:
+    gr.Markdown("## 🧳 Torn Foreign Stocks")
+    gr.Markdown("_Search YATA's foreign stocks data_")
 
-    query_box = gr.Textbox(label="Search (semantic, e.g. 'flowers in England')", elem_id="qbox")
-    category_drop = gr.Dropdown(label="Category (optional exact match)", choices=[""] + ALL_CATEGORIES, elem_id="catdrop")
-    country_box = gr.Textbox(label="Country (optional, e.g. UK, Cayman, Japan)", elem_id="countrybox")
-    capacity_slider = gr.Number(label="Travel Capacity", value=10, minimum=5, maximum=88, precision=0, elem_id="cap_num")
+    query_box = gr.Textbox(label="Search (semantic, e.g. 'flowers in England')")
+    category_drop = gr.Dropdown(label="Category (optional exact match)", choices=[""] + ALL_CATEGORIES)
+    country_box = gr.Textbox(label="Country (optional, e.g. UK, Cayman, Japan)")
+    capacity_slider = gr.Number(label="Travel Capacity", value=10, minimum=5, maximum=88, precision=0)
     refresh_check = gr.Checkbox(label="Force refresh (ignore cache)", value=False)
 
+    with gr.Row():
+        btn_short = gr.Button("🌸 Flushies (short haul)")
+        btn_medium = gr.Button("🧸 Flushies (medium haul)")
+        btn_long = gr.Button("🎁 Flushies (long haul)")
+        btn_xanax = gr.Button("💊 Xanax (SA)")
+        btn_temps = gr.Button("🧨 Temps")
+
     result_df = gr.Dataframe(label="Results")
     meta_box = gr.Textbox(label="Metadata / Last Update")
-
     run_btn = gr.Button("🔍 Search / Refresh")
+
     run_btn.click(run_query, inputs=[query_box, category_drop, country_box, capacity_slider, refresh_check],
                   outputs=[result_df, meta_box, category_drop])
 
+    btn_short.click(lambda c: run_multi(["flowers in mexico", "flowers in cayman islands", "flowers in canada",
+                                         "plushies in mexico", "plushies in cayman islands", "plushies in canada"], c),
+                    inputs=[capacity_slider], outputs=[result_df, meta_box])
+    btn_medium.click(lambda c: run_multi(["flowers in hawaii", "flowers in united kingdom", "flowers in argentina",
+                                          "flowers in switzerland", "flowers in japan",
+                                          "plushies in hawaii", "plushies in united kingdom", "plushies in argentina",
+                                          "plushies in switzerland", "plushies in japan"], c),
+                     inputs=[capacity_slider], outputs=[result_df, meta_box])
+    btn_long.click(lambda c: run_multi(["flowers in uae", "flowers in china", "flowers in south africa",
+                                        "plushies in uae", "plushies in china", "plushies in south africa"], c),
+                   inputs=[capacity_slider], outputs=[result_df, meta_box])
+    btn_xanax.click(lambda c: run_multi(["xanax in south africa"], c),
+                    inputs=[capacity_slider], outputs=[result_df, meta_box])
+    btn_temps.click(lambda c: run_multi(["tear gas in argentina", "smoke grenade in south africa",
+                                         "flash grenade in switzerland"], c),
+                    inputs=[capacity_slider], outputs=[result_df, meta_box])
+
     # --- JS for local time conversion ---
     gr.HTML("""
     <script>
@@ -291,9 +310,7 @@ with gr.Blocks(title="🧳 Torn Inventory Viewer") as iface:
     """)
 
 try:
-    print("✅ App initialized successfully — launching UI...")
     iface.launch()
 except Exception as e:
     import traceback
-    print("❌ Application failed to start:")
     traceback.print_exc()