Refactor graders to use clamping wrapper

server/tasks/task_registry.py

@@ -3,16 +3,26 @@ from typing import Callable, Dict, Tuple, List
 from server.tasks import task1_json, task2_yaml, task3_dockerfile
 from server.tasks import task4_compose, task5_k8s, task6_github_actions, task7_nginx
 
-# CRITICAL: Import from grader_api wrapper layer (with normalization), NOT raw graders
-from server.graders.grader_api import (
-    grade_task1,
-    grade_task2,
-    grade_task3,
-    grade_task4,
-    grade_task5,
-    grade_task6,
-    grade_task7,
-)
+# INTERNAL USE: Import directly from raw grader files (return tuples)
+# grader_api.py returns float-only (for validator/openenv.yaml)
+from server.graders.json_grader import grade_task1
+from server.graders.yaml_grader import grade_task2
+from server.graders.dockerfile_grader import grade_task3
+from server.graders.compose_grader import grade_task4
+from server.graders.k8s_grader import grade_task5
+from server.graders.github_actions_grader import grade_task6
+from server.graders.nginx_grader import grade_task7
+
+
+def _clamp_grader(fn):
+    """Wrap raw grader to clamp reward to (0.01, 0.99)."""
+    def wrapper(submitted_config: str) -> Tuple[float, str, List[str]]:
+        reward, error_msg, bugs_fixed = fn(submitted_config)
+        reward = max(0.01, min(0.99, float(reward)))
+        return reward, error_msg, bugs_fixed
+    wrapper.__name__ = fn.__name__
+    wrapper.__qualname__ = fn.__qualname__
+    return wrapper
 
 
 class TaskInfo:
@@ -39,13 +49,13 @@ TASK_ORDER = [
 ]
 
 TASK_REGISTRY: Dict[str, TaskInfo] = {
-    "task1_json": TaskInfo(task1_json, grade_task1),
-    "task2_yaml": TaskInfo(task2_yaml, grade_task2),
-    "task3_dockerfile": TaskInfo(task3_dockerfile, grade_task3),
-    "task4_compose": TaskInfo(task4_compose, grade_task4),
-    "task5_k8s": TaskInfo(task5_k8s, grade_task5),
-    "task6_github_actions": TaskInfo(task6_github_actions, grade_task6),
-    "task7_nginx": TaskInfo(task7_nginx, grade_task7),
+    "task1_json": TaskInfo(task1_json, _clamp_grader(grade_task1)),
+    "task2_yaml": TaskInfo(task2_yaml, _clamp_grader(grade_task2)),
+    "task3_dockerfile": TaskInfo(task3_dockerfile, _clamp_grader(grade_task3)),
+    "task4_compose": TaskInfo(task4_compose, _clamp_grader(grade_task4)),
+    "task5_k8s": TaskInfo(task5_k8s, _clamp_grader(grade_task5)),
+    "task6_github_actions": TaskInfo(task6_github_actions, _clamp_grader(grade_task6)),
+    "task7_nginx": TaskInfo(task7_nginx, _clamp_grader(grade_task7)),
 }