v4
Browse files- server/app.py +15 -12
server/app.py
CHANGED
|
@@ -1,12 +1,12 @@
|
|
| 1 |
from fastapi import FastAPI
|
| 2 |
from pydantic import BaseModel
|
|
|
|
| 3 |
from environment import SupportEnv
|
| 4 |
from dataset import easy_cases, medium_cases, hard_cases
|
| 5 |
-
from typing import Optional
|
| 6 |
|
| 7 |
app = FastAPI()
|
| 8 |
|
| 9 |
-
#
|
| 10 |
class Action(BaseModel):
|
| 11 |
message: str
|
| 12 |
|
|
@@ -28,26 +28,29 @@ def parse_action(message):
|
|
| 28 |
else:
|
| 29 |
return "reject"
|
| 30 |
|
| 31 |
-
#
|
| 32 |
TASKS = {
|
| 33 |
"easy": easy_cases,
|
| 34 |
"medium": medium_cases,
|
| 35 |
"hard": hard_cases
|
| 36 |
}
|
| 37 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 38 |
env = None
|
| 39 |
|
| 40 |
-
# RESET
|
| 41 |
@app.post("/reset")
|
| 42 |
def reset(req: Optional[ResetRequest] = None):
|
| 43 |
-
global env
|
| 44 |
|
| 45 |
-
#
|
| 46 |
-
task =
|
| 47 |
-
|
| 48 |
-
task = req.task
|
| 49 |
|
| 50 |
-
cases = TASKS
|
| 51 |
env = SupportEnv(cases)
|
| 52 |
|
| 53 |
obs = env.reset()
|
|
@@ -58,7 +61,7 @@ def reset(req: Optional[ResetRequest] = None):
|
|
| 58 |
"done": False
|
| 59 |
}
|
| 60 |
|
| 61 |
-
#STEP
|
| 62 |
@app.post("/step")
|
| 63 |
def step(action: Action):
|
| 64 |
parsed_action = parse_action(action.message)
|
|
@@ -71,7 +74,7 @@ def step(action: Action):
|
|
| 71 |
"done": done
|
| 72 |
}
|
| 73 |
|
| 74 |
-
# RETURN
|
| 75 |
if done:
|
| 76 |
response["score"] = env.get_score()
|
| 77 |
|
|
|
|
| 1 |
from fastapi import FastAPI
|
| 2 |
from pydantic import BaseModel
|
| 3 |
+
from typing import Optional
|
| 4 |
from environment import SupportEnv
|
| 5 |
from dataset import easy_cases, medium_cases, hard_cases
|
|
|
|
| 6 |
|
| 7 |
app = FastAPI()
|
| 8 |
|
| 9 |
+
# Models
|
| 10 |
class Action(BaseModel):
|
| 11 |
message: str
|
| 12 |
|
|
|
|
| 28 |
else:
|
| 29 |
return "reject"
|
| 30 |
|
| 31 |
+
# TASKS
|
| 32 |
TASKS = {
|
| 33 |
"easy": easy_cases,
|
| 34 |
"medium": medium_cases,
|
| 35 |
"hard": hard_cases
|
| 36 |
}
|
| 37 |
|
| 38 |
+
# AUTO TASK CYCLING
|
| 39 |
+
TASK_SEQUENCE = ["easy", "medium", "hard"]
|
| 40 |
+
current_task_index = 0
|
| 41 |
+
|
| 42 |
env = None
|
| 43 |
|
| 44 |
+
# RESET
|
| 45 |
@app.post("/reset")
|
| 46 |
def reset(req: Optional[ResetRequest] = None):
|
| 47 |
+
global env, current_task_index
|
| 48 |
|
| 49 |
+
# IGNORE BODY → AUTO CYCLE TASKS
|
| 50 |
+
task = TASK_SEQUENCE[current_task_index]
|
| 51 |
+
current_task_index = (current_task_index + 1) % 3
|
|
|
|
| 52 |
|
| 53 |
+
cases = TASKS[task]
|
| 54 |
env = SupportEnv(cases)
|
| 55 |
|
| 56 |
obs = env.reset()
|
|
|
|
| 61 |
"done": False
|
| 62 |
}
|
| 63 |
|
| 64 |
+
# STEP
|
| 65 |
@app.post("/step")
|
| 66 |
def step(action: Action):
|
| 67 |
parsed_action = parse_action(action.message)
|
|
|
|
| 74 |
"done": done
|
| 75 |
}
|
| 76 |
|
| 77 |
+
# RETURN SCORE PER TASK
|
| 78 |
if done:
|
| 79 |
response["score"] = env.get_score()
|
| 80 |
|