Update app.py

app.py

@@ -1,7 +1,6 @@
 import os
 import re
 import json
-import html
 import pickle
 from urllib.parse import quote
 
@@ -11,30 +10,20 @@ from rank_bm25 import BM25Okapi
 from sentence_transformers import SentenceTransformer
 from openai import OpenAI
 
-# =====================================================
-# PATHS
-# =====================================================
 BUILD_DIR = "brainchat_build"
 CHUNKS_PATH = os.path.join(BUILD_DIR, "chunks.pkl")
 TOKENS_PATH = os.path.join(BUILD_DIR, "tokenized_chunks.pkl")
 EMBED_PATH = os.path.join(BUILD_DIR, "embeddings.npy")
 CONFIG_PATH = os.path.join(BUILD_DIR, "config.json")
-
-# Put your logo file in the Space root with this exact name
 LOGO_FILE = "Brain chat-09.png"
 
-# =====================================================
-# GLOBALS
-# =====================================================
 EMBED_MODEL = None
 BM25 = None
 CHUNKS = None
 EMBEDDINGS = None
 OAI = None
 
-# =====================================================
-# HELPERS
-# =====================================================
+
 def tokenize(text: str):
     return re.findall(r"\w+", text.lower(), flags=re.UNICODE)
 
@@ -43,15 +32,9 @@ def ensure_loaded():
     global EMBED_MODEL, BM25, CHUNKS, EMBEDDINGS, OAI
 
     if CHUNKS is None:
-        missing = []
         for path in [CHUNKS_PATH, TOKENS_PATH, EMBED_PATH, CONFIG_PATH]:
             if not os.path.exists(path):
-                missing.append(path)
-
-        if missing:
-            raise FileNotFoundError(
-                "Missing build files:\n" + "\n".join(missing)
-            )
+                raise FileNotFoundError(f"Missing file: {path}")
 
         with open(CHUNKS_PATH, "rb") as f:
             CHUNKS = pickle.load(f)
@@ -132,19 +115,6 @@ def choose_quiz_count(user_text: str, selector: str) -> int:
     return 3
 
 
-def detect_logo_url():
-    if os.path.exists(LOGO_FILE):
-        return f"/gradio_api/file={quote(LOGO_FILE)}"
-    return None
-
-
-def clean_md(text: str) -> str:
-    return text.strip()
-
-
-# =====================================================
-# PROMPT BUILDERS
-# =====================================================
 def language_instruction(language_mode: str) -> str:
     if language_mode == "English":
         return "Answer only in English."
@@ -160,22 +130,11 @@ def language_instruction(language_mode: str) -> str:
 
 def build_tutor_prompt(mode: str, language_mode: str, question: str, context: str) -> str:
     mode_map = {
-        "Explain": (
-            "Explain clearly like a friendly tutor. "
-            "Use simple wording and short headings when useful."
-        ),
-        "Detailed": (
-            "Give a fuller explanation. Include concept, key points, and clinical relevance when supported by context."
-        ),
-        "Short Notes": (
-            "Answer in concise revision-note format using short bullet points."
-        ),
-        "Flashcards": (
-            "Create 6 flashcards in Q/A format using only the provided context."
-        ),
-        "Case-Based": (
-            "Create a short clinical scenario and then explain the concept clearly using the context."
-        ),
+        "Explain": "Explain clearly like a friendly tutor using simple language.",
+        "Detailed": "Give a fuller and more detailed explanation.",
+        "Short Notes": "Answer in concise revision-note format using bullets.",
+        "Flashcards": "Create 6 flashcards in Q/A format.",
+        "Case-Based": "Create a short clinical scenario and explain it clearly."
     }
 
     return f"""
@@ -185,8 +144,7 @@ Rules:
 - Use only the provided context from the books.
 - If the answer is not supported by the context, say exactly:
   Not found in the course material.
-- Be accurate, calm, and student-friendly.
-- Do not invent facts outside the context.
+- Be accurate and student-friendly.
 - {language_instruction(language_mode)}
 
 Teaching style:
@@ -207,7 +165,7 @@ You are BrainChat, an interactive tutor.
 Rules:
 - Use only the provided context.
 - Create exactly {n_questions} quiz questions.
-- Questions should be short, clear, and suitable for students.
+- Questions should be short and clear.
 - Also create a short answer key.
 - Return valid JSON only.
 - {language_instruction(language_mode)}
@@ -229,48 +187,6 @@ Topic:
 """.strip()
 
 
-def build_quiz_evaluation_prompt(language_mode: str, quiz_data: dict, user_answers: str) -> str:
-    quiz_json = json.dumps(quiz_data, ensure_ascii=False)
-    return f"""
-You are BrainChat, an interactive tutor.
-
-Evaluate the student's answers fairly using the quiz answer key.
-Give:
-- total score
-- per-question feedback
-- one short improvement suggestion
-
-Rules:
-- Be fair to answers that are semantically correct even if wording differs.
-- Return valid JSON only.
-- {language_instruction(language_mode)}
-
-Required JSON format:
-{{
-  "score_obtained": 0,
-  "score_total": 0,
-  "summary": "short overall feedback",
-  "results": [
-    {{
-      "question": "question text",
-      "student_answer": "student answer",
-      "result": "Correct / Partially Correct / Incorrect",
-      "feedback": "short explanation"
-    }}
-  ]
-}}
-
-Quiz data:
-{quiz_json}
-
-Student answers:
-{user_answers}
-""".strip()
-
-
-# =====================================================
-# OPENAI HELPERS
-# =====================================================
 def chat_text(prompt: str) -> str:
     resp = OAI.chat.completions.create(
         model="gpt-4o-mini",
@@ -296,172 +212,18 @@ def chat_json(prompt: str) -> dict:
     return json.loads(resp.choices[0].message.content)
 
 
-# =====================================================
-# MAIN CHAT LOGIC
-# =====================================================
-def answer_question(message, history, mode, language_mode, quiz_count_mode, show_sources, quiz_state):
-    if history is None:
-        history = []
-    if quiz_state is None:
-        quiz_state = {
-            "active": False,
-            "topic": None,
-            "quiz_data": None,
-            "language_mode": "Auto"
-        }
-
-    if not message or not message.strip():
-        return history, quiz_state, ""
-
-    try:
-        ensure_loaded()
-    except Exception as e:
-        history.append((message, f"Error: {str(e)}"))
-        return history, quiz_state, ""
-
-    user_text = message.strip()
-
-    # ---------------------------------------------
-    # If quiz is already active, evaluate answers
-    # ---------------------------------------------
-    if quiz_state.get("active", False):
-        try:
-            evaluation_prompt = build_quiz_evaluation_prompt(
-                quiz_state["language_mode"],
-                quiz_state["quiz_data"],
-                user_text
-            )
-            evaluation = chat_json(evaluation_prompt)
-
-            lines = []
-            lines.append(f"**Score:** {evaluation['score_obtained']}/{evaluation['score_total']}")
-            lines.append("")
-            lines.append(f"**Overall feedback:** {evaluation['summary']}")
-            lines.append("")
-            lines.append("**Question-wise evaluation:**")
-
-            for item in evaluation["results"]:
-                lines.append("")
-                lines.append(f"**Q:** {item['question']}")
-                lines.append(f"**Your answer:** {item['student_answer']}")
-                lines.append(f"**Result:** {item['result']}")
-                lines.append(f"**Feedback:** {item['feedback']}")
-
-            final_answer = "\n".join(lines)
-
-            history.append((user_text, final_answer))
-
-            quiz_state = {
-                "active": False,
-                "topic": None,
-                "quiz_data": None,
-                "language_mode": language_mode
-            }
-
-            return history, quiz_state, ""
-
-        except Exception as e:
-            history.append((user_text, f"Error while evaluating quiz: {str(e)}"))
-            quiz_state["active"] = False
-            return history, quiz_state, ""
-
-    # ---------------------------------------------
-    # Normal retrieval
-    # ---------------------------------------------
-    records = search_hybrid(user_text, shortlist_k=30, final_k=5)
-    context = build_context(records)
-
-    # ---------------------------------------------
-    # Quiz mode
-    # ---------------------------------------------
-    if mode == "Quiz Me":
-        try:
-            n_questions = choose_quiz_count(user_text, quiz_count_mode)
-            prompt = build_quiz_generation_prompt(language_mode, user_text, context, n_questions)
-            quiz_data = chat_json(prompt)
-
-            lines = []
-            lines.append(f"**{quiz_data.get('title', 'Quiz')}**")
-            lines.append("")
-            lines.append("Please answer the following questions in one message.")
-            lines.append("You can reply in numbered format, for example:")
-            lines.append("1. ...")
-            lines.append("2. ...")
-            lines.append("")
-            lines.append(f"**Total questions: {len(quiz_data['questions'])}**")
-            lines.append("")
-
-            for i, q in enumerate(quiz_data["questions"], start=1):
-                lines.append(f"**Q{i}.** {q['q']}")
-
-            if show_sources:
-                lines.append("\n---\n**Topic sources used to create the quiz:**")
-                lines.append(make_sources(records))
-
-            assistant_text = "\n".join(lines)
-
-            history.append((user_text, assistant_text))
-
-            quiz_state = {
-                "active": True,
-                "topic": user_text,
-                "quiz_data": quiz_data,
-                "language_mode": language_mode
-            }
-
-            return history, quiz_state, ""
-
-        except Exception as e:
-            history.append((user_text, f"Error while creating quiz: {str(e)}"))
-            return history, quiz_state, ""
-
-    # ---------------------------------------------
-    # Other modes
-    # ---------------------------------------------
-    try:
-        prompt = build_tutor_prompt(mode, language_mode, user_text, context)
-        answer = chat_text(prompt)
-
-        if show_sources:
-            answer += "\n\n---\n**Sources used:**\n" + make_sources(records)
-
-        history.append((user_text, clean_md(answer)))
-        return history, quiz_state, ""
-
-    except Exception as e:
-        history.append((user_text, f"Error: {str(e)}"))
-        return history, quiz_state, ""
-
-
-def clear_all():
-    empty_quiz = {
-        "active": False,
-        "topic": None,
-        "quiz_data": None,
-        "language_mode": "Auto"
-    }
-    return [], empty_quiz, ""
+def detect_logo_url():
+    if os.path.exists(LOGO_FILE):
+        return f"/gradio_api/file={quote(LOGO_FILE)}"
+    return None
 
 
-# =====================================================
-# UI
-# =====================================================
 def render_header():
     logo_url = detect_logo_url()
     if logo_url:
-        logo_html = f"""
-        <img src="{logo_url}" alt="BrainChat Logo"
-             style="width:120px;height:120px;object-fit:contain;display:block;margin:0 auto;">
-        """
+        logo_html = f'<img src="{logo_url}" alt="BrainChat Logo" style="width:120px;height:120px;object-fit:contain;display:block;margin:0 auto;">'
     else:
-        logo_html = """
-        <div style="
-            width:120px;height:120px;border-radius:50%;
-            background:#efe85a;display:flex;align-items:center;justify-content:center;
-            font-weight:700;text-align:center;margin:0 auto;">
-            BRAIN<br>CHAT
-        </div>
-        """
+        logo_html = '<div style="width:120px;height:120px;border-radius:50%;background:#efe85a;display:flex;align-items:center;justify-content:center;font-weight:700;text-align:center;margin:0 auto;">BRAIN<br>CHAT</div>'
 
     return f"""
     <div class="hero-card">
@@ -476,14 +238,58 @@ def render_header():
     """
 
 
+def answer_question(message, history, mode, language_mode, quiz_count_mode, show_sources):
+    if not message or not message.strip():
+        return "Please type a topic or question."
+
+    ensure_loaded()
+    user_text = message.strip()
+
+    records = search_hybrid(user_text, shortlist_k=30, final_k=5)
+    context = build_context(records)
+
+    if mode == "Quiz Me":
+        n_questions = choose_quiz_count(user_text, quiz_count_mode)
+        prompt = build_quiz_generation_prompt(language_mode, user_text, context, n_questions)
+        quiz_data = chat_json(prompt)
+
+        lines = []
+        lines.append(f"**{quiz_data.get('title', 'Quiz')}**")
+        lines.append("")
+        lines.append(f"**Total questions: {len(quiz_data['questions'])}**")
+        lines.append("")
+
+        for i, q in enumerate(quiz_data["questions"], start=1):
+            lines.append(f"**Q{i}.** {q['q']}")
+
+        lines.append("")
+        lines.append("Reply with your answers in one message, for example:")
+        lines.append("1. ...")
+        lines.append("2. ...")
+        lines.append("")
+        lines.append("This version generates quiz questions only. Evaluation can be added next.")
+
+        if show_sources:
+            lines.append("\n---\n**Topic sources used to create the quiz:**")
+            lines.append(make_sources(records))
+
+        return "\n".join(lines)
+
+    prompt = build_tutor_prompt(mode, language_mode, user_text, context)
+    answer = chat_text(prompt)
+
+    if show_sources:
+        answer += "\n\n---\n**Sources used:**\n" + make_sources(records)
+
+    return answer
+
+
 CSS = """
 body, .gradio-container {
     background: #dcdcdc !important;
     font-family: Arial, Helvetica, sans-serif !important;
 }
-footer {
-    display: none !important;
-}
+footer { display: none !important; }
 .hero-card {
     max-width: 860px;
     margin: 18px auto 14px auto;
@@ -491,9 +297,7 @@ footer {
     background: linear-gradient(180deg, #e8c7d4 0%, #a55ca2 48%, #2b0c46 100%);
     padding: 22px 22px 18px 22px;
 }
-.hero-inner {
-    text-align: center;
-}
+.hero-inner { text-align: center; }
 .hero-title {
     color: white;
     font-size: 34px;
@@ -506,24 +310,13 @@ footer {
     font-size: 16px;
     margin-top: 6px;
 }
-.control-row {
-    max-width: 860px;
-    margin: 0 auto 8px auto;
-}
 """
 
 
 with gr.Blocks(css=CSS) as demo:
-    quiz_state = gr.State({
-        "active": False,
-        "topic": None,
-        "quiz_data": None,
-        "language_mode": "Auto"
-    })
-
     gr.HTML(render_header())
 
-    with gr.Row(elem_classes="control-row"):
+    with gr.Row():
         mode = gr.Dropdown(
             choices=["Explain", "Detailed", "Short Notes", "Quiz Me", "Flashcards", "Case-Based"],
             value="Explain",
@@ -535,7 +328,7 @@ with gr.Blocks(css=CSS) as demo:
             label="Answer Language"
         )
 
-    with gr.Row(elem_classes="control-row"):
+    with gr.Row():
         quiz_count_mode = gr.Dropdown(
             choices=["Auto", "3", "5", "7"],
             value="Auto",
@@ -543,43 +336,23 @@ with gr.Blocks(css=CSS) as demo:
         )
         show_sources = gr.Checkbox(value=True, label="Show Sources")
 
-    gr.Markdown(
-        """
+    gr.Markdown("""
 **How to use**
 - Choose a **Tutor Mode**
 - Then type a topic or question
 - For **Quiz Me**, type a topic such as: `cranial nerves`
-- The system will ask questions, and your **next message will be evaluated automatically**
-        """
-    )
-
-    chatbot = gr.Chatbot(height=520)
-    msg = gr.Textbox(
-        placeholder="Ask a question or type a topic...",
-        lines=1,
-        show_label=False
-    )
-
-    with gr.Row():
-        send_btn = gr.Button("Send")
-        clear_btn = gr.Button("Clear Chat")
-
-    msg.submit(
-        answer_question,
-        inputs=[msg, chatbot, mode, language_mode, quiz_count_mode, show_sources, quiz_state],
-        outputs=[chatbot, quiz_state, msg]
-    )
-
-    send_btn.click(
-        answer_question,
-        inputs=[msg, chatbot, mode, language_mode, quiz_count_mode, show_sources, quiz_state],
-        outputs=[chatbot, quiz_state, msg]
-    )
-
-    clear_btn.click(
-        clear_all,
-        inputs=[],
-        outputs=[chatbot, quiz_state, msg]
+- For **Flashcards**, type a topic such as: `hippocampus`
+""")
+
+    gr.ChatInterface(
+        fn=answer_question,
+        additional_inputs=[mode, language_mode, quiz_count_mode, show_sources],
+        title=None,
+        description=None,
+        textbox=gr.Textbox(
+            placeholder="Ask a question or type a topic...",
+            lines=1
+        )
     )
 
 if __name__ == "__main__":