Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Flush logs on action start

Tomas Valenta6b53f6e87cd7
diff --git a/api-service/codegen/callbacks/log_queue.py b/api-service/codegen/callbacks/log_queue.py
index 5549016dd..21568a68e 100644
--- a/api-service/codegen/callbacks/log_queue.py
+++ b/api-service/codegen/callbacks/log_queue.py
@@ -4,26 +4,41 @@ from typing import Coroutine
class LogQueue:
def __init__(self, interval: float = 0.05) -> None:
- self.queue: Queue[Coroutine] = Queue()
- self.work = ensure_future(self.worker())
- self.interval = interval
+ self._interval = interval
+ self._queue: Queue[Coroutine] = Queue()
+ # Start the worker that saves logs from queue to the db.
+ self._worker = ensure_future(self._start())
- async def worker(self):
- while True:
- for _ in range(self.queue.qsize() - 1):
- old_coro = self.queue.get_nowait()
- try:
- old_coro.close()
- except Exception as e:
- print(e)
-
- task = await self.queue.get()
+ async def _work(self):
+ # Remove all logs except the newest one from the queue.
+ for _ in range(self._queue.qsize() - 1):
+ old_coro = self._queue.get_nowait()
try:
- await ensure_future(task)
- self.queue.task_done()
+ old_coro.close()
except Exception as e:
print(e)
- await sleep(self.interval)
+ finally:
+ self._queue.task_done()
+
+ # Save the newest log to the db or wait until a log is pushed to the queue.
+ task = await self._queue.get()
+ try:
+ await ensure_future(task)
+ except Exception as e:
+ print(e)
+ finally:
+ self._queue.task_done()
+
+ async def _start(self):
+ while True:
+ await self._work()
+ await sleep(self._interval)
+
+ async def flush(self):
+ await self._queue.join()
+
+ def add(self, log: Coroutine):
+ self._queue.put_nowait(log)
def close(self):
- self.work.cancel()
+ self._worker.cancel()
diff --git a/api-service/codegen/callbacks/logs.py b/api-service/codegen/callbacks/logs.py
index d4ad3b718..a72fe0103 100644
--- a/api-service/codegen/callbacks/logs.py
+++ b/api-service/codegen/callbacks/logs.py
@@ -20,7 +20,7 @@ class LogsCallbackHandler(AsyncCallbackHandler):
self._run_id = run_id
self._parser = LogStreamParser(tool_names=tool_names)
self._log_queue = LogQueue()
- self._raw_log_queue = LogQueue(3)
+ self._raw_log_queue = LogQueue(1.5)
def __del__(self):
self._log_queue.close()
@@ -28,13 +28,14 @@ class LogsCallbackHandler(AsyncCallbackHandler):
def _add_and_push_raw_logs(self, new_raw_log: str) -> None:
self._raw_logs += new_raw_log
- if self._raw_logs:
- coro = self._database.push_raw_logs(self._run_id, self._raw_logs)
- self._raw_log_queue.queue.put_nowait(coro)
+ self._raw_log_queue.add(
+ self._database.push_raw_logs(self._run_id, self._raw_logs),
+ )
def _push_logs(self, logs: list[ToolLog | ThoughtLog]) -> None:
- coro = self._database.push_logs(self._run_id, logs)
- self._log_queue.queue.put_nowait(coro)
+ self._log_queue.add(
+ self._database.push_logs(self._run_id, logs),
+ )
async def on_llm_start(
self, serialized: Dict[str, Any], prompts: List[str], **kwargs: Any
@@ -82,6 +83,10 @@ class LogsCallbackHandler(AsyncCallbackHandler):
print("Starting tool")
self._add_and_push_raw_logs("Starting tool...")
+ await self._log_queue.flush()
+ await self._raw_log_queue.flush()
+
+
async def on_tool_end(self, output: str, **kwargs: Any) -> None:
"""Run when tool ends running."""
print("Finished tool")