fix: resolve merge conflict in grader_api.py

openenv.yaml

@@ -59,4 +59,4 @@ tasks:
     difficulty: very_hard
     num_bugs: 6
     grader: server.graders.grader_api:grade_task7
-    has_grader: true
+    has_grader: true

server/env.py

@@ -363,4 +363,4 @@ with gr.Blocks(title="ConfigDebugEnv", theme=gr.themes.Soft()) as demo:
         outputs=[state_display],
     )
 
-app = gr.mount_gradio_app(app, demo, path="/")
+app = gr.mount_gradio_app(app, demo, path="/")

server/graders/grader_api.py

@@ -1,13 +1,6 @@
 """
-grader_api.py — Normalized grader wrappers for VALIDATOR use
-============================================================
-The hackathon validator imports graders via the paths in openenv.yaml
-and expects each grader to return a SINGLE FLOAT score in (0, 1).
-
-NOT a tuple. NOT a dict. Just a float.
-
-Internal code (task_registry) imports from the raw grader files
-which return (reward, error_msg, bugs_fixed) tuples.
+grader_api.py - Normalized grader wrappers for OpenEnv validator.
+Returns ONLY a float strictly between 0 and 1.
 """
 
 from server.graders.json_grader import grade_task1 as _raw_grade_task1
@@ -19,25 +12,36 @@ from server.graders.github_actions_grader import grade_task6 as _raw_grade_task6
 from server.graders.nginx_grader import grade_task7 as _raw_grade_task7
 
 
-def _make_score_only(fn):
-    """Wrap a grader: call it, extract reward float, clamp to (0.01, 0.99)."""
+def _make_float_grader(raw_fn):
     def wrapper(submitted_config: str) -> float:
-        result = fn(submitted_config)
-        # Raw graders return (reward, error_msg, bugs_fixed)
-        if isinstance(result, (tuple, list)):
-            reward = float(result[0])
-        else:
-            reward = float(result)
-        return max(0.01, min(0.99, reward))
-    wrapper.__name__ = fn.__name__
-    wrapper.__qualname__ = fn.__qualname__
+        try:
+            result = raw_fn(submitted_config)
+            if isinstance(result, (list, tuple)):
+                reward = float(result[0])
+            else:
+                reward = float(result)
+        except Exception:
+            reward = 0.01
+        reward = max(0.01, min(0.99, reward))
+        return reward
+    wrapper.__name__ = raw_fn.__name__
+    wrapper.__qualname__ = raw_fn.__qualname__
     return wrapper
 
 
-grade_task1 = _make_score_only(_raw_grade_task1)
-grade_task2 = _make_score_only(_raw_grade_task2)
-grade_task3 = _make_score_only(_raw_grade_task3)
-grade_task4 = _make_score_only(_raw_grade_task4)
-grade_task5 = _make_score_only(_raw_grade_task5)
-grade_task6 = _make_score_only(_raw_grade_task6)
-grade_task7 = _make_score_only(_raw_grade_task7)
+grade_task1 = _make_float_grader(_raw_grade_task1)
+grade_task2 = _make_float_grader(_raw_grade_task2)
+grade_task3 = _make_float_grader(_raw_grade_task3)
+grade_task4 = _make_float_grader(_raw_grade_task4)
+grade_task5 = _make_float_grader(_raw_grade_task5)
+grade_task6 = _make_float_grader(_raw_grade_task6)
+grade_task7 = _make_float_grader(_raw_grade_task7)
+
+# Aliases: app.py generates names like grade_task1_json, grade_task2_yaml etc.
+grade_task1_json = grade_task1
+grade_task2_yaml = grade_task2
+grade_task3_dockerfile = grade_task3
+grade_task4_compose = grade_task4
+grade_task5_k8s = grade_task5
+grade_task6_github_actions = grade_task6
+grade_task7_nginx = grade_task7

verify_graders.py

@@ -0,0 +1,51 @@
+import sys, os
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+def main():
+    print("=" * 60)
+    print("GRADER VERIFICATION")
+    print("=" * 60)
+
+    print("\n[TEST 1] Importing grader_api functions...")
+    try:
+        from server.graders.grader_api import (
+            grade_task1, grade_task2, grade_task3,
+            grade_task4, grade_task5, grade_task6, grade_task7,
+        )
+        print("  OK - All 7 graders imported")
+    except ImportError as e:
+        print(f"  FAIL - {e}")
+        sys.exit(1)
+
+    print("\n[TEST 2] Calling graders, checking type + range...")
+    graders = [
+        ("task1", grade_task1), ("task2", grade_task2),
+        ("task3", grade_task3), ("task4", grade_task4),
+        ("task5", grade_task5), ("task6", grade_task6),
+        ("task7", grade_task7),
+    ]
+    all_ok = True
+    for name, fn in graders:
+        try:
+            result = fn("{}")
+            if not isinstance(result, float):
+                print(f"  FAIL - {name}: returned {type(result).__name__}, need float")
+                all_ok = False
+            elif result <= 0.0 or result >= 1.0:
+                print(f"  FAIL - {name}: score={result} NOT in (0,1)")
+                all_ok = False
+            else:
+                print(f"  OK   - {name}: score={result}")
+        except Exception as e:
+            print(f"  FAIL - {name}: {e}")
+            all_ok = False
+
+    print("\n" + "=" * 60)
+    if all_ok:
+        print("ALL PASSED - Push and submit!")
+    else:
+        print("FAILED - Fix before submitting!")
+    print("=" * 60)
+
+if __name__ == "__main__":
+    main()