Update app.py

app.py

@@ -35,6 +35,90 @@ if openai.api_key is None:
 MAX_REQUESTS_PER_DAY = 500
 request_history = deque(maxlen=1000)
 
+# Define subtopic mappings
+SUBJECT_SUBTOPICS = {
+    "Single Variable Calculus": [
+        "limits", 
+        "derivatives",
+        "integrals", 
+        "related rates", 
+        "linear approximation", 
+        "integration techniques",
+        "improper integrals",
+        "area between curves",
+        "volumes of revolution",
+        "arc length",
+        "parametric equations",
+        "polar coordinates",
+        "sequences",
+        "series",
+        "Taylor series",
+        "L'Hôpital's rule",
+        "mean value theorem",
+        "fundamental theorem of calculus"
+    ],
+    "Multivariable Calculus": [
+        "partial derivatives", 
+        "multiple integrals", 
+        "vector fields", 
+        "optimization",
+        "stokes theorem",
+        "green's theorem",
+        "line intergals",
+        "parametric equations",
+        "spherical coordinates"
+    ],
+    "Linear Algebra": [
+        "matrices", 
+        "vector spaces", 
+        "eigenvalues", 
+        "linear transformations"
+    ],
+    "Differential Equations": [
+        "first order equations", 
+        "second order equations", 
+        "systems", 
+        "stability analysis"
+    ],
+    "Real Analysis": [
+        "sequences", 
+        "series", 
+        "continuity", 
+        "differentiation", 
+        "integration"
+    ],
+    "Complex Analysis": [
+        "complex functions", 
+        "analyticity", 
+        "contour integration", 
+        "residues"
+    ],
+    "Abstract Algebra": [
+        "groups", 
+        "rings", 
+        "fields", 
+        "homomorphisms"
+    ],
+    "Probability Theory": [
+        "probability spaces", 
+        "random variables", 
+        "distributions",
+        "limit theorems"
+    ],
+    "Numerical Analysis": [
+        "approximation", 
+        "interpolation", 
+        "numerical integration", 
+        "error analysis"
+    ],
+    "Topology": [
+        "metric spaces", 
+        "continuity", 
+        "compactness", 
+        "connectedness"
+    ],
+}
+
 SYMPY_GUIDELINES = """
 When writing SymPy code to verify solutions:
 
@@ -459,17 +543,36 @@ def create_latex_document(content, questions_only=False):
         latex_footer = r"\end{document}"
         
         if questions_only:
-            # Modified to handle single question
-            processed_content = content.split('Solution:')[0]
-            content = processed_content
+            # Find where the question ends and solution begins
+            question_marker = "Here is a test question"
+            solution_marker = "Here is a detailed solution"
+            
+            q_start = content.find(question_marker)
+            s_start = content.find(solution_marker)
+            
+            if q_start != -1 and s_start != -1:
+                # Extract only the question part
+                question_content = content[q_start:s_start].strip()
+                
+                # Remove any SymPy code or verification text if present
+                code_start = question_content.find('```python')
+                if code_start != -1:
+                    question_content = question_content[:code_start].strip()
+                
+                content = question_content
+            else:
+                # Fallback: try to split at the first occurrence of "Solution:"
+                parts = content.split('Solution:', 1)
+                content = parts[0].strip()
         
         full_document = f"{latex_header}\n{content}\n{latex_footer}"
         logger.debug(f"Created {'questions-only' if questions_only else 'full'} LaTeX document")
         return full_document
+        
     except Exception as e:
         logger.error(f"Error creating LaTeX document: {str(e)}")
         raise
-
+        
 def save_to_temp_file(content, filename):
     """Save content to a temporary file and return the path"""
     try:
@@ -701,7 +804,7 @@ def append_chatgpt_verification(initial_response, SYMPY_CONFIRMED, final_verific
         logger.error(f"Error in verification process: {str(e)}")
         return initial_response + f"\n\nError in ChatGPT verification: {str(e)}"
         
-def generate_question(subject, difficulty, question_type, use_enhancement=False, include_chatgpt="no"):
+def generate_question(subject, difficulty, question_type, subtopic, use_enhancement=False, include_chatgpt="no"):
     """Generate a single math question with additional verification"""
     try:
         logger.debug(f"ChatGPT verification: {'enabled' if include_chatgpt == 'yes' else 'disabled'}")
@@ -721,23 +824,8 @@ def generate_question(subject, difficulty, question_type, use_enhancement=False,
         
         request_history.append(now)
         
-        topics = {
-            "Single Variable Calculus": ["limits", "derivatives", "integrals", "series", "related rates", 
-                                         "linear_approximation", "lhopitals rule", "integration techniques","improper integrals","area between curves",
-                                         "volumes of revolution","arc length","parametric equations","polar coordinates"],
-            "Multivariable Calculus": ["partial derivatives", "multiple integrals", "vector fields", "optimization"],
-            "Linear Algebra": ["matrices", "vector spaces", "eigenvalues", "linear transformations"],
-            "Differential Equations": ["first order equations", "second order equations", "systems", "stability analysis"],
-            "Real Analysis": ["sequences", "series", "continuity", "differentiation", "integration"],
-            "Complex Analysis": ["complex functions", "analyticity", "contour integration", "residues"],
-            "Abstract Algebra": ["groups", "rings", "fields", "homomorphisms"],
-            "Probability Theory": ["probability spaces", "random variables", "distributions", "limit theorems"],
-            "Numerical Analysis": ["approximation", "interpolation", "numerical integration", "error analysis"],
-            "Topology": ["metric spaces", "continuity", "compactness", "connectedness"]
-        }
-        
-        selected_topic = random.choice(topics.get(subject, ["general"]))
-        logger.debug(f"Selected topic: {selected_topic}")
+        selected_topic = subtopic
+        logger.debug(f"Using selected subtopic: {selected_topic}")
         
         difficulty_params = get_difficulty_parameters(difficulty)
         problem_type_addition = get_problem_type_addition(question_type)
@@ -1215,7 +1303,19 @@ Remember to write out the complete solution even if you are repeating things fro
     except Exception as e:
         logger.error(f"Error in final verification: {str(e)}")
         return f"Error in final verification: {str(e)}"
-        
+
+# Add this function to update subtopic choices
+def update_subtopics(subject):
+    if subject in SUBJECT_SUBTOPICS:
+        return {
+            "choices": SUBJECT_SUBTOPICS[subject],
+            "visible": True
+        }
+    return {
+        "choices": [],
+        "visible": False
+    }
+
 # Create Gradio interface
 with gr.Blocks() as interface:
     gr.Markdown("# Advanced Mathematics Question Generator")
@@ -1240,7 +1340,22 @@ with gr.Blocks() as interface:
                 label="Select Mathematics Subject",
                 info="Choose a subject for the question"
             )
-            
+
+            # Add this after subject_dropdown
+            subtopic_dropdown = gr.Dropdown(
+                choices=[],  # Empty initially
+                label="Select Subtopic",
+                info="Choose a specific topic within the subject",
+                visible=False  # Hidden initially
+            )
+
+            # Connect the update function
+            subject_dropdown.change(
+                update_subtopics,
+                inputs=[subject_dropdown],
+                outputs=[subtopic_dropdown]
+            )
+       
             difficulty_slider = gr.Slider(
                 minimum=1,
                 maximum=5,
@@ -1295,12 +1410,13 @@ with gr.Blocks() as interface:
             subject_dropdown,
             difficulty_slider,
             question_type,
+            subtopic_dropdown,  # Add this
             use_enhancement,
             chatgpt_verify
         ],
-        outputs=[output_text, questions_file, full_file]
+    outputs=[output_text, questions_file, full_file]
     )
-
+    
 if __name__ == "__main__":
     logger.info("Starting application")
     interface.launch()