DaizzyJ commited on
Commit
7bd3d5d
·
verified ·
1 Parent(s): 314fa1c

Update app/main.py

Browse files
Files changed (1) hide show
  1. app/main.py +56 -3
app/main.py CHANGED
@@ -9,7 +9,12 @@ from typing import Optional
9
  import uvicorn
10
 
11
  from app.environment import YouTubeAddictionEnv
12
- from app.graders import run_all_graders
 
 
 
 
 
13
 
14
  app = FastAPI(
15
  title="YouTube Addiction Controller",
@@ -76,8 +81,56 @@ def state():
76
  @app.get("/grade")
77
  def grade():
78
  """Run all graders and return scores for all 3 tasks."""
79
- results = run_all_graders()
80
- return results
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
81
 
82
 
83
  @app.get("/tasks")
 
9
  import uvicorn
10
 
11
  from app.environment import YouTubeAddictionEnv
12
+ from app.graders import (
13
+ grade_task_casual,
14
+ grade_task_addict,
15
+ grade_task_binge_procrastinator,
16
+ run_all_graders,
17
+ )
18
 
19
  app = FastAPI(
20
  title="YouTube Addiction Controller",
 
81
  @app.get("/grade")
82
  def grade():
83
  """Run all graders and return scores for all 3 tasks."""
84
+ r1 = grade_task_casual()
85
+ r2 = grade_task_addict()
86
+ r3 = grade_task_binge_procrastinator()
87
+
88
+ overall = round((r1["score"] + r2["score"] + r3["score"]) / 3, 4)
89
+
90
+ return {
91
+ "graders": [
92
+ {
93
+ "task_id": "task_casual",
94
+ "grader": "grade_task_casual",
95
+ "score": r1["score"],
96
+ "steps": r1["steps"],
97
+ "description": r1["description"],
98
+ },
99
+ {
100
+ "task_id": "task_addict",
101
+ "grader": "grade_task_addict",
102
+ "score": r2["score"],
103
+ "steps": r2["steps"],
104
+ "description": r2["description"],
105
+ },
106
+ {
107
+ "task_id": "task_binge_procrastinator",
108
+ "grader": "grade_task_binge_procrastinator",
109
+ "score": r3["score"],
110
+ "steps": r3["steps"],
111
+ "description": r3["description"],
112
+ },
113
+ ],
114
+ "tasks": {
115
+ "task_casual": r1,
116
+ "task_addict": r2,
117
+ "task_binge_procrastinator": r3,
118
+ },
119
+ "overall_score": overall,
120
+ }
121
+
122
+
123
+ @app.get("/grade/{task_id}")
124
+ def grade_single(task_id: str):
125
+ """Run grader for a single task."""
126
+ graders = {
127
+ "task_casual": grade_task_casual,
128
+ "task_addict": grade_task_addict,
129
+ "task_binge_procrastinator": grade_task_binge_procrastinator,
130
+ }
131
+ if task_id not in graders:
132
+ raise HTTPException(status_code=404, detail=f"Unknown task_id: {task_id}")
133
+ return graders[task_id]()
134
 
135
 
136
  @app.get("/tasks")