Update app.py

app.py

@@ -59,6 +59,8 @@ def has_code(text):
 # ── Detect student signal ────────────────────────────────────
 def detect_student_signal(text):
     text_lower = text.lower()
+    if any(k in text_lower for k in ["hello", "hi", "hey", "good morning", "good evening", "howdy"]):
+        return "greeting"
     if any(k in text_lower for k in ["hint", "help", "don't know", "idk", "no idea", "i give up", "tell me", "just give"]):
         return "hint_request"
     if any(k in text_lower for k in ["i think", "maybe", "is it", "could it be", "how about", "like this", "would it"]):
@@ -69,24 +71,29 @@ def detect_student_signal(text):
         return "submitted_code"
     return "general"
 
+# ── Extract content from a history message (dict or ChatMessage) ──
+def msg_role(m):
+    return m["role"] if isinstance(m, dict) else m.role
+
+def msg_content(m):
+    c = m["content"] if isinstance(m, dict) else m.content
+    # If content is itself a dict (ChatMessage serialization artifact), unwrap it
+    if isinstance(c, dict):
+        return c.get("text", c.get("content", str(c)))
+    return str(c)
+
 # ── Build adaptive prompt ────────────────────────────────────
 def build_prompt(user_message, history, language):
     signal = detect_student_signal(user_message)
 
-    # history: list of gr.ChatMessage objects with .role and .content
     history_text = ""
     if history:
         pairs = []
         i = 0
         while i < len(history) - 1:
             a, b = history[i], history[i + 1]
-            # Support both ChatMessage objects and plain dicts
-            a_role    = a.role    if hasattr(a, "role")    else a.get("role", "")
-            a_content = a.content if hasattr(a, "content") else a.get("content", "")
-            b_role    = b.role    if hasattr(b, "role")    else b.get("role", "")
-            b_content = b.content if hasattr(b, "content") else b.get("content", "")
-            if a_role == "user" and b_role == "assistant":
-                pairs.append((a_content, b_content))
+            if msg_role(a) == "user" and msg_role(b) == "assistant":
+                pairs.append((msg_content(a), msg_content(b)))
                 i += 2
             else:
                 i += 1
@@ -96,6 +103,7 @@ def build_prompt(user_message, history, language):
     context = f"Previous conversation:\n{history_text}" if history_text else ""
 
     styles = {
+        "greeting":         "The student just said hello.\n- Greet them briefly and warmly (1 sentence max)\n- Ask what programming topic or problem they want to work on today\n- Do NOT give any code or explanations yet",
         "hint_request":     "The student is asking for a hint.\n- Give ONE small hint only — not the answer\n- Point them in the right direction with a question\n- Do NOT write complete code",
         "submitted_code":   "The student has written code.\n- First check if the logic is correct or not\n- If CORRECT: validate genuinely then push forward with a question\n- If WRONG: identify the specific issue, give a targeted hint\n- If copy-pasted (too perfect): ask them to walk you through it\n- Never rewrite their code for them",
         "attempting":       "The student is guessing or attempting an explanation.\n- If CORRECT: confirm clearly and move to the next concept\n- If WRONG: gently correct their thinking with a question\n- Always build on what they said",
@@ -113,13 +121,31 @@ Detected language: {language}
 {style}
 
 {context}### Instruction:
-Student question or code
+Respond to the student's message below.
 
 ### Input:
 {user_message}
 
 ### Response:
-"""
+CodeMentor:"""
+
+# ── Extract clean response ───────────────────────────────────
+def extract_response(full_text):
+    if "### Response:" in full_text:
+        after = full_text.split("### Response:")[-1]
+    else:
+        after = full_text
+
+    if after.lstrip().startswith("CodeMentor:"):
+        after = after.lstrip()[len("CodeMentor:"):].strip()
+    else:
+        after = after.strip()
+
+    for stop in ["### Input:", "### Instruction:", "Student:", "\n###"]:
+        if stop in after:
+            after = after.split(stop)[0]
+
+    return after.strip()
 
 # ── Generate response ────────────────────────────────────────
 def generate(prompt):
@@ -133,9 +159,10 @@ def generate(prompt):
             temperature=0.7,
             top_p=0.9,
             repetition_penalty=1.2,
+            pad_token_id=tokenizer.eos_token_id,
         )
     full = tokenizer.decode(outputs[0], skip_special_tokens=True)
-    return full.split("### Response:")[-1].strip()
+    return extract_response(full)
 
 # ── Log conversations ────────────────────────────────────────
 def log_conversation(user_msg, bot_msg, language):
@@ -147,11 +174,9 @@ def log_conversation(user_msg, bot_msg, language):
 def chat(user_message, history):
     language = detect_language(user_message)
     if language == "General" and history:
-        for msg in history:
-            content = msg.content if hasattr(msg, "content") else msg.get("content", "")
-            role    = msg.role    if hasattr(msg, "role")    else msg.get("role", "")
-            if role == "user":
-                detected = detect_language(content)
+        for m in history:
+            if msg_role(m) == "user":
+                detected = detect_language(msg_content(m))
                 if detected != "General":
                     language = detected
                     break
@@ -165,7 +190,6 @@ with gr.Blocks(title="CodeMentor AI") as demo:
     gr.Markdown("# 🎓 CodeMentor — AI Programming Tutor")
     gr.Markdown("*Ask any programming question. I'll guide you — not give you the answer!*")
 
-    # No type= param — use gr.ChatMessage objects for compatibility
     chatbot = gr.Chatbot(height=450)
 
     lang_display = gr.Textbox(label="Detected Language", interactive=False, value="🌐 General")
@@ -180,9 +204,9 @@ with gr.Blocks(title="CodeMentor AI") as demo:
         if not message.strip():
             return "", chat_history, lang_display.value
         response, language = chat(message, chat_history)
-        # gr.ChatMessage is the cross-version compatible way to append messages
-        chat_history.append(gr.ChatMessage(role="user",      content=message))
-        chat_history.append(gr.ChatMessage(role="assistant", content=response))
+        # Plain dicts — the correct format for this Gradio version
+        chat_history.append({"role": "user",      "content": message})
+        chat_history.append({"role": "assistant", "content": response})
         return "", chat_history, f"🌐 {language}"
 
     send.click(respond,  [msg, chatbot], [msg, chatbot, lang_display])