Update app.py

app.py

@@ -7,89 +7,65 @@ def grade(student_code):
     grade = 10  # Start with full points
 
     try:
-        # Parse the student's code into an AST (Abstract Syntax Tree)
         tree = ast.parse(student_code)
 
-        # Variables to track correctness
-        pin_setup = False
-        initial_delay = False
-        loop_found = False
-        blink_pattern = False
-        sleep_times = []
+        pin_setup = {"22": False, "15": False}
+        button_used = False
+        led_toggle_detected = False
+        bool_variable_used = False
 
-        # Analyze the AST
         for node in ast.walk(tree):
-            # Check pin setup
             if isinstance(node, ast.Assign):
                 if isinstance(node.value, ast.Call) and isinstance(node.value.func, ast.Attribute):
                     if node.value.func.attr == "Pin":
                         args = node.value.args
                         if len(args) >= 2 and isinstance(args[0], ast.Constant):
-                            if str(args[0].value) == "21":
-                                pin_setup = True
-            
-            # Check for time.sleep() calls
-            if isinstance(node, ast.Call) and isinstance(node.func, ast.Attribute):
-                if node.func.attr == "sleep" and isinstance(node.args[0], ast.Constant):
-                    sleep_times.append(node.args[0].value)
-
-            # Check for while loop
-            if isinstance(node, ast.While):
-                loop_found = True
-
-            # Check LED alternation
-            if isinstance(node, ast.Expr) and isinstance(node.value, ast.Call):
-                if isinstance(node.value.func, ast.Attribute):
-                    if node.value.func.attr == "value" or node.value.func.attr == "on" or node.value.func.attr == "off":
-                        blink_pattern = True
-
-        # Validate pin setup
-        if not pin_setup:
-            feedback.append("⛔️ Pin 21 must be correctly set as an output (-2 pts).")
-            grade -= 2
+                            pin_num = str(args[0].value)
+                            if pin_num in pin_setup:
+                                pin_setup[pin_num] = True
+                elif isinstance(node.value, ast.NameConstant) and isinstance(node.targets[0], ast.Name):
+                    bool_variable_used = True
+
+            if isinstance(node, ast.If):
+                if isinstance(node.test, ast.Call) and isinstance(node.test.func, ast.Attribute):
+                    if node.test.func.attr == "value":
+                        button_used = True
+                        for stmt in node.body:
+                            if isinstance(stmt, ast.Assign):
+                                if isinstance(stmt.value, ast.UnaryOp) and isinstance(stmt.value.op, ast.Not):
+                                    led_toggle_detected = True
+
+        if not all(pin_setup.values()):
+            feedback.append("⛔️ Pins 22 (LED) and 15 (button) must be correctly set up (-3 pts).")
+            grade -= 3
         else:
-            feedback.append("✅ Correct pin setup detected (+2 pts).")
+            feedback.append("✅ Correct pin setup detected (+3 pts).")
 
-        # Validate initial delay
-        if 3 in sleep_times:
-            initial_delay = True
-            feedback.append("✅ Initial delay of 3 seconds detected (+2 pts).")
+        if not button_used:
+            feedback.append("⛔️ No button press detection found (-3 pts).")
+            grade -= 3
         else:
-            feedback.append("⛔️ The LED must stay ON for 3 seconds initially (-2 pts).")
-            grade -= 2
+            feedback.append("✅ Button press detection found (+3 pts).")
 
-        # Validate while loop
-        if not loop_found:
-            feedback.append("⛔️ No `while True:` loop found! The LED must blink continuously (-2 pts).")
+        if not led_toggle_detected:
+            feedback.append("⛔️ No LED toggle logic detected (-2 pts).")
             grade -= 2
         else:
-            feedback.append("✅ Infinite loop detected (+2 pts).")
+            feedback.append("✅ LED toggle logic detected (+2 pts).")
 
-        # Validate blinking pattern
-        if 1 in sleep_times:
-            feedback.append("✅ Blinking delay of 1 second detected (+2 pts).")
-        else:
-            feedback.append("⛔️ The LED must blink every second after the initial delay (-2 pts).")
-            grade -= 2
-
-        # Validate LED alternation
-        if not blink_pattern:
-            feedback.append("⛔️ The LED should alternate states in the loop (-2 pts).")
+        if not bool_variable_used:
+            feedback.append("⛔️ No boolean variable found for tracking LED state (-2 pts).")
             grade -= 2
         else:
-            feedback.append("✅ LED alternation detected (+2 pts).")
+            feedback.append("✅ Boolean variable found for LED state tracking (+2 pts).")
 
     except Exception as e:
-        feedback = f"Error parsing code: {e}"
+        feedback = [f"⛔️ Error parsing code: {e}"]
+        grade = 0
 
-    # Ensure the grade is not negative
     grade = max(0, grade)
-
     grade = f"{grade}/10"
-    
     feedback = "\n".join(feedback)
-
-    # Return feedback
     return grade, feedback
 
 # Interface Gradio seulement si le script est exécuté directement