dev merge

python/api/import_knowledge.py

@@ -2,7 +2,7 @@ from python.helpers.api import ApiHandler
 from flask import Request, Response
 
 from python.helpers.file_browser import FileBrowser
-from python.helpers import files
+from python.helpers import files, memory
 import os
 from 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]
+        }

python/api/nudge.py

@@ -1,8 +1,6 @@
 from python.helpers.api import ApiHandler
 from flask import Request, Response
 
-from python.helpers import persist_chat
-
 class Nudge(ApiHandler):
     async def process(self, input: dict, request: Request) -> dict | Response:
         ctxid = input.get("ctxid", "")

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,
         }