Google auth + chat-quality + mobile

RAG_Products/api.py

@@ -12,7 +12,7 @@ import json
 import uuid
 from pathlib import Path
 
-from fastapi import FastAPI, HTTPException, UploadFile, File, Form
+from fastapi import FastAPI, HTTPException, UploadFile, File, Form, Header
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
@@ -114,8 +114,18 @@ def health():
     }
 
 
+def _resolve_user(authorization, fallback):
+    """Prefer the verified Firebase uid from the Bearer token; else the
+    client-supplied id (used in local/no-auth mode)."""
+    if authorization and authorization.lower().startswith("bearer "):
+        uid = storage.verify_token(authorization[7:].strip())
+        if uid:
+            return uid
+    return fallback or "default"
+
+
 @app.post("/chat")
-def chat(req: ChatRequest):
+def chat(req: ChatRequest, authorization: str | None = Header(None)):
     """Single-box product assistant: deterministic answer + recommendations.
 
     Returns a fixed-shape JSON object (answer, match, results, recommendations,
@@ -126,7 +136,7 @@ def chat(req: ChatRequest):
         raise HTTPException(400, "message must not be empty")
 
     chat_id = req.chat_id or req.session_id or uuid.uuid4().hex
-    user_id = req.user_id or "default"
+    user_id = _resolve_user(authorization, req.user_id)
 
     existing = storage.get_chat(chat_id)
     context = existing.get("context") if existing else None
@@ -134,13 +144,12 @@ def chat(req: ChatRequest):
     result = chat_handle(msg, context=context)
 
     # carry kit memory forward across turns (kit edits update it; others keep it)
+    new_context = dict(context or {})
     if result.get("kit_categories"):
-        new_context = {
-            "kit_categories": result.get("kit_categories"),
-            "kit_budget": result.get("kit_budget"),
-        }
-    else:
-        new_context = context or {}
+        new_context["kit_categories"] = result.get("kit_categories")
+        new_context["kit_budget"] = result.get("kit_budget")
+    if result.get("last_category"):
+        new_context["last_category"] = result.get("last_category")
 
     storage.append_messages(
         chat_id, user_id,
@@ -156,8 +165,9 @@ def chat(req: ChatRequest):
 # Chat history (Firestore-backed, local-JSON fallback)
 # ---------------------------------------------------------------------------
 @app.get("/chats")
-def list_chats(user_id: str = "default"):
-    return {"backend": storage.backend(), "chats": storage.list_chats(user_id)}
+def list_chats(user_id: str = "default", authorization: str | None = Header(None)):
+    uid = _resolve_user(authorization, user_id)
+    return {"backend": storage.backend(), "chats": storage.list_chats(uid)}
 
 
 @app.get("/chats/{chat_id}")

RAG_Products/chat.py

@@ -128,29 +128,49 @@ def _parse_budget(query):
     return None
 
 
+def _is_bare_budget(query):
+    """True if the query is essentially only a price refinement ("under 10k",
+    "below 5000", "cheaper ones") with no product/category of its own."""
+    q = query.lower()
+    stripped = re.sub(
+        r"\b(under|below|less than|upto|up to|within|around|over|above|cheaper|"
+        r"cheapest|budget|only|just|show|me|the|a|an|ones?|options?|something|"
+        r"for|rs|rupees|price)\b|\d[\d,]*\s*k?|₹|,", " ", q)
+    return stripped.strip() == ""
+
+
 def detect_intent(query):
     q = f" {query.lower()} "
     budget = _parse_budget(query)
     category = detect_category_in_query(query)
 
-    # 1. Kit / bundle ("vlogging setup under 50k") — needs an explicit kit word
-    #    or a budget, so "best mic for an interview" isn't read as a kit.
+    has_kit_word = bool(re.search(
+        r"\b(kit|set ?up|bundle|package|gear|rig|build me|everything)\b", q))
+
+    # 1. Explicit "best <product> for <use-case>" beats kit detection, so
+    #    "best mic for indoor interviews under 10k" is a budgeted MIC search,
+    #    not an interview kit. Requires a resolvable product category, the
+    #    "for" structure, and NO explicit kit word.
+    uc = detect_use_case(query)
+    uc_cat = None
+    if uc:
+        x_text, uc_keys = uc
+        uc_cat = detect_category_in_query(x_text) or category
+    if uc and uc_cat and uc_keys and not has_kit_word and re.search(r"\bfor\b|\bbest\b", q):
+        return "use_case", {"budget": budget, "category": uc_cat, "use_cases": uc_keys}
+
+    # 2. Kit / bundle ("vlogging setup under 50k") — explicit kit word or budget.
     kit = detect_kit(query, budget)
     if kit:
         return "kit", {"budget": budget, "kit_name": kit[0], "categories": kit[1]}
 
-    # 2. Compatibility ("which batteries fit the Sony A7", "charger for V1")
+    # 3. Compatibility ("which batteries fit the Sony A7", "charger for V1")
     if is_compatibility_query(query):
         return "compatibility", {"budget": budget, "category": category}
 
-    # 3. Use-case ("best mic for outdoor interviews") — only when we can resolve
-    #    a product type to a category AND a use-case word is present.
-    uc = detect_use_case(query)
-    if uc:
-        x_text, keys = uc
-        uc_cat = detect_category_in_query(x_text) or category
-        if uc_cat and keys:
-            return "use_case", {"budget": budget, "category": uc_cat, "use_cases": keys}
+    # 4. Looser use-case fallback (e.g. "studio lighting") when category resolves.
+    if uc and uc_cat and uc_keys:
+        return "use_case", {"budget": budget, "category": uc_cat, "use_cases": uc_keys}
 
     if re.search(r"\b(vs|versus)\b|\bcompare\b", q):
         return "compare", {"budget": budget, "category": category}
@@ -262,6 +282,17 @@ def handle(query, context=None):
         if fu:
             return _handle_kit_followup(query, fu, context)
 
+    # ---- bare budget refinement: "under 10k" after "best mic ..." keeps mics ----
+    if context and context.get("last_category") and _is_bare_budget(query):
+        b = _parse_budget(query)
+        if b:
+            cat = context["last_category"]
+            results = _browse(cat, b)
+            if results:
+                answer = f"Top {len(results)} {cat.lower()} under {_money(b)}, best value first."
+                return _finalize(query, "budget_browse", answer, None, results,
+                                 results[:SIMILAR_K], confidence=1.0)
+
     intent, ent = detect_intent(query)
     budget, category = ent.get("budget"), ent.get("category")
 
@@ -597,14 +628,19 @@ def _handle_kit_followup(query, fu, context):
 def _handle_use_case(query, ent):
     category = ent["category"]
     keys = ent["use_cases"]
-    ranked = rank_for_use_case(category, keys, get_catalog(), k=SIMILAR_K)
+    budget = ent.get("budget")
+    ranked = rank_for_use_case(category, keys, get_catalog(), k=SIMILAR_K * 3)
+    if budget:  # honor "best mic for interviews UNDER 10k"
+        ranked = [d for d in ranked if (d.metadata.get("price") or 1e12) <= budget]
+    ranked = ranked[:SIMILAR_K]
     if not ranked:
+        within = f" under {_money(budget)}" if budget else ""
         return _empty(query, "use_case",
-                      f"I couldn't find {category.lower()} for that use case.")
+                      f"I couldn't find {category.lower()} for that use case{within}.")
     cards = [product_card(d) for d in ranked]
     uc_txt = " / ".join(keys)
-    answer = (f"Best {category.lower()} for {uc_txt}, "
-              f"ranked for that use case.")
+    within = f" under {_money(budget)}" if budget else ""
+    answer = f"Best {category.lower()} for {uc_txt}{within}, ranked for that use case."
     return _finalize(query, "use_case", answer, cards[0], cards[1:], [],
                      confidence=1.0)
 
@@ -632,6 +668,8 @@ def _finalize(query, intent, answer, match, results, recos, confidence,
     for kb in (kits or []):
         cards += kb.get("items", [])
     ok, phantom = verify_prices(answer, cards, extra_allowed=extra_allowed)
+    # remember the topic category so a bare "under 10k" follow-up stays on topic
+    topic = match or (results[0] if results else (recos[0] if recos else None))
     return {
         "query": query,
         "intent": intent,
@@ -644,6 +682,7 @@ def _finalize(query, intent, answer, match, results, recos, confidence,
         "verified": ok,
         "phantom_numbers": phantom,
         "note": note,
+        "last_category": topic.get("category") if topic else None,
     }
 
 

RAG_Products/config.py

@@ -79,4 +79,5 @@ CONFIDENCE_THRESHOLD = 0.45
 W_SEMANTIC = 0.60       # weight of vector similarity
 W_BRAND = 0.20          # bonus if same brand
 W_PRICE = 0.20          # bonus for price proximity
-PRICE_BAND = 0.40       # +/- 40% price window counts as "close"
+PRICE_BAND = 0.40       # +/- 40% price window counts as "close
+

RAG_Products/static/.gitignore

@@ -0,0 +1 @@
+.vercel

RAG_Products/static/config.js

@@ -1,6 +1,15 @@
-// API base URL for the AHV Assistant frontend.
-//
+// ---- Backend API base ----
 //  • Leave EMPTY ("") when the backend serves this page (same origin / local).
-//  • On Vercel, set this to your Hugging Face Space URL, e.g.
-//      window.AHV_API = "https://your-name-ahv-assistant.hf.space";
-window.AHV_API = "";
+//  • On Vercel, set this to your Hugging Face Space URL.
+window.AHV_API = "https://mvali77-ahv.hf.space";
+
+// ---- Firebase web config (for Google sign-in) ----
+// Get this from Firebase Console → Project settings → General →
+// "Your apps" → Web app → SDK setup and configuration → "Config".
+// Leave apiKey empty to disable sign-in (anonymous per-browser mode).
+window.FIREBASE_CONFIG = {
+  apiKey: "",
+  authDomain: "ahv-assistant.firebaseapp.com",
+  projectId: "ahv-assistant",
+  appId: "1:201860800907:web:26114586af1b4a42704f8e"
+};

RAG_Products/static/index.html

@@ -14,7 +14,7 @@
     html,body { height:100%; margin:0; }
     body { font-family:"Inter",-apple-system,"Segoe UI",Roboto,sans-serif;
            color:var(--ink); background:var(--bg); font-size:15px; line-height:1.55; }
-    .app { display:flex; height:100vh; }
+    .app { display:flex; height:100vh; height:100dvh; }
 
     /* sidebar */
     .sidebar { width:264px; flex-shrink:0; background:var(--side); border-right:1px solid var(--line);
@@ -38,6 +38,18 @@
     .side-foot { border-top:1px solid var(--line); padding:12px 14px; display:flex; flex-direction:column; gap:8px; }
     .side-foot a { font-size:13px; color:var(--muted); text-decoration:none; cursor:pointer; }
     .side-foot a:hover { color:var(--ink); }
+    .signin-btn { display:flex; align-items:center; justify-content:center; gap:8px; width:100%;
+                  padding:9px 12px; border:1px solid var(--line); background:#fff; border-radius:9px;
+                  cursor:pointer; font-size:13.5px; font-family:inherit; color:var(--ink); }
+    .signin-btn:hover { border-color:var(--ink); }
+    .signin-btn svg { width:16px; height:16px; }
+    .user-row { display:flex; align-items:center; gap:8px; font-size:13px; }
+    .user-row img { width:26px; height:26px; border-radius:50%; }
+    .user-row .uname { flex:1; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
+    .user-row .signout { font-size:12px; color:var(--muted); cursor:pointer; background:none; border:none; }
+    .user-row .signout:hover { color:#dc2626; }
+    .gate { text-align:center; color:var(--muted); margin-top:10vh; }
+    .gate h2 { color:var(--ink); font-weight:600; font-size:20px; margin:0 0 8px; }
     .status { font-size:11.5px; color:var(--muted); display:flex; align-items:center; gap:6px; margin-top:2px; }
     .dot { width:7px; height:7px; border-radius:50%; background:#d4d4d8; }
     .dot.up { background:var(--good); } .dot.down { background:#dc2626; }
@@ -136,17 +148,42 @@
     .toast.ok { background:#f0fdf4; color:#166534; border:1px solid #bbf7d0; }
     .toast.err { background:#fef2f2; color:#991b1b; border:1px solid #fecaca; }
     .hidden { display:none; }
-    @media (max-width:640px){ .sidebar{display:none;} .rec-grid,.kit-items{grid-template-columns:1fr;} }
+    /* mobile top bar (hamburger) + drawer overlay */
+    .mobile-bar { display:none; align-items:center; gap:12px; padding:11px 16px; border-bottom:1px solid var(--line); }
+    .mobile-bar button { background:none; border:none; font-size:22px; cursor:pointer; line-height:1; color:var(--ink); padding:0; }
+    .mobile-bar .mb-title { font-weight:600; font-size:15px; }
+    .side-overlay { display:none; position:fixed; inset:0; background:rgba(0,0,0,.35); z-index:40; }
+    @media (max-width:640px){
+      .sidebar { position:fixed; left:0; top:0; bottom:0; z-index:50; transform:translateX(-100%); transition:transform .2s ease; box-shadow:2px 0 16px rgba(0,0,0,.12); }
+      .sidebar.open { transform:translateX(0); }
+      .side-overlay.open { display:block; }
+      .mobile-bar { display:flex; }
+      .rec-grid, .kit-items { grid-template-columns:1fr; }
+      .thread { padding:18px 14px 32px; gap:18px; }
+      .composer { padding:10px 12px 4px; }
+      .composer input { font-size:16px; padding:12px 14px; }   /* 16px stops iOS zoom-on-focus */
+      .composer button { padding:0 16px; }
+      .hint { padding:4px 12px 10px; font-size:11px; }
+      .msg-user { max-width:88%; }
+      .card { padding:14px 14px; }
+      .card .price .buy { font-size:18px; }
+      .kit { padding:12px 13px; }
+      .modal { width:94vw; padding:18px 16px; max-height:90dvh; }
+      .field input, .field select { font-size:16px; }
+      .mb-title { flex:1; }
+    }
   </style>
 </head>
 
 <body>
   <div class="app">
+    <div class="side-overlay" id="sideOverlay"></div>
     <aside class="sidebar">
       <div class="side-head"><div class="logo">A</div>AHV <span>Assistant</span></div>
       <button class="new-btn" id="newChat">+ New chat</button>
       <div class="chat-list" id="chatList"></div>
       <div class="side-foot">
+        <div id="authBox"></div>
         <a id="addProducts">+ Add products</a>
         <a href="dashboard.html">Owner dashboard →</a>
         <div class="status" id="status"><span class="dot"></span>connecting…</div>
@@ -154,6 +191,10 @@
     </aside>
 
     <main class="main">
+      <div class="mobile-bar">
+        <button id="menuBtn" aria-label="Menu">☰</button>
+        <span class="mb-title">AHV Assistant</span>
+      </div>
       <div class="scroll" id="scroll">
         <div class="thread" id="thread"></div>
       </div>
@@ -208,6 +249,8 @@
     </div>
   </div>
 
+  <script src="https://www.gstatic.com/firebasejs/10.12.2/firebase-app-compat.js"></script>
+  <script src="https://www.gstatic.com/firebasejs/10.12.2/firebase-auth-compat.js"></script>
   <script src="config.js"></script>
   <script>
     const $ = s => document.querySelector(s);
@@ -218,11 +261,16 @@
     const api = p => API_BASE + p;
 
     // identity + active chat (persist across reloads)
-    const USER_ID = localStorage.getItem('ahv_user') || (() => {
+    let USER_ID = localStorage.getItem('ahv_user') || (() => {
       const u = (crypto.randomUUID ? crypto.randomUUID() : 'u' + Date.now()); localStorage.setItem('ahv_user', u); return u;
     })();
     let activeChat = localStorage.getItem('ahv_active') || null;
 
+    // Firebase auth (Google sign-in). Enabled only when FIREBASE_CONFIG.apiKey is set.
+    const AUTH_ENABLED = !!(window.FIREBASE_CONFIG && window.FIREBASE_CONFIG.apiKey);
+    let fbAuth = null, authUser = null, idToken = null;
+    function authHeaders(base) { const h = base || {}; if (idToken) h['Authorization'] = 'Bearer ' + idToken; return h; }
+
     /* ---------- rendering ---------- */
     function priceBlock(c) {
       let h = `<div class="price"><div class="buy">${peso(c.best_buy)}</div>`;
@@ -292,7 +340,7 @@
     /* ---------- chat history ---------- */
     async function loadChats() {
       try {
-        const d = await (await fetch(api('/chats?user_id=' + encodeURIComponent(USER_ID)))).json();
+        const d = await (await fetch(api('/chats?user_id=' + encodeURIComponent(USER_ID)), { headers: authHeaders() })).json();
         const list = $('#chatList'); list.innerHTML = '';
         d.chats.forEach(c => {
           const el = document.createElement('div');
@@ -306,17 +354,24 @@
     }
     async function openChat(id) {
       activeChat = id; localStorage.setItem('ahv_active', id);
-      const chat = await (await fetch(api('/chats/' + id))).json();
+      const chat = await (await fetch(api('/chats/' + id), { headers: authHeaders() })).json();
       thread.innerHTML = '';
       (chat.messages || []).forEach(m => { if (m.role === 'user') addUser(m.text); else if (m.data) addBot(m.data); });
-      loadChats(); scroll.scrollTop = scroll.scrollHeight; box.focus();
+      loadChats(); closeDrawer(); scroll.scrollTop = scroll.scrollHeight; box.focus();
     }
     async function deleteChat(id) {
-      await fetch(api('/chats/' + id), { method: 'DELETE' });
+      await fetch(api('/chats/' + id), { method: 'DELETE', headers: authHeaders() });
       if (id === activeChat) { activeChat = null; localStorage.removeItem('ahv_active'); showIntro(); }
       loadChats();
     }
-    $('#newChat').onclick = () => { activeChat = null; localStorage.removeItem('ahv_active'); showIntro(); loadChats(); box.focus(); };
+    $('#newChat').onclick = () => { activeChat = null; localStorage.removeItem('ahv_active'); showIntro(); loadChats(); closeDrawer(); box.focus(); };
+
+    /* ---------- mobile drawer ---------- */
+    const sidebarEl = document.querySelector('.sidebar'), sideOverlay = $('#sideOverlay');
+    function setDrawer(open) { sidebarEl.classList.toggle('open', open); sideOverlay.classList.toggle('open', open); }
+    function closeDrawer() { setDrawer(false); }
+    $('#menuBtn').onclick = () => setDrawer(!sidebarEl.classList.contains('open'));
+    sideOverlay.onclick = closeDrawer;
 
     /* ---------- sending ---------- */
     async function ask(text) {
@@ -327,8 +382,9 @@
       loading.innerHTML = `<div class="answer" style="color:var(--muted)">Looking…</div>`;
       thread.appendChild(loading); scroll.scrollTop = scroll.scrollHeight;
       try {
+        if (authUser) { try { idToken = await authUser.getIdToken(); } catch (e) {} }
         const res = await fetch(api('/chat'), {
-          method: 'POST', headers: { 'Content-Type': 'application/json' },
+          method: 'POST', headers: authHeaders({ 'Content-Type': 'application/json' }),
           body: JSON.stringify({ message: text, chat_id: activeChat, user_id: USER_ID })
         });
         const data = await res.json(); loading.remove();
@@ -426,10 +482,54 @@
       $('#ingestBtn').disabled = false;
     };
 
+    /* ---------- auth ---------- */
+    const GOOGLE_SVG = '<svg viewBox="0 0 48 48"><path fill="#EA4335" d="M24 9.5c3.5 0 6.6 1.2 9 3.6l6.7-6.7C35.6 2.6 30.2 0 24 0 14.6 0 6.5 5.4 2.6 13.2l7.8 6.1C12.2 13.2 17.6 9.5 24 9.5z"/><path fill="#4285F4" d="M46.1 24.5c0-1.6-.1-3.1-.4-4.5H24v9h12.4c-.5 2.9-2.1 5.3-4.5 7l7 5.4c4.1-3.8 6.5-9.4 6.5-16.9z"/><path fill="#FBBC05" d="M10.4 28.3c-.5-1.4-.8-2.9-.8-4.3s.3-3 .8-4.3l-7.8-6.1C.9 16.5 0 20.1 0 24s.9 7.5 2.6 10.4l7.8-6.1z"/><path fill="#34A853" d="M24 48c6.2 0 11.5-2 15.3-5.5l-7-5.4c-2 1.4-4.6 2.2-8.3 2.2-6.4 0-11.8-3.7-13.6-9l-7.8 6.1C6.5 42.6 14.6 48 24 48z"/></svg>';
+    function gateSign() {
+      thread.innerHTML = `<div class="gate"><h2>Welcome to AHV Assistant</h2>
+        <div>Sign in to start chatting and keep your history on any device.</div></div>`;
+      box.disabled = true; send.disabled = true; box.placeholder = 'Sign in to chat…';
+    }
+    function renderAuth(user) {
+      const el = $('#authBox');
+      if (user) {
+        el.innerHTML = `<div class="user-row">
+          ${user.photoURL ? `<img src="${user.photoURL}" alt="">` : ''}
+          <span class="uname">${user.displayName || user.email}</span>
+          <button class="signout" id="signOut">Sign out</button></div>`;
+        $('#signOut').onclick = () => fbAuth.signOut();
+        box.disabled = false; send.disabled = false; box.placeholder = 'Message AHV Assistant…';
+      } else if (AUTH_ENABLED) {
+        el.innerHTML = `<button class="signin-btn" id="signIn">${GOOGLE_SVG} Sign in with Google</button>`;
+        $('#signIn').onclick = () => fbAuth.signInWithPopup(new firebase.auth.GoogleAuthProvider());
+      } else {
+        el.innerHTML = '';  // anonymous mode: no auth UI
+      }
+    }
+
     /* ---------- boot ---------- */
-    health(); loadChats();
-    if (activeChat) openChat(activeChat).catch(showIntro); else showIntro();
-    box.focus();
+    health();
+    if (AUTH_ENABLED) {
+      firebase.initializeApp(window.FIREBASE_CONFIG);
+      fbAuth = firebase.auth();
+      gateSign(); renderAuth(null);
+      fbAuth.onAuthStateChanged(async (user) => {
+        authUser = user;
+        if (user) {
+          USER_ID = user.uid;
+          try { idToken = await user.getIdToken(); } catch (e) {}
+          renderAuth(user); loadChats();
+          if (activeChat) openChat(activeChat).catch(showIntro); else showIntro();
+        } else {
+          idToken = null; activeChat = null; localStorage.removeItem('ahv_active');
+          $('#chatList').innerHTML = ''; renderAuth(null); gateSign();
+        }
+      });
+    } else {
+      // anonymous per-browser mode (local / no Firebase config)
+      renderAuth(null); loadChats();
+      if (activeChat) openChat(activeChat).catch(showIntro); else showIntro();
+      box.focus();
+    }
   </script>
 </body>
 

RAG_Products/storage.py

@@ -66,6 +66,23 @@ def backend() -> str:
     return _backend
 
 
+def verify_token(id_token):
+    """Verify a Firebase ID token and return its uid, or None if invalid.
+
+    Returns None when Firestore/Auth isn't configured (local mode) so callers
+    can fall back to a client-supplied user_id.
+    """
+    _init()
+    if _backend != "firestore" or not id_token:
+        return None
+    try:
+        from firebase_admin import auth
+
+        return auth.verify_id_token(id_token).get("uid")
+    except Exception:
+        return None
+
+
 # ---------------------------------------------------------------------------
 # Local-file helpers
 # ---------------------------------------------------------------------------