Agent Zero AI framework
offload memory to deferred tasks
frdel720ff4a5eae9
diff --git a/python/extensions/message_loop_end/_10_organize_history.py b/python/extensions/message_loop_end/_10_organize_history.pyindex a529b49ce..e7c9eceb7 100644--- a/python/extensions/message_loop_end/_10_organize_history.py+++ b/python/extensions/message_loop_end/_10_organize_history.py@@ -1,6 +1,6 @@-import asynciofrom python.helpers.extension import Extensionfrom agent import LoopData+from python.helpers.defer import DeferredTask, THREAD_BACKGROUNDDATA_NAME_TASK = "_organize_history_task"@@ -8,11 +8,12 @@ DATA_NAME_TASK = "_organize_history_task"class OrganizeHistory(Extension):async def execute(self, loop_data: LoopData = LoopData(), **kwargs):# is there a running task? if yes, skip this round, the wait extension will double check the context size- task = self.agent.get_data(DATA_NAME_TASK)- if task and not task.done():+ task: DeferredTask|None = self.agent.get_data(DATA_NAME_TASK)+ if task and not task.is_ready():return# start task- task = asyncio.create_task(self.agent.history.compress())+ task = DeferredTask(thread_name=THREAD_BACKGROUND)+ task.start_task(self.agent.history.compress)# set to agent to be able to wait for itself.agent.set_data(DATA_NAME_TASK, task)diff --git a/python/extensions/message_loop_prompts_before/_90_organize_history_wait.py b/python/extensions/message_loop_prompts_before/_90_organize_history_wait.pyindex 84bc5ab50..6454957e9 100644--- a/python/extensions/message_loop_prompts_before/_90_organize_history_wait.py+++ b/python/extensions/message_loop_prompts_before/_90_organize_history_wait.py@@ -1,7 +1,7 @@from python.helpers.extension import Extensionfrom agent import LoopDatafrom python.extensions.message_loop_end._10_organize_history import DATA_NAME_TASK-import asyncio+from python.helpers.defer import DeferredTask, THREAD_BACKGROUNDclass OrganizeHistoryWait(Extension):@@ -10,20 +10,20 @@ class OrganizeHistoryWait(Extension):# sync action only required if the history is too large, otherwise leave it in backgroundwhile self.agent.history.is_over_limit():# get task- task = self.agent.get_data(DATA_NAME_TASK)+ task: DeferredTask|None = self.agent.get_data(DATA_NAME_TASK)# Check if the task is already doneif task:- if not task.done():+ if not task.is_ready():self.agent.context.log.set_progress("Compressing history...")# Wait for the task to complete- await task+ await task.result()# Clear the coroutine data after it's doneself.agent.set_data(DATA_NAME_TASK, None)else:- # no task running, start and wait+ # no task was running, start and waitself.agent.context.log.set_progress("Compressing history...")await self.agent.history.compress()diff --git a/python/extensions/monologue_end/_50_memorize_fragments.py b/python/extensions/monologue_end/_50_memorize_fragments.pyindex 9dbf91dae..3a6420ae7 100644--- a/python/extensions/monologue_end/_50_memorize_fragments.py+++ b/python/extensions/monologue_end/_50_memorize_fragments.py@@ -6,6 +6,7 @@ from python.helpers.dirty_json import DirtyJsonfrom agent import LoopDatafrom python.helpers.log import LogItemfrom python.tools.memory_load import DEFAULT_THRESHOLD as DEFAULT_MEMORY_THRESHOLD+from python.helpers.defer import DeferredTask, THREAD_BACKGROUNDclass MemorizeMemories(Extension):@@ -25,11 +26,16 @@ class MemorizeMemories(Extension):)# memorize in background- task = asyncio.create_task(self.memorize(loop_data, log_item))+ task = DeferredTask(thread_name=THREAD_BACKGROUND)+ task.start_task(self.memorize, loop_data, log_item)+ # task = asyncio.create_task(self.memorize(loop_data, log_item))return taskasync def memorize(self, loop_data: LoopData, log_item: LogItem, **kwargs):++ await asyncio.sleep(15)+set = settings.get_settings()db = await Memory.get(self.agent)diff --git a/python/extensions/monologue_end/_51_memorize_solutions.py b/python/extensions/monologue_end/_51_memorize_solutions.pyindex d3969bb02..7189174fa 100644--- a/python/extensions/monologue_end/_51_memorize_solutions.py+++ b/python/extensions/monologue_end/_51_memorize_solutions.py@@ -6,7 +6,7 @@ from python.helpers.dirty_json import DirtyJsonfrom agent import LoopDatafrom python.helpers.log import LogItemfrom python.tools.memory_load import DEFAULT_THRESHOLD as DEFAULT_MEMORY_THRESHOLD-+from python.helpers.defer import DeferredTask, THREAD_BACKGROUNDclass MemorizeSolutions(Extension):@@ -25,7 +25,9 @@ class MemorizeSolutions(Extension):)# memorize in background- task = asyncio.create_task(self.memorize(loop_data, log_item))+ task = DeferredTask(thread_name=THREAD_BACKGROUND)+ task.start_task(self.memorize, loop_data, log_item)+ # task = asyncio.create_task(self.memorize(loop_data, log_item))return taskasync def memorize(self, loop_data: LoopData, log_item: LogItem, **kwargs):diff --git a/python/helpers/defer.py b/python/helpers/defer.pyindex 8c2c7e86e..eb2a68e56 100644--- a/python/helpers/defer.py+++ b/python/helpers/defer.py@@ -6,17 +6,19 @@ from typing import Any, Callable, Optional, Coroutine, TypeVar, AwaitableT = TypeVar("T")+THREAD_BACKGROUND = "Background"+class EventLoopThread:_instances: dict[str, "EventLoopThread"] = {}_lock = threading.Lock()- def __init__(self, thread_name: str = "Background") -> None:+ def __init__(self, thread_name: str = THREAD_BACKGROUND) -> None:"""Initialize the event loop thread."""self.thread_name = thread_nameself._start()- def __new__(cls, thread_name: str = "Background"):+ def __new__(cls, thread_name: str = THREAD_BACKGROUND):with cls._lock:if thread_name not in cls._instances:instance = super(EventLoopThread, cls).__new__(cls)@@ -81,7 +83,7 @@ class ChildTask:class DeferredTask:def __init__(self,- thread_name: str = "Background",+ thread_name: str = THREAD_BACKGROUND,):self.event_loop_thread = EventLoopThread(thread_name)self._future: Optional[Future] = Nonediff --git a/webui/js/messages.js b/webui/js/messages.jsindex 359a7085c..a81d24e62 100644--- a/webui/js/messages.js+++ b/webui/js/messages.js@@ -1217,7 +1217,7 @@ export function drawMessageUtil({});- result.dontScroll = preferencesStore.showUtils;+ result.dontScroll = !preferencesStore.showUtils;return result;}