Update app.py

app.py

@@ -129,45 +129,53 @@ def generate_tutor_output(subject: str, difficulty: str, student_input: str) ->
             if enhanced_topic:
                 break
         
+        # Enhanced prompt with explicit JSON requirement
         if enhanced_topic:
             logging.debug(f"Using enhanced topic: {enhanced_topic}")
             prompt = f"""
             You are an expert tutor specializing in {enhanced_topic} at the {difficulty} level. The student has asked about: "{student_input}"
-            Please provide your response in the following format:
-            1. Lesson: A comprehensive lesson based on national educational standards on the topic (3-4 paragraphs), including its historical context.
-            2. Example: A detailed step-by-step example problem with a full solution. Structure it as follows:
-               - Start with "Example Problem:" followed by the question.
-               - Then, list the steps to solve the problem, each on a new line starting with "Step 1:", "Step 2:", etc.
-               - Finally, provide the answer starting with "Answer:".
-            3. Real-World Application: A challenging real-world application of this concept, demonstrating its practical use.
-            4. Quiz: Create a short quiz (3 multiple-choice questions) to test the student's understanding.
-            Format your entire response as a JSON object with keys: "lesson", "example", "real_world_problem", "quiz".
-            Ensure that the content for each key is a single string, with line breaks where appropriate.
+            Provide your response as a valid JSON object with the following keys and content:
+            - "lesson": A comprehensive lesson (3-4 paragraphs) based on national educational standards, including historical context.
+            - "example": A detailed step-by-step example problem with a full solution, formatted as:
+                - "Example Problem:" followed by the question
+                - "Step 1:", "Step 2:", etc., each on a new line
+                - "Answer:" with the final solution
+            - "real_world_problem": A challenging real-world application of this concept.
+            - "quiz": A short quiz with 3 multiple-choice questions (e.g., "1. Question text\n   a) option1\n   b) option2\n   c) option3\nCorrect answer: a").
+            Return only the JSON object, enclosed in ```json``` markers, with no additional text outside the markers.
             """
         else:
             logging.debug(f"Using general subject: {subject_lower}")
             prompt = f"""
-            You are an expert tutor in {subject_lower} at the {difficulty} level. The student has provided the following input: "{student_input}"
-            Please generate your response in the following format:
-            1. Lesson: Provide a descriptive, long, and engaging lesson on the topic (3-4 paragraphs).
-            2. Example: Present an example problem related to the topic. Structure it as follows:
-               - Start with "Example Problem:" followed by the question.
-               - Then, list the steps to solve the problem, each on a new line starting with "Step 1:", "Step 2:", etc.
-               - Finally, provide the answer starting with "Answer:".
-            3. Real-World Application: Describe a real-world problem that can be solved using the concepts from the lesson.
-            4. Quiz: Create a short quiz (3 multiple-choice questions) to test the student's understanding.
-            Format your entire response as a JSON object with keys: "lesson", "example", "real_world_problem", "quiz".
-            Ensure that the content for each key is a single string, with line breaks where appropriate.
+            You are an expert tutor in {subject_lower} at the {difficulty} level. The student has provided: "{student_input}"
+            Provide your response as a valid JSON object with the following keys and content:
+            - "lesson": A descriptive, engaging lesson (3-4 paragraphs) on the topic.
+            - "example": An example problem with a full solution, formatted as:
+                - "Example Problem:" followed by the question
+                - "Step 1:", "Step 2:", etc., each on a new line
+                - "Answer:" with the final solution
+            - "real_world_problem": A real-world problem solvable using the lesson concepts.
+            - "quiz": A short quiz with 3 multiple-choice questions (e.g., "1. Question text\n   a) option1\n   b) option2\n   c) option3\nCorrect answer: a").
+            Return only the JSON object, enclosed in ```json``` markers, with no additional text outside the markers.
             """
         
-        target_model = "llama-3.3-70b-versatile"
+        # Model selection with fallback
+        try:
+            models = client.models.list()
+            available_models = [m.id for m in models.data]
+            logging.debug(f"Available models: {available_models}")
+            target_model = "llama-3.3-70b-versatile" if "llama-3.3-70b-versatile" in available_models else available_models[0]
+        except Exception:
+            logging.warning("Could not fetch model list, using default model")
+            target_model = "llama-3.3-70b-versatile"
+        
         logging.debug(f"Sending prompt to model: {target_model}")
         
         completion = client.chat.completions.create(
             messages=[
                 {
                     "role": "system",
-                    "content": f"You are the world's best AI tutor, renowned for your ability to explain complex concepts in an engaging, clear, and memorable way. Your expertise in {subject_lower} is unparalleled, and you're adept at tailoring your teaching to {difficulty} level students. Your goal is to not just impart knowledge, but to inspire a love for learning and critical thinking.",
+                    "content": f"You are the world's best AI tutor, renowned for your ability to explain complex concepts clearly and engagingly. Your expertise in {subject_lower} is unparalleled, and you tailor your teaching to {difficulty} level students. Always return responses as valid JSON enclosed in ```json``` markers.",
                 },
                 {
                     "role": "user",
@@ -179,38 +187,62 @@ def generate_tutor_output(subject: str, difficulty: str, student_input: str) ->
         )
         
         response_content = completion.choices[0].message.content
-        logging.debug(f"Received response: {response_content[:100]}...")
+        logging.debug(f"Raw API response: {response_content}")
         
-        try:
-            result = json.loads(response_content)
-            logging.debug("Successfully parsed JSON response")
-        except json.JSONDecodeError:
-            logging.warning("Failed to parse JSON, using fallback parsing")
+        # Extract JSON from response
+        json_match = re.search(r'```json\s*([\s\S]*?)\s*```', response_content)
+        if json_match:
+            json_str = json_match.group(1)
+            try:
+                result = json.loads(json_str)
+                logging.debug("Successfully parsed JSON from response")
+            except json.JSONDecodeError as e:
+                logging.warning(f"JSON parsing failed: {e}")
+                result = None
+        else:
+            logging.warning("No JSON markers found in response")
+            result = None
+        
+        # Fallback parsing if JSON extraction fails
+        if not result:
+            logging.debug("Falling back to text parsing")
             sections = {
-                "lesson": "No lesson generated due to parsing error",
-                "example": "No example generated due to parsing error",
-                "real_world_problem": "No real-world application generated due to parsing error",
-                "quiz": "No quiz generated due to parsing error"
+                "lesson": "",
+                "example": "",
+                "real_world_problem": "",
+                "quiz": ""
             }
             lines = response_content.split('\n')
             current_section = None
             for line in lines:
                 line = line.strip()
+                if not line or line.startswith('```'):
+                    continue
                 if "Lesson:" in line or line.startswith("1."):
                     current_section = "lesson"
-                    sections[current_section] = line.replace("Lesson:", "").replace("1.", "").strip() + "\n"
+                    sections[current_section] += line.replace("Lesson:", "").replace("1.", "").strip() + "\n"
                 elif "Example:" in line or line.startswith("2."):
                     current_section = "example"
-                    sections[current_section] = line.replace("Example:", "").replace("2.", "").strip() + "\n"
-                elif "Real-World Application:" in line or line.startswith("3."):
+                    sections[current_section] += line.replace("Example:", "").replace("2.", "").strip() + "\n"
+                elif "Real-World Application:" in line or "Real-World Problem:" in line or line.startswith("3."):
                     current_section = "real_world_problem"
-                    sections[current_section] = line.replace("Real-World Application:", "").replace("3.", "").strip() + "\n"
+                    sections[current_section] += line.replace("Real-World Application:", "").replace("Real-World Problem:", "").replace("3.", "").strip() + "\n"
                 elif "Quiz:" in line or line.startswith("4."):
                     current_section = "quiz"
-                    sections[current_section] = line.replace("Quiz:", "").replace("4.", "").strip() + "\n"
+                    sections[current_section] += line.replace("Quiz:", "").replace("4.", "").strip() + "\n"
                 elif current_section:
                     sections[current_section] += line + "\n"
-            result = sections
+            
+            # Check if any section was populated
+            if any(sections.values()):
+                result = sections
+            else:
+                result = {
+                    "lesson": "Failed to parse lesson content",
+                    "example": "Failed to parse example content",
+                    "real_world_problem": "Failed to parse real-world application content",
+                    "quiz": "Failed to parse quiz content"
+                }
         
         # Ensure all keys are present
         for key in ["lesson", "example", "real_world_problem", "quiz"]: