fix: Stop ends a run immediately, even mid-call
Browse files- app.py +40 -8
- lantern/agent.py +2 -0
app.py
CHANGED
|
@@ -46,10 +46,36 @@ class Run:
|
|
| 46 |
self.events: list[dict] = []
|
| 47 |
self.done = False
|
| 48 |
self.stop = threading.Event()
|
|
|
|
| 49 |
|
| 50 |
def start(self) -> None:
|
| 51 |
threading.Thread(target=self._play, daemon=True).start()
|
| 52 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 53 |
def _play(self) -> None:
|
| 54 |
env = None
|
| 55 |
try:
|
|
@@ -57,24 +83,30 @@ class Run:
|
|
| 57 |
lessons = journal.lessons(self.task_id)
|
| 58 |
config = EpisodeConfig(use_lessons=self.use_lessons)
|
| 59 |
for event in run_episode(env, ChatClient(), lessons, config, self.stop):
|
|
|
|
|
|
|
| 60 |
if event["type"] == "end" and event["new_lessons"]:
|
| 61 |
event["journal"] = journal.add(self.task_id, event["new_lessons"])
|
| 62 |
store.push_journal()
|
| 63 |
-
self.
|
|
|
|
| 64 |
except Exception as exc: # surface the failure to the viewer instead of hanging
|
| 65 |
-
self.
|
| 66 |
finally:
|
| 67 |
if env is not None:
|
| 68 |
env.close()
|
| 69 |
-
self.
|
| 70 |
-
|
|
|
|
| 71 |
|
| 72 |
-
def
|
|
|
|
|
|
|
| 73 |
end = next((e for e in reversed(self.events) if e["type"] == "end"), {})
|
| 74 |
store.save({"id": self.id, "task": self.task_id, "seed": self.seed, "source": "space",
|
| 75 |
"use_lessons": self.use_lessons, "finished_at": time.time(),
|
| 76 |
"outcome": end.get("outcome", "error"), "steps": end.get("steps", 0),
|
| 77 |
-
"events": self.events})
|
| 78 |
|
| 79 |
|
| 80 |
runs: dict[str, Run] = {}
|
|
@@ -123,8 +155,8 @@ def stop_run(run_id: str) -> dict:
|
|
| 123 |
run = runs.get(run_id)
|
| 124 |
if run is None:
|
| 125 |
raise HTTPException(404, "No such run.")
|
| 126 |
-
run.
|
| 127 |
-
return {"
|
| 128 |
|
| 129 |
|
| 130 |
@app.get("/api/runs/{run_id}/events")
|
|
|
|
| 46 |
self.events: list[dict] = []
|
| 47 |
self.done = False
|
| 48 |
self.stop = threading.Event()
|
| 49 |
+
self._lock = threading.Lock()
|
| 50 |
|
| 51 |
def start(self) -> None:
|
| 52 |
threading.Thread(target=self._play, daemon=True).start()
|
| 53 |
|
| 54 |
+
def request_stop(self) -> None:
|
| 55 |
+
"""End the run for viewers right away.
|
| 56 |
+
|
| 57 |
+
A Beam call already in flight cannot be cancelled cleanly, so the worker thread
|
| 58 |
+
lets it finish and discards the result; viewers and the run slot don't wait for it.
|
| 59 |
+
"""
|
| 60 |
+
self.stop.set()
|
| 61 |
+
with self._lock:
|
| 62 |
+
if self.done:
|
| 63 |
+
return
|
| 64 |
+
turns = [e for e in self.events if e["type"] == "turn"]
|
| 65 |
+
self.events.append({"type": "end", "task": self.task_id, "outcome": "stopped",
|
| 66 |
+
"steps": turns[-1]["steps"] if turns else 0, "reward": 0.0,
|
| 67 |
+
"usage": {"prompt_tokens": 0, "completion_tokens": 0, "calls": len(turns)},
|
| 68 |
+
"new_lessons": []})
|
| 69 |
+
self._finish()
|
| 70 |
+
|
| 71 |
+
def _emit(self, event: dict) -> bool:
|
| 72 |
+
"""Record an event unless the run was already stopped; returns False once stopped."""
|
| 73 |
+
with self._lock:
|
| 74 |
+
if self.done:
|
| 75 |
+
return False
|
| 76 |
+
self.events.append(event)
|
| 77 |
+
return True
|
| 78 |
+
|
| 79 |
def _play(self) -> None:
|
| 80 |
env = None
|
| 81 |
try:
|
|
|
|
| 83 |
lessons = journal.lessons(self.task_id)
|
| 84 |
config = EpisodeConfig(use_lessons=self.use_lessons)
|
| 85 |
for event in run_episode(env, ChatClient(), lessons, config, self.stop):
|
| 86 |
+
if self.stop.is_set():
|
| 87 |
+
break
|
| 88 |
if event["type"] == "end" and event["new_lessons"]:
|
| 89 |
event["journal"] = journal.add(self.task_id, event["new_lessons"])
|
| 90 |
store.push_journal()
|
| 91 |
+
if not self._emit(event):
|
| 92 |
+
break
|
| 93 |
except Exception as exc: # surface the failure to the viewer instead of hanging
|
| 94 |
+
self._emit({"type": "error", "message": f"{type(exc).__name__}: {exc}"})
|
| 95 |
finally:
|
| 96 |
if env is not None:
|
| 97 |
env.close()
|
| 98 |
+
with self._lock:
|
| 99 |
+
if not self.done:
|
| 100 |
+
self._finish()
|
| 101 |
|
| 102 |
+
def _finish(self) -> None:
|
| 103 |
+
"""Mark done and save; callers hold the lock."""
|
| 104 |
+
self.done = True
|
| 105 |
end = next((e for e in reversed(self.events) if e["type"] == "end"), {})
|
| 106 |
store.save({"id": self.id, "task": self.task_id, "seed": self.seed, "source": "space",
|
| 107 |
"use_lessons": self.use_lessons, "finished_at": time.time(),
|
| 108 |
"outcome": end.get("outcome", "error"), "steps": end.get("steps", 0),
|
| 109 |
+
"events": list(self.events)})
|
| 110 |
|
| 111 |
|
| 112 |
runs: dict[str, Run] = {}
|
|
|
|
| 155 |
run = runs.get(run_id)
|
| 156 |
if run is None:
|
| 157 |
raise HTTPException(404, "No such run.")
|
| 158 |
+
run.request_stop()
|
| 159 |
+
return {"stopped": True}
|
| 160 |
|
| 161 |
|
| 162 |
@app.get("/api/runs/{run_id}/events")
|
lantern/agent.py
CHANGED
|
@@ -171,6 +171,8 @@ def run_episode(env: Env, client: ChatClient, lessons: list[str] | None = None,
|
|
| 171 |
plan = [a for a in args.get("actions", []) if a in env.action_names][:MAX_PLAN]
|
| 172 |
done_actions, path = [], []
|
| 173 |
for name in plan:
|
|
|
|
|
|
|
| 174 |
hp_before = frame.status["hp"]
|
| 175 |
frame, reward, terminated, truncated = env.step(name)
|
| 176 |
steps += 1
|
|
|
|
| 171 |
plan = [a for a in args.get("actions", []) if a in env.action_names][:MAX_PLAN]
|
| 172 |
done_actions, path = [], []
|
| 173 |
for name in plan:
|
| 174 |
+
if stop is not None and stop.is_set():
|
| 175 |
+
break
|
| 176 |
hp_before = frame.status["hp"]
|
| 177 |
frame, reward, terminated, truncated = env.step(name)
|
| 178 |
steps += 1
|