Merge branch 'main' of https://github.com/Alalalallalalalalalalalal/Frontend

app.py

@@ -16,21 +16,9 @@ from phase import welcome
 
 import os, requests
 
-from utils.api import BACKEND
-st.sidebar.caption(f"Backend URL: {BACKEND}")
-
 
 DISABLE_DB = os.getenv("DISABLE_DB", "1") == "1"
 
-try:
-    ok = api.health().get("ok")
-    if ok:
-        st.sidebar.success("Backend: UP")
-    else:
-        st.sidebar.warning("Backend: ?")
-except Exception as e:
-    st.sidebar.error(f"Backend DOWN: {e}")
-
     
 # --- SESSION STATE INITIALIZATION ---
 for key, default in [("user", None), ("current_page", "Welcome"),

phase/Student_view/chatbot.py

@@ -1,5 +1,6 @@
 # phase/Student_view/chatbot.py
 import os
+import re
 import datetime
 import traceback
 import streamlit as st
@@ -17,6 +18,15 @@ except ModuleNotFoundError:
 
 TUTOR_WELCOME = "Hi! I'm your AI Financial Tutor. What would you like to learn today?"
 
+def _clean_bot_text(t: str) -> str:
+    # strip xml-ish tags like <user>...</user>, <assistant>...</assistant>
+    t = re.sub(r"</?(user|assistant|system)\b[^>]*>", "", t, flags=re.I)
+    # strip leading speaker labels (User:, Assistant:, System:)
+    t = re.sub(r"(?im)^(user|assistant|system)\s*:\s*", "", t)
+    # collapse extra newlines
+    t = re.sub(r"\n{3,}", "\n\n", t)
+    return t.strip()
+
 # -------------------------------
 # History helpers
 # -------------------------------
@@ -60,32 +70,36 @@ def _normalize_messages():
     st.session_state.messages = normed
 
 def _history_for_backend():
-    """Convert our local history into [{role, content}] for the backend."""
     hist = []
     for m in st.session_state.get("messages", []):
         text = (m.get("text") or "").strip()
-        if not text:
+        if not text or text == TUTOR_WELCOME:
             continue
         role = "assistant" if (m.get("sender") == "assistant") else "user"
         hist.append({"role": role, "content": text})
-    return hist
+    return hist[-4:]  # <= keep it tiny
 
 # -------------------------------
 # Reply via backend (/chat)
 # -------------------------------
 def _reply_via_backend(user_text: str) -> str:
-    # Defaults: use selected lesson/level if present
     lesson_id = st.session_state.get("current_lesson_id") or 0
     level_slug = (st.session_state.get("user", {}).get("level") or "beginner").strip().lower()
 
+    # Build history and remove duplicate of the message we are sending as `query`
+    hist = _history_for_backend()
+    if hist and hist[-1].get("role") == "user" and hist[-1].get("content", "").strip() == (user_text or "").strip():
+        hist = hist[:-1]
+    hist = hist[-4:]
+
     try:
         answer = backend.chat_ai(
             query=user_text,
             lesson_id=lesson_id,
             level_slug=level_slug,
-            history=_history_for_backend(),
+            history=hist,
         )
-        return (answer or "").strip()
+        return _clean_bot_text((answer or "").strip())
     except Exception as e:
         err_text = "".join(traceback.format_exception_only(type(e), e)).strip()
         return f"⚠️ Chat failed: {err_text}"
@@ -97,6 +111,7 @@ def show_page():
     st.title("🤖 AI Financial Tutor")
     st.caption("Get personalized help with your financial questions")
 
+    # --- session state init ---
     if "messages" not in st.session_state:
         st.session_state.messages = [{
             "id": "1",
@@ -106,9 +121,12 @@ def show_page():
         }]
     if "is_typing" not in st.session_state:
         st.session_state.is_typing = False
+    if "chatbot_prefill_sent" not in st.session_state:
+        st.session_state.chatbot_prefill_sent = False
 
     _normalize_messages()
 
+    # --- render chat bubbles ---
     chat_container = st.container()
     with chat_container:
         for msg in st.session_state.messages:
@@ -130,7 +148,16 @@ def show_page():
         if st.session_state.is_typing:
             st.markdown("🤖 _FinanceBot is typing..._")
 
-    # Quick suggestions when only the welcome is present
+    # --- quiz handoff auto-prompt (only once) ---
+    prefill = st.session_state.get("chatbot_prefill")
+    if prefill and not st.session_state.chatbot_prefill_sent:
+        add_message(prefill, "user")
+        st.session_state.is_typing = True
+        st.session_state.chatbot_prefill_sent = True
+        st.session_state.chatbot_prefill = None
+        st.rerun()
+
+    # --- quick suggestions when fresh ---
     if len(st.session_state.messages) == 1:
         st.markdown("Try asking about:")
         cols = st.columns(2)
@@ -146,19 +173,22 @@ def show_page():
                 st.session_state.is_typing = True
                 st.rerun()
 
+    # --- user input ---
     user_input = st.chat_input("Ask me anything about personal finance...")
     if user_input:
         add_message(user_input, "user")
         st.session_state.is_typing = True
         st.rerun()
 
+    # --- handle pending bot reply ---
     if st.session_state.is_typing:
         with st.spinner("FinanceBot is thinking..."):
-            bot_reply = _reply_via_backend(st.session_state.messages[-1]["text"])
+            last_user_msg = next((m["text"] for m in reversed(st.session_state.messages) if m["sender"] == "user"), "")
+            bot_reply = _reply_via_backend(last_user_msg)
             add_message(bot_reply, "assistant")
         st.session_state.is_typing = False
         st.rerun()
 
     if st.button("Back to Dashboard", key="ai_tutor_back_btn"):
         st.session_state.current_page = "Student Dashboard"
-        st.rerun()
+        st.rerun()

phase/Student_view/quiz.py

@@ -1,3 +1,4 @@
+#quiz.py
 import os
 import streamlit as st
 from utils.quizdata import quizzes_data
@@ -350,13 +351,26 @@ def show_results(quiz_id):
         st.session_state.answers = {}
         if "messages" not in st.session_state:
             st.session_state.messages = []
-        wrong_q_text = "\n".join(
-            [f"Q: {q}\nYour answer: {ua}\nCorrect answer: {ca}\nExplanation: {ex}"
-             for q, ua, ca, ex in wrong_answers])
-        tutor_prompt = f"I just completed a financial quiz and got some questions wrong. Here are the details:\n{wrong_q_text}\nCan you help me understand these concepts better?"
+
+        # keep only first 3 wrong items, and cap text length
+        short = wrong_answers[:3]
+        rows = []
+        for q, ua, ca, ex in short:
+            q = (q or "")[:160]
+            ua = (", ".join(ua) if isinstance(ua, list) else str(ua or ""))[:120]
+            ca = (", ".join(ca) if isinstance(ca, list) else str(ca or ""))[:120]
+            ex = (ex or "")[:200]
+            rows.append(f"Q: {q}\nYour answer: {ua}\nCorrect answer: {ca}\nExplanation: {ex}")
+
+        handoff = (
+            "I just completed a financial quiz and missed a few. "
+            "Explain each briefly and give one easy tip to remember:\n\n" +
+            "\n\n".join(rows)
+        )
+
         st.session_state.messages.append({
             "id": str(datetime.datetime.now().timestamp()),
-            "text": tutor_prompt,
+            "text": handoff,
             "sender": "user",
             "timestamp": datetime.datetime.now()
         })

phase/welcome.py

@@ -128,8 +128,8 @@ def welcomeui():
     col1, col2, col3, col4 = st.columns(4)
 
     features = [
-        ("📖", "Interactive Lessons", "Engaging content that makes financial literacy fun and accessible for all ages!"),
-        ("🎮", "Educational Games", "Learn through play with our collection of money management games and challenges!"),
+        ("📖", "Lessons", "Engaging content that makes financial literacy fun and accessible for all ages!"),
+        ("🎮", "Games", "Learn through play with our collection of money management games and challenges!"),
         ("🏆", "Progress Tracking", "Monitor learning progress with quizzes, achievements, and detailed analytics!"),
         ("🤖", "AI Assistant", "Get instant help and personalized guidance from our friendly chatbot!")
     ]
@@ -165,7 +165,7 @@ def welcomeui():
         <div class="card" style="background: linear-gradient(to right, #30E8BF, #FF8235); color: #fff;">
             <div class="card-icon">👩‍🏫</div>
             <h3>For Teachers</h3>
-            <p>Manage your classroom, track progress, and engage your students with financial education!</p>
+            <p>Manage your classroom, track progress, and engage your students!</p>
         </div>
         """, unsafe_allow_html=True)
         if st.button("📊 Teacher Dashboard"):

utils/api.py

@@ -12,7 +12,7 @@ if not BACKEND:
     raise RuntimeError("BACKEND_URL is not set in Space secrets.")
 
 TOKEN = (os.getenv("BACKEND_TOKEN") or os.getenv("HF_TOKEN") or "").strip()
-DEFAULT_TIMEOUT = int(os.getenv("BACKEND_TIMEOUT", "60"))
+DEFAULT_TIMEOUT = int(os.getenv("BACKEND_TIMEOUT", "120"))
 
 _session = requests.Session()
 retry = Retry(
@@ -65,18 +65,24 @@ def _req(method: str, path: str, **kw):
             # try next prefix on 404
             if status == 404:
                 continue
+
+            # ---------- friendlier auth errors ----------
+            if status in (401, 403):
+                # Normal bad credentials on the login endpoint
+                if path.endswith("/auth/login"):
+                    raise RuntimeError("Incorrect email or password.") from e
+                # Generic auth issue elsewhere (expired session, etc.)
+                raise RuntimeError("Authentication failed. Please sign in again.") from e
+            # -------------------------------------------
+
+            # keep a tiny body for other errors
             body = ""
             try:
                 body = e.response.text[:500]
             except Exception:
                 pass
-            if status in (401, 403):
-                raise RuntimeError(
-                    f"{method} {url} failed [{status}] – auth rejected. "
-                    f"Check BACKEND_TOKEN/HF_TOKEN and backend visibility."
-                ) from e
             raise RuntimeError(f"{method} {url} failed [{status}]: {body}") from e
-        except requests.RequestException as e:
+        except requests.RequestException:
             # try next prefix
             continue
     raise RuntimeError(f"No matching endpoint for {method} {path} with prefixes {list(_prefixes())}")
@@ -337,12 +343,12 @@ def chat_ai(query: str, lesson_id: int, level_slug: str, history=None) -> str:
         "history": history or [],
     }
     try:
-        # Force the full path without relying on _prefixes
-        url = f"{BACKEND}/chat"  # make sure BACKEND has no trailing slash
-        r = _session.post(url, json=payload, timeout=120)
+        url = f"{BACKEND}/chat"
+        with requests.Session() as s:
+            s.headers.update(_session.headers)
+            r = s.post(url, json=payload, timeout=DEFAULT_TIMEOUT)  # no retry adapter
         r.raise_for_status()
-        d = r.json()
-        return d.get("answer", "")
+        return r.json().get("answer", "")
     except Exception as e:
         return f"(chat failed: {e})"