Update app.py

app.py

@@ -105,130 +105,213 @@ def ask_ai(prompt, temperature=0.7, max_retries=2, image=None):
     
     return " All AI services failed. Please try again later.", "error"
 
-# ---------- 3. Uganda Primary Curriculum Syllabus (P6 & P7 Only) ----------
+# ---------- 3. Uganda Primary Curriculum Syllabus (P6 & P7 Only, by Subject) ----------
+# Topics below are expanded and aligned to typical NCDC/UNEB primary curriculum themes
+# (see https://ncdc.go.ug/ and Ministry of Education resources for official documents).
 syllabus_topics = {
-    "Primary 6": [
-        "Whole Numbers - Addition & Subtraction",
-        "Whole Numbers - Multiplication & Division",
-        "Fractions & Decimals",
-        "Money & Making Change",
-        "Measurement - Length, Mass & Capacity",
-        "Time & Telling Time",
-        "Geometry & Shapes",
-        "Data Handling - Graphs & Tables",
-        "Ratio & Proportion",
-        "Basic Algebra & Equations"
-    ],
-    "Primary 7": [
-        "Integers & Operations",
-        "Fractions - Addition & Subtraction",
-        "Fractions - Multiplication & Division",
-        "Decimals & Percentages",
-        "Ratio, Rate & Proportion",
-        "Geometry - Angles & Properties",
-        "Mensuration - Area & Perimeter",
-        "Volumes & Surface Area",
-        "Statistics & Probability",
-        "Algebraic Expressions & Equations"
-    ]
-}
-
-# ---------- 4. Generate Practice Questions (Customizable) ----------
-def generate_sample_questions(grade_level, topic, num_questions=10):
-    """Fallback: Generate sample questions locally when AI is unavailable"""
-    samples = {
-        "Integers & Operations": [
-            "Q1. Calculate the sum of -20 and -15.",
-            "Q2. A farmer bought 40 oranges and then sold 25 of them. What is the difference between the number of oranges bought and sold?",
-            "Q3. Simplify: 36 - (-10) + 5. Q10. Find the value of -2(8) + 15.",
-            "Q11. A car is parked at -10 meters. If it moves up a slope of 15 meters, what is its final position?",
-            "Q12. Calculate the product of -4 and 5.",
-            "Q13. A boat descends 12 meters below sea level, then rises 8 meters. What is its final position relative to sea level?",
-            "Q16. Simplify: 2(-3) + 5(-2).",
-            "Q17. A rabbit hops 7 meters forward and then 4 meters backward. What is the net distance covered by the rabbit?",
-            "Q18. Calculate the value of 2/3(-18) + 5.",
-            "Q19. A plane descends 300 meters and then ascends 200 meters. What is the plane's final position relative to the initial descent point?",
+    "Primary 6": {
+        "Mathematics": [
+            "Whole Numbers - Addition & Subtraction",
+            "Whole Numbers - Multiplication & Division",
+            "Factors, Multiples and Prime Numbers",
+            "Fractions & Decimals",
+            "Money & Making Change",
+            "Measurement - Length, Mass & Capacity",
+            "Time - Hours, Minutes & Conversion",
+            "Geometry - Shapes, Symmetry & Angles (basic)",
+            "Data Handling - Tables, Bar Graphs & Pictograms",
+            "Ratio & Proportion",
+            "Introduction to Algebra - Simple Equations",
+            "Basic Percentages and Problem Solving"
+        ],
+        "English": [
+            "Reading Comprehension - Short Passages",
+            "Grammar - Tenses, Parts of Speech, Sentence Structure",
+            "Vocabulary Building & Spelling",
+            "Composition - Story and Letter Writing",
+            "Punctuation & Capitalization",
+            "Clarity in Expression - Cohesion and Coherence",
+            "Cloze Tests & Short Answer Questions",
+            "Listening and Speaking Basics"
         ],
-        "Fractions - Addition & Subtraction": [
-            "Q1. Add 1/4 and 1/3.",
-            "Q2. Subtract 2/5 from 3/5.",
-            "Q3. What is 1/2 + 1/4 + 1/8?",
-            "Q4. Calculate 7/8 - 1/4.",
-            "Q5. Find the sum of 2/3 and 1/6.",
-            "Q6. Subtract 3/10 from 9/10.",
-            "Q7. Add 1/5, 2/5, and 1/5.",
-            "Q8. What is 5/6 - 1/3?",
-            "Q9. Calculate 3/4 + 2/8.",
-            "Q10. Find 11/12 - 1/4.",
+        "Social Studies": [
+            "Local Community - Roles, Services & Leaders",
+            "Local History & Traditions",
+            "Civics - Rights, Responsibilities & Good Citizenship",
+            "Map Skills - Directions, Symbols, Scale (basic)",
+            "Resources and Local Economy - Farming, Trade, Markets",
+            "Culture, Customs and Heritage",
+            "Environment & Conservation - Local Examples",
+            "Health, Sanitation and Community Wellbeing",
+            "Basic Local Government Structures and Participation",
+            "Road Safety and Community Rules"
         ],
-        "Decimals & Percentages": [
-            "Q1. Convert 0.25 to a percentage.",
-            "Q2. What is 25% of 80?",
-            "Q3. Convert 3/4 to a decimal.",
-            "Q4. Calculate 15% of 200.",
-            "Q5. What decimal is equivalent to 60%?",
-            "Q6. Find 10% of 450.",
-            "Q7. Convert 0.875 to a percentage.",
-            "Q8. What is 50% of 64?",
-            "Q9. Calculate 30% of 150.",
-            "Q10. Convert 45% to a decimal.",
+        "Science": [
+            "Living & Non-Living Things - Characteristics",
+            "Plants - Parts and Functions",
+            "Animals - Habitats and Adaptations",
+            "Human Body - Health, Nutrition & Hygiene",
+            "Materials & Their Properties",
+            "Forces and Motion - Simple Examples",
+            "Light, Heat and Sound (basic concepts)",
+            "Environment and Natural Resources",
+            "Simple Experiments and Observations"
+        ]
+    },
+    "Primary 7": {
+        "Mathematics": [
+            "Integers & Operations",
+            "Fractions - Addition, Subtraction, Multiplication & Division",
+            "Decimals & Percentages",
+            "Ratio, Rate & Proportion",
+            "Algebraic Expressions & Simple Equations",
+            "Geometry - Angles, Triangles and Quadrilaterals",
+            "Mensuration - Area, Perimeter and Volume (basic)",
+            "Statistics & Probability - Averages and Data Interpretation",
+            "Coordinate Geometry - Introduction",
+            "Number Theory - Factors, HCF & LCM",
+            "Problem Solving Strategies"
         ],
-        "Geometry - Angles & Properties": [
-            "Q1. What is the sum of angles in a triangle?",
-            "Q2. If one angle of a triangle is 60° and another is 50°, find the third angle.",
-            "Q3. What are the properties of a rectangle?",
-            "Q4. Calculate the perimeter of a square with side 5 cm.",
-            "Q5. What is the sum of angles in a quadrilateral?",
-            "Q6. If two angles are complementary, and one is 35°, what is the other?",
-            "Q7. Define a right angle.",
-            "Q8. What is the area of a triangle with base 8 cm and height 6 cm?",
-            "Q9. Calculate the perimeter of a rectangle with length 10 cm and width 6 cm.",
-            "Q10. What are supplementary angles?",
+        "English": [
+            "Comprehension - Longer Passages & Questioning",
+            "Grammar - Sentence Transformation, Tenses, Agreement",
+            "Composition - Stories, Letters, Reports and Dialogues",
+            "Cloze & Summary Writing",
+            "Vocabulary - Synonyms, Antonyms & Contextual Use",
+            "Listening Skills and Oral Expression",
+            "Directed Writing and Examination Techniques"
         ],
+        "Social Studies": [
+            "History - Key Events in Uganda and East Africa (pre-colonial, colonial, independence)",
+            "Civics and Governance - Structure of Government, Roles and Rights",
+            "Geography - Maps, Physical Features, Weather, Climate and Resources",
+            "Economy - Agriculture, Trade, Markets, Production and Consumption",
+            "Community Development - Projects, Participation and Leadership",
+            "Citizenship Education - Rights, Responsibilities and Human Rights",
+            "Culture, National Symbols and Heritage",
+            "Local and National Government - Functions and Services",
+            "Environmental Issues - Conservation, Deforestation, Pollution",
+            "Global Connections - Trade, Aid and Regional Cooperation"
+        ],
+        "Science": [
+            "Living Things - Classification, Life Cycles and Ecosystems",
+            "Plants and Animals - Structure and Function",
+            "Human Body Systems - Digestive, Respiratory, Circulatory (basic)",
+            "Health and Disease Prevention",
+            "Forces, Magnets and Motion",
+            "Energy - Sources and Uses",
+            "Materials and Their Uses (including mixtures and separation)",
+            "Environment - Habitats, Conservation and Sustainable Use",
+            "Simple Scientific Investigation and Reporting"
+        ]
+    }
+}
+
+# ---------- 4. Generate Practice Questions (Customizable) ----------
+def generate_sample_questions(grade_level, subject, topic, num_questions=10):
+    """Fallback: Generate sample questions locally when AI is unavailable.
+    This function is subject-aware and supplies simple sample questions for common topics."""
+    # Basic sample banks keyed by subject/topic
+    samples = {
+        "Mathematics": {
+            "Integers & Operations": [
+                "Q1. Calculate the sum of -20 and -15.",
+                "Q2. A farmer bought 40 oranges and then sold 25 of them. What is the difference between the number of oranges bought and sold?",
+                "Q3. Simplify: 36 - (-10) + 5.",
+                "Q4. Find the value of -2(8) + 15.",
+                "Q5. A car is parked at -10 meters. If it moves up 15 meters, what is its final position?",
+                "Q6. Calculate the product of -4 and 5.",
+                "Q7. A boat descends 12 meters, then rises 8 meters. What is its final position relative to sea level?",
+                "Q8. Simplify: 2(-3) + 5(-2).",
+                "Q9. A rabbit hops 7 meters forward and then 4 meters backward. What is the net distance covered?",
+                "Q10. A plane descends 300 meters and then ascends 200 meters. What is the plane's final position?",
+            ],
+            "Fractions - Addition & Subtraction": [
+                "Q1. Add 1/4 and 1/3.",
+                "Q2. Subtract 2/5 from 3/5.",
+                "Q3. What is 1/2 + 1/4 + 1/8?",
+                "Q4. Calculate 7/8 - 1/4.",
+                "Q5. Find the sum of 2/3 and 1/6.",
+                "Q6. Subtract 3/10 from 9/10.",
+                "Q7. Add 1/5, 2/5, and 1/5.",
+                "Q8. What is 5/6 - 1/3?",
+                "Q9. Calculate 3/4 + 2/8.",
+                "Q10. Find 11/12 - 1/4.",
+            ],
+        },
+        "English": {
+            "Comprehension - Passages & Questions": [
+                "Q1. Read the passage and answer: What is the main idea of paragraph 2?",
+                "Q2. From the passage, extract two reasons the author gives for saving water.",
+                "Q3. What does the word 'frugal' mean in the passage?",
+                "Q4. Give a title for the passage in not more than five words.",
+                "Q5. Why did the character decide to leave home?",
+            ],
+            "Grammar - Sentence Transformation & Tenses": [
+                "Q1. Change to passive voice: 'The teacher marked the tests.'",
+                "Q2. Fill in the blank with the correct tense: 'She ___ (go) to school yesterday.'",
+                "Q3. Correct the sentence: 'He don't like vegetables.'",
+                "Q4. Combine the sentences: 'He ran fast. He missed the bus.'",
+                "Q5. Rewrite in reported speech: 'She said, "I will come."'",
+            ]
+        },
+        "Science": {
+            "Living Things - Classification": [
+                "Q1. State two differences between plants and animals.",
+                "Q2. Name three groups of living organisms.",
+                "Q3. How do leaves help plants to survive?",
+                "Q4. What is photosynthesis? Give a simple definition.",
+                "Q5. Explain why animals need oxygen.",
+            ],
+            "Forces, Magnets and Motion": [
+                "Q1. Define force with an example.",
+                "Q2. What does a magnet attract?",
+                "Q3. Give one example of a push and one example of a pull.",
+            ]
+        },
+        "Social Studies": {
+            "History - Uganda & East Africa": [
+                "Q1. Name one important event in Uganda's history and explain why it is important.",
+                "Q2. Who was the first person to unite (example) ...?",
+            ],
+            "Geography - Maps, Weather & Resources": [
+                "Q1. Give two uses of a map.",
+                "Q2. What are the main types of weather in Uganda?",
+            ]
+        }
     }
     
-    # Use sample questions for the given topic, or create generic ones
+    subject_bank = samples.get(subject, {})
+    # Try to match topic within subject bank
     topic_key = None
-    for key in samples:
+    for key in subject_bank:
         if key.lower() in topic.lower() or topic.lower() in key.lower():
             topic_key = key
             break
     
     if topic_key:
-        qs = samples[topic_key][:num_questions]
+        qs = subject_bank[topic_key][:num_questions]
     else:
-        qs = [f"Q{i+1}. Sample question {i+1} on {topic}." for i in range(num_questions)]
+        # Generic fallback per subject
+        qs = [f"Q{i+1}. Sample {subject} question {i+1} on {topic}." for i in range(num_questions)]
     
     return "\n\n".join(qs)
 
-
-def generate_practice_questions(grade_level, topic, num_questions=10):
-    """Generate multiple questions with robust text parsing (not JSON)"""
+def generate_practice_questions(grade_level, subject, topic, num_questions=10):
+    """Generate multiple questions with robust text parsing (not JSON). Subject-aware prompt."""
     
     if not topic:
         return None, "⚠️ Please select a topic first!"
     
-    prompt = f"""Generate exactly {num_questions} UNEB-style mathematics questions for {grade_level} students on: "{topic}"
-
-Format your response EXACTLY like this:
-Q1. [Question text here]
-Q2. [Question text here]
-Q3. [Question text here]
-... and so on up to Q{num_questions}
-
-Each question should be:
-- Clear and exam-like
-- Appropriate difficulty for {grade_level}
-- Self-contained (includes all necessary information)
-- Solvable in 2-5 minutes
-
-Start immediately with Q1. Do not include any introduction or explanation."""
+    prompt = f"""Generate exactly {num_questions} UNEB-style {subject} questions for {grade_level} students on: \"{topic}\"\n\n"
+    prompt += "Format your response EXACTLY like this:\nQ1. [Question text here]\nQ2. [Question text here]\nQ3. [Question text here]\n... and so on up to Q{num_questions}\n\n"
+    prompt += f"Each question should be:\n- Clear and exam-like\n- Appropriate difficulty for {grade_level}\n- Self-contained (includes all necessary information)\n- Solvable in 2-5 minutes for short-answer questions\n\nStart immediately with Q1. Do not include any introduction or explanation."""
     
     response, source = ask_ai(prompt, temperature=0.6)
     
-    # Fallback: if AI fails, generate sample questions locally
-    if "All AI services failed" in response or response.startswith(""):
-        response = generate_sample_questions(grade_level, topic, num_questions)
+    # Fallback: if AI fails or returns empty, use local generator (now subject-aware)
+    if "All AI services failed" in response or not response or response.strip() == "":
+        response = generate_sample_questions(grade_level, subject, topic, num_questions)
 
     # Parse questions robustly using regex to support multi-digit numbers (Q1..Q10..)
     questions = []
@@ -267,7 +350,7 @@ Start immediately with Q1. Do not include any introduction or explanation."""
     return questions, formatted
 
 # ---------- 5. Grade/Mark Student Answers ----------
-def grade_student_answers(questions, student_answers, grade_level, topic):
+def grade_student_answers(questions, student_answers, grade_level, topic, subject=None):
     """Grade all student answers and provide feedback"""
     
     if not questions or not student_answers:
@@ -283,7 +366,7 @@ def grade_student_answers(questions, student_answers, grade_level, topic):
             continue
         
         # Create grading prompt
-        grading_prompt = f"""You are an experienced UNEB examiner for {grade_level} students.
+        grading_prompt = f"""You are an experienced UNEB examiner for {grade_level} students. Subject: {subject or 'General'}
         
 Question: {question_text}
 
@@ -323,17 +406,19 @@ class StudentSession:
 session = StudentSession()
 
 # ---------- 7. Download Functions ----------
-def download_questions_file(questions_list, topic, grade_level):
+def download_questions_file(questions_list, topic, grade_level, subject=None):
     """Download questions as text file"""
     if not questions_list:
         return None
     
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    filename = f"questions_{grade_level}_{topic}_{timestamp}.txt"
+    subject_tag = f"_{subject}" if subject else ""
+    filename = f"questions_{grade_level}{subject_tag}_{topic}_{timestamp}.txt"
     
     content = f"""UNEB EXAM PRACTICE QUESTIONS
 {'='*50}
 Grade Level: {grade_level}
+Subject: {subject or 'N/A'}
 Topic: {topic}
 Generated: {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}
 Total Questions: {len(questions_list)}
@@ -363,7 +448,7 @@ Good luck!
     return filepath
 
 
-def download_questions_pdf(questions_list, topic, grade_level):
+def download_questions_pdf(questions_list, topic, grade_level, subject=None):
     """Generate a simple PDF with the questions, return filepath."""
     try:
         from reportlab.lib.pagesizes import A4
@@ -374,7 +459,8 @@ def download_questions_pdf(questions_list, topic, grade_level):
         return None
 
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    filename = f"questions_{grade_level}_{topic}_{timestamp}.pdf"
+    subject_tag = f"_{subject}" if subject else ""
+    filename = f"questions_{grade_level}{subject_tag}_{topic}_{timestamp}.pdf"
     filepath = f"downloads/{filename}"
     os.makedirs("downloads", exist_ok=True)
 
@@ -386,7 +472,7 @@ def download_questions_pdf(questions_list, topic, grade_level):
 
     elems.append(Paragraph("UNEB EXAM PRACTICE QUESTIONS", styles['Title']))
     elems.append(Spacer(1, 4*mm))
-    meta = f"Grade Level: {grade_level}     Topic: {topic}     Generated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
+    meta = f"Grade Level: {grade_level}     Subject: {subject or 'N/A'}     Topic: {topic}     Generated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
     elems.append(Paragraph(meta, normal))
     elems.append(Spacer(1, 6*mm))
 
@@ -402,18 +488,20 @@ def download_questions_pdf(questions_list, topic, grade_level):
     except Exception:
         return None
 
-def download_feedback_file(feedback_text, topic, grade_level):
+def download_feedback_file(feedback_text, topic, grade_level, subject=None):
     """Download AI feedback/corrections"""
     if not feedback_text:
         return None
     
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    filename = f"feedback_{grade_level}_{topic}_{timestamp}.txt"
+    subject_tag = f"_{subject}" if subject else ""
+    filename = f"feedback_{grade_level}{subject_tag}_{topic}_{timestamp}.txt"
     
     content = f"""AI CORRECTION & FEEDBACK
 {'='*50}
 Student: {session.student_name}
 Grade Level: {grade_level}
+Subject: {subject or 'N/A'}
 Topic: {topic}
 Date: {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}
 {'='*50}
@@ -473,7 +561,7 @@ with gr.Blocks(title="UNEB Exam Prep - Primary 6 & 7", theme=gr.themes.Soft(), c
     
     gr.Markdown("""
     #  UNEB Exam Practice
-    ## Primary 6 & 7 Mathematics
+    ## Primary 6 & 7 — Multiple Subjects
     """)
     
     # Global state for questions
@@ -496,7 +584,7 @@ with gr.Blocks(title="UNEB Exam Prep - Primary 6 & 7", theme=gr.themes.Soft(), c
     with gr.Tabs():
         # ===== TAB 1: GENERATE QUESTIONS =====
         with gr.Tab("1️⃣ Generate Questions"):
-            gr.Markdown("### Step 1: Generate Practice Questions")
+            gr.Markdown("### Step 1: Generate Practice Questions\n\nChoose the Grade, Subject and Topic, then set the Number of Questions (1–100).")
             
             with gr.Row():
                 grade_input = gr.Dropdown(
@@ -504,20 +592,30 @@ with gr.Blocks(title="UNEB Exam Prep - Primary 6 & 7", theme=gr.themes.Soft(), c
                     label="Grade Level",
                     value="Primary 7"
                 )
+                subject_input = gr.Dropdown(
+                    choices=["Mathematics", "English", "Social Studies", "Science"],
+                    label="Subject",
+                    value="Mathematics"
+                )
                 topic_input = gr.Dropdown(
                     label="Topic",
-                    choices=syllabus_topics["Primary 7"],
-                    value=syllabus_topics["Primary 7"][0]
+                    choices=syllabus_topics["Primary 7"]["Mathematics"],
+                    value=syllabus_topics["Primary 7"]["Mathematics"][0]
                 )
             
-            # Update topics when grade changes
-            def update_topics(grade):
-                return gr.Dropdown(choices=syllabus_topics[grade], value=syllabus_topics[grade][0])
+            # Update topics when grade or subject changes
+            def update_topics(grade, subject):
+                topics = syllabus_topics.get(grade, {}).get(subject, [])
+                if not topics:
+                    topics = ["General - " + subject]
+                return gr.Dropdown(choices=topics, value=topics[0])
             
-            grade_input.change(update_topics, grade_input, topic_input)
+            grade_input.change(update_topics, [grade_input, subject_input], topic_input)
+            subject_input.change(update_topics, [grade_input, subject_input], topic_input)
             
             with gr.Row():
-                generate_btn = gr.Button(" Generate 20 Questions", variant="primary", size="lg")
+                num_questions_input = gr.Slider(minimum=1, maximum=100, step=1, value=20, label="Number of Questions")
+                generate_btn = gr.Button(" Generate Questions", variant="primary", size="lg")
             
             questions_output = gr.Markdown(
                 value="",
@@ -535,8 +633,8 @@ with gr.Blocks(title="UNEB Exam Prep - Primary 6 & 7", theme=gr.themes.Soft(), c
                 copy_btn = gr.Button(" Copy Questions")
             
             # Generate questions handler
-            def generate_and_display(grade, topic):
-                questions_list, formatted_text = generate_practice_questions(grade, topic, num_questions=20)
+            def generate_and_display(grade, subject, topic, num_questions):
+                questions_list, formatted_text = generate_practice_questions(grade, subject, topic, num_questions=num_questions)
                 
                 if questions_list is None:
                     return "", formatted_text, questions_state.value, " Generation failed"
@@ -544,28 +642,30 @@ with gr.Blocks(title="UNEB Exam Prep - Primary 6 & 7", theme=gr.themes.Soft(), c
                 session.current_questions = questions_list
                 session.current_grade = grade
                 session.current_topic = topic
+                # Also store subject
+                session.current_subject = subject
                 
                 # For Markdown display, keep spacing and simple formatting
                 md_text = "\n\n".join([f"**{i+1}.** {q.split('.',1)[1].strip() if '.' in q else q}" for i, q in enumerate(questions_list)])
-                return md_text, md_text, questions_list, f" Generated {len(questions_list)} questions on {topic}"
+                return md_text, md_text, questions_list, f" Generated {len(questions_list)} {subject} questions on {topic}"
             
             generate_btn.click(
                 fn=generate_and_display,
-                inputs=[grade_input, topic_input],
+                inputs=[grade_input, subject_input, topic_input, num_questions_input],
                 outputs=[questions_output, questions_output, questions_state, status_output]
-            )
-            
+            )            
             # Download handler - returns file path for gr.DownloadButton
             def download_qns():
                 if not session.current_questions:
                     return None
                 try:
                     # Prefer PDF export; fall back to plain text if PDF library missing
-                    pdf_path = download_questions_pdf(session.current_questions, session.current_topic, session.current_grade)
+                    subject = getattr(session, 'current_subject', None)
+                    pdf_path = download_questions_pdf(session.current_questions, session.current_topic, session.current_grade, subject=subject)
                     if pdf_path:
                         return pdf_path
                     # Fallback to text
-                    filepath = download_questions_file(session.current_questions, session.current_topic, session.current_grade)
+                    filepath = download_questions_file(session.current_questions, session.current_topic, session.current_grade, subject=subject)
                     return filepath
                 except Exception as e:
                     return None
@@ -710,7 +810,8 @@ with gr.Blocks(title="UNEB Exam Prep - Primary 6 & 7", theme=gr.themes.Soft(), c
                     session.current_questions,
                     session.current_answers,
                     session.current_grade,
-                    session.current_topic
+                    session.current_topic,
+                    getattr(session, 'current_subject', None)
                 )
                 
                 session.last_feedback = feedback
@@ -727,7 +828,8 @@ with gr.Blocks(title="UNEB Exam Prep - Primary 6 & 7", theme=gr.themes.Soft(), c
                 if not session.last_feedback:
                     return None
                 try:
-                    filepath = download_feedback_file(session.last_feedback, session.current_topic, session.current_grade)
+                    subject = getattr(session, 'current_subject', None)
+                    filepath = download_feedback_file(session.last_feedback, session.current_topic, session.current_grade, subject=subject)
                     return filepath
                 except Exception as e:
                     return None