Agent Zero AI framework
knowledge import/reload
frdelf7b3e2540c0a
diff --git a/python/api/import_knowledge.py b/python/api/import_knowledge.pyindex fd760355d..30d2d8716 100644--- a/python/api/import_knowledge.py+++ b/python/api/import_knowledge.py@@ -2,7 +2,7 @@ from python.helpers.api import ApiHandlerfrom flask import Request, Responsefrom python.helpers.file_browser import FileBrowser-from python.helpers import files+from python.helpers import files, memoryimport osfrom werkzeug.utils import secure_filename@@ -12,8 +12,14 @@ class ImportKnowledge(ApiHandler):if "files[]" not in request.files:raise Exception("No files part")+ ctxid = request.form.get("ctxid", "")+ if not ctxid:+ raise Exception("No context id provided")++ context = self.get_context(ctxid)+file_list = request.files.getlist("files[]")- KNOWLEDGE_FOLDER = files.get_abs_path("knowledge/custom/main")+ KNOWLEDGE_FOLDER = files.get_abs_path(memory.get_custom_knowledge_subdir_abs(context.agent0),"main")saved_filenames = []@@ -23,4 +29,11 @@ class ImportKnowledge(ApiHandler):file.save(os.path.join(KNOWLEDGE_FOLDER, filename))saved_filenames.append(filename)- return {"message": "Knowledge Imported", "filenames": saved_filenames}+ #reload memory to re-import knowledge+ await memory.Memory.reload(context.agent0)+ context.log.set_initial_progress()++ return {+ "message": "Knowledge Imported",+ "filenames": saved_filenames[:5]+ }\ No newline at end of filediff --git a/python/api/poll.py b/python/api/poll.pyindex 174a02107..bf547a421 100644--- a/python/api/poll.py+++ b/python/api/poll.py@@ -35,5 +35,6 @@ class Poll(ApiHandler):"log_guid": context.log.guid,"log_version": len(context.log.updates),"log_progress": context.log.progress,+ "log_progress_active": context.log.progress_active,"paused": context.paused,}\ No newline at end of filediff --git a/python/extensions/monologue_end/_90_waiting_for_input_msg.py b/python/extensions/monologue_end/_90_waiting_for_input_msg.pyindex 448bc9017..987852949 100644--- a/python/extensions/monologue_end/_90_waiting_for_input_msg.py+++ b/python/extensions/monologue_end/_90_waiting_for_input_msg.py@@ -6,7 +6,5 @@ class WaitingForInputMsg(Extension):async def execute(self, loop_data: LoopData = LoopData(), **kwargs):# show temp info messageif self.agent.number == 0:- self.agent.context.log.log(- type="util", heading="Waiting for input", temp=True- )+ self.agent.context.log.set_initial_progress()diff --git a/python/helpers/log.py b/python/helpers/log.pyindex 7312a74ae..1dbe21887 100644--- a/python/helpers/log.py+++ b/python/helpers/log.py@@ -83,8 +83,7 @@ class Log:self.guid: str = str(uuid.uuid4())self.updates: list[int] = []self.logs: list[LogItem] = []- self.progress = ""- self.progress_no = 0+ self.set_initial_progress()def log(self,@@ -111,8 +110,7 @@ class Log:self.logs.append(item)self.updates += [item.no]if heading and item.no >= self.progress_no:- self.progress = heading- self.progress_no = item.no+ self.set_progress(heading, item.no)return itemdef update_item(@@ -131,8 +129,7 @@ class Log:if heading is not None:item.heading = headingif no >= self.progress_no:- self.progress = heading- self.progress_no = no+ self.set_progress(heading, no)if content is not None:item.content = contentif kvps is not None:@@ -149,9 +146,15 @@ class Log:self.updates += [item.no]- def set_progress(self, progress: str):+ def set_progress(self, progress: str, no: int = 0, active: bool = True):self.progress = progress- self.progress_no = len(self.logs)+ if not no:+ no = len(self.logs)+ self.progress_no = no+ self.progress_active = active++ def set_initial_progress(self):+ self.set_progress("Waiting for input", 0, False)def output(self, start=None, end=None):if start is None:@@ -172,5 +175,4 @@ class Log:self.guid = str(uuid.uuid4())self.updates = []self.logs = []- self.progress = ""- self.progress_no = 0+ self.set_initial_progress()diff --git a/python/helpers/memory.py b/python/helpers/memory.pyindex 1815c8583..cdce41d32 100644--- a/python/helpers/memory.py+++ b/python/helpers/memory.py@@ -72,6 +72,13 @@ class Memory:memory_subdir=memory_subdir,)+ @staticmethod+ async def reload(agent: Agent):+ memory_subdir = agent.config.memory_subdir or "default"+ if Memory.index.get(memory_subdir):+ del Memory.index[memory_subdir]+ return await Memory.get(agent)+@staticmethoddef initialize(log_item: LogItem | None,@@ -151,6 +158,9 @@ class Memory:async def preload_knowledge(self, log_item: LogItem | None, kn_dirs: list[str], memory_subdir: str):+ if log_item:+ log_item.update(heading="Preloading knowledge...")+# db abs pathdb_dir = Memory._abs_db_dir(memory_subdir)@@ -351,5 +361,12 @@ class Memory:def get_timestamp():return datetime.now().strftime("%Y-%m-%d %H:%M:%S")+def get_memory_subdir_abs(agent: Agent) -> str:- return files.get_abs_path("memory", agent.config.memory_subdir or "default")\ No newline at end of file+ return files.get_abs_path("memory", agent.config.memory_subdir or "default")++def get_custom_knowledge_subdir_abs(agent: Agent) -> str:+ for dir in agent.config.knowledge_subdirs:+ if dir != "default":+ return files.get_abs_path("knowledge", dir)+ raise Exception("No custom knowledge subdir set")diff --git a/python/helpers/persist_chat.py b/python/helpers/persist_chat.pyindex 2906d1380..51c489c46 100644--- a/python/helpers/persist_chat.py+++ b/python/helpers/persist_chat.py@@ -166,8 +166,7 @@ def _deserialize_agents(def _deserialize_log(data: dict[str, Any]) -> "Log":log = Log()log.guid = data.get("guid", str(uuid.uuid4()))- log.progress = "" # data.get("progress", "")- log.progress_no = data.get("progress_no", 0)+ log.set_initial_progress()# Deserialize the list of LogItem objectsi = 0diff --git a/webui/index.js b/webui/index.jsindex 5c5b56fab..d1944caf7 100644--- a/webui/index.js+++ b/webui/index.js@@ -269,6 +269,8 @@ window.loadKnowledge = async function () {formData.append('files[]', file);}+ formData.append('ctxid', getContext());+const response = await fetch('/import_knowledge', {method: 'POST',body: formData,@@ -357,7 +359,7 @@ async function poll() {afterMessagesUpdate(response.logs)}- updateProgress(response.log_progress)+ updateProgress(response.log_progress, response.log_progress_active)//set ui model vars from backendconst inputAD = Alpine.$data(inputSection);@@ -400,11 +402,10 @@ function speakMessages(logs) {}}-function updateProgress(progress) {- const defaultText = "Waiting for input"- if (!progress) progress = defaultText+function updateProgress(progress, active) {+ if (!progress) progress = ""- if (progress == defaultText) {+ if (!active) {removeClassFromElement(progressBar, "shiny-text")} else {addClassToElement(progressBar, "shiny-text")