elkay: api.py, chatbot, 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
 # -------------------------------
@@ -73,18 +83,23 @@ def _history_for_backend():
 # 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}"

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"):