Update app.py

app.py

@@ -43,15 +43,19 @@ def analyze_task1_graph(image, question):
 
     return analysis, "✅ Image analyzed successfully"
 
+
+# -------------------------
+# TASK 1 EVALUATION
+# -------------------------
 def evaluate_task1(image, question, response, graph_analysis):
     if image is None:
-        return "Please upload an image", "", "", "", ""
+        return "Please upload an image", "", "", "", "", "", ""
     if not question.strip():
-        return "Please enter the question", "", "", "", ""
+        return "Please enter the question", "", "", "", "", "", ""
     if not response.strip():
-        return "Please write your response", "", "", "", ""
+        return "Please write your response", "", "", "", "", "", ""
     if graph_analysis is None:
-        return "Graph not analyzed yet", "", "", "", ""
+        return "Graph not analyzed yet", "", "", "", "", "", ""
 
     evaluator, _ = create_evaluators("Task 1")
 
@@ -61,13 +65,21 @@ def evaluate_task1(image, question, response, graph_analysis):
     task_achievement = evaluator.analyze_task_achievement(question, graph_analysis, response)
     cohesion = evaluator.analyze_cohesion_coherence(response, graph_analysis)
 
-    return evaluation, grammar, vocabulary, task_achievement, cohesion
+    # Return display + states
+    return (
+        evaluation, grammar, vocabulary, task_achievement, cohesion,
+        grammar, vocabulary, response
+    )
 
+
+# -------------------------
+# TASK 2 EVALUATION
+# -------------------------
 def evaluate_task2(question, response):
     if not question.strip():
-        return "Please enter the question", "", "", "", ""
+        return "Please enter the question", "", "", "", "", "", ""
     if not response.strip():
-        return "Please write your response", "", "", "", ""
+        return "Please write your response", "", "", "", "", "", ""
 
     evaluator, _ = create_evaluators("Task 2")
 
@@ -77,49 +89,47 @@ def evaluate_task2(question, response):
     task_achievement = evaluator.analyze_task_achievement(question, response)
     cohesion = evaluator.analyze_cohesion_coherence(response)
 
-    return evaluation, grammar, vocabulary, task_achievement, cohesion
+    return (
+        evaluation, grammar, vocabulary, task_achievement, cohesion,
+        grammar, vocabulary, response
+    )
+
 
+# -------------------------
+# GENERATE EXERCISES (working version)
+# -------------------------
 def generate_exercises(
     task,
     grammar_t1, vocab_t1, resp_t1,
-    grammar_t2, vocab_t2, resp_t2,
+    grammar_t2, vocab_t2, resp_t2
 ):
-    # Decide which task's results to use
     if task == "Task 1":
-        grammar_text = grammar_t1 or ""
-        vocab_text = vocab_t1 or ""
-        response = resp_t1 or ""
+        grammar_text = grammar_t1
+        vocab_text = vocab_t1
+        response_text = resp_t1
     else:
-        grammar_text = grammar_t2 or ""
-        vocab_text = vocab_t2 or ""
-        response = resp_t2 or ""
-
-    # Require evaluation first
-    if not grammar_text.strip() or not vocab_text.strip() or not response.strip():
-        return (
-            "⚠️ Please run the evaluation for the selected task first, then click this button.",
-            ""
-        )
-
-    # Get the right generator (Task1 or Task2)
+        grammar_text = grammar_t2
+        vocab_text = vocab_t2
+        response_text = resp_t2
+
+    if not grammar_text or not vocab_text or not response_text:
+        return "⚠️ Please run evaluation first.", ""
+
     _, generator = create_evaluators(task)
 
     try:
-        grammar_ex = generator.generate_grammar_exercises(grammar_text, response)
+        grammar_ex = generator.generate_grammar_exercises(grammar_text, response_text)
         vocab_ex = generator.generate_vocabulary_exercises(vocab_text)
         return grammar_ex, vocab_ex
     except Exception as e:
-        return f"❌ Error while generating exercises:\n\n{e}", ""
+        return f"❌ Error generating exercises:\n{e}", ""
 
 
 # -------------------------
-# BUILD INTERFACE
+# BUILD UI
 # -------------------------
 with gr.Blocks() as demo:
 
-    # -------------------------
-    # LOGIN SCREEN
-    # -------------------------
     login_box = gr.Group(visible=True)
     with login_box:
         gr.Markdown("## 🔐 Login")
@@ -128,21 +138,18 @@ with gr.Blocks() as demo:
         login_btn = gr.Button("Login")
         login_msg = gr.Markdown("")
 
-    # -------------------------
-    # MAIN APP
-    # -------------------------
     main = gr.Group(visible=False)
     with main:
         gr.Markdown("# 📝 IELTS Writing Evaluator")
 
-        task_selector = gr.Radio(["Task 1", "Task 2"], label="Choose Task Type", value="Task 1")
+        task_selector = gr.Radio(["Task 1", "Task 2"], value="Task 1")
 
         # -------------------------
         # TASK 1 UI
         # -------------------------
         with gr.Tab("Task 1"):
             image = gr.Image(type="pil", label="Upload Graph/Chart")
-            t1_question = gr.Textbox(label="Task 1 Question", lines=3)
+            t1_question = gr.Textbox(label="Task 1 Question")
             analyze_btn = gr.Button("Analyze Graph")
             graph_output = gr.Markdown("")
             graph_state = gr.State()
@@ -156,11 +163,15 @@ with gr.Blocks() as demo:
             task_ach1 = gr.Markdown()
             cohesion1 = gr.Markdown()
 
+            grammar1_state = gr.State("")
+            vocabulary1_state = gr.State("")
+            response1_state = gr.State("")
+
         # -------------------------
         # TASK 2 UI
         # -------------------------
         with gr.Tab("Task 2"):
-            t2_question = gr.Textbox(label="Task 2 Question", lines=3)
+            t2_question = gr.Textbox(label="Task 2 Question")
             response2 = gr.Textbox(label="Your Response", lines=10)
             eval_btn2 = gr.Button("Evaluate Essay")
 
@@ -170,22 +181,23 @@ with gr.Blocks() as demo:
             task_ach2 = gr.Markdown()
             cohesion2 = gr.Markdown()
 
+            grammar2_state = gr.State("")
+            vocabulary2_state = gr.State("")
+            response2_state = gr.State("")
+
         # -------------------------
-        # EXERCISE GENERATION
+        # EXERCISE SECTION
         # -------------------------
-        gr.Markdown("---\n## 📚 Practice Exercises")
+        gr.Markdown("## 📚 Practice Exercises")
         exercise_btn = gr.Button("Generate Exercises")
         exercises_grammar = gr.Markdown()
         exercises_vocab = gr.Markdown()
 
+
     # -------------------------
-    # BIND FUNCTIONS
+    # BINDINGS
     # -------------------------
-    login_btn.click(
-        login,
-        [user, pwd],
-        [login_box, main, login_msg]
-    )
+    login_btn.click(login, [user, pwd], [login_box, main, login_msg])
 
     analyze_btn.click(
         analyze_task1_graph,
@@ -196,27 +208,29 @@ with gr.Blocks() as demo:
     eval_btn1.click(
         evaluate_task1,
         [image, t1_question, response1, graph_state],
-        [evaluation1, grammar1, vocabulary1, task_ach1, cohesion1]
+        [
+            evaluation1, grammar1, vocabulary1, task_ach1, cohesion1,
+            grammar1_state, vocabulary1_state, response1_state
+        ]
     )
 
     eval_btn2.click(
         evaluate_task2,
         [t2_question, response2],
-        [evaluation2, grammar2, vocabulary2, task_ach2, cohesion2]
+        [
+            evaluation2, grammar2, vocabulary2, task_ach2, cohesion2,
+            grammar2_state, vocabulary2_state, response2_state
+        ]
     )
 
     exercise_btn.click(
         generate_exercises,
         [
             task_selector,
-            grammar1,  vocabulary1,  response1,   # Task 1 outputs
-            grammar2,  vocabulary2,  response2    # Task 2 outputs
+            grammar1_state, vocabulary1_state, response1_state,
+            grammar2_state, vocabulary2_state, response2_state
         ],
         [exercises_grammar, exercises_vocab]
     )
 
-
-# -------------------------
-# RUN
-# -------------------------
 demo.launch()