Agent Zero AI framework
threading, readline fixes
frdela4937de68a38
diff --git a/python/helpers/defer.py b/python/helpers/defer.pyindex 2d26e77a5..274e00330 100644--- a/python/helpers/defer.py+++ b/python/helpers/defer.py@@ -5,15 +5,16 @@ from concurrent.futures import Futureclass DeferredTask:def __init__(self, func, *args, **kwargs):self._loop = asyncio.new_event_loop()- # self._thread = Noneself._task = Noneself._future = Future()+ self._task_initialized = threading.Event() # Event to signal task initializationself._start_task(func, *args, **kwargs)def _start_task(self, func, *args, **kwargs):def run_in_thread(loop, func, args, kwargs):asyncio.set_event_loop(loop)self._task = loop.create_task(self._run(func, *args, **kwargs))+ self._task_initialized.set() # Signal that the task has been initializedloop.run_forever()self._thread = threading.Thread(target=run_in_thread, args=(self._loop, func, args, kwargs))@@ -32,15 +33,18 @@ class DeferredTask:return self._future.done()async def result(self, timeout=None):- if self._task is None:+ if not self._task_initialized.wait(timeout): # Wait until the task is initializedraise RuntimeError("Task was not initialized properly.")-+try:return await asyncio.wait_for(asyncio.wrap_future(self._future), timeout)except asyncio.TimeoutError:raise TimeoutError("The task did not complete within the specified timeout.")def result_sync(self, timeout=None):+ if not self._task_initialized.wait(timeout): # Wait until the task is initialized+ raise RuntimeError("Task was not initialized properly.")+try:return self._future.result(timeout)except TimeoutError:diff --git a/python/helpers/timed_input.py b/python/helpers/timed_input.pyindex 64c30d33b..923002dae 100644--- a/python/helpers/timed_input.py+++ b/python/helpers/timed_input.py@@ -1,8 +1,9 @@+import sysfrom inputimeout import inputimeout, TimeoutOccurreddef timeout_input(prompt, timeout=10):try:- import readline+ if sys.platform != "win32": import readlineuser_input = inputimeout(prompt=prompt, timeout=timeout)return user_inputexcept TimeoutOccurred:diff --git a/run_cli.py b/run_cli.pyindex e2f4406a0..6e50663d2 100644--- a/run_cli.py+++ b/run_cli.py@@ -1,4 +1,5 @@import asyncio+import sysimport threading, time, models, osfrom ansio import application_keypad, mouse_input, raw_inputfrom ansio.input import InputEvent, get_input_event@@ -24,13 +25,13 @@ async def chat(context: AgentContext):timeout = context.agent0.get_data("timeout") # how long the agent is willing to waitif not timeout: # if agent wants to wait for user input foreverPrintStyle(background_color="#6C3483", font_color="white", bold=True, padding=True).print(f"User message ('e' to leave):")- import readline # this fixes arrow keys in terminal+ if sys.platform != "win32": import readline # this fixes arrow keys in terminaluser_input = input("> ")PrintStyle(font_color="white", padding=False, log_only=True).print(f"> {user_input}")else: # otherwise wait for user input with a timeoutPrintStyle(background_color="#6C3483", font_color="white", bold=True, padding=True).print(f"User message ({timeout}s timeout, 'w' to wait, 'e' to leave):")- import readline # this fixes arrow keys in terminal+ if sys.platform != "win32": import readline # this fixes arrow keys in terminal# user_input = timed_input("> ", timeout=timeout)user_input = timeout_input("> ", timeout=timeout)@@ -62,7 +63,7 @@ def intervention():context.paused = True # stop agent streamingPrintStyle(background_color="#6C3483", font_color="white", bold=True, padding=True).print(f"User intervention ('e' to leave, empty to continue):")- import readline # this fixes arrow keys in terminal+ if sys.platform != "win32": import readline # this fixes arrow keys in terminaluser_input = input("> ").strip()PrintStyle(font_color="white", padding=False, log_only=True).print(f"> {user_input}")