Agent Zero AI framework
Refactor memory imports; add Alpine move directives
frdel39a81d0d5d14
diff --git a/plugins/memory/extensions/python/message_loop_prompts_after/_91_recall_wait.py b/plugins/memory/extensions/python/message_loop_prompts_after/_91_recall_wait.pyindex b21785953..4f17d7732 100644--- a/plugins/memory/extensions/python/message_loop_prompts_after/_91_recall_wait.py+++ b/plugins/memory/extensions/python/message_loop_prompts_after/_91_recall_wait.py@@ -1,6 +1,6 @@from python.helpers.extension import Extensionfrom agent import LoopData-from plugins.memory.extensions.backend.message_loop_prompts_after._50_recall_memories import DATA_NAME_TASK as DATA_NAME_TASK_MEMORIES, DATA_NAME_ITER as DATA_NAME_ITER_MEMORIES+from plugins.memory.extensions.python.message_loop_prompts_after._50_recall_memories import DATA_NAME_TASK as DATA_NAME_TASK_MEMORIES, DATA_NAME_ITER as DATA_NAME_ITER_MEMORIESfrom python.helpers import settingsclass RecallWait(Extension):diff --git a/plugins/memory/extensions/webui/sidebar-quick-actions-main-2/memory-entry.html b/plugins/memory/extensions/webui/sidebar-quick-actions-main-2/memory-entry.htmldeleted file mode 100644index 779cf10c6..000000000--- a/plugins/memory/extensions/webui/sidebar-quick-actions-main-2/memory-entry.html+++ /dev/null@@ -1,19 +0,0 @@-<!-- <html>--<head>- <meta name="plugin-target" content=".quick-actions-dropdown">-</head>--<body>- <button class="dropdown-item" @click="openModal('../plugins/memory/webui/memory-dashboard.html'); dropdownOpen = false">- <span class="material-symbols-outlined">psychology</span>- <span>Memories</span>- </button>-</body>--</html> -->-- <!-- Memory -->- <button class="config-button" id="memory-dash" @click="openModal('../plugins/memory/webui/memory-dashboard.html')" title="Memory">- <span class="material-symbols-outlined">psychology</span>- </button>diff --git a/plugins/memory/extensions/webui/sidebar-quick-actions-main-start/memory-entry.html b/plugins/memory/extensions/webui/sidebar-quick-actions-main-start/memory-entry.htmlnew file mode 100644index 000000000..a964d471a--- /dev/null+++ b/plugins/memory/extensions/webui/sidebar-quick-actions-main-start/memory-entry.html@@ -0,0 +1,7 @@+<!-- Memory -->+<div x-data>+ <button x-move-after=".config-button#dashboard" class="config-button" id="memory-dash" @click="openModal('../plugins/memory/webui/memory-dashboard.html')"+ title="Memory">+ <span class="material-symbols-outlined">psychology</span>+ </button>+</div>\ No newline at end of filediff --git a/plugins/memory/tools/behaviour_adjustment.py b/plugins/memory/tools/behaviour_adjustment.pyindex 292aaa126..3aabf3198 100644--- a/plugins/memory/tools/behaviour_adjustment.py+++ b/plugins/memory/tools/behaviour_adjustment.py@@ -2,8 +2,6 @@ from python.helpers import filesfrom python.helpers.tool import Tool, Responsefrom agent import Agentfrom python.helpers.log import LogItem--# Direct import - this tool lives inside the memory pluginfrom plugins.memory.helpers import memorydiff --git a/plugins/memory/tools/memory_delete.py b/plugins/memory/tools/memory_delete.pyindex 5ecf8a3f6..9accb6273 100644--- a/plugins/memory/tools/memory_delete.py+++ b/plugins/memory/tools/memory_delete.py@@ -1,12 +1,6 @@from python.helpers.tool import Tool, Response+from plugins.memory.helpers.memory import Memory-# Import Memory from plugin-import sys-from pathlib import Path-_plugin_root = Path(__file__).parent.parent-if str(_plugin_root) not in sys.path:- sys.path.insert(0, str(_plugin_root))-from helpers.memory import Memoryclass MemoryDelete(Tool):diff --git a/plugins/memory/tools/memory_forget.py b/plugins/memory/tools/memory_forget.pyindex 51a7f2c40..113f15629 100644--- a/plugins/memory/tools/memory_forget.py+++ b/plugins/memory/tools/memory_forget.py@@ -1,12 +1,6 @@from python.helpers.tool import Tool, Response+from plugins.memory.helpers.memory import Memory-# Import Memory and DEFAULT_THRESHOLD from plugin-import sys-from pathlib import Path-_plugin_root = Path(__file__).parent.parent-if str(_plugin_root) not in sys.path:- sys.path.insert(0, str(_plugin_root))-from helpers.memory import Memoryfrom tools.memory_load import DEFAULT_THRESHOLDdiff --git a/plugins/memory/tools/memory_load.py b/plugins/memory/tools/memory_load.pyindex 323891c4e..bbe226dcc 100644--- a/plugins/memory/tools/memory_load.py+++ b/plugins/memory/tools/memory_load.py@@ -1,12 +1,5 @@from python.helpers.tool import Tool, Response--# Import Memory from plugin-import sys-from pathlib import Path-_plugin_root = Path(__file__).parent.parent-if str(_plugin_root) not in sys.path:- sys.path.insert(0, str(_plugin_root))-from helpers.memory import Memory+from plugins.memory.helpers.memory import MemoryDEFAULT_THRESHOLD = 0.7DEFAULT_LIMIT = 10diff --git a/plugins/memory/tools/memory_save.py b/plugins/memory/tools/memory_save.pyindex c5b13166f..b33e92ca3 100644--- a/plugins/memory/tools/memory_save.py+++ b/plugins/memory/tools/memory_save.py@@ -1,12 +1,6 @@from python.helpers.tool import Tool, Response+from plugins.memory.helpers.memory import Memory-# Import Memory from plugin-import sys-from pathlib import Path-_plugin_root = Path(__file__).parent.parent-if str(_plugin_root) not in sys.path:- sys.path.insert(0, str(_plugin_root))-from helpers.memory import Memoryclass MemorySave(Tool):diff --git a/python/__init__.py b/python/__init__.pydeleted file mode 100644index e69de29bb..000000000diff --git a/webui/components/sidebar/top-section/quick-actions.html b/webui/components/sidebar/top-section/quick-actions.htmlindex 8da1cd21c..91cdae566 100644--- a/webui/components/sidebar/top-section/quick-actions.html+++ b/webui/components/sidebar/top-section/quick-actions.html@@ -19,23 +19,11 @@<span class="material-symbols-outlined">home</span></button>- <x-extension id="sidebar-quick-actions-main-2"></x-extension>--- <!-- Memory -->- <!-- <button class="config-button" id="memory-dash" @click="openModal('../plugins/memory/webui/memory-dashboard.html')" title="Memory">- <span class="material-symbols-outlined">psychology</span>- </button> -->-- <x-extension id="sidebar-quick-actions-main-3"></x-extension>-<!-- Scheduler --><button class="config-button" id="scheduler" @click="openModal('modals/scheduler/scheduler-modal.html')" title="Scheduler"><span class="material-symbols-outlined">schedule</span></button>- <x-extension id="sidebar-quick-actions-main-4"></x-extension>-<!-- Settings --><button class="config-button" id="settings" @click="openModal('settings/settings.html')" title="Settings"><span class="material-symbols-outlined">settings</span>@@ -58,8 +46,6 @@<div class="dropdown-header">Navigation</div>- <x-extension id="sidebar-quick-actions-dropdown-navigation-start"></x-extension>-<button class="dropdown-item" @click="deselectChat(); dropdownOpen = false"><span class="material-symbols-outlined">home</span><span>Dashboard</span>@@ -79,15 +65,10 @@<span class="material-symbols-outlined">settings</span><span>Settings</span></button>-- <x-extension id="sidebar-quick-actions-dropdown-navigation-end"></x-extension>-<div class="dropdown-separator"></div><div class="dropdown-header">Chat Actions</div>- <x-extension id="sidebar-quick-actions-dropdown-chat-start"></x-extension>-<button class="dropdown-item" @click="$store.chats.newChat(); dropdownOpen = false"><span class="material-symbols-outlined">edit_square</span><span>New Chat</span>@@ -108,11 +89,8 @@<span>Clear Chat</span></button>- <x-extension id="sidebar-quick-actions-dropdown-chat-end"></x-extension>-<div class="dropdown-separator"></div>- <x-extension id="sidebar-quick-actions-dropdown-rest-start"></x-extension><button class="dropdown-item" @click="$confirmClick($event, () => { $store.chats.logout(); dropdownOpen = false })" :disabled="!$store.chats.loggedIn"><span class="material-symbols-outlined">logout</span>@@ -124,7 +102,7 @@<span>Restart A0</span></button>- <x-extension id="sidebar-quick-actions-dropdown-rest-end"></x-extension>+ <x-extension id="sidebar-quick-actions-dropdown-end"></x-extension></div></div></body>diff --git a/webui/js/extensions.js b/webui/js/extensions.jsindex db73fe30c..9a4a5c859 100644--- a/webui/js/extensions.js+++ b/webui/js/extensions.js@@ -36,11 +36,11 @@ export function invalidateCache() {* @param {any} data* @returns {Promise<void>}*/-export async function callJsExtensions(extensionPoint, data){+export async function callJsExtensions(extensionPoint, ...data){const extensions = jsExtensionsCache.get(extensionPoint) || await loadJsExtensions(extensionPoint);for(const extension of extensions){try{- await extension.module.default(data);+ await extension.module.default(...data);}catch(error){console.error(`Error calling extension: ${extension.path}`, error);}diff --git a/webui/js/initFw.js b/webui/js/initFw.jsindex 8f7d1c00b..658fbc89a 100644--- a/webui/js/initFw.js+++ b/webui/js/initFw.js@@ -31,6 +31,93 @@ Alpine.directive(});+ const resolveSelector = (expression, evaluateLater, cb) => {+ if (typeof expression !== "string" || !expression.trim()) return;++ if (/^[\s]*["']/.test(expression)) {+ const getSelector = evaluateLater(expression);+ getSelector((evaluated) => {+ if (typeof evaluated !== "string" || !evaluated.trim()) return;+ cb(evaluated.trim());+ });+ return;+ }++ cb(expression.trim());+ };++ const moveOnNextTick = (el, expression, evaluateLater, fn) => {+ Alpine.nextTick(() => {+ resolveSelector(expression, evaluateLater, (selector) => fn(el, selector));+ });+ };++ Alpine.directive(+ "move-to-start",+ (el, { expression }, { evaluateLater }) => {+ moveOnNextTick(el, expression, evaluateLater, (_el, selector) => {+ const parent = document.querySelector(selector);+ if (!parent) return;+ parent.insertBefore(_el, parent.firstChild);+ });+ }+ );++ Alpine.directive(+ "move-to-end",+ (el, { expression }, { evaluateLater }) => {+ moveOnNextTick(el, expression, evaluateLater, (_el, selector) => {+ const parent = document.querySelector(selector);+ if (!parent) return;+ parent.appendChild(_el);+ });+ }+ );++ Alpine.directive(+ "move-to",+ (el, { expression, modifiers, value }, { evaluateLater }) => {+ const orderModifier = Array.isArray(modifiers)+ ? modifiers.find((m) => /^\d+$/.test(m))+ : null;++ const orderRaw = orderModifier ?? value;+ const order = Number(orderRaw);+ if (!Number.isFinite(order)) return;++ moveOnNextTick(el, expression, evaluateLater, (_el, selector) => {+ const parent = document.querySelector(selector);+ if (!parent) return;++ const index = Math.max(0, Math.floor(order));+ const beforeNode = parent.children.item(index) ?? null;+ parent.insertBefore(_el, beforeNode);+ });+ }+ );++ Alpine.directive(+ "move-before",+ (el, { expression }, { evaluateLater }) => {+ moveOnNextTick(el, expression, evaluateLater, (_el, selector) => {+ const ref = document.querySelector(selector);+ if (!ref || !ref.parentElement) return;+ ref.parentElement.insertBefore(_el, ref);+ });+ }+ );++ Alpine.directive(+ "move-after",+ (el, { expression }, { evaluateLater }) => {+ moveOnNextTick(el, expression, evaluateLater, (_el, selector) => {+ const ref = document.querySelector(selector);+ if (!ref || !ref.parentElement) return;+ ref.parentElement.insertBefore(_el, ref.nextSibling);+ });+ }+ );+// run every second if the component is activeAlpine.directive("every-second",