Condense prompt, add implicit sympathy instructions, and update tests

backend/main.py

@@ -128,24 +128,21 @@ def run_flow_b(message: str, api_key: str, history: Optional[List[ChatMessage]]
     )
     
     custom_system = (
-        "Socratic tutor: guide with clear, substantial hints (no tiny nudges) to solve faster. "
-        "Confidence is not mastery—continue Socratic hints unless they are close. "
-        "Only when close to the solution, give the final answer & ask: 'Do you want to learn something else?'"
+        "Socratic tutor: guide with clear, substantial hints. Continue unless close. "
+        "If close: give answer & ask: 'Do you want to learn something else?'"
     )
     
     tone_instruction = (
-        "JSON format: {\"s\": \"confusion|frustration|confused_but_engaged|confused_and_frustrated|starting_to_get_bored|confident_and_engaged|neutral\", \"r\": \"string\"}\n"
+        "JSON: {\"s\":\"sentiment\",\"r\":\"reply\"}\n"
+        "s values: confusion|frustration|confused_but_engaged|confused_and_frustrated|starting_to_get_bored|confident_and_engaged|neutral\n"
         "Rules:\n"
-        "- No robotic templates (e.g. 'I understand', 'it can be frustrating').\n"
-        "- NEVER use the phrase 'if you' anywhere in your response (e.g. do not say 'if you think', 'if you were', etc.). Instead, frame instructions or scenarios directly (e.g., say 'think about', 'imagine', 'when looking at', or 'sometimes').\n"
-        "- Only ask one question at a time to avoid overwhelming the user.\n"
-        "- Close to answer: give final answer directly, ask: 'Do you want to learn something else?'\n"
-        "- Not close (including confident_and_engaged): Socratic guidance (substantial hint + question).\n"
-        "Replies by state:\n"
-        "  * confusion: hint + question.\n"
-        "  * frustration: simplify step + question.\n"
-        "  * starting_to_get_bored: puzzle/analogy + question.\n"
-        "  * confident_and_engaged / neutral: guide with hint + question."
+        "- Sympathize with s implicitly (tone/style); never name or mention the sentiment/emotion itself.\n"
+        "- NEVER use 'if you' (use direct phrasing: 'think about', 'imagine').\n"
+        "- Ask 1 question max.\n"
+        "Responses:\n"
+        "- frustration: simplify + question.\n"
+        "- starting_to_get_bored: puzzle/analogy + question.\n"
+        "- other: hint + question."
     )
     
     messages = [SystemMessage(content=f"{custom_system}\n\n{tone_instruction}")]

backend/test_sentiment.py

@@ -1,40 +1,34 @@
 import os
 import sys
+from unittest.mock import MagicMock, patch
 
 # Add current directory to path for imports
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-from main import map_distilroberta_emotions
+from main import run_flow_b
 
-def test_mapping():
-    print("Testing DistilRoBERTa emotion mapping logic...")
+def test_run_flow_b_parsing():
+    print("Testing run_flow_b parsing and extraction logic...")
     
-    # 1. Frustration tests
-    anger_test = [{"label": "anger", "score": 0.8}, {"label": "neutral", "score": 0.2}]
-    assert map_distilroberta_emotions(anger_test) == "frustration", f"Expected frustration, got {map_distilroberta_emotions(anger_test)}"
+    mock_response = MagicMock()
+    mock_response.content = '{"s": "frustration", "r": "Let\'s simplify this. What do you get when you add the numbers first?"}'
     
-    disgust_test = [{"label": "disgust", "score": 0.6}]
-    assert map_distilroberta_emotions(disgust_test) == "frustration", f"Expected frustration, got {map_distilroberta_emotions(disgust_test)}"
-    
-    # 2. Confusion tests
-    sadness_test = [{"label": "sadness", "score": 0.9}]
-    assert map_distilroberta_emotions(sadness_test) == "confusion", f"Expected confusion, got {map_distilroberta_emotions(sadness_test)}"
-    
-    surprise_test = [{"label": "surprise", "score": 0.55}]
-    assert map_distilroberta_emotions(surprise_test) == "confusion", f"Expected confusion, got {map_distilroberta_emotions(surprise_test)}"
-    
-    fear_test = [{"label": "fear", "score": 0.7}]
-    assert map_distilroberta_emotions(fear_test) == "confusion", f"Expected confusion, got {map_distilroberta_emotions(fear_test)}"
-    
-    # 3. Confidence tests
-    joy_test = [{"label": "joy", "score": 0.95}]
-    assert map_distilroberta_emotions(joy_test) == "confidence", f"Expected confidence, got {map_distilroberta_emotions(joy_test)}"
-    
-    # 4. Boredom tests
-    neutral_test = [{"label": "neutral", "score": 0.9}]
-    assert map_distilroberta_emotions(neutral_test) == "boredom", f"Expected boredom, got {map_distilroberta_emotions(neutral_test)}"
-
-    print("All DistilRoBERTa mapping assertions passed successfully!")
+    with patch("main.ChatGoogleGenerativeAI") as MockLLM:
+        mock_llm_instance = MagicMock()
+        mock_llm_instance.invoke.return_value = mock_response
+        MockLLM.return_value = mock_llm_instance
+        
+        state, reply, context, est_in, est_out = run_flow_b(
+            message="I am stuck on this step, it is too hard!",
+            api_key="fake-api-key"
+        )
+        
+        assert state == "frustration", f"Expected frustration, got {state}"
+        assert "simplify" in reply, f"Expected reply to contain simplification, got {reply}"
+        assert est_in > 0
+        assert est_out > 0
+        
+        print("Mocked run_flow_b test passed!")
 
 if __name__ == "__main__":
-    test_mapping()
+    test_run_flow_b_parsing()