Fixed what I broke

app_storefront.py

@@ -1,20 +1,52 @@
 # app_storefront.py
 import os
+import sys
 import gradio as gr
 
-from model_core import model_generate, MODEL_NAME
-from data_storefront import (
-    DEFAULT_PRODUCTS, DEFAULT_PARKING, DEFAULT_VENUE,
-    STORE_DATA, USE_HELPERS
+# Make "core/" importable even on Spaces
+sys.path.append(os.path.join(os.path.dirname(__file__), "core"))
+
+# --- New modules ---
+from core.model import model_generate, MODEL_NAME
+from core.memory import build_prompt_from_history
+from core.storefront import (
+    load_storefront,
+    storefront_qna,
+    extract_products,
+    get_rules,
+    DEFAULT_PRODUCTS as CORE_DEFAULT_PRODUCTS,
+    DEFAULT_PARKING as CORE_DEFAULT_PARKING,
+    DEFAULT_VENUE as CORE_DEFAULT_VENUE,
+    USE_HELPERS,
+    STORE_DATA,
 )
-from qna_router import storefront_qna
-from memory_core import build_prompt_from_history, clean_generation
+
+# ---------------- Data for tabs (safe fallbacks) ----------------
+# Try to load JSON data; if not available, use module defaults.
+_loaded = load_storefront()  # may be None if JSON absent/empty
+if _loaded:
+    PRODUCTS = extract_products(_loaded) or CORE_DEFAULT_PRODUCTS
+    RULES = get_rules(_loaded) or {"venue": CORE_DEFAULT_VENUE, "parking": CORE_DEFAULT_PARKING}
+else:
+    PRODUCTS = CORE_DEFAULT_PRODUCTS
+    RULES = {"venue": CORE_DEFAULT_VENUE, "parking": CORE_DEFAULT_PARKING}
+
+DEFAULT_PRODUCTS = PRODUCTS
+DEFAULT_VENUE = RULES.get("venue", CORE_DEFAULT_VENUE)
+DEFAULT_PARKING = RULES.get("parking", CORE_DEFAULT_PARKING)
+
+# ---------------- Utilities ----------------
+def clean_generation(text: str) -> str:
+    """Tiny post-process to strip runaway prefixes or trailing artifacts."""
+    return (text or "").strip()
 
 # ---------------- Chat logic ----------------
 def chat_pipeline(history, message, max_new_tokens=128, temperature=0.8, top_p=0.95):
+    # 1) Intercept storefront facts first (reduces hallucinations)
     sf = storefront_qna(message)
     if sf:
         return sf
+    # 2) Memory-aware prompt for the model
     prompt = build_prompt_from_history(history, message, k=4)
     gen = model_generate(prompt, max_new_tokens, temperature, top_p)
     return clean_generation(gen)
@@ -30,26 +62,34 @@ CSS = """
 with gr.Blocks(title="Storefront Chat", css=CSS) as demo:
     gr.Markdown("## Storefront Chat")
 
-    # One state object that mirrors the Chatbot value
+    # Single source of truth for conversation history
     history_state = gr.State([])
 
     with gr.Tabs():
-        # --- Chat tab ---
+        # --- TAB: Chat ---
         with gr.TabItem("Chat"):
             with gr.Group(elem_classes=["panel"]):
-                chat = gr.Chatbot(height=360, bubble_full_width=False, label="Chat")
+                chat = gr.Chatbot(
+                    height=360,
+                    bubble_full_width=False,
+                    label="Chat"
+                )
 
                 with gr.Row():
-                    msg = gr.Textbox(placeholder="Ask about parking rules, attire, cap & gown, pickup times…", scale=5)
+                    msg = gr.Textbox(
+                        placeholder="Ask about parking rules, attire, cap & gown, pickup times…",
+                        scale=5
+                    )
                     send = gr.Button("Send", scale=1)
 
+                # Quick chips
                 with gr.Row():
                     chip1 = gr.Button("Parking rules", variant="secondary")
                     chip2 = gr.Button("Multiple passes", variant="secondary")
                     chip3 = gr.Button("Attire", variant="secondary")
                     chip4 = gr.Button("When do lots open?", variant="secondary")
 
-                # Advanced area (sliders + health/capabilities) — off the main screen
+                # Advanced (sliders + health/capabilities) — kept off the main screen
                 with gr.Accordion("Advanced chat options", open=False):
                     max_new = gr.Slider(32, 512, 128, 1, label="Max new tokens")
                     temp    = gr.Slider(0.1, 1.5, 0.8, 0.05, label="Temperature")
@@ -60,21 +100,21 @@ with gr.Blocks(title="Storefront Chat", css=CSS) as demo:
                         caps_btn   = gr.Button("Capabilities", variant="secondary")
                         status_md  = gr.Markdown("Status: not checked", elem_classes=["small"])
 
-        # --- Products tab ---
+        # --- TAB: Products ---
         with gr.TabItem("Products"):
             gr.Markdown("### Available Items")
             cols = list(DEFAULT_PRODUCTS[0].keys()) if DEFAULT_PRODUCTS else ["SKU","Name","Price","Notes"]
-            data = [[p.get(c,"") for c in cols] for p in DEFAULT_PRODUCTS]
+            data = [[p.get(c, "") for c in cols] for p in DEFAULT_PRODUCTS]
             gr.Dataframe(headers=cols, value=data, interactive=False, wrap=True, label="Products")
 
-        # --- Rules tab ---
+        # --- TAB: Rules ---
         with gr.TabItem("Rules"):
             gr.Markdown("### Venue rules")
             gr.Markdown("- " + "\n- ".join(DEFAULT_VENUE))
             gr.Markdown("### Parking rules")
             gr.Markdown("- " + "\n- ".join(DEFAULT_PARKING))
 
-        # --- Logistics tab ---
+        # --- TAB: Logistics ---
         with gr.TabItem("Logistics"):
             gr.Markdown(
                 "### Event Logistics\n"
@@ -85,8 +125,9 @@ with gr.Blocks(title="Storefront Chat", css=CSS) as demo:
                 "\n*Try asking the bot:* “What time should I arrive?” • “Where do I pick up the gown?”"
             )
 
-    # ---------- Helpers that keep Chatbot history valid ----------
+    # ---------- Helpers ----------
     def _append_bot_md(history, md_text):
+        """Append a bot-side markdown message while preserving the [[u,b],…] format."""
         history = history or []
         return history + [[None, md_text]]
 
@@ -94,18 +135,24 @@ with gr.Blocks(title="Storefront Chat", css=CSS) as demo:
     def on_send(history, message, max_new_tokens, temperature, top_p):
         t = (message or "").strip()
         if not t:
-            return history, history, ""  # no-op
+            return history, history, ""  # no-op; keep shapes identical
+        # add user row
         history = (history or []) + [[t, None]]
+        # generate reply using history prior to this turn
         reply = chat_pipeline(history[:-1], t, max_new_tokens, temperature, top_p)
         history[-1][1] = reply
+        # update both state and Chatbot, clear textbox
         return history, history, ""
 
     def _health_cb(history):
-        md = (f"### Status: ✅ Healthy\n"
-              f"- Model: `{MODEL_NAME}`\n"
-              f"- Storefront module: {'yes' if USE_HELPERS else 'no'}\n"
-              f"- Storefront JSON: {'loaded' if bool(STORE_DATA) else 'not found'}")
+        md = (
+            f"### Status: ✅ Healthy\n"
+            f"- Model: `{MODEL_NAME}`\n"
+            f"- Storefront module: {'yes' if USE_HELPERS else 'no'}\n"
+            f"- Storefront JSON: {'loaded' if bool(STORE_DATA) else 'not found'}"
+        )
         new_hist = _append_bot_md(history, md)
+        # Update chat AND status label
         return new_hist, new_hist, "Status: ✅ Healthy"
 
     def _caps_cb(history):
@@ -118,17 +165,17 @@ with gr.Blocks(title="Storefront Chat", css=CSS) as demo:
         new_hist = _append_bot_md(history, md)
         return new_hist, new_hist
 
-    # Wire up (update both state and Chatbot)
+    # Wire up (update both the state and Chatbot widget)
     send.click(on_send, [history_state, msg, max_new, temp, topp], [history_state, chat, msg])
     msg.submit(on_send, [history_state, msg, max_new, temp, topp], [history_state, chat, msg])
 
-    # Chips
+    # Chips → prefill textbox (don’t mutate history)
     chip1.click(lambda: "What are the parking rules?", outputs=msg)
     chip2.click(lambda: "Can I buy multiple parking passes?", outputs=msg)
     chip3.click(lambda: "Is formal attire required?", outputs=msg)
     chip4.click(lambda: "What time do the parking lots open?", outputs=msg)
 
-    # Health / Capabilities (now inside the Advanced accordion)
+    # Health / Capabilities: now inside the Advanced accordion
     health_btn.click(_health_cb, inputs=[history_state], outputs=[history_state, chat, status_md])
     caps_btn.click(_caps_cb, inputs=[history_state], outputs=[history_state, chat])