Skip to content

Agent Zero AI framework

BIG PYTHON REFACTOR

frdeld02dda3667de
diff --git a/AGENTS.md b/AGENTS.md
index a4ee3eb8d..e347564e0 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -105,8 +105,8 @@ Key Files:
## Development Patterns & Conventions
### Backend (Python)
-- Context Access: Use from agent import AgentContext, AgentContextType (not python.helpers.context).
-- Communication: Use mq from python.helpers.messages to log proactive UI messages:
+- Context Access: Use from agent import AgentContext, AgentContextType (not helpers.context).
+- Communication: Use mq from helpers.messages to log proactive UI messages:
mq.log_user_message(context.id, "Message", source="Plugin")
- API Handlers: Derive from ApiHandler in python/helpers/api.py.
- Extensions: Use the extension framework in python/helpers/extension.py for lifecycle hooks.
@@ -164,7 +164,7 @@ Key Files:
### API Handler (Good)
```python
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
class MyHandler(ApiHandler):
async def process(self, input: dict, request: Request) -> dict | Response:
@@ -186,7 +186,7 @@ export const store = createStore("myStore", {
### Tool Definition (Good)
```python
-from python.helpers.tool import Tool, ToolResult
+from helpers.tool import Tool, ToolResult
class MyTool(Tool):
async def execute(self, arg1: str):
diff --git a/agent.py b/agent.py
index 4904734e7..efcbec1c7 100644
--- a/agent.py
+++ b/agent.py
@@ -7,7 +7,7 @@ from typing import Any, Awaitable, Coroutine, Dict, Literal
from enum import Enum
import models
-from python.helpers import (
+from helpers import (
extract_tools,
files,
errors,
@@ -17,22 +17,21 @@ from python.helpers import (
dirty_json,
subagents,
)
-from python.helpers import extension
-from python.helpers.print_style import PrintStyle
+from helpers import extension
+from helpers.print_style import PrintStyle
from langchain_core.prompts import (
ChatPromptTemplate,
)
from langchain_core.messages import SystemMessage, BaseMessage
-import python.helpers.log as Log
-from python.helpers.dirty_json import DirtyJson
-from python.helpers.defer import DeferredTask
+import helpers.log as Log
+from helpers.dirty_json import DirtyJson
+from helpers.defer import DeferredTask
from typing import Callable
-from python.helpers.localization import Localization
-from python.helpers.extension import call_extensions, extensible
-from python.helpers.errors import RepairableException, InterventionException, HandledException
-
+from helpers.localization import Localization
+from helpers.extension import call_extensions, extensible
+from helpers.errors import RepairableException, InterventionException, HandledException
class AgentContextType(Enum):
USER = "user"
@@ -147,7 +146,7 @@ class AgentContext:
@classmethod
def get_notification_manager(cls):
if cls._notification_manager is None:
- from python.helpers.notification import NotificationManager # type: ignore
+ from helpers.notification import NotificationManager # type: ignore
cls._notification_manager = NotificationManager()
return cls._notification_manager
@@ -177,7 +176,7 @@ class AgentContext:
# recursive is not used now, prepared for context hierarchy
self.output_data[key] = value
- @extensible
+ # @extensible
def output(self):
return {
"id": self.id,
@@ -859,7 +858,7 @@ class Agent:
# Try getting tool from MCP first
try:
- import python.helpers.mcp_handler as mcp_helper
+ import helpers.mcp_handler as mcp_helper
mcp_tool_candidate = mcp_helper.MCPConfig.get_instance().get_tool(
self, tool_name
@@ -969,13 +968,13 @@ class Agent:
loop_data: LoopData | None,
**kwargs,
):
- from python.tools.unknown import Unknown
- from python.helpers.tool import Tool
+ from tools.unknown import Unknown
+ from helpers.tool import Tool
classes = []
# search for tools in agent's folder hierarchy
- paths = subagents.get_paths(self, "tools", name + ".py", default_root="python")
+ paths = subagents.get_paths(self, "tools", name + ".py")
for path in paths:
try:
diff --git a/agents/_example/extensions/agent_init/_10_example_extension.py b/agents/_example/extensions/agent_init/_10_example_extension.py
index 587213e8c..22c2cb594 100644
--- a/agents/_example/extensions/agent_init/_10_example_extension.py
+++ b/agents/_example/extensions/agent_init/_10_example_extension.py
@@ -1,4 +1,4 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
# this is an example extension that renames the current agent when initialized
# see /extensions folder for all available extension points
diff --git a/agents/_example/tools/example_tool.py b/agents/_example/tools/example_tool.py
index e0aeb314e..a8ec89939 100644
--- a/agents/_example/tools/example_tool.py
+++ b/agents/_example/tools/example_tool.py
@@ -1,4 +1,4 @@
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
# this is an example tool class
# don't forget to include instructions in the system prompt by creating
diff --git a/agents/_example/tools/response.py b/agents/_example/tools/response.py
index f9017fb74..1d5b7f8d1 100644
--- a/agents/_example/tools/response.py
+++ b/agents/_example/tools/response.py
@@ -1,4 +1,4 @@
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
# example of a tool redefinition
# the original response tool is in python/tools/response.py
diff --git a/python/api/agents.py b/api/agents.py
similarity index 83%
rename from python/api/agents.py
rename to api/agents.py
index 372ed178f..c96b71fba 100644
--- a/python/api/agents.py
+++ b/api/agents.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers import subagents
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers import subagents
class Agents(ApiHandler):
diff --git a/python/api/api_files_get.py b/api/api_files_get.py
similarity index 95%
rename from python/api/api_files_get.py
rename to api/api_files_get.py
index 4d6dc2059..b2533f4f4 100644
--- a/python/api/api_files_get.py
+++ b/api/api_files_get.py
@@ -1,8 +1,8 @@
import base64
import os
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files
-from python.helpers.print_style import PrintStyle
+from helpers.api import ApiHandler, Request, Response
+from helpers import files
+from helpers.print_style import PrintStyle
import json
diff --git a/python/api/api_log_get.py b/api/api_log_get.py
similarity index 97%
rename from python/api/api_log_get.py
rename to api/api_log_get.py
index 44e64333d..7e26a5f61 100644
--- a/python/api/api_log_get.py
+++ b/api/api_log_get.py
@@ -1,5 +1,5 @@
from agent import AgentContext
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
class ApiLogGet(ApiHandler):
diff --git a/python/api/api_message.py b/api/api_message.py
similarity index 96%
rename from python/api/api_message.py
rename to api/api_message.py
index 11da89af8..1fbe66b41 100644
--- a/python/api/api_message.py
+++ b/api/api_message.py
@@ -2,11 +2,11 @@ import base64
import os
from datetime import datetime, timedelta
from agent import AgentContext, UserMessage, AgentContextType
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files, projects
-from python.helpers.print_style import PrintStyle
-from python.helpers.projects import activate_project
-from python.helpers.security import safe_filename
+from helpers.api import ApiHandler, Request, Response
+from helpers import files, projects
+from helpers.print_style import PrintStyle
+from helpers.projects import activate_project
+from helpers.security import safe_filename
from initialize import initialize_agent
import threading
diff --git a/python/api/api_reset_chat.py b/api/api_reset_chat.py
similarity index 93%
rename from python/api/api_reset_chat.py
rename to api/api_reset_chat.py
index d2d45f1b2..ddddf56a1 100644
--- a/python/api/api_reset_chat.py
+++ b/api/api_reset_chat.py
@@ -1,7 +1,7 @@
from agent import AgentContext
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.print_style import PrintStyle
-from python.helpers import persist_chat
+from helpers.api import ApiHandler, Request, Response
+from helpers.print_style import PrintStyle
+from helpers import persist_chat
import json
diff --git a/python/api/api_terminate_chat.py b/api/api_terminate_chat.py
similarity index 92%
rename from python/api/api_terminate_chat.py
rename to api/api_terminate_chat.py
index e746d84c5..a4d228ea3 100644
--- a/python/api/api_terminate_chat.py
+++ b/api/api_terminate_chat.py
@@ -1,7 +1,7 @@
from agent import AgentContext
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.persist_chat import remove_chat
-from python.helpers.print_style import PrintStyle
+from helpers.api import ApiHandler, Request, Response
+from helpers.persist_chat import remove_chat
+from helpers.print_style import PrintStyle
import json
diff --git a/python/api/backup_create.py b/api/backup_create.py
similarity index 91%
rename from python/api/backup_create.py
rename to api/backup_create.py
index c2b332361..f6c55dcdd 100644
--- a/python/api/backup_create.py
+++ b/api/backup_create.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response, send_file
-from python.helpers.backup import BackupService
-from python.helpers.persist_chat import save_tmp_chats
+from helpers.api import ApiHandler, Request, Response, send_file
+from helpers.backup import BackupService
+from helpers.persist_chat import save_tmp_chats
class BackupCreate(ApiHandler):
diff --git a/python/api/backup_get_defaults.py b/api/backup_get_defaults.py
similarity index 88%
rename from python/api/backup_get_defaults.py
rename to api/backup_get_defaults.py
index 3a3f4cf9e..0a0ba4b10 100644
--- a/python/api/backup_get_defaults.py
+++ b/api/backup_get_defaults.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.backup import BackupService
+from helpers.api import ApiHandler, Request, Response
+from helpers.backup import BackupService
class BackupGetDefaults(ApiHandler):
diff --git a/python/api/backup_inspect.py b/api/backup_inspect.py
similarity index 94%
rename from python/api/backup_inspect.py
rename to api/backup_inspect.py
index d4cea5616..8bbf9114c 100644
--- a/python/api/backup_inspect.py
+++ b/api/backup_inspect.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.backup import BackupService
+from helpers.api import ApiHandler, Request, Response
+from helpers.backup import BackupService
from werkzeug.datastructures import FileStorage
diff --git a/python/api/backup_preview_grouped.py b/api/backup_preview_grouped.py
similarity index 97%
rename from python/api/backup_preview_grouped.py
rename to api/backup_preview_grouped.py
index b7b12dbd6..736d17779 100644
--- a/python/api/backup_preview_grouped.py
+++ b/api/backup_preview_grouped.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.backup import BackupService
+from helpers.api import ApiHandler, Request, Response
+from helpers.backup import BackupService
from typing import Dict, Any
diff --git a/python/api/backup_restore.py b/api/backup_restore.py
similarity index 93%
rename from python/api/backup_restore.py
rename to api/backup_restore.py
index 86bf2a82a..4b4d3c47d 100644
--- a/python/api/backup_restore.py
+++ b/api/backup_restore.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
from werkzeug.datastructures import FileStorage
-from python.helpers.backup import BackupService
-from python.helpers.persist_chat import load_tmp_chats
+from helpers.backup import BackupService
+from helpers.persist_chat import load_tmp_chats
import json
diff --git a/python/api/backup_restore_preview.py b/api/backup_restore_preview.py
similarity index 96%
rename from python/api/backup_restore_preview.py
rename to api/backup_restore_preview.py
index d5d6e1bb5..aeedb36fb 100644
--- a/python/api/backup_restore_preview.py
+++ b/api/backup_restore_preview.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
from werkzeug.datastructures import FileStorage
-from python.helpers.backup import BackupService
+from helpers.backup import BackupService
import json
diff --git a/python/api/backup_test.py b/api/backup_test.py
similarity index 95%
rename from python/api/backup_test.py
rename to api/backup_test.py
index a7ef1b30c..b5b43eac8 100644
--- a/python/api/backup_test.py
+++ b/api/backup_test.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.backup import BackupService
+from helpers.api import ApiHandler, Request, Response
+from helpers.backup import BackupService
class BackupTest(ApiHandler):
diff --git a/python/api/banners.py b/api/banners.py
similarity index 84%
rename from python/api/banners.py
rename to api/banners.py
index f20e02ea1..f20a752e9 100644
--- a/python/api/banners.py
+++ b/api/banners.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.extension import call_extensions
+from helpers.api import ApiHandler, Request, Response
+from helpers.extension import call_extensions
class GetBanners(ApiHandler):
diff --git a/api/cache_reset.py b/api/cache_reset.py
new file mode 100644
index 000000000..ea45c508f
--- /dev/null
+++ b/api/cache_reset.py
@@ -0,0 +1,35 @@
+from helpers.api import ApiHandler, Request, Response
+from helpers import cache
+
+
+class CacheReset(ApiHandler):
+ @classmethod
+ def requires_auth(cls) -> bool:
+ return False
+
+ @classmethod
+ def requires_csrf(cls) -> bool:
+ return False
+
+ @classmethod
+ def requires_api_key(cls) -> bool:
+ return False
+
+ @classmethod
+ def requires_loopback(cls) -> bool:
+ return True
+
+ @classmethod
+ def get_methods(cls) -> list[str]:
+ return ["GET", "POST"]
+
+ async def process(self, input: dict, request: Request) -> dict | Response:
+ areas = input.get("areas", [])
+
+ if not areas:
+ cache.clear_all()
+ else:
+ for area in areas:
+ cache.clear(area)
+
+ return {"ok": True}
diff --git a/python/api/chat_create.py b/api/chat_create.py
similarity index 86%
rename from python/api/chat_create.py
rename to api/chat_create.py
index f979395f4..3f6996adc 100644
--- a/python/api/chat_create.py
+++ b/api/chat_create.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import settings, projects, guids
+from helpers import settings, projects, guids
from agent import AgentContext
@@ -26,7 +26,7 @@ class CreateChat(ApiHandler):
new_context.set_output_data(projects.CONTEXT_DATA_KEY_PROJECT, current_data_2)
# New context should appear in other tabs' chat lists via state_push.
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="api.chat_create.CreateChat")
return {
diff --git a/python/api/chat_export.py b/api/chat_export.py
similarity index 77%
rename from python/api/chat_export.py
rename to api/chat_export.py
index a82be6483..ab0d17b30 100644
--- a/python/api/chat_export.py
+++ b/api/chat_export.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import persist_chat
+from helpers import persist_chat
class ExportChat(ApiHandler):
async def process(self, input: Input, request: Request) -> Output:
diff --git a/python/api/chat_files_path_get.py b/api/chat_files_path_get.py
similarity index 82%
rename from python/api/chat_files_path_get.py
rename to api/chat_files_path_get.py
index aafdd8456..4cb11ffd2 100644
--- a/python/api/chat_files_path_get.py
+++ b/api/chat_files_path_get.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files, projects, settings
+from helpers.api import ApiHandler, Request, Response
+from helpers import files, projects, settings
class GetChatFilesPath(ApiHandler):
diff --git a/python/api/chat_load.py b/api/chat_load.py
similarity index 75%
rename from python/api/chat_load.py
rename to api/chat_load.py
index 3991212a7..c9c4226ef 100644
--- a/python/api/chat_load.py
+++ b/api/chat_load.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import persist_chat
+from helpers import persist_chat
class LoadChats(ApiHandler):
async def process(self, input: Input, request: Request) -> Output:
diff --git a/python/api/chat_remove.py b/api/chat_remove.py
similarity index 77%
rename from python/api/chat_remove.py
rename to api/chat_remove.py
index ee6f52aef..aecf59dda 100644
--- a/python/api/chat_remove.py
+++ b/api/chat_remove.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.api import ApiHandler, Input, Output, Request, Response
from agent import AgentContext
-from python.helpers import persist_chat
-from python.helpers.task_scheduler import TaskScheduler
+from helpers import persist_chat
+from helpers.task_scheduler import TaskScheduler
class RemoveChat(ApiHandler):
@@ -26,7 +26,7 @@ class RemoveChat(ApiHandler):
await scheduler.remove_task_by_uuid(task.uuid)
# Context removal affects global chat/task lists in all tabs.
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="api.chat_remove.RemoveChat")
return {
diff --git a/python/api/chat_reset.py b/api/chat_reset.py
similarity index 74%
rename from python/api/chat_reset.py
rename to api/chat_reset.py
index 92e8dc723..3030eed98 100644
--- a/python/api/chat_reset.py
+++ b/api/chat_reset.py
@@ -1,8 +1,8 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import persist_chat
-from python.helpers.task_scheduler import TaskScheduler
+from helpers import persist_chat
+from helpers.task_scheduler import TaskScheduler
class Reset(ApiHandler):
@@ -19,7 +19,7 @@ class Reset(ApiHandler):
persist_chat.remove_msg_files(ctxid)
# Reset updates context metadata (log guid/version) and must refresh other tabs' lists.
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="api.chat_reset.Reset")
return {
diff --git a/python/api/csrf_token.py b/api/csrf_token.py
similarity index 96%
rename from python/api/csrf_token.py
rename to api/csrf_token.py
index 69082a59b..5f4ba13d5 100644
--- a/python/api/csrf_token.py
+++ b/api/csrf_token.py
@@ -1,6 +1,6 @@
import secrets
from urllib.parse import urlparse
-from python.helpers.api import (
+from helpers.api import (
ApiHandler,
Input,
Output,
@@ -8,7 +8,7 @@ from python.helpers.api import (
Response,
session,
)
-from python.helpers import runtime, dotenv, login
+from helpers import runtime, dotenv, login
import fnmatch
ALLOWED_ORIGINS_KEY = "ALLOWED_ORIGINS"
@@ -104,7 +104,7 @@ class GetCsrfToken(ApiHandler):
# always allow tunnel url if running
try:
- from python.api.tunnel_proxy import process as tunnel_api_process
+ from api.tunnel_proxy import process as tunnel_api_process
tunnel = await tunnel_api_process({"action": "get"})
if tunnel and isinstance(tunnel, dict) and tunnel["success"]:
diff --git a/python/api/ctx_window_get.py b/api/ctx_window_get.py
similarity index 82%
rename from python/api/ctx_window_get.py
rename to api/ctx_window_get.py
index 46573cb60..ba6f2450a 100644
--- a/python/api/ctx_window_get.py
+++ b/api/ctx_window_get.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import tokens
+from helpers import tokens
class GetCtxWindow(ApiHandler):
diff --git a/python/api/delete_work_dir_file.py b/api/delete_work_dir_file.py
similarity index 82%
rename from python/api/delete_work_dir_file.py
rename to api/delete_work_dir_file.py
index 103027791..a925dd40b 100644
--- a/python/api/delete_work_dir_file.py
+++ b/api/delete_work_dir_file.py
@@ -1,9 +1,9 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers.file_browser import FileBrowser
-from python.helpers import files, runtime
-from python.api import get_work_dir_files
+from helpers.file_browser import FileBrowser
+from helpers import files, runtime
+from api import get_work_dir_files
class DeleteWorkDirFile(ApiHandler):
diff --git a/python/api/download_work_dir_file.py b/api/download_work_dir_file.py
similarity index 97%
rename from python/api/download_work_dir_file.py
rename to api/download_work_dir_file.py
index 747c6a494..4ac184ea0 100644
--- a/python/api/download_work_dir_file.py
+++ b/api/download_work_dir_file.py
@@ -4,9 +4,9 @@ import mimetypes
import os
from flask import Response
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers import files, runtime
-from python.api import file_info
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers import files, runtime
+from api import file_info
from urllib.parse import quote
diff --git a/python/api/edit_work_dir_file.py b/api/edit_work_dir_file.py
similarity index 95%
rename from python/api/edit_work_dir_file.py
rename to api/edit_work_dir_file.py
index a23e19b39..2c043df62 100644
--- a/python/api/edit_work_dir_file.py
+++ b/api/edit_work_dir_file.py
@@ -1,9 +1,9 @@
import mimetypes
import os
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers.file_browser import FileBrowser
-from python.helpers import runtime, files
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers.file_browser import FileBrowser
+from helpers import runtime, files
MAX_EDIT_FILE_SIZE = 1024 * 1024
BINARY_SAMPLE_SIZE = 10 * 1024
diff --git a/python/api/file_info.py b/api/file_info.py
similarity index 92%
rename from python/api/file_info.py
rename to api/file_info.py
index 6f52db4f6..9f2a9d665 100644
--- a/python/api/file_info.py
+++ b/api/file_info.py
@@ -1,6 +1,6 @@
import os
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import files, runtime
+from helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers import files, runtime
from typing import TypedDict
class FileInfoApi(ApiHandler):
diff --git a/python/api/get_work_dir_files.py b/api/get_work_dir_files.py
similarity index 82%
rename from python/api/get_work_dir_files.py
rename to api/get_work_dir_files.py
index 13cd428d4..7e8e99c7f 100644
--- a/python/api/get_work_dir_files.py
+++ b/api/get_work_dir_files.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.file_browser import FileBrowser
-from python.helpers import runtime, files
+from helpers.api import ApiHandler, Request, Response
+from helpers.file_browser import FileBrowser
+from helpers import runtime, files
class GetWorkDirFiles(ApiHandler):
diff --git a/python/api/health.py b/api/health.py
similarity index 85%
rename from python/api/health.py
rename to api/health.py
index 72a6b83f8..3eb8c105e 100644
--- a/python/api/health.py
+++ b/api/health.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import errors, git
+from helpers.api import ApiHandler, Request, Response
+from helpers import errors, git
class HealthCheck(ApiHandler):
diff --git a/python/api/history_get.py b/api/history_get.py
similarity index 85%
rename from python/api/history_get.py
rename to api/history_get.py
index 608a523ec..1ee9c7e68 100644
--- a/python/api/history_get.py
+++ b/api/history_get.py
@@ -1,4 +1,4 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
class GetHistory(ApiHandler):
diff --git a/python/api/image_get.py b/api/image_get.py
similarity index 97%
rename from python/api/image_get.py
rename to api/image_get.py
index f9600a148..0b4267a4e 100644
--- a/python/api/image_get.py
+++ b/api/image_get.py
@@ -1,7 +1,7 @@
import base64
import os
-from python.helpers.api import ApiHandler, Request, Response, send_file
-from python.helpers import files, runtime
+from helpers.api import ApiHandler, Request, Response, send_file
+from helpers import files, runtime
import io
from mimetypes import guess_type
diff --git a/python/api/load_webui_extensions.py b/api/load_webui_extensions.py
similarity index 72%
rename from python/api/load_webui_extensions.py
rename to api/load_webui_extensions.py
index 667d326fe..45be7a7aa 100644
--- a/python/api/load_webui_extensions.py
+++ b/api/load_webui_extensions.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import plugins
+from helpers.api import ApiHandler, Request, Response
+from helpers import extension
class LoadWebuiExtensions(ApiHandler):
@@ -15,6 +15,6 @@ class LoadWebuiExtensions(ApiHandler):
if not extension_point:
return Response(status=400, response="Missing extension_point")
- exts = plugins.get_webui_extensions(agent=None, extension_point=extension_point, filters=filters)
+ exts = extension.get_webui_extensions(agent=None, extension_point=extension_point, filters=filters)
return {"extensions": exts or []}
diff --git a/python/api/logout.py b/api/logout.py
similarity index 85%
rename from python/api/logout.py
rename to api/logout.py
index 952f60385..8d68254d7 100644
--- a/python/api/logout.py
+++ b/api/logout.py
@@ -1,4 +1,4 @@
-from python.helpers.api import ApiHandler, Request, session
+from helpers.api import ApiHandler, Request, session
class ApiLogout(ApiHandler):
diff --git a/python/api/mcp_server_get_detail.py b/api/mcp_server_get_detail.py
similarity index 83%
rename from python/api/mcp_server_get_detail.py
rename to api/mcp_server_get_detail.py
index 0608aadc5..bc5552c4d 100644
--- a/python/api/mcp_server_get_detail.py
+++ b/api/mcp_server_get_detail.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
from typing import Any
-from python.helpers.mcp_handler import MCPConfig
+from helpers.mcp_handler import MCPConfig
class McpServerGetDetail(ApiHandler):
diff --git a/python/api/mcp_server_get_log.py b/api/mcp_server_get_log.py
similarity index 83%
rename from python/api/mcp_server_get_log.py
rename to api/mcp_server_get_log.py
index f9488c7df..3305430ea 100644
--- a/python/api/mcp_server_get_log.py
+++ b/api/mcp_server_get_log.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
from typing import Any
-from python.helpers.mcp_handler import MCPConfig
+from helpers.mcp_handler import MCPConfig
class McpServerGetLog(ApiHandler):
diff --git a/python/api/mcp_servers_apply.py b/api/mcp_servers_apply.py
similarity index 82%
rename from python/api/mcp_servers_apply.py
rename to api/mcp_servers_apply.py
index 08f513652..7ea5275db 100644
--- a/python/api/mcp_servers_apply.py
+++ b/api/mcp_servers_apply.py
@@ -1,10 +1,10 @@
import time
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
from typing import Any
-from python.helpers.mcp_handler import MCPConfig
-from python.helpers.settings import set_settings_delta
+from helpers.mcp_handler import MCPConfig
+from helpers.settings import set_settings_delta
class McpServersApply(ApiHandler):
diff --git a/python/api/mcp_servers_status.py b/api/mcp_servers_status.py
similarity index 78%
rename from python/api/mcp_servers_status.py
rename to api/mcp_servers_status.py
index be2654930..20f8a64c8 100644
--- a/python/api/mcp_servers_status.py
+++ b/api/mcp_servers_status.py
@@ -1,8 +1,8 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
from typing import Any
-from python.helpers.mcp_handler import MCPConfig
+from helpers.mcp_handler import MCPConfig
class McpServersStatuss(ApiHandler):
diff --git a/python/api/message.py b/api/message.py
similarity index 92%
rename from python/api/message.py
rename to api/message.py
index 867cc703d..5aff05b77 100644
--- a/python/api/message.py
+++ b/api/message.py
@@ -1,10 +1,10 @@
from agent import AgentContext, UserMessage
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers import files, extension, message_queue as mq
+from helpers import files, extension, message_queue as mq
import os
-from python.helpers.security import safe_filename
-from python.helpers.defer import DeferredTask
+from helpers.security import safe_filename
+from helpers.defer import DeferredTask
class Message(ApiHandler):
diff --git a/python/api/message_async.py b/api/message_async.py
similarity index 73%
rename from python/api/message_async.py
rename to api/message_async.py
index f3e85dfb5..f101af718 100644
--- a/python/api/message_async.py
+++ b/api/message_async.py
@@ -1,6 +1,6 @@
from agent import AgentContext
-from python.helpers.defer import DeferredTask
-from python.api.message import Message
+from helpers.defer import DeferredTask
+from api.message import Message
class MessageAsync(Message):
diff --git a/python/api/message_queue_add.py b/api/message_queue_add.py
similarity index 81%
rename from python/api/message_queue_add.py
rename to api/message_queue_add.py
index 053ad3a41..b7fcaae70 100644
--- a/python/api/message_queue_add.py
+++ b/api/message_queue_add.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import message_queue as mq
+from helpers.api import ApiHandler, Request, Response
+from helpers import message_queue as mq
from agent import AgentContext
-from python.helpers.state_monitor_integration import mark_dirty_for_context
+from helpers.state_monitor_integration import mark_dirty_for_context
class MessageQueueAdd(ApiHandler):
diff --git a/python/api/message_queue_remove.py b/api/message_queue_remove.py
similarity index 75%
rename from python/api/message_queue_remove.py
rename to api/message_queue_remove.py
index 4fd619a71..5dff225be 100644
--- a/python/api/message_queue_remove.py
+++ b/api/message_queue_remove.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import message_queue as mq
+from helpers.api import ApiHandler, Request, Response
+from helpers import message_queue as mq
from agent import AgentContext
-from python.helpers.state_monitor_integration import mark_dirty_for_context
+from helpers.state_monitor_integration import mark_dirty_for_context
class MessageQueueRemove(ApiHandler):
"""Remove message(s) from queue."""
diff --git a/python/api/message_queue_send.py b/api/message_queue_send.py
similarity index 84%
rename from python/api/message_queue_send.py
rename to api/message_queue_send.py
index a609d065b..ac1cb1652 100644
--- a/python/api/message_queue_send.py
+++ b/api/message_queue_send.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import message_queue as mq
+from helpers.api import ApiHandler, Request, Response
+from helpers import message_queue as mq
from agent import AgentContext
-from python.helpers.state_monitor_integration import mark_dirty_for_context
+from helpers.state_monitor_integration import mark_dirty_for_context
class MessageQueueSend(ApiHandler):
"""Send queued message(s) immediately."""
diff --git a/python/api/notification_create.py b/api/notification_create.py
similarity index 93%
rename from python/api/notification_create.py
rename to api/notification_create.py
index 6699fd258..78e5c0fc5 100644
--- a/python/api/notification_create.py
+++ b/api/notification_create.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler
+from helpers.api import ApiHandler
from flask import Request, Response
-from python.helpers.notification import NotificationManager, NotificationPriority, NotificationType
+from helpers.notification import NotificationManager, NotificationPriority, NotificationType
class NotificationCreate(ApiHandler):
diff --git a/python/api/notifications_clear.py b/api/notifications_clear.py
similarity index 92%
rename from python/api/notifications_clear.py
rename to api/notifications_clear.py
index f8e6a0520..336c5ec59 100644
--- a/python/api/notifications_clear.py
+++ b/api/notifications_clear.py
@@ -1,4 +1,4 @@
-from python.helpers.api import ApiHandler
+from helpers.api import ApiHandler
from flask import Request, Response
from agent import AgentContext
diff --git a/python/api/notifications_history.py b/api/notifications_history.py
similarity index 93%
rename from python/api/notifications_history.py
rename to api/notifications_history.py
index 83629288f..c840d574a 100644
--- a/python/api/notifications_history.py
+++ b/api/notifications_history.py
@@ -1,4 +1,4 @@
-from python.helpers.api import ApiHandler
+from helpers.api import ApiHandler
from flask import Request, Response
from agent import AgentContext
diff --git a/python/api/notifications_mark_read.py b/api/notifications_mark_read.py
similarity index 96%
rename from python/api/notifications_mark_read.py
rename to api/notifications_mark_read.py
index 4a25f167a..4cf1c1627 100644
--- a/python/api/notifications_mark_read.py
+++ b/api/notifications_mark_read.py
@@ -1,4 +1,4 @@
-from python.helpers.api import ApiHandler
+from helpers.api import ApiHandler
from flask import Request, Response
from agent import AgentContext
diff --git a/python/api/nudge.py b/api/nudge.py
similarity index 87%
rename from python/api/nudge.py
rename to api/nudge.py
index 558734cdf..d463c06dc 100644
--- a/python/api/nudge.py
+++ b/api/nudge.py
@@ -1,4 +1,4 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
class Nudge(ApiHandler):
async def process(self, input: dict, request: Request) -> dict | Response:
diff --git a/python/api/pause.py b/api/pause.py
similarity index 89%
rename from python/api/pause.py
rename to api/pause.py
index 47b444e80..b30929b7a 100644
--- a/python/api/pause.py
+++ b/api/pause.py
@@ -1,4 +1,4 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
class Pause(ApiHandler):
diff --git a/python/api/plugins.py b/api/plugins.py
similarity index 99%
rename from python/api/plugins.py
rename to api/plugins.py
index 814e48e08..2243f7319 100644
--- a/python/api/plugins.py
+++ b/api/plugins.py
@@ -4,8 +4,8 @@ import subprocess
import sys
from datetime import datetime, timezone
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import plugins, files
+from helpers.api import ApiHandler, Request, Response
+from helpers import plugins, files
class Plugins(ApiHandler):
diff --git a/python/api/plugins_list.py b/api/plugins_list.py
similarity index 80%
rename from python/api/plugins_list.py
rename to api/plugins_list.py
index 25d612db7..cf7d52e37 100644
--- a/python/api/plugins_list.py
+++ b/api/plugins_list.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers import plugins
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers import plugins
class PluginsList(ApiHandler):
async def process(self, input: Input, request: Request) -> Output:
diff --git a/python/api/poll.py b/api/poll.py
similarity index 75%
rename from python/api/poll.py
rename to api/poll.py
index b6989e55d..519387b8b 100644
--- a/python/api/poll.py
+++ b/api/poll.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers.state_snapshot import build_snapshot
+from helpers.state_snapshot import build_snapshot
class Poll(ApiHandler):
diff --git a/python/api/projects.py b/api/projects.py
similarity index 95%
rename from python/api/projects.py
rename to api/projects.py
index 7b62b4b48..10fd8cc12 100644
--- a/python/api/projects.py
+++ b/api/projects.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import projects
-from python.helpers.notification import NotificationManager, NotificationType, NotificationPriority
+from helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers import projects
+from helpers.notification import NotificationManager, NotificationType, NotificationPriority
class Projects(ApiHandler):
diff --git a/python/api/rename_work_dir_file.py b/api/rename_work_dir_file.py
similarity index 90%
rename from python/api/rename_work_dir_file.py
rename to api/rename_work_dir_file.py
index 2279d2264..5a05088db 100644
--- a/python/api/rename_work_dir_file.py
+++ b/api/rename_work_dir_file.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers.file_browser import FileBrowser
-from python.helpers import runtime
-from python.api import get_work_dir_files
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers.file_browser import FileBrowser
+from helpers import runtime
+from api import get_work_dir_files
class RenameWorkDirFile(ApiHandler):
diff --git a/python/api/restart.py b/api/restart.py
similarity index 50%
rename from python/api/restart.py
rename to api/restart.py
index 678fe7490..e5db07adf 100644
--- a/python/api/restart.py
+++ b/api/restart.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers import process
+from helpers import process
class Restart(ApiHandler):
async def process(self, input: dict, request: Request) -> dict | Response:
diff --git a/python/api/rfc.py b/api/rfc.py
similarity index 78%
rename from python/api/rfc.py
rename to api/rfc.py
index 1faa0724f..75968651d 100644
--- a/python/api/rfc.py
+++ b/api/rfc.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers import runtime
+from helpers import runtime
class RFC(ApiHandler):
diff --git a/python/api/scheduler_task_create.py b/api/scheduler_task_create.py
similarity index 95%
rename from python/api/scheduler_task_create.py
rename to api/scheduler_task_create.py
index 48aeb24e8..31522d377 100644
--- a/python/api/scheduler_task_create.py
+++ b/api/scheduler_task_create.py
@@ -1,11 +1,11 @@
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers.task_scheduler import (
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers.task_scheduler import (
TaskScheduler, ScheduledTask, AdHocTask, PlannedTask, TaskSchedule,
serialize_task, parse_task_schedule, parse_task_plan, TaskType
)
-from python.helpers.projects import load_basic_project_data
-from python.helpers.localization import Localization
-from python.helpers.print_style import PrintStyle
+from helpers.projects import load_basic_project_data
+from helpers.localization import Localization
+from helpers.print_style import PrintStyle
import random
diff --git a/python/api/scheduler_task_delete.py b/api/scheduler_task_delete.py
similarity index 88%
rename from python/api/scheduler_task_delete.py
rename to api/scheduler_task_delete.py
index 5e41a0bd6..80848948a 100644
--- a/python/api/scheduler_task_delete.py
+++ b/api/scheduler_task_delete.py
@@ -1,8 +1,8 @@
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers.task_scheduler import TaskScheduler, TaskState
-from python.helpers.localization import Localization
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers.task_scheduler import TaskScheduler, TaskState
+from helpers.localization import Localization
from agent import AgentContext
-from python.helpers import persist_chat
+from helpers import persist_chat
class SchedulerTaskDelete(ApiHandler):
diff --git a/python/api/scheduler_task_run.py b/api/scheduler_task_run.py
similarity index 91%
rename from python/api/scheduler_task_run.py
rename to api/scheduler_task_run.py
index 00c3dd8b4..205ab636c 100644
--- a/python/api/scheduler_task_run.py
+++ b/api/scheduler_task_run.py
@@ -1,7 +1,7 @@
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers.task_scheduler import TaskScheduler, TaskState
-from python.helpers.print_style import PrintStyle
-from python.helpers.localization import Localization
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers.task_scheduler import TaskScheduler, TaskState
+from helpers.print_style import PrintStyle
+from helpers.localization import Localization
class SchedulerTaskRun(ApiHandler):
diff --git a/python/api/scheduler_task_update.py b/api/scheduler_task_update.py
similarity index 95%
rename from python/api/scheduler_task_update.py
rename to api/scheduler_task_update.py
index b5b73cb59..dc7401c70 100644
--- a/python/api/scheduler_task_update.py
+++ b/api/scheduler_task_update.py
@@ -1,9 +1,9 @@
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers.task_scheduler import (
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers.task_scheduler import (
TaskScheduler, ScheduledTask, AdHocTask, PlannedTask, TaskState,
serialize_task, parse_task_schedule, parse_task_plan
)
-from python.helpers.localization import Localization
+from helpers.localization import Localization
class SchedulerTaskUpdate(ApiHandler):
diff --git a/python/api/scheduler_tasks_list.py b/api/scheduler_tasks_list.py
similarity index 81%
rename from python/api/scheduler_tasks_list.py
rename to api/scheduler_tasks_list.py
index 8d07235d2..48dea38d5 100644
--- a/python/api/scheduler_tasks_list.py
+++ b/api/scheduler_tasks_list.py
@@ -1,8 +1,8 @@
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers.task_scheduler import TaskScheduler
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers.task_scheduler import TaskScheduler
import traceback
-from python.helpers.print_style import PrintStyle
-from python.helpers.localization import Localization
+from helpers.print_style import PrintStyle
+from helpers.localization import Localization
class SchedulerTasksList(ApiHandler):
diff --git a/python/api/scheduler_tick.py b/api/scheduler_tick.py
similarity index 87%
rename from python/api/scheduler_tick.py
rename to api/scheduler_tick.py
index 2363ab837..f04141756 100644
--- a/python/api/scheduler_tick.py
+++ b/api/scheduler_tick.py
@@ -1,9 +1,9 @@
from datetime import datetime
-from python.helpers.api import ApiHandler, Input, Output, Request
-from python.helpers.print_style import PrintStyle
-from python.helpers.task_scheduler import TaskScheduler
-from python.helpers.localization import Localization
+from helpers.api import ApiHandler, Input, Output, Request
+from helpers.print_style import PrintStyle
+from helpers.task_scheduler import TaskScheduler
+from helpers.localization import Localization
class SchedulerTick(ApiHandler):
diff --git a/python/api/settings_get.py b/api/settings_get.py
similarity index 76%
rename from python/api/settings_get.py
rename to api/settings_get.py
index 5285b4fd4..cf7047056 100644
--- a/python/api/settings_get.py
+++ b/api/settings_get.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers import settings
+from helpers import settings
class GetSettings(ApiHandler):
async def process(self, input: dict, request: Request) -> dict | Response:
diff --git a/python/api/settings_set.py b/api/settings_set.py
similarity index 80%
rename from python/api/settings_set.py
rename to api/settings_set.py
index 3213eada7..21146605e 100644
--- a/python/api/settings_set.py
+++ b/api/settings_set.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers import settings
+from helpers import settings
from typing import Any
diff --git a/python/api/settings_workdir_file_structure.py b/api/settings_workdir_file_structure.py
similarity index 90%
rename from python/api/settings_workdir_file_structure.py
rename to api/settings_workdir_file_structure.py
index ac1e117c2..ec7d4a991 100644
--- a/python/api/settings_workdir_file_structure.py
+++ b/api/settings_workdir_file_structure.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers import file_tree, files
+from helpers import file_tree, files
class SettingsWorkdirFileStructure(ApiHandler):
diff --git a/python/api/skills.py b/api/skills.py
similarity index 94%
rename from python/api/skills.py
rename to api/skills.py
index b37e92d23..cb105120c 100644
--- a/python/api/skills.py
+++ b/api/skills.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import runtime, skills, projects, files
+from helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers import runtime, skills, projects, files
class Skills(ApiHandler):
diff --git a/python/api/skills_import.py b/api/skills_import.py
similarity index 95%
rename from python/api/skills_import.py
rename to api/skills_import.py
index d2e842ebf..ff67c2b48 100644
--- a/python/api/skills_import.py
+++ b/api/skills_import.py
@@ -5,9 +5,9 @@ import time
import uuid
from pathlib import Path
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files
-from python.helpers.skills_import import import_skills
+from helpers.api import ApiHandler, Request, Response
+from helpers import files
+from helpers.skills_import import import_skills
from werkzeug.datastructures import FileStorage
from werkzeug.utils import secure_filename
diff --git a/python/api/skills_import_preview.py b/api/skills_import_preview.py
similarity index 95%
rename from python/api/skills_import_preview.py
rename to api/skills_import_preview.py
index b4f9e70c8..33baac03e 100644
--- a/python/api/skills_import_preview.py
+++ b/api/skills_import_preview.py
@@ -5,9 +5,9 @@ import time
import uuid
from pathlib import Path
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files
-from python.helpers.skills_import import import_skills
+from helpers.api import ApiHandler, Request, Response
+from helpers import files
+from helpers.skills_import import import_skills
from werkzeug.datastructures import FileStorage
from werkzeug.utils import secure_filename
diff --git a/python/api/subagents.py b/api/subagents.py
similarity index 90%
rename from python/api/subagents.py
rename to api/subagents.py
index 6f501ac76..81fd89b1e 100644
--- a/python/api/subagents.py
+++ b/api/subagents.py
@@ -1,9 +1,9 @@
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import subagents
+from helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers import subagents
from typing import TYPE_CHECKING
if TYPE_CHECKING:
- from python.helpers import projects
+ from helpers import projects
class Subagents(ApiHandler):
async def process(self, input: Input, request: Request) -> Output:
diff --git a/python/api/synthesize.py b/api/synthesize.py
similarity index 95%
rename from python/api/synthesize.py
rename to api/synthesize.py
index 87f93eeaa..7957ef0d8 100644
--- a/python/api/synthesize.py
+++ b/api/synthesize.py
@@ -1,8 +1,8 @@
# api/synthesize.py
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers import runtime, settings, kokoro_tts
+from helpers import runtime, settings, kokoro_tts
class Synthesize(ApiHandler):
async def process(self, input: dict, request: Request) -> dict | Response:
diff --git a/python/api/transcribe.py b/api/transcribe.py
similarity index 83%
rename from python/api/transcribe.py
rename to api/transcribe.py
index 5abb9a083..93e1cd592 100644
--- a/python/api/transcribe.py
+++ b/api/transcribe.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
-from python.helpers import runtime, settings, whisper
+from helpers import runtime, settings, whisper
class Transcribe(ApiHandler):
async def process(self, input: dict, request: Request) -> dict | Response:
diff --git a/python/api/tunnel.py b/api/tunnel.py
similarity index 92%
rename from python/api/tunnel.py
rename to api/tunnel.py
index edcf8ab55..6ff5ea62f 100644
--- a/python/api/tunnel.py
+++ b/api/tunnel.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import runtime
-from python.helpers.tunnel_manager import TunnelManager
+from helpers.api import ApiHandler, Request, Response
+from helpers import runtime
+from helpers.tunnel_manager import TunnelManager
class Tunnel(ApiHandler):
async def process(self, input: dict, request: Request) -> dict | Response:
diff --git a/python/api/tunnel_proxy.py b/api/tunnel_proxy.py
similarity index 82%
rename from python/api/tunnel_proxy.py
rename to api/tunnel_proxy.py
index 4df17893a..29868eac8 100644
--- a/python/api/tunnel_proxy.py
+++ b/api/tunnel_proxy.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import dotenv, runtime
-from python.helpers.tunnel_manager import TunnelManager
+from helpers.api import ApiHandler, Request, Response
+from helpers import dotenv, runtime
+from helpers.tunnel_manager import TunnelManager
import requests
@@ -34,5 +34,5 @@ async def process(input: dict) -> dict | Response:
return {"error": str(e)}
else:
# forward to API handler directly
- from python.api.tunnel import process as local_process
+ from api.tunnel import process as local_process
return await local_process(input)
diff --git a/python/api/upload.py b/api/upload.py
similarity index 85%
rename from python/api/upload.py
rename to api/upload.py
index 26826f456..f334fb0af 100644
--- a/python/api/upload.py
+++ b/api/upload.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files
-from python.helpers.security import safe_filename
+from helpers.api import ApiHandler, Request, Response
+from helpers import files
+from helpers.security import safe_filename
class UploadFile(ApiHandler):
diff --git a/python/api/upload_work_dir_files.py b/api/upload_work_dir_files.py
similarity index 91%
rename from python/api/upload_work_dir_files.py
rename to api/upload_work_dir_files.py
index 8bf85e664..88a9ff080 100644
--- a/python/api/upload_work_dir_files.py
+++ b/api/upload_work_dir_files.py
@@ -1,9 +1,9 @@
import base64
from werkzeug.datastructures import FileStorage
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers.file_browser import FileBrowser
-from python.helpers import files, runtime
-from python.api import get_work_dir_files
+from helpers.api import ApiHandler, Request, Response
+from helpers.file_browser import FileBrowser
+from helpers import files, runtime
+from api import get_work_dir_files
import os
diff --git a/docs/developer/contributing-skills.md b/docs/developer/contributing-skills.md
index 97b8a8c4a..8b876e709 100644
--- a/docs/developer/contributing-skills.md
+++ b/docs/developer/contributing-skills.md
@@ -37,16 +37,16 @@ Skills you create here can be used in any of these platforms!
```bash
# Create a new skill interactively
-python -m python.helpers.skills_cli create my-skill-name
+python -m helpers.skills_cli create my-skill-name
# List all available skills
-python -m python.helpers.skills_cli list
+python -m helpers.skills_cli list
# Validate a skill
-python -m python.helpers.skills_cli validate my-skill-name
+python -m helpers.skills_cli validate my-skill-name
# Search skills
-python -m python.helpers.skills_cli search "keyword"
+python -m helpers.skills_cli search "keyword"
```
### Manual Creation
@@ -161,7 +161,7 @@ Ask yourself:
```bash
# Using CLI
-python -m python.helpers.skills_cli create my-awesome-skill
+python -m helpers.skills_cli create my-awesome-skill
# Or manually
mkdir -p usr/skills/my-awesome-skill
@@ -225,7 +225,7 @@ This skill includes helper scripts:
```bash
# Validate the skill
-python -m python.helpers.skills_cli validate my-awesome-skill
+python -m helpers.skills_cli validate my-awesome-skill
# Test in Agent Zero
# Start the agent and ask it to perform the task your skill handles
@@ -281,7 +281,7 @@ One skill = one expertise area. If your skill is getting too long, split it:
1. **Validate Structure:**
```bash
- python -m python.helpers.skills_cli validate my-skill
+ python -m helpers.skills_cli validate my-skill
```
2. **Test Semantic Recall:**
@@ -304,7 +304,7 @@ One skill = one expertise area. If your skill is getting too long, split it:
2. **Create Your Skill:**
```bash
- python -m python.helpers.skills_cli create my-skill
+ python -m helpers.skills_cli create my-skill
# Edit usr/skills/my-skill/SKILL.md
```
diff --git a/docs/developer/extensions.md b/docs/developer/extensions.md
index 1440f7e1a..436f6de99 100644
--- a/docs/developer/extensions.md
+++ b/docs/developer/extensions.md
@@ -48,7 +48,7 @@ To create a custom extension:
```python
# File: /agents/_example/extensions/agent_init/_10_example_extension.py
-from python.helpers.extension import Extension
+from helpers.extension import Extension
class ExampleExtension(Extension):
async def execute(self, **kwargs):
@@ -80,7 +80,7 @@ When a tool with the same name is requested, Agent Zero first checks for its exi
```python
# File: /agents/_example/tools/response.py
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
# example of a tool redefinition
# the original response tool is in python/tools/response.py
@@ -145,8 +145,8 @@ When a prompt file is processed, Agent Zero automatically looks for a correspond
If you have a prompt file `agent.system.tools.md`, you can create `agent.system.tools.py` alongside it:
```python
-from python.helpers.files import VariablesPlugin
-from python.helpers import files
+from helpers.files import VariablesPlugin
+from helpers import files
class Tools(VariablesPlugin):
def get_variables(self, file: str, backup_dirs: list[str] | None = None) -> dict[str, Any]:
diff --git a/docs/developer/notifications.md b/docs/developer/notifications.md
index fac6363fb..29919457b 100644
--- a/docs/developer/notifications.md
+++ b/docs/developer/notifications.md
@@ -10,7 +10,7 @@ Quick guide for using the notification system in Agent Zero.
Use `AgentNotification` helper methods anywhere in your Python code:
```python
-from python.helpers.notification import AgentNotification
+from helpers.notification import AgentNotification
# Basic notifications
AgentNotification.info("Operation completed")
diff --git a/docs/developer/websockets.md b/docs/developer/websockets.md
index d2f44e775..1527a74c6 100644
--- a/docs/developer/websockets.md
+++ b/docs/developer/websockets.md
@@ -146,7 +146,7 @@ Handlers are discovered deterministically from `python/websocket_handlers/`:
Create handler modules under the appropriate namespace entry and inherit from `WebSocketHandler`.
```python
-from python.helpers.websocket import WebSocketHandler
+from helpers.websocket import WebSocketHandler
class DashboardHandler(WebSocketHandler):
@classmethod
diff --git a/python/extensions/before_main_llm_call/.gitkeep b/extensions/python/.gitkeep
similarity index 100%
rename from python/extensions/before_main_llm_call/.gitkeep
rename to extensions/python/.gitkeep
diff --git a/python/extensions/agent_Agent_handle_exception_end/_40_handle_intervention_exception.py b/extensions/python/agent_Agent_handle_exception_end/_40_handle_intervention_exception.py
similarity index 64%
rename from python/extensions/agent_Agent_handle_exception_end/_40_handle_intervention_exception.py
rename to extensions/python/agent_Agent_handle_exception_end/_40_handle_intervention_exception.py
index 6374113de..71437278c 100644
--- a/python/extensions/agent_Agent_handle_exception_end/_40_handle_intervention_exception.py
+++ b/extensions/python/agent_Agent_handle_exception_end/_40_handle_intervention_exception.py
@@ -1,10 +1,10 @@
from datetime import datetime, timezone
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers.localization import Localization
-from python.helpers.errors import InterventionException
-from python.helpers import errors
-from python.helpers.print_style import PrintStyle
+from helpers.localization import Localization
+from helpers.errors import InterventionException
+from helpers import errors
+from helpers.print_style import PrintStyle
class HandleInterventionException(Extension):
diff --git a/python/extensions/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py b/extensions/python/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py
similarity index 75%
rename from python/extensions/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py
rename to extensions/python/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py
index 980d4dda5..3f111337d 100644
--- a/python/extensions/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py
+++ b/extensions/python/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py
@@ -1,10 +1,10 @@
from datetime import datetime, timezone
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers.localization import Localization
-from python.helpers.errors import RepairableException
-from python.helpers import errors
-from python.helpers.print_style import PrintStyle
+from helpers.localization import Localization
+from helpers.errors import RepairableException
+from helpers import errors
+from helpers.print_style import PrintStyle
class HandleRepairableException(Extension):
diff --git a/python/extensions/agent_Agent_handle_exception_end/_90_handle_critical_exception.py b/extensions/python/agent_Agent_handle_exception_end/_90_handle_critical_exception.py
similarity index 88%
rename from python/extensions/agent_Agent_handle_exception_end/_90_handle_critical_exception.py
rename to extensions/python/agent_Agent_handle_exception_end/_90_handle_critical_exception.py
index d6b4d904a..ccd6edfc7 100644
--- a/python/extensions/agent_Agent_handle_exception_end/_90_handle_critical_exception.py
+++ b/extensions/python/agent_Agent_handle_exception_end/_90_handle_critical_exception.py
@@ -1,10 +1,10 @@
import asyncio
-from python.helpers.extension import Extension
-from python.helpers.print_style import PrintStyle
-from python.helpers import errors
+from helpers.extension import Extension
+from helpers.print_style import PrintStyle
+from helpers import errors
-from python.helpers.errors import HandledException
+from helpers.errors import HandledException
class HandleCriticalException(Extension):
diff --git a/python/extensions/message_loop_end/.gitkeep b/extensions/python/agent_init/.gitkeep
similarity index 100%
rename from python/extensions/message_loop_end/.gitkeep
rename to extensions/python/agent_init/.gitkeep
diff --git a/python/extensions/agent_init/_10_initial_message.py b/extensions/python/agent_init/_10_initial_message.py
similarity index 94%
rename from python/extensions/agent_init/_10_initial_message.py
rename to extensions/python/agent_init/_10_initial_message.py
index 65b5010fd..30c735030 100644
--- a/python/extensions/agent_init/_10_initial_message.py
+++ b/extensions/python/agent_init/_10_initial_message.py
@@ -1,6 +1,6 @@
import json
from agent import LoopData
-from python.helpers.extension import Extension
+from helpers.extension import Extension
class InitialMessage(Extension):
@@ -10,6 +10,8 @@ class InitialMessage(Extension):
Add an initial greeting message when first user message is processed.
Called only once per session via _process_chain method.
"""
+ if not self.agent:
+ return
# Only add initial message for main agent (A0), not subordinate agents
if self.agent.number != 0:
diff --git a/python/extensions/agent_init/_15_load_profile_settings.py b/extensions/python/agent_init/_15_load_profile_settings.py
similarity index 95%
rename from python/extensions/agent_init/_15_load_profile_settings.py
rename to extensions/python/agent_init/_15_load_profile_settings.py
index 2b87f93d7..4fe17bb39 100644
--- a/python/extensions/agent_init/_15_load_profile_settings.py
+++ b/extensions/python/agent_init/_15_load_profile_settings.py
@@ -1,6 +1,6 @@
from initialize import initialize_agent
-from python.helpers import dirty_json, files, subagents, projects
-from python.helpers.extension import Extension
+from helpers import dirty_json, files, subagents, projects
+from helpers.extension import Extension
class LoadProfileSettings(Extension):
diff --git a/python/extensions/message_loop_prompts_after/.gitkeep b/extensions/python/banners/.gitkeep
similarity index 100%
rename from python/extensions/message_loop_prompts_after/.gitkeep
rename to extensions/python/banners/.gitkeep
diff --git a/python/extensions/banners/_10_unsecured_connection.py b/extensions/python/banners/_10_unsecured_connection.py
similarity index 96%
rename from python/extensions/banners/_10_unsecured_connection.py
rename to extensions/python/banners/_10_unsecured_connection.py
index 89f5dcb6c..3b05b21b3 100644
--- a/python/extensions/banners/_10_unsecured_connection.py
+++ b/extensions/python/banners/_10_unsecured_connection.py
@@ -1,5 +1,5 @@
-from python.helpers.extension import Extension
-from python.helpers import dotenv
+from helpers.extension import Extension
+from helpers import dotenv
import re
diff --git a/python/extensions/banners/_20_missing_api_key.py b/extensions/python/banners/_20_missing_api_key.py
similarity index 96%
rename from python/extensions/banners/_20_missing_api_key.py
rename to extensions/python/banners/_20_missing_api_key.py
index 672f8d3bb..6dae5142e 100644
--- a/python/extensions/banners/_20_missing_api_key.py
+++ b/extensions/python/banners/_20_missing_api_key.py
@@ -1,5 +1,5 @@
-from python.helpers.extension import Extension
-from python.helpers import settings as settings_helper
+from helpers.extension import Extension
+from helpers import settings as settings_helper
import models
diff --git a/python/extensions/banners/_30_system_resources.py b/extensions/python/banners/_30_system_resources.py
similarity index 99%
rename from python/extensions/banners/_30_system_resources.py
rename to extensions/python/banners/_30_system_resources.py
index c85810176..25c65a670 100644
--- a/python/extensions/banners/_30_system_resources.py
+++ b/extensions/python/banners/_30_system_resources.py
@@ -1,4 +1,4 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
import os
import psutil
diff --git a/python/extensions/message_loop_prompts_before/.gitkeep b/extensions/python/before_main_llm_call/.gitkeep
similarity index 100%
rename from python/extensions/message_loop_prompts_before/.gitkeep
rename to extensions/python/before_main_llm_call/.gitkeep
diff --git a/python/extensions/before_main_llm_call/_10_log_for_stream.py b/extensions/python/before_main_llm_call/_10_log_for_stream.py
similarity index 77%
rename from python/extensions/before_main_llm_call/_10_log_for_stream.py
rename to extensions/python/before_main_llm_call/_10_log_for_stream.py
index 60063dd5c..58684ab27 100644
--- a/python/extensions/before_main_llm_call/_10_log_for_stream.py
+++ b/extensions/python/before_main_llm_call/_10_log_for_stream.py
@@ -1,15 +1,18 @@
-from python.helpers import persist_chat, tokens
-from python.helpers.extension import Extension
+from helpers import persist_chat, tokens
+from helpers.extension import Extension
from agent import LoopData
import asyncio
-from python.helpers.log import LogItem
-from python.helpers import log
+from helpers.log import LogItem
+from helpers import log
import math
class LogForStream(Extension):
async def execute(self, loop_data: LoopData = LoopData(), text: str = "", **kwargs):
+ if not self.agent:
+ return
+
# create log message and store it in loop data temporary params
if "log_item_generating" not in loop_data.params_temporary:
loop_data.params_temporary["log_item_generating"] = (
diff --git a/python/extensions/message_loop_start/.gitkeep b/extensions/python/error_format/.gitkeep
similarity index 100%
rename from python/extensions/message_loop_start/.gitkeep
rename to extensions/python/error_format/.gitkeep
diff --git a/python/extensions/error_format/_10_mask_errors.py b/extensions/python/error_format/_10_mask_errors.py
similarity index 72%
rename from python/extensions/error_format/_10_mask_errors.py
rename to extensions/python/error_format/_10_mask_errors.py
index f90cf7773..3547e5220 100644
--- a/python/extensions/error_format/_10_mask_errors.py
+++ b/extensions/python/error_format/_10_mask_errors.py
@@ -1,10 +1,13 @@
-from python.helpers.extension import Extension
-from python.helpers.secrets import get_secrets_manager
+from helpers.extension import Extension
+from helpers.secrets import get_secrets_manager
class MaskErrorSecrets(Extension):
async def execute(self, **kwargs):
+ if not self.agent:
+ return
+
# Get error data from kwargs
msg = kwargs.get("msg")
if not msg:
diff --git a/python/extensions/monologue_end/.gitkeep b/extensions/python/hist_add_before/.gitkeep
similarity index 100%
rename from python/extensions/monologue_end/.gitkeep
rename to extensions/python/hist_add_before/.gitkeep
diff --git a/python/extensions/hist_add_before/_10_mask_content.py b/extensions/python/hist_add_before/_10_mask_content.py
similarity index 88%
rename from python/extensions/hist_add_before/_10_mask_content.py
rename to extensions/python/hist_add_before/_10_mask_content.py
index a59006e62..e57a8c60f 100644
--- a/python/extensions/hist_add_before/_10_mask_content.py
+++ b/extensions/python/hist_add_before/_10_mask_content.py
@@ -1,10 +1,13 @@
-from python.helpers.extension import Extension
-from python.helpers.secrets import get_secrets_manager
+from helpers.extension import Extension
+from helpers.secrets import get_secrets_manager
class MaskHistoryContent(Extension):
async def execute(self, **kwargs):
+ if not self.agent:
+ return
+
# Get content data from kwargs
content_data = kwargs.get("content_data")
if not content_data:
diff --git a/python/extensions/monologue_start/.gitkeep b/extensions/python/hist_add_tool_result/.gitkeep
similarity index 100%
rename from python/extensions/monologue_start/.gitkeep
rename to extensions/python/hist_add_tool_result/.gitkeep
diff --git a/python/extensions/hist_add_tool_result/_90_save_tool_call_file.py b/extensions/python/hist_add_tool_result/_90_save_tool_call_file.py
similarity index 87%
rename from python/extensions/hist_add_tool_result/_90_save_tool_call_file.py
rename to extensions/python/hist_add_tool_result/_90_save_tool_call_file.py
index 3aa734cee..a00232bc0 100644
--- a/python/extensions/hist_add_tool_result/_90_save_tool_call_file.py
+++ b/extensions/python/hist_add_tool_result/_90_save_tool_call_file.py
@@ -1,12 +1,15 @@
from typing import Any
-from python.helpers.extension import Extension
-from python.helpers import files, persist_chat
+from helpers.extension import Extension
+from helpers import files, persist_chat
import os, re
LEN_MIN = 500
class SaveToolCallFile(Extension):
async def execute(self, data: dict[str, Any] | None = None, **kwargs):
+ if not self.agent:
+ return
+
if not data:
return
diff --git a/python/extensions/reasoning_stream/.gitkeep b/extensions/python/job_loop/.gitkeep
similarity index 100%
rename from python/extensions/reasoning_stream/.gitkeep
rename to extensions/python/job_loop/.gitkeep
diff --git a/python/extensions/response_stream/.gitkeep b/extensions/python/message_loop_end/.gitkeep
similarity index 100%
rename from python/extensions/response_stream/.gitkeep
rename to extensions/python/message_loop_end/.gitkeep
diff --git a/python/extensions/message_loop_end/_10_organize_history.py b/extensions/python/message_loop_end/_10_organize_history.py
similarity index 82%
rename from python/extensions/message_loop_end/_10_organize_history.py
rename to extensions/python/message_loop_end/_10_organize_history.py
index e7c9eceb7..d91c9ef80 100644
--- a/python/extensions/message_loop_end/_10_organize_history.py
+++ b/extensions/python/message_loop_end/_10_organize_history.py
@@ -1,12 +1,15 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers.defer import DeferredTask, THREAD_BACKGROUND
+from helpers.defer import DeferredTask, THREAD_BACKGROUND
DATA_NAME_TASK = "_organize_history_task"
class OrganizeHistory(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
+
# is there a running task? if yes, skip this round, the wait extension will double check the context size
task: DeferredTask|None = self.agent.get_data(DATA_NAME_TASK)
if task and not task.is_ready():
diff --git a/python/extensions/message_loop_end/_90_save_chat.py b/extensions/python/message_loop_end/_90_save_chat.py
similarity index 74%
rename from python/extensions/message_loop_end/_90_save_chat.py
rename to extensions/python/message_loop_end/_90_save_chat.py
index ea81bed0c..72a3410be 100644
--- a/python/extensions/message_loop_end/_90_save_chat.py
+++ b/extensions/python/message_loop_end/_90_save_chat.py
@@ -1,10 +1,13 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData, AgentContextType
-from python.helpers import persist_chat
+from helpers import persist_chat
class SaveChat(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
+
# Skip saving BACKGROUND contexts as they should be ephemeral
if self.agent.context.type == AgentContextType.BACKGROUND:
return
diff --git a/python/extensions/system_prompt/.gitkeep b/extensions/python/message_loop_prompts_after/.gitkeep
similarity index 100%
rename from python/extensions/system_prompt/.gitkeep
rename to extensions/python/message_loop_prompts_after/.gitkeep
diff --git a/python/extensions/message_loop_prompts_after/_60_include_current_datetime.py b/extensions/python/message_loop_prompts_after/_60_include_current_datetime.py
similarity index 85%
rename from python/extensions/message_loop_prompts_after/_60_include_current_datetime.py
rename to extensions/python/message_loop_prompts_after/_60_include_current_datetime.py
index 306443653..7ab073c45 100644
--- a/python/extensions/message_loop_prompts_after/_60_include_current_datetime.py
+++ b/extensions/python/message_loop_prompts_after/_60_include_current_datetime.py
@@ -1,11 +1,14 @@
from datetime import datetime, timezone
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers.localization import Localization
+from helpers.localization import Localization
class IncludeCurrentDatetime(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
+
# get current datetime
current_datetime = Localization.get().utc_dt_to_localtime_str(
datetime.now(timezone.utc), sep=" ", timespec="seconds"
diff --git a/python/extensions/message_loop_prompts_after/_65_include_loaded_skills.py b/extensions/python/message_loop_prompts_after/_65_include_loaded_skills.py
similarity index 82%
rename from python/extensions/message_loop_prompts_after/_65_include_loaded_skills.py
rename to extensions/python/message_loop_prompts_after/_65_include_loaded_skills.py
index efcabcbb0..04c86fc8a 100644
--- a/python/extensions/message_loop_prompts_after/_65_include_loaded_skills.py
+++ b/extensions/python/message_loop_prompts_after/_65_include_loaded_skills.py
@@ -1,11 +1,14 @@
-from python.helpers.extension import Extension
-from python.helpers import skills
-from python.tools.skills_tool import DATA_NAME_LOADED_SKILLS
+from helpers.extension import Extension
+from helpers import skills
+from tools.skills_tool import DATA_NAME_LOADED_SKILLS
from agent import LoopData
class IncludeLoadedSkills(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
+
extras = loop_data.extras_persistent
# Get loaded skills names
diff --git a/python/extensions/message_loop_prompts_after/_70_include_agent_info.py b/extensions/python/message_loop_prompts_after/_70_include_agent_info.py
similarity index 87%
rename from python/extensions/message_loop_prompts_after/_70_include_agent_info.py
rename to extensions/python/message_loop_prompts_after/_70_include_agent_info.py
index f6b54cb32..08976e8b3 100644
--- a/python/extensions/message_loop_prompts_after/_70_include_agent_info.py
+++ b/extensions/python/message_loop_prompts_after/_70_include_agent_info.py
@@ -1,9 +1,11 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
class IncludeAgentInfo(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
# read prompt
agent_info_prompt = self.agent.read_prompt(
diff --git a/python/extensions/message_loop_prompts_after/_75_include_workdir_extras.py b/extensions/python/message_loop_prompts_after/_75_include_workdir_extras.py
similarity index 92%
rename from python/extensions/message_loop_prompts_after/_75_include_workdir_extras.py
rename to extensions/python/message_loop_prompts_after/_75_include_workdir_extras.py
index 98dc3d229..d823b8199 100644
--- a/python/extensions/message_loop_prompts_after/_75_include_workdir_extras.py
+++ b/extensions/python/message_loop_prompts_after/_75_include_workdir_extras.py
@@ -1,13 +1,15 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers import projects
-from python.helpers import settings
-from python.helpers import runtime
-from python.helpers import file_tree
-from python.helpers import files
+from helpers import projects
+from helpers import settings
+from helpers import runtime
+from helpers import file_tree
+from helpers import files
class IncludeWorkdirExtras(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
project_name = projects.get_context_project_name(self.agent.context)
diff --git a/extensions/python/message_loop_prompts_before/.gitkeep b/extensions/python/message_loop_prompts_before/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/message_loop_prompts_before/_90_organize_history_wait.py b/extensions/python/message_loop_prompts_before/_90_organize_history_wait.py
similarity index 82%
rename from python/extensions/message_loop_prompts_before/_90_organize_history_wait.py
rename to extensions/python/message_loop_prompts_before/_90_organize_history_wait.py
index 6454957e9..903981ad4 100644
--- a/python/extensions/message_loop_prompts_before/_90_organize_history_wait.py
+++ b/extensions/python/message_loop_prompts_before/_90_organize_history_wait.py
@@ -1,11 +1,13 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.extensions.message_loop_end._10_organize_history import DATA_NAME_TASK
-from python.helpers.defer import DeferredTask, THREAD_BACKGROUND
+from extensions.python.message_loop_end._10_organize_history import DATA_NAME_TASK
+from helpers.defer import DeferredTask, THREAD_BACKGROUND
class OrganizeHistoryWait(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
# sync action only required if the history is too large, otherwise leave it in background
while self.agent.history.is_over_limit():
diff --git a/extensions/python/message_loop_start/.gitkeep b/extensions/python/message_loop_start/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/message_loop_start/_10_iteration_no.py b/extensions/python/message_loop_start/_10_iteration_no.py
similarity index 70%
rename from python/extensions/message_loop_start/_10_iteration_no.py
rename to extensions/python/message_loop_start/_10_iteration_no.py
index 82b1951c3..81fc4af97 100644
--- a/python/extensions/message_loop_start/_10_iteration_no.py
+++ b/extensions/python/message_loop_start/_10_iteration_no.py
@@ -1,10 +1,13 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import Agent, LoopData
DATA_NAME_ITER_NO = "iteration_no"
class IterationNo(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
+
# total iteration number
no = self.agent.get_data(DATA_NAME_ITER_NO) or 0
self.agent.set_data(DATA_NAME_ITER_NO, no + 1)
diff --git a/extensions/python/monologue_end/.gitkeep b/extensions/python/monologue_end/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/monologue_end/_90_waiting_for_input_msg.py b/extensions/python/monologue_end/_90_waiting_for_input_msg.py
similarity index 72%
rename from python/extensions/monologue_end/_90_waiting_for_input_msg.py
rename to extensions/python/monologue_end/_90_waiting_for_input_msg.py
index 45f062fb6..09a025b10 100644
--- a/python/extensions/monologue_end/_90_waiting_for_input_msg.py
+++ b/extensions/python/monologue_end/_90_waiting_for_input_msg.py
@@ -1,9 +1,12 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
class WaitingForInputMsg(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
+
# show temp info message
if self.agent.number == 0:
self.agent.context.log.set_initial_progress()
diff --git a/extensions/python/monologue_start/.gitkeep b/extensions/python/monologue_start/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/monologue_start/_60_rename_chat.py b/extensions/python/monologue_start/_60_rename_chat.py
similarity index 91%
rename from python/extensions/monologue_start/_60_rename_chat.py
rename to extensions/python/monologue_start/_60_rename_chat.py
index dba8de51c..cebba5d14 100644
--- a/python/extensions/monologue_start/_60_rename_chat.py
+++ b/extensions/python/monologue_start/_60_rename_chat.py
@@ -1,5 +1,5 @@
-from python.helpers import persist_chat, tokens
-from python.helpers.extension import Extension
+from helpers import persist_chat, tokens
+from helpers.extension import Extension
from agent import LoopData
import asyncio
@@ -10,6 +10,9 @@ class RenameChat(Extension):
asyncio.create_task(self.change_name())
async def change_name(self):
+ if not self.agent:
+ return
+
try:
# prepare history
history_text = self.agent.history.output_text()
diff --git a/extensions/python/process_chain_end/.gitkeep b/extensions/python/process_chain_end/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/process_chain_end/_50_process_queue.py b/extensions/python/process_chain_end/_50_process_queue.py
similarity index 90%
rename from python/extensions/process_chain_end/_50_process_queue.py
rename to extensions/python/process_chain_end/_50_process_queue.py
index 239419487..912890f3b 100644
--- a/python/extensions/process_chain_end/_50_process_queue.py
+++ b/extensions/python/process_chain_end/_50_process_queue.py
@@ -1,6 +1,6 @@
import asyncio
-from python.helpers.extension import Extension
-from python.helpers import message_queue as mq
+from helpers.extension import Extension
+from helpers import message_queue as mq
from agent import AgentContext, Agent, LoopData
@@ -8,6 +8,9 @@ class ProcessQueue(Extension):
"""Process queued messages after monologue ends."""
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
+ if not self.agent:
+ return
+
# Only process for agent0 (main agent)
if self.agent.number != 0:
return
diff --git a/extensions/python/reasoning_stream/.gitkeep b/extensions/python/reasoning_stream/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/reasoning_stream/_10_log_from_stream.py b/extensions/python/reasoning_stream/_10_log_from_stream.py
similarity index 80%
rename from python/extensions/reasoning_stream/_10_log_from_stream.py
rename to extensions/python/reasoning_stream/_10_log_from_stream.py
index 7695169e1..8f228b9b1 100644
--- a/python/extensions/reasoning_stream/_10_log_from_stream.py
+++ b/extensions/python/reasoning_stream/_10_log_from_stream.py
@@ -1,15 +1,17 @@
-from python.helpers import persist_chat, tokens
-from python.helpers.extension import Extension
+from helpers import persist_chat, tokens
+from helpers.extension import Extension
from agent import LoopData
import asyncio
-from python.helpers.log import LogItem
-from python.helpers import log
+from helpers.log import LogItem
+from helpers import log
import math
-from python.extensions.before_main_llm_call._10_log_for_stream import build_heading, build_default_heading
+from extensions.python.before_main_llm_call._10_log_for_stream import build_heading, build_default_heading
class LogFromStream(Extension):
async def execute(self, loop_data: LoopData = LoopData(), text: str = "", **kwargs):
+ if not self.agent:
+ return
# thought length indicator
length = f"({len(text)})" if text else ""
diff --git a/extensions/python/reasoning_stream_chunk/.gitkeep b/extensions/python/reasoning_stream_chunk/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/reasoning_stream_chunk/_10_mask_stream.py b/extensions/python/reasoning_stream_chunk/_10_mask_stream.py
similarity index 86%
rename from python/extensions/reasoning_stream_chunk/_10_mask_stream.py
rename to extensions/python/reasoning_stream_chunk/_10_mask_stream.py
index 07459e64c..bd3adc855 100644
--- a/python/extensions/reasoning_stream_chunk/_10_mask_stream.py
+++ b/extensions/python/reasoning_stream_chunk/_10_mask_stream.py
@@ -1,9 +1,12 @@
-from python.helpers.extension import Extension
-from python.helpers.secrets import get_secrets_manager
+from helpers.extension import Extension
+from helpers.secrets import get_secrets_manager
class MaskReasoningStreamChunk(Extension):
async def execute(self, **kwargs):
+ if not self.agent:
+ return
+
# Get stream data and agent from kwargs
stream_data = kwargs.get("stream_data")
agent = kwargs.get("agent")
@@ -31,7 +34,7 @@ class MaskReasoningStreamChunk(Extension):
# Print the processed chunk (this is where printing should happen)
if processed_chunk:
- from python.helpers.print_style import PrintStyle
+ from helpers.print_style import PrintStyle
PrintStyle().stream(processed_chunk)
except Exception as e:
# If masking fails, proceed without masking
diff --git a/extensions/python/reasoning_stream_end/.gitkeep b/extensions/python/reasoning_stream_end/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/reasoning_stream_end/_10_mask_end.py b/extensions/python/reasoning_stream_end/_10_mask_end.py
similarity index 87%
rename from python/extensions/reasoning_stream_end/_10_mask_end.py
rename to extensions/python/reasoning_stream_end/_10_mask_end.py
index ae292af65..89787c493 100644
--- a/python/extensions/reasoning_stream_end/_10_mask_end.py
+++ b/extensions/python/reasoning_stream_end/_10_mask_end.py
@@ -1,4 +1,4 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
class MaskReasoningStreamEnd(Extension):
@@ -17,7 +17,7 @@ class MaskReasoningStreamEnd(Extension):
# Print any remaining masked content
if tail:
- from python.helpers.print_style import PrintStyle
+ from helpers.print_style import PrintStyle
PrintStyle().stream(tail)
# Clean up the filter
diff --git a/extensions/python/response_stream/.gitkeep b/extensions/python/response_stream/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/response_stream/_10_log_from_stream.py b/extensions/python/response_stream/_10_log_from_stream.py
similarity index 91%
rename from python/extensions/response_stream/_10_log_from_stream.py
rename to extensions/python/response_stream/_10_log_from_stream.py
index 591d2cdeb..4df102b51 100644
--- a/python/extensions/response_stream/_10_log_from_stream.py
+++ b/extensions/python/response_stream/_10_log_from_stream.py
@@ -1,11 +1,11 @@
-from python.helpers import persist_chat, tokens
-from python.helpers.extension import Extension
+from helpers import persist_chat, tokens
+from helpers.extension import Extension
from agent import LoopData
import asyncio
-from python.helpers.log import LogItem
-from python.helpers import log
+from helpers.log import LogItem
+from helpers import log
import math
-from python.extensions.before_main_llm_call._10_log_for_stream import build_heading, build_default_heading
+from extensions.python.before_main_llm_call._10_log_for_stream import build_heading, build_default_heading
class LogFromStream(Extension):
@@ -17,6 +17,8 @@ class LogFromStream(Extension):
parsed: dict = {},
**kwargs,
):
+ if not self.agent:
+ return
heading = build_default_heading(self.agent)
if "headline" in parsed:
diff --git a/python/extensions/response_stream/_15_replace_include_alias.py b/extensions/python/response_stream/_15_replace_include_alias.py
similarity index 90%
rename from python/extensions/response_stream/_15_replace_include_alias.py
rename to extensions/python/response_stream/_15_replace_include_alias.py
index 103ed7114..0994b75f6 100644
--- a/python/extensions/response_stream/_15_replace_include_alias.py
+++ b/extensions/python/response_stream/_15_replace_include_alias.py
@@ -1,6 +1,6 @@
from typing import Any
-from python.helpers.extension import Extension
-from python.helpers.strings import replace_file_includes
+from helpers.extension import Extension
+from helpers.strings import replace_file_includes
class ReplaceIncludeAlias(Extension):
diff --git a/python/extensions/response_stream/_20_live_response.py b/extensions/python/response_stream/_20_live_response.py
similarity index 86%
rename from python/extensions/response_stream/_20_live_response.py
rename to extensions/python/response_stream/_20_live_response.py
index f9455ed82..255358117 100644
--- a/python/extensions/response_stream/_20_live_response.py
+++ b/extensions/python/response_stream/_20_live_response.py
@@ -1,9 +1,9 @@
-from python.helpers import persist_chat, tokens
-from python.helpers.extension import Extension
+from helpers import persist_chat, tokens
+from helpers.extension import Extension
from agent import LoopData
import asyncio
-from python.helpers.log import LogItem
-from python.helpers import log
+from helpers.log import LogItem
+from helpers import log
class LiveResponse(Extension):
@@ -15,6 +15,9 @@ class LiveResponse(Extension):
parsed: dict = {},
**kwargs,
):
+ if not self.agent:
+ return
+
try:
if (
not "tool_name" in parsed
diff --git a/extensions/python/response_stream_chunk/.gitkeep b/extensions/python/response_stream_chunk/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/response_stream_chunk/_10_mask_stream.py b/extensions/python/response_stream_chunk/_10_mask_stream.py
similarity index 87%
rename from python/extensions/response_stream_chunk/_10_mask_stream.py
rename to extensions/python/response_stream_chunk/_10_mask_stream.py
index fe7eb3dd7..4690df662 100644
--- a/python/extensions/response_stream_chunk/_10_mask_stream.py
+++ b/extensions/python/response_stream_chunk/_10_mask_stream.py
@@ -1,11 +1,14 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import Agent, LoopData
-from python.helpers.secrets import get_secrets_manager
+from helpers.secrets import get_secrets_manager
class MaskResponseStreamChunk(Extension):
async def execute(self, **kwargs):
+ if not self.agent:
+ return
+
# Get stream data and agent from kwargs
stream_data = kwargs.get("stream_data")
agent = kwargs.get("agent")
@@ -33,7 +36,7 @@ class MaskResponseStreamChunk(Extension):
# Print the processed chunk (this is where printing should happen)
if processed_chunk:
- from python.helpers.print_style import PrintStyle
+ from helpers.print_style import PrintStyle
PrintStyle().stream(processed_chunk)
except Exception as e:
# If masking fails, proceed without masking
diff --git a/extensions/python/response_stream_end/.gitkeep b/extensions/python/response_stream_end/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/response_stream_end/_10_mask_end.py b/extensions/python/response_stream_end/_10_mask_end.py
similarity index 82%
rename from python/extensions/response_stream_end/_10_mask_end.py
rename to extensions/python/response_stream_end/_10_mask_end.py
index 3d7dc7697..1d2773319 100644
--- a/python/extensions/response_stream_end/_10_mask_end.py
+++ b/extensions/python/response_stream_end/_10_mask_end.py
@@ -1,5 +1,5 @@
-from python.helpers.extension import Extension
-from python.helpers.secrets import SecretsManager
+from helpers.extension import Extension
+from helpers.secrets import SecretsManager
class MaskResponseStreamEnd(Extension):
@@ -18,7 +18,7 @@ class MaskResponseStreamEnd(Extension):
# Print any remaining masked content
if tail:
- from python.helpers.print_style import PrintStyle
+ from helpers.print_style import PrintStyle
PrintStyle().stream(tail)
# Clean up the filter
diff --git a/python/extensions/response_stream_end/_15_log_from_stream_end.py b/extensions/python/response_stream_end/_15_log_from_stream_end.py
similarity index 70%
rename from python/extensions/response_stream_end/_15_log_from_stream_end.py
rename to extensions/python/response_stream_end/_15_log_from_stream_end.py
index 3208834d1..b23adb31f 100644
--- a/python/extensions/response_stream_end/_15_log_from_stream_end.py
+++ b/extensions/python/response_stream_end/_15_log_from_stream_end.py
@@ -1,11 +1,11 @@
-from python.helpers import persist_chat, tokens
-from python.helpers.extension import Extension
+from helpers import persist_chat, tokens
+from helpers.extension import Extension
from agent import LoopData
import asyncio
-from python.helpers.log import LogItem
-from python.helpers import log
+from helpers.log import LogItem
+from helpers import log
import math
-from python.extensions.before_main_llm_call._10_log_for_stream import build_heading, build_default_heading
+from extensions.python.before_main_llm_call._10_log_for_stream import build_heading, build_default_heading
class LogFromStream(Extension):
diff --git a/extensions/python/system_prompt/.gitkeep b/extensions/python/system_prompt/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/system_prompt/_10_system_prompt.py b/extensions/python/system_prompt/_10_system_prompt.py
similarity index 92%
rename from python/extensions/system_prompt/_10_system_prompt.py
rename to extensions/python/system_prompt/_10_system_prompt.py
index ef4c18de6..5901af275 100644
--- a/python/extensions/system_prompt/_10_system_prompt.py
+++ b/extensions/python/system_prompt/_10_system_prompt.py
@@ -1,9 +1,9 @@
from typing import Any
-from python.helpers.extension import Extension
-from python.helpers.mcp_handler import MCPConfig
+from helpers.extension import Extension
+from helpers.mcp_handler import MCPConfig
from agent import Agent, LoopData
-from python.helpers.settings import get_settings
-from python.helpers import projects, skills
+from helpers.settings import get_settings
+from helpers import projects, skills
class SystemPrompt(Extension):
@@ -14,6 +14,9 @@ class SystemPrompt(Extension):
loop_data: LoopData = LoopData(),
**kwargs: Any
):
+ if not self.agent:
+ return
+
# append main system prompt and tools
main = get_main_prompt(self.agent)
tools = get_tools_prompt(self.agent)
@@ -61,7 +64,7 @@ def get_mcp_tools_prompt(agent: Agent):
def get_secrets_prompt(agent: Agent):
try:
# Use lazy import to avoid circular dependencies
- from python.helpers.secrets import get_secrets_manager
+ from helpers.secrets import get_secrets_manager
secrets_manager = get_secrets_manager(agent.context)
secrets = secrets_manager.get_secrets_for_prompt()
diff --git a/extensions/python/tool_execute_after/.gitkeep b/extensions/python/tool_execute_after/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/tool_execute_after/_10_mask_secrets.py b/extensions/python/tool_execute_after/_10_mask_secrets.py
similarity index 62%
rename from python/extensions/tool_execute_after/_10_mask_secrets.py
rename to extensions/python/tool_execute_after/_10_mask_secrets.py
index ae2cdc4ef..362706fd3 100644
--- a/python/extensions/tool_execute_after/_10_mask_secrets.py
+++ b/extensions/python/tool_execute_after/_10_mask_secrets.py
@@ -1,11 +1,14 @@
-from python.helpers.extension import Extension
-from python.helpers.secrets import get_secrets_manager
-from python.helpers.tool import Response
+from helpers.extension import Extension
+from helpers.secrets import get_secrets_manager
+from helpers.tool import Response
class MaskToolSecrets(Extension):
async def execute(self, response: Response | None = None, **kwargs):
+ if not self.agent:
+ return
+
if not response:
return
secrets_mgr = get_secrets_manager(self.agent.context)
diff --git a/extensions/python/tool_execute_before/.gitkeep b/extensions/python/tool_execute_before/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/tool_execute_before/_10_replace_last_tool_output.py b/extensions/python/tool_execute_before/_10_replace_last_tool_output.py
similarity index 93%
rename from python/extensions/tool_execute_before/_10_replace_last_tool_output.py
rename to extensions/python/tool_execute_before/_10_replace_last_tool_output.py
index 411e75567..c1cdb3883 100644
--- a/python/extensions/tool_execute_before/_10_replace_last_tool_output.py
+++ b/extensions/python/tool_execute_before/_10_replace_last_tool_output.py
@@ -1,9 +1,12 @@
from typing import Any
-from python.helpers.extension import Extension
+from helpers.extension import Extension
class ReplaceLastToolOutput(Extension):
async def execute(self, tool_args: dict[str, Any] | None = None, tool_name: str = "", **kwargs):
+ if not self.agent:
+ return
+
if not tool_args:
return
diff --git a/python/extensions/tool_execute_before/_10_unmask_secrets.py b/extensions/python/tool_execute_before/_10_unmask_secrets.py
similarity index 77%
rename from python/extensions/tool_execute_before/_10_unmask_secrets.py
rename to extensions/python/tool_execute_before/_10_unmask_secrets.py
index 902581229..3ec649d55 100644
--- a/python/extensions/tool_execute_before/_10_unmask_secrets.py
+++ b/extensions/python/tool_execute_before/_10_unmask_secrets.py
@@ -1,10 +1,13 @@
-from python.helpers.extension import Extension
-from python.helpers.secrets import get_secrets_manager
+from helpers.extension import Extension
+from helpers.secrets import get_secrets_manager
class UnmaskToolSecrets(Extension):
async def execute(self, **kwargs):
+ if not self.agent:
+ return
+
# Get tool args from kwargs
tool_args = kwargs.get("tool_args")
if not tool_args:
diff --git a/extensions/python/user_message_ui/.gitkeep b/extensions/python/user_message_ui/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/user_message_ui/_10_update_check.py b/extensions/python/user_message_ui/_10_update_check.py
similarity index 92%
rename from python/extensions/user_message_ui/_10_update_check.py
rename to extensions/python/user_message_ui/_10_update_check.py
index ad967f44d..74650b9cf 100644
--- a/python/extensions/user_message_ui/_10_update_check.py
+++ b/extensions/python/user_message_ui/_10_update_check.py
@@ -1,7 +1,7 @@
-from python.helpers import notification
-from python.helpers.extension import Extension
+from helpers import notification
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers import settings, update_check
+from helpers import settings, update_check
import datetime
@@ -19,6 +19,9 @@ notification_cooldown_seconds = 60 * 60 * 24
class UpdateCheck(Extension):
async def execute(self, loop_data: LoopData = LoopData(), text: str = "", **kwargs):
+ if not self.agent:
+ return
+
try:
global last_check, last_notification_id, last_notification_time
@@ -46,6 +49,9 @@ class UpdateCheck(Extension):
def send_notification(self, notif):
+ if not self.agent:
+ return
+
notifs = self.agent.context.get_notification_manager()
notifs.send_notification(
title=notif.get("title", "Newer version available"),
diff --git a/extensions/python/util_model_call_before/.gitkeep b/extensions/python/util_model_call_before/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/extensions/util_model_call_before/_10_mask_secrets.py b/extensions/python/util_model_call_before/_10_mask_secrets.py
similarity index 76%
rename from python/extensions/util_model_call_before/_10_mask_secrets.py
rename to extensions/python/util_model_call_before/_10_mask_secrets.py
index df23ff1f6..60b9545d5 100644
--- a/python/extensions/util_model_call_before/_10_mask_secrets.py
+++ b/extensions/python/util_model_call_before/_10_mask_secrets.py
@@ -1,10 +1,13 @@
-from python.helpers.extension import Extension
-from python.helpers.secrets import get_secrets_manager
+from helpers.extension import Extension
+from helpers.secrets import get_secrets_manager
class MaskToolSecrets(Extension):
async def execute(self, **kwargs):
+ if not self.agent:
+ return
+
# model call data
call_data:dict = kwargs.get("call_data", {})
diff --git a/extensions/webui/.gitkeep b/extensions/webui/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/extensions/webui/api_call_after/.gitkeep b/extensions/webui/api_call_after/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/extensions/webui/api_call_before/.gitkeep b/extensions/webui/api_call_before/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/extensions/webui/get_message_handler/.gitkeep b/extensions/webui/get_message_handler/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/extensions/webui/set_messages_after_loop/.gitkeep b/extensions/webui/set_messages_after_loop/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/extensions/webui/set_messages_before_loop/.gitkeep b/extensions/webui/set_messages_before_loop/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/helpers/api.py b/helpers/api.py
similarity index 94%
rename from python/helpers/api.py
rename to helpers/api.py
index afa357e21..8811c663d 100644
--- a/python/helpers/api.py
+++ b/helpers/api.py
@@ -10,9 +10,9 @@ from flask import Request, Response, jsonify, Flask, session, request, send_file
from werkzeug.wrappers.response import Response as BaseResponse
from agent import AgentContext
from initialize import initialize_agent
-from python.helpers.print_style import PrintStyle
-from python.helpers.errors import format_error
-from python.helpers import files, cache
+from helpers.print_style import PrintStyle
+from helpers.errors import format_error
+from helpers import files, cache
ThreadLockType = Union[threading.Lock, threading.RLock]
@@ -147,7 +147,7 @@ def is_loopback_address(address: str) -> bool:
def requires_api_key(f):
@wraps(f)
async def decorated(*args, **kwargs):
- from python.helpers.settings import get_settings
+ from helpers.settings import get_settings
valid_api_key = get_settings()["mcp_server_token"]
if api_key := request.headers.get("X-API-KEY"):
@@ -177,7 +177,7 @@ def requires_loopback(f):
def requires_auth(f):
@wraps(f)
async def decorated(*args, **kwargs):
- from python.helpers import login
+ from helpers import login
user_pass_hash = login.get_credentials_hash()
if not user_pass_hash:
return await f(*args, **kwargs)
@@ -191,7 +191,7 @@ def requires_auth(f):
def csrf_protect(f):
@wraps(f)
async def decorated(*args, **kwargs):
- from python.helpers import runtime
+ from helpers import runtime
token = session.get("csrf_token")
header = request.headers.get("X-CSRF-Token")
cookie = request.cookies.get("csrf_token_" + runtime.get_runtime_id())
@@ -204,8 +204,8 @@ def csrf_protect(f):
def register_api_route(app: Flask, lock: ThreadLockType) -> None:
- from python.helpers.extract_tools import load_classes_from_file
- from python.helpers import plugins
+ from helpers.extract_tools import load_classes_from_file
+ from helpers import plugins
async def _dispatch(path: str) -> BaseResponse:
# Return cached wrapped handler if available
@@ -218,8 +218,8 @@ def register_api_route(app: Flask, lock: ThreadLockType) -> None:
handler_cls: type[ApiHandler] | None = None
# Check built-in python/api/<path>.py
- builtin_file = files.get_abs_path(f"python/api/{path}.py")
- if files.is_in_dir(builtin_file, files.get_abs_path("python/api")) and files.exists(builtin_file):
+ builtin_file = files.get_abs_path(f"api/{path}.py")
+ if files.is_in_dir(builtin_file, files.get_abs_path("api")) and files.exists(builtin_file):
classes = load_classes_from_file(builtin_file, ApiHandler)
if classes:
handler_cls = classes[0]
diff --git a/python/helpers/attachment_manager.py b/helpers/attachment_manager.py
similarity index 96%
rename from python/helpers/attachment_manager.py
rename to helpers/attachment_manager.py
index 9a737d44c..cf366dadf 100644
--- a/python/helpers/attachment_manager.py
+++ b/helpers/attachment_manager.py
@@ -3,10 +3,10 @@ import io
import base64
from PIL import Image
from typing import Dict, List, Optional, Tuple
-from python.helpers.security import safe_filename
+from helpers.security import safe_filename
from werkzeug.datastructures import FileStorage
-from python.helpers.print_style import PrintStyle
+from helpers.print_style import PrintStyle
class AttachmentManager:
ALLOWED_EXTENSIONS = {
diff --git a/python/helpers/backup.py b/helpers/backup.py
similarity index 99%
rename from python/helpers/backup.py
rename to helpers/backup.py
index fbabfb0ac..b38c9f005 100644
--- a/python/helpers/backup.py
+++ b/helpers/backup.py
@@ -9,8 +9,8 @@ from typing import List, Dict, Any, Optional
from pathspec import PathSpec
from pathspec.patterns.gitwildmatch import GitWildMatchPattern
-from python.helpers import files, runtime, git
-from python.helpers.print_style import PrintStyle
+from helpers import files, runtime, git
+from helpers.print_style import PrintStyle
class BackupService:
diff --git a/python/helpers/browser.py b/helpers/browser.py
similarity index 99%
rename from python/helpers/browser.py
rename to helpers/browser.py
index c560f5c86..a10c4429e 100644
--- a/python/helpers/browser.py
+++ b/helpers/browser.py
@@ -9,7 +9,7 @@
# BrowserContext,
# )
-# from python.helpers import files
+# from helpers import files
# class NoPageError(Exception):
diff --git a/python/helpers/browser_use.py b/helpers/browser_use.py
similarity index 57%
rename from python/helpers/browser_use.py
rename to helpers/browser_use.py
index 5c1800d2e..3ba097382 100644
--- a/python/helpers/browser_use.py
+++ b/helpers/browser_use.py
@@ -1,4 +1,4 @@
-from python.helpers import dotenv
+from helpers import dotenv
dotenv.save_dotenv_value("ANONYMIZED_TELEMETRY", "false")
import browser_use
import browser_use.utils
\ No newline at end of file
diff --git a/python/helpers/browser_use_monkeypatch.py b/helpers/browser_use_monkeypatch.py
similarity index 99%
rename from python/helpers/browser_use_monkeypatch.py
rename to helpers/browser_use_monkeypatch.py
index 8f77ca9e6..5c918015f 100644
--- a/python/helpers/browser_use_monkeypatch.py
+++ b/helpers/browser_use_monkeypatch.py
@@ -1,6 +1,6 @@
from typing import Any
from browser_use.llm import ChatGoogle
-from python.helpers import dirty_json
+from helpers import dirty_json
# ------------------------------------------------------------------------------
diff --git a/python/helpers/cache.py b/helpers/cache.py
similarity index 100%
rename from python/helpers/cache.py
rename to helpers/cache.py
diff --git a/python/helpers/call_llm.py b/helpers/call_llm.py
similarity index 100%
rename from python/helpers/call_llm.py
rename to helpers/call_llm.py
diff --git a/python/helpers/cloudflare_tunnel._py b/helpers/cloudflare_tunnel._py
similarity index 98%
rename from python/helpers/cloudflare_tunnel._py
rename to helpers/cloudflare_tunnel._py
index ebd1f50e8..5ef12de8e 100644
--- a/python/helpers/cloudflare_tunnel._py
+++ b/helpers/cloudflare_tunnel._py
@@ -3,8 +3,8 @@ import platform
import requests
import subprocess
import threading
-from python.helpers import files
-from python.helpers.print_style import PrintStyle
+from helpers import files
+from helpers.print_style import PrintStyle
class CloudflareTunnel:
def __init__(self, port: int):
diff --git a/python/helpers/context.py b/helpers/context.py
similarity index 100%
rename from python/helpers/context.py
rename to helpers/context.py
diff --git a/python/helpers/crypto.py b/helpers/crypto.py
similarity index 100%
rename from python/helpers/crypto.py
rename to helpers/crypto.py
diff --git a/python/helpers/defer.py b/helpers/defer.py
similarity index 100%
rename from python/helpers/defer.py
rename to helpers/defer.py
diff --git a/python/helpers/dirty_json.py b/helpers/dirty_json.py
similarity index 100%
rename from python/helpers/dirty_json.py
rename to helpers/dirty_json.py
diff --git a/python/helpers/docker.py b/helpers/docker.py
similarity index 96%
rename from python/helpers/docker.py
rename to helpers/docker.py
index dc1852bb3..a95aaee37 100644
--- a/python/helpers/docker.py
+++ b/helpers/docker.py
@@ -2,10 +2,10 @@ import time
import docker
import atexit
from typing import Optional
-from python.helpers.files import get_abs_path
-from python.helpers.errors import format_error
-from python.helpers.print_style import PrintStyle
-from python.helpers.log import Log
+from helpers.files import get_abs_path
+from helpers.errors import format_error
+from helpers.print_style import PrintStyle
+from helpers.log import Log
class DockerContainerManager:
def __init__(self, image: str, name: str, ports: Optional[dict[str, int]] = None, volumes: Optional[dict[str, dict[str, str]]] = None,logger: Log|None=None):
diff --git a/python/helpers/document_query.py b/helpers/document_query.py
similarity index 99%
rename from python/helpers/document_query.py
rename to helpers/document_query.py
index 4ba82b159..1f6925f4d 100644
--- a/python/helpers/document_query.py
+++ b/helpers/document_query.py
@@ -4,7 +4,7 @@ import asyncio
import aiohttp
import json
-from python.helpers.vector_db import VectorDB
+from helpers.vector_db import VectorDB
os.environ["USER_AGENT"] = "@mixedbread-ai/unstructured" # noqa E402
from langchain_unstructured import UnstructuredLoader # noqa E402
@@ -22,8 +22,8 @@ from langchain_community.document_loaders.parsers.images import TesseractBlobPar
from langchain_core.documents import Document
from langchain.schema import SystemMessage, HumanMessage
-from python.helpers.print_style import PrintStyle
-from python.helpers import files, errors
+from helpers.print_style import PrintStyle
+from helpers import files, errors
from agent import Agent
from langchain.text_splitter import RecursiveCharacterTextSplitter
diff --git a/python/helpers/dotenv.py b/helpers/dotenv.py
similarity index 100%
rename from python/helpers/dotenv.py
rename to helpers/dotenv.py
diff --git a/python/helpers/duckduckgo_search.py b/helpers/duckduckgo_search.py
similarity index 100%
rename from python/helpers/duckduckgo_search.py
rename to helpers/duckduckgo_search.py
diff --git a/python/helpers/email_client.py b/helpers/email_client.py
similarity index 99%
rename from python/helpers/email_client.py
rename to helpers/email_client.py
index 45e795ebe..11adc5a9a 100644
--- a/python/helpers/email_client.py
+++ b/helpers/email_client.py
@@ -13,9 +13,9 @@ import html2text
from bs4 import BeautifulSoup
from imapclient import IMAPClient
-from python.helpers import files
-from python.helpers.errors import RepairableException, format_error
-from python.helpers.print_style import PrintStyle
+from helpers import files
+from helpers.errors import RepairableException, format_error
+from helpers.print_style import PrintStyle
@dataclass
@@ -560,7 +560,7 @@ async def read_messages(
List of Message objects
Example:
- from python.helpers.email_client import read_messages
+ from helpers.email_client import read_messages
messages = await read_messages(
server="imap.gmail.com",
port=993,
diff --git a/python/helpers/errors.py b/helpers/errors.py
similarity index 89%
rename from python/helpers/errors.py
rename to helpers/errors.py
index a0ee7c89a..be56263d9 100644
--- a/python/helpers/errors.py
+++ b/helpers/errors.py
@@ -14,9 +14,14 @@ def error_text(e: Exception):
return str(e)
-def format_error(e: Exception, start_entries=20, end_entries=15, error_message_position:Literal["top", "bottom", "none"] = "top"):
+def format_error(
+ e: Exception,
+ start_entries=20,
+ end_entries=15,
+ error_message_position: Literal["top", "bottom", "none"] = "top",
+):
# format traceback from the provided exception instead of the most recent one
- traceback_text = ''.join(traceback.format_exception(type(e), e, e.__traceback__))
+ traceback_text = "".join(traceback.format_exception(type(e), e, e.__traceback__))
# Split the traceback into lines
lines = traceback_text.split("\n")
@@ -77,15 +82,15 @@ def format_error(e: Exception, start_entries=20, end_entries=15, error_message_p
class RepairableException(Exception):
"""An exception type indicating errors that can be surfaced to the LLM for potential self-repair."""
- pass
-class InterventionException(Exception):
- """An exception type raised on user intervention, skipping rest of message loop iteration."""
pass
+
+
class InterventionException(Exception):
"""An exception type raised on user intervention, skipping rest of message loop iteration."""
+
pass
class HandledException(Exception):
- pass
\ No newline at end of file
+ pass
diff --git a/python/helpers/extension.py b/helpers/extension.py
similarity index 81%
rename from python/helpers/extension.py
rename to helpers/extension.py
index 87d81404f..bb379b108 100644
--- a/python/helpers/extension.py
+++ b/helpers/extension.py
@@ -1,7 +1,7 @@
from abc import abstractmethod
from typing import Any
-from python.helpers import extract_tools, files
-from python.helpers import cache
+from helpers import extract_tools, files
+from helpers import cache, plugins, subagents
from typing import TYPE_CHECKING
from functools import wraps
import asyncio
@@ -15,7 +15,7 @@ DEFAULT_EXTENSIONS_FOLDER = "python/extensions"
USER_EXTENSIONS_FOLDER = "usr/extensions"
_CACHE_AREA = "extension_folder_classes(extensions)(plugins)"
-cache.toggle_area(_CACHE_AREA, False) # cache off for now
+cache.toggle_area(_CACHE_AREA, True) # cache off for now
class _Unset:
@@ -58,6 +58,7 @@ def extensible(func):
Finally, if ``data["exception"]`` contains an exception it is raised;
otherwise ``data["result"]`` is returned.
"""
+
@wraps(func)
async def _inner_async(*args, **kwargs):
from agent import Agent
@@ -75,7 +76,9 @@ def extensible(func):
def _get_agent() -> "Agent|None":
candidate = kwargs.get("agent")
- if isinstance(candidate, Agent) and bool(getattr(candidate, "__dict__", None)):
+ if isinstance(candidate, Agent) and bool(
+ getattr(candidate, "__dict__", None)
+ ):
return candidate
for a in args:
@@ -149,18 +152,14 @@ class Extension:
async def call_extensions(
extension_point: str, agent: "Agent|None" = None, **kwargs
) -> Any:
- from python.helpers import projects, subagents, plugins
-
# search for extension folders in all agent's paths
- paths = subagents.get_paths(
- agent, "extensions", extension_point, default_root="python"
- )
+ paths = subagents.get_paths(agent, "extensions/python", extension_point)
- # Add plugin backend extension paths (plugins/*/extensions/python/{extension_point})
- plugin_paths = plugins.get_enabled_plugin_paths(
- agent, "extensions", "python", extension_point
- )
- paths.extend(p for p in plugin_paths if p not in paths)
+ # # Add plugin backend extension paths (plugins/*/extensions/python/{extension_point})
+ # plugin_paths = plugins.get_enabled_plugin_paths(
+ # agent, "extensions", "python", extension_point
+ # )
+ # paths.extend(p for p in plugin_paths if p not in paths)
all_exts = [cls for path in paths for cls in _get_extensions(path)]
@@ -179,6 +178,33 @@ async def call_extensions(
await cls(agent=agent).execute(**kwargs)
+def get_webui_extensions(
+ agent: "Agent | None", extension_point: str, filters: list[str] | None = None
+):
+ entries: list[str] = []
+ effective_filters = filters or ["*"]
+
+ # search for extension folders in all agent's paths
+ folders = subagents.get_paths(
+ agent,
+ "extensions/webui",
+ extension_point,
+ )
+
+ extensions = []
+
+ for folder in folders:
+ for filter in effective_filters:
+ pattern = files.get_abs_path(folder, filter)
+ extensions.extend(files.find_existing_paths_by_pattern(pattern))
+
+ for extension in extensions:
+ rel_path = files.deabsolute_path(extension)
+ entries.append(rel_path)
+
+ return entries
+
+
def _get_file_from_module(module_name: str) -> str:
return module_name.split(".")[-1]
diff --git a/python/helpers/extract_tools.py b/helpers/extract_tools.py
similarity index 100%
rename from python/helpers/extract_tools.py
rename to helpers/extract_tools.py
diff --git a/python/helpers/faiss_monkey_patch.py b/helpers/faiss_monkey_patch.py
similarity index 100%
rename from python/helpers/faiss_monkey_patch.py
rename to helpers/faiss_monkey_patch.py
diff --git a/python/helpers/fasta2a_client.py b/helpers/fasta2a_client.py
similarity index 99%
rename from python/helpers/fasta2a_client.py
rename to helpers/fasta2a_client.py
index a02d22fd1..2a8752b55 100644
--- a/python/helpers/fasta2a_client.py
+++ b/helpers/fasta2a_client.py
@@ -1,6 +1,6 @@
import uuid
from typing import Any, Dict, List, Optional
-from python.helpers.print_style import PrintStyle
+from helpers.print_style import PrintStyle
try:
from fasta2a.client import A2AClient # type: ignore
diff --git a/python/helpers/fasta2a_server.py b/helpers/fasta2a_server.py
similarity index 99%
rename from python/helpers/fasta2a_server.py
rename to helpers/fasta2a_server.py
index 83ed30650..89afade1c 100644
--- a/python/helpers/fasta2a_server.py
+++ b/helpers/fasta2a_server.py
@@ -6,14 +6,14 @@ from typing import Any, List
import contextlib
import threading
-from python.helpers import settings, projects
+from helpers import settings, projects
from starlette.requests import Request
# Local imports
-from python.helpers.print_style import PrintStyle
+from helpers.print_style import PrintStyle
from agent import AgentContext, UserMessage, AgentContextType
from initialize import initialize_agent
-from python.helpers.persist_chat import remove_chat
+from helpers.persist_chat import remove_chat
# Import FastA2A
try:
@@ -358,7 +358,7 @@ class DynamicA2AProxy:
})
return
- from python.helpers import settings
+ from helpers import settings
cfg = settings.get_settings()
if not cfg["a2a_server_enabled"]:
response = b'HTTP/1.1 403 Forbidden\r\n\r\nA2A server is disabled'
diff --git a/python/helpers/file_browser.py b/helpers/file_browser.py
similarity index 99%
rename from python/helpers/file_browser.py
rename to helpers/file_browser.py
index 143bd358e..4f58d4c2e 100644
--- a/python/helpers/file_browser.py
+++ b/helpers/file_browser.py
@@ -4,11 +4,11 @@ import shutil
import base64
import subprocess
from typing import Dict, List, Tuple, Any
-from python.helpers.security import safe_filename
+from helpers.security import safe_filename
from datetime import datetime
-from python.helpers import files
-from python.helpers.print_style import PrintStyle
+from helpers import files
+from helpers.print_style import PrintStyle
class FileBrowser:
diff --git a/python/helpers/file_tree.py b/helpers/file_tree.py
similarity index 99%
rename from python/helpers/file_tree.py
rename to helpers/file_tree.py
index c587ed487..b08361e60 100644
--- a/python/helpers/file_tree.py
+++ b/helpers/file_tree.py
@@ -8,7 +8,7 @@ from typing import Any, Callable, Iterable, Literal, Optional, Sequence
from pathspec import PathSpec
-from python.helpers import files as files_helper
+from helpers import files as files_helper
SORT_BY_NAME = "name"
SORT_BY_CREATED = "created"
diff --git a/python/helpers/files.py b/helpers/files.py
similarity index 98%
rename from python/helpers/files.py
rename to helpers/files.py
index b2508ca34..efef577ee 100644
--- a/python/helpers/files.py
+++ b/helpers/files.py
@@ -12,7 +12,7 @@ import zipfile
import glob
import mimetypes
from simpleeval import simple_eval
-from python.helpers import yaml
+from helpers import yaml
AGENTS_DIR = "agents"
PLUGINS_DIR = "plugins"
@@ -45,7 +45,7 @@ def load_plugin_variables(
if plugin_file and exists(plugin_file):
- from python.helpers import extract_tools
+ from helpers import extract_tools
classes = extract_tools.load_classes_from_file(
plugin_file, VariablesPlugin, one_per_file=False
@@ -80,7 +80,7 @@ def load_plugin_variables(
return {}
-from python.helpers.strings import sanitize_string
+from helpers.strings import sanitize_string
def parse_file(
@@ -536,7 +536,7 @@ def get_abs_path(*relative_paths):
def get_abs_path_dockerized(*relative_paths):
"Ensures the abs path is dockerized (i.e. /a0/... path)"
abs = get_abs_path(*relative_paths)
- from python.helpers import runtime
+ from helpers import runtime
if runtime.is_dockerized():
return abs
@@ -556,7 +556,7 @@ def deabsolute_path(path: str):
def fix_dev_path(path: str):
"On dev environment, convert /a0/... paths to local absolute paths"
- from python.helpers.runtime import is_development
+ from helpers.runtime import is_development
if is_development():
if path.startswith("/a0/"):
@@ -589,7 +589,7 @@ def is_dir(*relative_paths):
def get_base_dir():
# Get the base directory from the current file path
- base_dir = os.path.dirname(os.path.abspath(os.path.join(__file__, "../../")))
+ base_dir = os.path.dirname(os.path.abspath(os.path.join(__file__, "../")))
return base_dir
diff --git a/python/helpers/git.py b/helpers/git.py
similarity index 98%
rename from python/helpers/git.py
rename to helpers/git.py
index c34e30834..5a8872f51 100644
--- a/python/helpers/git.py
+++ b/helpers/git.py
@@ -4,7 +4,7 @@ import os
import subprocess
import base64
from urllib.parse import urlparse, urlunparse
-from python.helpers import files
+from helpers import files
def strip_auth_from_url(url: str) -> str:
@@ -167,7 +167,7 @@ def get_repo_status(repo_path: str) -> dict:
commit = repo.head.commit
last_commit = {
"hash": commit.hexsha[:7],
- "message": commit.message.split('\n')[0][:80],
+ "message": str(commit.message).split("\n")[0][:80],
"author": str(commit.author),
"date": datetime.fromtimestamp(commit.committed_date).strftime('%Y-%m-%d %H:%M')
}
diff --git a/python/helpers/guids.py b/helpers/guids.py
similarity index 100%
rename from python/helpers/guids.py
rename to helpers/guids.py
diff --git a/python/helpers/history.py b/helpers/history.py
similarity index 99%
rename from python/helpers/history.py
rename to helpers/history.py
index 45270bc48..be51f19f3 100644
--- a/python/helpers/history.py
+++ b/helpers/history.py
@@ -5,7 +5,7 @@ from collections.abc import Mapping
import json
import math
from typing import Coroutine, Literal, TypedDict, cast, Union, Dict, List, Any
-from python.helpers import messages, tokens, settings, call_llm
+from helpers import messages, tokens, settings, call_llm
from enum import Enum
from langchain_core.messages import BaseMessage, HumanMessage, SystemMessage, AIMessage
diff --git a/python/helpers/images.py b/helpers/images.py
similarity index 100%
rename from python/helpers/images.py
rename to helpers/images.py
diff --git a/python/helpers/job_loop.py b/helpers/job_loop.py
similarity index 89%
rename from python/helpers/job_loop.py
rename to helpers/job_loop.py
index 72e74cafd..184858b18 100644
--- a/python/helpers/job_loop.py
+++ b/helpers/job_loop.py
@@ -1,10 +1,10 @@
import asyncio
from datetime import datetime
import time
-from python.helpers.task_scheduler import TaskScheduler
-from python.helpers.print_style import PrintStyle
-from python.helpers import errors
-from python.helpers import runtime
+from helpers.task_scheduler import TaskScheduler
+from helpers.print_style import PrintStyle
+from helpers import errors
+from helpers import runtime
SLEEP_TIME = 60
diff --git a/python/helpers/kokoro_tts.py b/helpers/kokoro_tts.py
similarity index 94%
rename from python/helpers/kokoro_tts.py
rename to helpers/kokoro_tts.py
index f24311df5..7dd7c12f6 100644
--- a/python/helpers/kokoro_tts.py
+++ b/helpers/kokoro_tts.py
@@ -5,9 +5,9 @@ import io
import warnings
import asyncio
import soundfile as sf
-from python.helpers import runtime
-from python.helpers.print_style import PrintStyle
-from python.helpers.notification import NotificationManager, NotificationType, NotificationPriority
+from helpers import runtime
+from helpers.print_style import PrintStyle
+from helpers.notification import NotificationManager, NotificationType, NotificationPriority
warnings.filterwarnings("ignore", category=FutureWarning)
warnings.filterwarnings("ignore", category=UserWarning)
diff --git a/python/helpers/kvp.py b/helpers/kvp.py
similarity index 98%
rename from python/helpers/kvp.py
rename to helpers/kvp.py
index 0a900fb3c..a051bb6f2 100644
--- a/python/helpers/kvp.py
+++ b/helpers/kvp.py
@@ -6,7 +6,7 @@ import tempfile
import threading
from typing import Any
-from python.helpers.files import get_abs_path
+from helpers.files import get_abs_path
_runtime_lock = threading.RLock()
_runtime_store: dict[str, Any] = {}
diff --git a/python/helpers/localization.py b/helpers/localization.py
similarity index 98%
rename from python/helpers/localization.py
rename to helpers/localization.py
index 565f3f7f2..e9076a55b 100644
--- a/python/helpers/localization.py
+++ b/helpers/localization.py
@@ -1,8 +1,8 @@
from datetime import datetime, timezone as dt_timezone, timedelta
import pytz # type: ignore
-from python.helpers.print_style import PrintStyle
-from python.helpers.dotenv import get_dotenv_value, save_dotenv_value
+from helpers.print_style import PrintStyle
+from helpers.dotenv import get_dotenv_value, save_dotenv_value
diff --git a/python/helpers/log.py b/helpers/log.py
similarity index 98%
rename from python/helpers/log.py
rename to helpers/log.py
index 9f10ff9e3..0bd27c0fd 100644
--- a/python/helpers/log.py
+++ b/helpers/log.py
@@ -7,8 +7,8 @@ from collections import OrderedDict
from dataclasses import dataclass
from typing import Any, Literal, Optional, TYPE_CHECKING, TypeVar, cast
-from python.helpers.secrets import get_secrets_manager
-from python.helpers.strings import truncate_text_by_ratio
+from helpers.secrets import get_secrets_manager
+from helpers.strings import truncate_text_by_ratio
if TYPE_CHECKING:
@@ -23,7 +23,7 @@ def _lazy_mark_dirty_all(*, reason: str | None = None) -> None:
# Lazy import to avoid circular import at module load time (AgentContext -> Log).
global _MARK_DIRTY_ALL
if _MARK_DIRTY_ALL is None:
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
_MARK_DIRTY_ALL = mark_dirty_all
_MARK_DIRTY_ALL(reason=reason)
@@ -33,7 +33,7 @@ def _lazy_mark_dirty_for_context(context_id: str, *, reason: str | None = None)
# Lazy import to avoid circular import at module load time (AgentContext -> Log).
global _MARK_DIRTY_FOR_CONTEXT
if _MARK_DIRTY_FOR_CONTEXT is None:
- from python.helpers.state_monitor_integration import mark_dirty_for_context
+ from helpers.state_monitor_integration import mark_dirty_for_context
_MARK_DIRTY_FOR_CONTEXT = mark_dirty_for_context
_MARK_DIRTY_FOR_CONTEXT(context_id, reason=reason)
diff --git a/python/helpers/login.py b/helpers/login.py
similarity index 91%
rename from python/helpers/login.py
rename to helpers/login.py
index 2b02c5701..4c0828731 100644
--- a/python/helpers/login.py
+++ b/helpers/login.py
@@ -1,4 +1,4 @@
-from python.helpers import dotenv
+from helpers import dotenv
import hashlib
diff --git a/python/helpers/mcp_handler.py b/helpers/mcp_handler.py
similarity index 99%
rename from python/helpers/mcp_handler.py
rename to helpers/mcp_handler.py
index 5047b3679..c93cf1369 100644
--- a/python/helpers/mcp_handler.py
+++ b/helpers/mcp_handler.py
@@ -21,9 +21,9 @@ from contextlib import AsyncExitStack
from shutil import which
from datetime import timedelta
import json
-from python.helpers import errors
-from python.helpers import settings
-from python.helpers.log import LogItem
+from helpers import errors
+from helpers import settings
+from helpers.log import LogItem
import httpx
@@ -39,9 +39,9 @@ from anyio.streams.memory import (
)
from pydantic import BaseModel, Field, Discriminator, Tag, PrivateAttr
-from python.helpers import dirty_json
-from python.helpers.print_style import PrintStyle
-from python.helpers.tool import Tool, Response
+from helpers import dirty_json
+from helpers.print_style import PrintStyle
+from helpers.tool import Tool, Response
def normalize_name(name: str) -> str:
diff --git a/python/helpers/mcp_server.py b/helpers/mcp_server.py
similarity index 99%
rename from python/helpers/mcp_server.py
rename to helpers/mcp_server.py
index d41fdeb72..94b70c1d5 100644
--- a/python/helpers/mcp_server.py
+++ b/helpers/mcp_server.py
@@ -9,10 +9,10 @@ from fastmcp import FastMCP
import contextvars
from agent import AgentContext, AgentContextType, UserMessage
-from python.helpers.persist_chat import remove_chat
+from helpers.persist_chat import remove_chat
from initialize import initialize_agent
-from python.helpers.print_style import PrintStyle
-from python.helpers import settings, projects
+from helpers.print_style import PrintStyle
+from helpers import settings, projects
from starlette.middleware import Middleware
from starlette.middleware.base import BaseHTTPMiddleware
from starlette.exceptions import HTTPException as StarletteHTTPException
diff --git a/python/helpers/message_queue.py b/helpers/message_queue.py
similarity index 98%
rename from python/helpers/message_queue.py
rename to helpers/message_queue.py
index af324c937..37d8065e1 100644
--- a/python/helpers/message_queue.py
+++ b/helpers/message_queue.py
@@ -1,12 +1,12 @@
import os
import uuid
from typing import TYPE_CHECKING
-from python.helpers import guids
+from helpers import guids
if TYPE_CHECKING:
from agent import AgentContext
-from python.helpers.print_style import PrintStyle
+from helpers.print_style import PrintStyle
QUEUE_KEY = "message_queue"
QUEUE_SEQ_KEY = "message_queue_seq"
diff --git a/python/helpers/messages.py b/helpers/messages.py
similarity index 100%
rename from python/helpers/messages.py
rename to helpers/messages.py
diff --git a/python/helpers/migration.py b/helpers/migration.py
similarity index 96%
rename from python/helpers/migration.py
rename to helpers/migration.py
index d523411e7..477bb51d0 100644
--- a/python/helpers/migration.py
+++ b/helpers/migration.py
@@ -1,9 +1,9 @@
import os
import json
-from python.helpers import files
-from python.helpers import subagents
-from python.helpers import yaml as yaml_helper
-from python.helpers.print_style import PrintStyle
+from helpers import files
+from helpers import subagents
+from helpers import yaml as yaml_helper
+from helpers.print_style import PrintStyle
def startup_migration() -> None:
diff --git a/python/helpers/notification.py b/helpers/notification.py
similarity index 95%
rename from python/helpers/notification.py
rename to helpers/notification.py
index a15cb1b38..44590093d 100644
--- a/python/helpers/notification.py
+++ b/helpers/notification.py
@@ -115,7 +115,7 @@ class NotificationManager:
# Enforce limit
self._enforce_limit()
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="notification.NotificationManager.add_notification")
return item
@@ -175,7 +175,7 @@ class NotificationManager:
if not changed_nos:
return 0
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="notification.NotificationManager.mark_read_by_ids")
return len(changed_nos)
@@ -196,7 +196,7 @@ class NotificationManager:
if not changed:
return
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="notification.NotificationManager._update_item")
def mark_all_read(self):
@@ -212,7 +212,7 @@ class NotificationManager:
if not changed_nos:
return
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="notification.NotificationManager.mark_all_read")
def clear_all(self):
@@ -220,7 +220,7 @@ class NotificationManager:
self.notifications = []
self.updates = []
self.guid = str(uuid.uuid4())
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="notification.NotificationManager.clear_all")
def get_notifications_by_type(self, type: NotificationType) -> list[NotificationItem]:
diff --git a/helpers/performance.py b/helpers/performance.py
new file mode 100644
index 000000000..0bbce04ab
--- /dev/null
+++ b/helpers/performance.py
@@ -0,0 +1,51 @@
+import functools
+import inspect
+from pyinstrument import Profiler
+
+def trace_performance(*, show_all=False, color=True, unicode=True):
+ """
+ Decorator that profiles a function and prints a call tree when it finishes.
+
+ Works with both synchronous and asynchronous functions.
+ """
+
+ def decorator(func):
+ is_coro = inspect.iscoroutinefunction(func)
+
+ @functools.wraps(func)
+ async def async_wrapper(*args, **kwargs):
+ profiler = Profiler()
+ profiler.start()
+ try:
+ return await func(*args, **kwargs)
+ finally:
+ profiler.stop()
+ print(f"\n=== Performance trace: {func.__module__}.{func.__qualname__} (async) ===")
+ print(
+ profiler.output_text(
+ color=color,
+ unicode=unicode,
+ show_all=show_all,
+ )
+ )
+
+ @functools.wraps(func)
+ def sync_wrapper(*args, **kwargs):
+ profiler = Profiler()
+ profiler.start()
+ try:
+ return func(*args, **kwargs)
+ finally:
+ profiler.stop()
+ print(f"\n=== Performance trace: {func.__module__}.{func.__qualname__} ===")
+ print(
+ profiler.output_text(
+ color=color,
+ unicode=unicode,
+ show_all=show_all,
+ )
+ )
+
+ return async_wrapper if is_coro else sync_wrapper
+
+ return decorator
\ No newline at end of file
diff --git a/python/helpers/perplexity_search.py b/helpers/perplexity_search.py
similarity index 100%
rename from python/helpers/perplexity_search.py
rename to helpers/perplexity_search.py
diff --git a/python/helpers/persist_chat.py b/helpers/persist_chat.py
similarity index 99%
rename from python/helpers/persist_chat.py
rename to helpers/persist_chat.py
index 110474448..db04e1b5e 100644
--- a/python/helpers/persist_chat.py
+++ b/helpers/persist_chat.py
@@ -3,11 +3,11 @@ from datetime import datetime
from typing import Any
import uuid
from agent import Agent, AgentConfig, AgentContext, AgentContextType
-from python.helpers import files, history
+from helpers import files, history
import json
from initialize import initialize_agent
-from python.helpers.log import Log, LogItem
+from helpers.log import Log, LogItem
CHATS_FOLDER = "usr/chats"
LOG_SIZE = 1000
diff --git a/python/helpers/playwright.py b/helpers/playwright.py
similarity index 95%
rename from python/helpers/playwright.py
rename to helpers/playwright.py
index c352407b2..c00deba6d 100644
--- a/python/helpers/playwright.py
+++ b/helpers/playwright.py
@@ -3,7 +3,7 @@ import os
import sys
from pathlib import Path
import subprocess
-from python.helpers import files
+from helpers import files
# this helper ensures that playwright is installed in /lib/playwright
diff --git a/python/helpers/plugins.py b/helpers/plugins.py
similarity index 95%
rename from python/helpers/plugins.py
rename to helpers/plugins.py
index dd3c1c9f0..8b1a53371 100644
--- a/python/helpers/plugins.py
+++ b/helpers/plugins.py
@@ -13,7 +13,7 @@ from typing import (
TypedDict,
)
-from python.helpers import files, print_style, yaml as yaml_helper, cache
+from helpers import files, print_style, yaml as yaml_helper, cache
from pydantic import BaseModel, Field
if TYPE_CHECKING:
@@ -235,7 +235,7 @@ def get_enabled_plugins(agent: Agent | None):
# + agent paths
if agent:
- from python.helpers import subagents
+ from helpers import subagents
agent_paths = subagents.get_paths(
agent,
@@ -349,19 +349,6 @@ def toggle_plugin(
files.write_file(disabled_file, "")
-def get_webui_extensions(agent: Agent | None, extension_point: str, filters: List[str] | None = None):
- entries: List[str] = []
- effective_filters = filters or ["*"]
-
- for filter in effective_filters:
- extensions = get_enabled_plugin_paths(agent, "extensions", "webui", extension_point, filter)
- for extension in extensions:
- rel_path = files.deabsolute_path(extension)
- entries.append(rel_path)
-
- return entries
-
-
def get_plugin_config(
plugin_name: str,
agent: Agent | None = None,
@@ -370,7 +357,7 @@ def get_plugin_config(
):
if project_name is None and agent is not None:
- from python.helpers import projects
+ from helpers import projects
project_name = projects.get_context_project_name(agent.context)
if agent_profile is None and agent is not None:
@@ -436,7 +423,7 @@ def find_plugin_assets(
agent_profile: str = "*",
only_first: bool = False,
) -> list[PluginAssetFile]:
- from python.helpers import projects, subagents
+ from helpers import projects, subagents
results: list[PluginAssetFile] = []
@@ -550,7 +537,7 @@ def determine_plugin_asset_path(
base_path = files.get_abs_path(files.USER_DIR)
if project_name:
- from python.helpers import projects
+ from helpers import projects
base_path = projects.get_project_meta(project_name)
diff --git a/python/helpers/print_catch.py b/helpers/print_catch.py
similarity index 100%
rename from python/helpers/print_catch.py
rename to helpers/print_catch.py
diff --git a/python/helpers/print_style.py b/helpers/print_style.py
similarity index 99%
rename from python/helpers/print_style.py
rename to helpers/print_style.py
index 25b7a408e..88db30532 100644
--- a/python/helpers/print_style.py
+++ b/helpers/print_style.py
@@ -138,7 +138,7 @@ class PrintStyle:
# Automatically mask secrets in all print output
try:
if not hasattr(self, "secrets_mgr"):
- from python.helpers.secrets import get_secrets_manager
+ from helpers.secrets import get_secrets_manager
self.secrets_mgr = get_secrets_manager()
text = self.secrets_mgr.mask_values(text)
except Exception:
diff --git a/python/helpers/process.py b/helpers/process.py
similarity index 85%
rename from python/helpers/process.py
rename to helpers/process.py
index 59c994d32..430f3cfed 100644
--- a/python/helpers/process.py
+++ b/helpers/process.py
@@ -1,7 +1,7 @@
import os
import sys
-from python.helpers import runtime
-from python.helpers.print_style import PrintStyle
+from helpers import runtime
+from helpers.print_style import PrintStyle
_server = None
diff --git a/python/helpers/projects.py b/helpers/projects.py
similarity index 96%
rename from python/helpers/projects.py
rename to helpers/projects.py
index 19031807a..3e5193cc9 100644
--- a/python/helpers/projects.py
+++ b/helpers/projects.py
@@ -1,8 +1,8 @@
import os
from typing import Literal, TypedDict, TYPE_CHECKING, cast
-from python.helpers import files, dirty_json, persist_chat, file_tree
-from python.helpers.print_style import PrintStyle
+from helpers import files, dirty_json, persist_chat, file_tree
+from helpers.print_style import PrintStyle
if TYPE_CHECKING:
@@ -87,7 +87,7 @@ def create_project(name: str, data: BasicProjectData):
def clone_git_project(name: str, git_url: str, git_token: str, data: BasicProjectData):
"""Clone a git repository as a new A0 project. Token is used only for cloning via http header."""
- from python.helpers import git
+ from helpers import git
abs_path = files.create_dir_safe(
files.get_abs_path(PROJECTS_PARENT_DIR, name), rename_format="{name}_{number}"
@@ -231,7 +231,7 @@ def load_basic_project_data(name: str) -> BasicProjectData:
def load_edit_project_data(name: str) -> EditProjectData:
- from python.helpers import git
+ from helpers import git
data = load_basic_project_data(name)
additional_instructions = get_additional_instructions_files(name)
@@ -316,7 +316,7 @@ def activate_project(context_id: str, name: str, *, mark_dirty: bool = True):
persist_chat.save_tmp_chat(context)
if mark_dirty:
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="projects.activate_project")
@@ -333,7 +333,7 @@ def deactivate_project(context_id: str, *, mark_dirty: bool = True):
persist_chat.save_tmp_chat(context)
if mark_dirty:
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="projects.deactivate_project")
@@ -345,7 +345,7 @@ def reactivate_project_in_chats(name: str):
activate_project(context.id, name, mark_dirty=False)
persist_chat.save_tmp_chat(context)
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="projects.reactivate_project_in_chats")
@@ -357,7 +357,7 @@ def deactivate_project_in_chats(name: str):
deactivate_project(context.id, mark_dirty=False)
persist_chat.save_tmp_chat(context)
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="projects.deactivate_project_in_chats")
@@ -425,7 +425,7 @@ def save_project_subagents(name: str, subagents_data: dict[str, SubAgentSettings
def _normalize_subagents(
subagents_data: dict[str, SubAgentSettings]
) -> dict[str, SubAgentSettings]:
- from python.helpers import subagents
+ from helpers import subagents
agents_dict = subagents.get_agents_dict()
@@ -445,14 +445,14 @@ def _normalize_subagents(
def load_project_secrets_masked(name: str, merge_with_global=False):
- from python.helpers import secrets
+ from helpers import secrets
mgr = secrets.get_project_secrets_manager(name, merge_with_global)
return mgr.get_masked_secrets()
def save_project_secrets(name: str, secrets: str):
- from python.helpers.secrets import get_project_secrets_manager
+ from helpers.secrets import get_project_secrets_manager
secrets_manager = get_project_secrets_manager(name)
secrets_manager.save_secrets_with_merge(secrets)
diff --git a/python/helpers/providers.py b/helpers/providers.py
similarity index 98%
rename from python/helpers/providers.py
rename to helpers/providers.py
index f60238bd5..ab74d6d9b 100644
--- a/python/helpers/providers.py
+++ b/helpers/providers.py
@@ -1,5 +1,5 @@
import yaml
-from python.helpers import files
+from helpers import files
from typing import List, Dict, Optional, TypedDict, Literal
ModelType = Literal["chat", "embedding"]
diff --git a/python/helpers/rate_limiter.py b/helpers/rate_limiter.py
similarity index 100%
rename from python/helpers/rate_limiter.py
rename to helpers/rate_limiter.py
diff --git a/python/helpers/rfc.py b/helpers/rfc.py
similarity index 96%
rename from python/helpers/rfc.py
rename to helpers/rfc.py
index eb7125d81..13c18a53c 100644
--- a/python/helpers/rfc.py
+++ b/helpers/rfc.py
@@ -3,9 +3,9 @@ import inspect
import json
from typing import Any, TypedDict
import aiohttp
-from python.helpers import crypto
+from helpers import crypto
-from python.helpers import dotenv
+from helpers import dotenv
# Remote Function Call library
diff --git a/python/helpers/rfc_exchange.py b/helpers/rfc_exchange.py
similarity index 91%
rename from python/helpers/rfc_exchange.py
rename to helpers/rfc_exchange.py
index 440631fbb..4ad0d9fa2 100644
--- a/python/helpers/rfc_exchange.py
+++ b/helpers/rfc_exchange.py
@@ -1,4 +1,4 @@
-from python.helpers import runtime, crypto, dotenv
+from helpers import runtime, crypto, dotenv
async def get_root_password():
if runtime.is_dockerized():
diff --git a/python/helpers/rfc_files.py b/helpers/rfc_files.py
similarity index 99%
rename from python/helpers/rfc_files.py
rename to helpers/rfc_files.py
index 2357828fe..662bd0f81 100644
--- a/python/helpers/rfc_files.py
+++ b/helpers/rfc_files.py
@@ -4,7 +4,7 @@ import fnmatch
import base64
import tempfile
import zipfile
-from python.helpers import runtime
+from helpers import runtime
def get_abs_path(*relative_paths):
diff --git a/python/helpers/runtime.py b/helpers/runtime.py
similarity index 98%
rename from python/helpers/runtime.py
rename to helpers/runtime.py
index ed5fbace4..d56ca44fa 100644
--- a/python/helpers/runtime.py
+++ b/helpers/runtime.py
@@ -3,7 +3,7 @@ import inspect
import secrets
from pathlib import Path
from typing import TypeVar, Callable, Awaitable, Union, overload, cast
-from python.helpers import dotenv, rfc, settings, files
+from helpers import dotenv, rfc, settings, files
import asyncio
import threading
import queue
diff --git a/python/helpers/searxng.py b/helpers/searxng.py
similarity index 91%
rename from python/helpers/searxng.py
rename to helpers/searxng.py
index e51d98950..b325ee76c 100644
--- a/python/helpers/searxng.py
+++ b/helpers/searxng.py
@@ -1,5 +1,5 @@
import aiohttp
-from python.helpers import runtime
+from helpers import runtime
URL = "http://localhost:55510/search"
diff --git a/python/helpers/secrets.py b/helpers/secrets.py
similarity index 99%
rename from python/helpers/secrets.py
rename to helpers/secrets.py
index 8cb8b0cbc..28e27f5b1 100644
--- a/python/helpers/secrets.py
+++ b/helpers/secrets.py
@@ -6,8 +6,8 @@ from io import StringIO
from dataclasses import dataclass
from typing import Dict, Optional, List, Literal, Set, Callable, Tuple, TYPE_CHECKING
from dotenv.parser import parse_stream
-from python.helpers.errors import RepairableException
-from python.helpers import files
+from helpers.errors import RepairableException
+from helpers import files
if TYPE_CHECKING:
from agent import AgentContext
@@ -505,7 +505,7 @@ class SecretsManager:
def get_secrets_manager(context: "AgentContext|None" = None) -> SecretsManager:
- from python.helpers import projects
+ from helpers import projects
# default secrets file
secret_files = [DEFAULT_SECRETS_FILE]
@@ -524,7 +524,7 @@ def get_secrets_manager(context: "AgentContext|None" = None) -> SecretsManager:
return SecretsManager.get_instance(*secret_files)
def get_project_secrets_manager(project_name: str, merge_with_global: bool = False) -> SecretsManager:
- from python.helpers import projects
+ from helpers import projects
# default secrets file
secret_files = []
diff --git a/python/helpers/security.py b/helpers/security.py
similarity index 100%
rename from python/helpers/security.py
rename to helpers/security.py
diff --git a/python/helpers/settings.py b/helpers/settings.py
similarity index 97%
rename from python/helpers/settings.py
rename to helpers/settings.py
index 1d9b1cc2d..8eab0731f 100644
--- a/python/helpers/settings.py
+++ b/helpers/settings.py
@@ -7,13 +7,13 @@ import subprocess
from typing import Any, Literal, TypedDict, cast, TypeVar
import models
-from python.helpers import runtime, whisper, defer, git, subagents
+from helpers import runtime, whisper, defer, git, subagents
from . import files, dotenv
-from python.helpers.print_style import PrintStyle
-from python.helpers.providers import get_providers, FieldOption as ProvidersFO
-from python.helpers.secrets import get_default_secrets_manager
-from python.helpers import dirty_json
-from python.helpers.notification import NotificationManager, NotificationType, NotificationPriority
+from helpers.print_style import PrintStyle
+from helpers.providers import get_providers, FieldOption as ProvidersFO
+from helpers.secrets import get_default_secrets_manager
+from helpers import dirty_json
+from helpers.notification import NotificationManager, NotificationType, NotificationPriority
T = TypeVar('T')
@@ -600,7 +600,7 @@ def _apply_settings(previous: Settings | None):
or _settings["embed_model_provider"] != previous["embed_model_provider"]
or _settings["embed_model_kwargs"] != previous["embed_model_kwargs"]
):
- from python.helpers.extension import call_extensions
+ from helpers.extension import call_extensions
defer.DeferredTask().start_task(
call_extensions, "embedding_model_changed"
@@ -608,7 +608,7 @@ def _apply_settings(previous: Settings | None):
# update mcp settings if necessary
if not previous or _settings["mcp_servers"] != previous["mcp_servers"]:
- from python.helpers.mcp_handler import MCPConfig
+ from helpers.mcp_handler import MCPConfig
async def update_mcp_settings(mcp_servers: str):
PrintStyle(
@@ -670,7 +670,7 @@ def _apply_settings(previous: Settings | None):
if not previous or current_token != previous["mcp_server_token"]:
async def update_mcp_token(token: str):
- from python.helpers.mcp_server import DynamicMcpProxy
+ from helpers.mcp_server import DynamicMcpProxy
DynamicMcpProxy.get_instance().reconfigure(token=token)
@@ -682,7 +682,7 @@ def _apply_settings(previous: Settings | None):
if not previous or current_token != previous["mcp_server_token"]:
async def update_a2a_token(token: str):
- from python.helpers.fasta2a_server import DynamicA2AProxy
+ from helpers.fasta2a_server import DynamicA2AProxy
DynamicA2AProxy.get_instance().reconfigure(token=token)
diff --git a/python/helpers/shell_local.py b/helpers/shell_local.py
similarity index 91%
rename from python/helpers/shell_local.py
rename to helpers/shell_local.py
index dcc14398d..fc238842f 100644
--- a/python/helpers/shell_local.py
+++ b/helpers/shell_local.py
@@ -4,8 +4,8 @@ import subprocess
import time
import sys
from typing import Optional, Tuple
-from python.helpers import tty_session, runtime
-from python.helpers.shell_ssh import clean_string
+from helpers import tty_session, runtime
+from helpers.shell_ssh import clean_string
class LocalInteractiveSession:
def __init__(self, cwd: str|None = None):
diff --git a/python/helpers/shell_ssh.py b/helpers/shell_ssh.py
similarity index 98%
rename from python/helpers/shell_ssh.py
rename to helpers/shell_ssh.py
index 71faf9eb1..9aa9b4706 100644
--- a/python/helpers/shell_ssh.py
+++ b/helpers/shell_ssh.py
@@ -3,9 +3,9 @@ import paramiko
import time
import re
from typing import Tuple
-from python.helpers.log import Log
-from python.helpers.print_style import PrintStyle
-# from python.helpers.strings import calculate_valid_match_lengths
+from helpers.log import Log
+from helpers.print_style import PrintStyle
+# from helpers.strings import calculate_valid_match_lengths
class SSHInteractiveSession:
diff --git a/python/helpers/skills.py b/helpers/skills.py
similarity index 99%
rename from python/helpers/skills.py
rename to helpers/skills.py
index e9f6aca14..4cd7028be 100644
--- a/python/helpers/skills.py
+++ b/helpers/skills.py
@@ -6,7 +6,7 @@ from dataclasses import dataclass, field
from pathlib import Path
from typing import Any, Dict, Iterable, List, Literal, Optional, Tuple, TYPE_CHECKING
-from python.helpers import files, subagents, projects, file_tree, runtime
+from helpers import files, subagents, projects, file_tree, runtime
if TYPE_CHECKING:
from agent import Agent
diff --git a/python/helpers/skills_cli.py b/helpers/skills_cli.py
similarity index 95%
rename from python/helpers/skills_cli.py
rename to helpers/skills_cli.py
index 865b01d92..820d7e771 100644
--- a/python/helpers/skills_cli.py
+++ b/helpers/skills_cli.py
@@ -3,11 +3,11 @@
Skills CLI - Easy skill management for Agent Zero
Usage:
- python -m python.helpers.skills_cli list List all skills
- python -m python.helpers.skills_cli create <name> Create a new skill
- python -m python.helpers.skills_cli show <name> Show skill details
- python -m python.helpers.skills_cli validate <name> Validate a skill
- python -m python.helpers.skills_cli search <query> Search skills
+ python -m helpers.skills_cli list List all skills
+ python -m helpers.skills_cli create <name> Create a new skill
+ python -m helpers.skills_cli show <name> Show skill details
+ python -m helpers.skills_cli validate <name> Validate a skill
+ python -m helpers.skills_cli search <query> Search skills
"""
import argparse
@@ -23,7 +23,7 @@ from datetime import datetime
# Add parent directory to path for imports
sys.path.insert(0, str(Path(__file__).parent.parent.parent))
-from python.helpers import files
+from helpers import files
@dataclass
@@ -306,7 +306,7 @@ Examples:
print(f"\nNext steps:")
print(f" 1. Edit {skill_dir / 'SKILL.md'} to add your instructions")
print(f" 2. Add any helper scripts to {skill_dir / 'scripts'}/")
- print(f" 3. Run: python -m python.helpers.skills_cli validate {args.name}")
+ print(f" 3. Run: python -m helpers.skills_cli validate {args.name}")
except ValueError as e:
print(f"\n❌ Error: {e}")
sys.exit(1)
diff --git a/python/helpers/skills_import.py b/helpers/skills_import.py
similarity index 97%
rename from python/helpers/skills_import.py
rename to helpers/skills_import.py
index 527e6285b..c73ffa55d 100644
--- a/python/helpers/skills_import.py
+++ b/helpers/skills_import.py
@@ -9,8 +9,8 @@ from dataclasses import dataclass
from pathlib import Path
from typing import Iterable, List, Literal, Optional, Tuple
-from python.helpers import files
-from python.helpers.skills import discover_skill_md_files
+from helpers import files
+from helpers.skills import discover_skill_md_files
ConflictPolicy = Literal["skip", "overwrite", "rename"]
@@ -172,7 +172,7 @@ def _resolve_conflict(dest: Path, policy: ConflictPolicy) -> Tuple[Path, bool]:
def get_project_skills_folder(project_name: str) -> Path:
"""Get the skills folder path for a project."""
- from python.helpers.projects import get_project_meta
+ from helpers.projects import get_project_meta
return Path(get_project_meta(project_name, PROJECT_SKILLS_DIR))
@@ -181,7 +181,7 @@ def get_agent_profile_skills_folder(profile_name: str) -> Path:
def get_project_agent_profile_skills_folder(project_name: str, profile_name: str) -> Path:
- from python.helpers.projects import get_project_meta
+ from helpers.projects import get_project_meta
return Path(get_project_meta(project_name, "agents", profile_name, "skills"))
diff --git a/python/helpers/state_monitor.py b/helpers/state_monitor.py
similarity index 98%
rename from python/helpers/state_monitor.py
rename to helpers/state_monitor.py
index 1e7abcecf..ff4766125 100644
--- a/python/helpers/state_monitor.py
+++ b/helpers/state_monitor.py
@@ -7,17 +7,17 @@ import time
from dataclasses import dataclass, field
from typing import Any, TYPE_CHECKING
-from python.helpers import runtime
-from python.helpers.print_style import PrintStyle
-from python.helpers.state_snapshot import (
+from helpers import runtime
+from helpers.print_style import PrintStyle
+from helpers.state_snapshot import (
StateRequestV1,
advance_state_request_after_snapshot,
build_snapshot_from_request,
)
-from python.helpers.websocket import ConnectionNotFoundError
+from helpers.websocket import ConnectionNotFoundError
if TYPE_CHECKING: # pragma: no cover - hints only
- from python.helpers.websocket_manager import WebSocketManager
+ from helpers.websocket_manager import WebSocketManager
ConnectionIdentity = tuple[str, str] # (namespace, sid)
diff --git a/python/helpers/state_monitor_integration.py b/helpers/state_monitor_integration.py
similarity index 71%
rename from python/helpers/state_monitor_integration.py
rename to helpers/state_monitor_integration.py
index 4a00b42f1..f70411e64 100644
--- a/python/helpers/state_monitor_integration.py
+++ b/helpers/state_monitor_integration.py
@@ -2,12 +2,12 @@ from __future__ import annotations
def mark_dirty_all(*, reason: str | None = None) -> None:
- from python.helpers.state_monitor import get_state_monitor
+ from helpers.state_monitor import get_state_monitor
get_state_monitor().mark_dirty_all(reason=reason)
def mark_dirty_for_context(context_id: str, *, reason: str | None = None) -> None:
- from python.helpers.state_monitor import get_state_monitor
+ from helpers.state_monitor import get_state_monitor
get_state_monitor().mark_dirty_for_context(context_id, reason=reason)
diff --git a/python/helpers/state_snapshot.py b/helpers/state_snapshot.py
similarity index 98%
rename from python/helpers/state_snapshot.py
rename to helpers/state_snapshot.py
index cde137cb4..578183925 100644
--- a/python/helpers/state_snapshot.py
+++ b/helpers/state_snapshot.py
@@ -9,9 +9,9 @@ import pytz # type: ignore[import-untyped]
from agent import AgentContext, AgentContextType
-from python.helpers.dotenv import get_dotenv_value
-from python.helpers.localization import Localization
-from python.helpers.task_scheduler import TaskScheduler
+from helpers.dotenv import get_dotenv_value
+from helpers.localization import Localization
+from helpers.task_scheduler import TaskScheduler
class SnapshotV1(TypedDict):
diff --git a/python/helpers/strings.py b/helpers/strings.py
similarity index 98%
rename from python/helpers/strings.py
rename to helpers/strings.py
index dac89c63e..09e868afa 100644
--- a/python/helpers/strings.py
+++ b/helpers/strings.py
@@ -1,7 +1,7 @@
import re
import sys
import time
-from python.helpers import files
+from helpers import files
def sanitize_string(s: str, encoding: str = "utf-8") -> str:
# Replace surrogates and invalid unicode with replacement character
diff --git a/python/helpers/subagents.py b/helpers/subagents.py
similarity index 96%
rename from python/helpers/subagents.py
rename to helpers/subagents.py
index 44cbe2497..6b90b0ae8 100644
--- a/python/helpers/subagents.py
+++ b/helpers/subagents.py
@@ -1,5 +1,5 @@
-from python.helpers import files
-from python.helpers import yaml as yaml_helper
+from helpers import files
+from helpers import yaml as yaml_helper
from typing import TypedDict, TYPE_CHECKING
from pydantic import BaseModel, model_validator
import json
@@ -58,7 +58,7 @@ def get_agents_dict(
)
return merged
- from python.helpers import plugins
+ from helpers import plugins
# load default, plugin, and custom agents and merge
default_agents = _get_agents_list_from_dir(DEFAULT_AGENTS_DIR, origin="default")
@@ -74,7 +74,7 @@ def get_agents_dict(
# merge with project agents if possible
if project_name:
- from python.helpers import projects
+ from helpers import projects
project_agents_dir = projects.get_project_meta(project_name, "agents")
project_agents = _get_agents_list_from_dir(project_agents_dir, origin="project")
@@ -117,7 +117,7 @@ def load_agent_data(name: str, project_name: str | None = None) -> SubAgent:
return original
return override
- from python.helpers import plugins
+ from helpers import plugins
# load default, plugin, and user agents and merge
default_agent = _load_agent_data_from_dir(
@@ -136,7 +136,7 @@ def load_agent_data(name: str, project_name: str | None = None) -> SubAgent:
# merge with project agent if possible
if project_name:
- from python.helpers import projects
+ from helpers import projects
project_agents_dir = projects.get_project_meta(project_name, "agents")
project_agent = _load_agent_data_from_dir(
@@ -252,7 +252,7 @@ def _merge_agent_list_items(
def get_agents_roots() -> list[str]:
- from python.helpers import plugins
+ from helpers import plugins
plugin_agents = plugins.get_enabled_plugin_paths(None, "agents")
project_agents = files.find_existing_paths_by_pattern("usr/projects/*/.a0proj/agents")
@@ -318,7 +318,7 @@ def get_available_agents_dict(
# all available agents
all_agents = get_agents_dict()
# filter by project settings
- from python.helpers import projects
+ from helpers import projects
project_settings = (
projects.load_project_subagents(project_name) if project_name else {}
@@ -351,7 +351,7 @@ def get_paths(
project_name = ""
if include_project and agent:
- from python.helpers import projects
+ from helpers import projects
project_name = projects.get_context_project_name(agent.context) or ""
@@ -378,7 +378,7 @@ def get_paths(
# plugin agents/<profile>/...
if include_plugins:
- from python.helpers import plugins
+ from helpers import plugins
for plugin_dir in plugins.get_enabled_plugin_paths(agent, "agents", profile_name):
path = files.get_abs_path(plugin_dir, *subpaths)
if (not must_exist_completely) or files.exists(files.get_abs_path(plugin_dir, *check_subpaths)):
@@ -397,7 +397,7 @@ def get_paths(
if include_plugins:
# plugins/*/subpaths...
- from python.helpers import plugins
+ from helpers import plugins
for plugin_dir in plugins.get_enabled_plugin_paths(agent):
path = files.get_abs_path(plugin_dir, *subpaths)
diff --git a/python/helpers/task_scheduler.py b/helpers/task_scheduler.py
similarity index 98%
rename from python/helpers/task_scheduler.py
rename to helpers/task_scheduler.py
index fb230622b..05f352a76 100644
--- a/python/helpers/task_scheduler.py
+++ b/helpers/task_scheduler.py
@@ -17,12 +17,12 @@ from pydantic import BaseModel, Field, PrivateAttr
from agent import Agent, AgentContext, UserMessage
from initialize import initialize_agent
-from python.helpers.persist_chat import save_tmp_chat
-from python.helpers.print_style import PrintStyle
-from python.helpers.defer import DeferredTask
-from python.helpers.files import get_abs_path, make_dirs, read_file, write_file
-from python.helpers.localization import Localization
-from python.helpers import projects, guids
+from helpers.persist_chat import save_tmp_chat
+from helpers.print_style import PrintStyle
+from helpers.defer import DeferredTask
+from helpers.files import get_abs_path, make_dirs, read_file, write_file
+from helpers.localization import Localization
+from helpers import projects, guids
import pytz
from typing import Annotated
@@ -677,19 +677,19 @@ class TaskScheduler:
async def add_task(self, task: Union[ScheduledTask, AdHocTask, PlannedTask]) -> "TaskScheduler":
await self._tasks.add_task(task)
ctx = await self._get_chat_context(task) # invoke context creation
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="task_scheduler.TaskScheduler.add_task")
return self
async def remove_task_by_uuid(self, task_uuid: str) -> "TaskScheduler":
await self._tasks.remove_task_by_uuid(task_uuid)
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="task_scheduler.TaskScheduler.remove_task_by_uuid")
return self
async def remove_task_by_name(self, name: str) -> "TaskScheduler":
await self._tasks.remove_task_by_name(name)
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="task_scheduler.TaskScheduler.remove_task_by_name")
return self
@@ -762,7 +762,7 @@ class TaskScheduler:
updated = await self._tasks.update_task_by_uuid(task_uuid, _update_task, verify_func)
if updated is not None:
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="task_scheduler.TaskScheduler.update_task_checked")
return updated
diff --git a/python/helpers/timed_input.py b/helpers/timed_input.py
similarity index 100%
rename from python/helpers/timed_input.py
rename to helpers/timed_input.py
diff --git a/python/helpers/tokens.py b/helpers/tokens.py
similarity index 100%
rename from python/helpers/tokens.py
rename to helpers/tokens.py
diff --git a/python/helpers/tool.py b/helpers/tool.py
similarity index 96%
rename from python/helpers/tool.py
rename to helpers/tool.py
index 7f68b1234..8e2edf337 100644
--- a/python/helpers/tool.py
+++ b/helpers/tool.py
@@ -3,8 +3,8 @@ from dataclasses import dataclass
from typing import Any
from agent import Agent, LoopData
-from python.helpers.print_style import PrintStyle
-from python.helpers.strings import sanitize_string
+from helpers.print_style import PrintStyle
+from helpers.strings import sanitize_string
@dataclass
diff --git a/python/helpers/tty_session.py b/helpers/tty_session.py
similarity index 100%
rename from python/helpers/tty_session.py
rename to helpers/tty_session.py
diff --git a/python/helpers/tunnel_manager.py b/helpers/tunnel_manager.py
similarity index 98%
rename from python/helpers/tunnel_manager.py
rename to helpers/tunnel_manager.py
index 42a1d87cd..4a2ddbeb2 100644
--- a/python/helpers/tunnel_manager.py
+++ b/helpers/tunnel_manager.py
@@ -7,7 +7,7 @@ from flaredantic import (
import threading
from collections import deque
-from python.helpers.print_style import PrintStyle
+from helpers.print_style import PrintStyle
# Singleton to manage the tunnel instance
class TunnelManager:
diff --git a/python/helpers/update_check.py b/helpers/update_check.py
similarity index 93%
rename from python/helpers/update_check.py
rename to helpers/update_check.py
index d093be3d7..15df58e12 100644
--- a/python/helpers/update_check.py
+++ b/helpers/update_check.py
@@ -1,4 +1,4 @@
-from python.helpers import git, runtime
+from helpers import git, runtime
import hashlib
diff --git a/python/helpers/vector_db.py b/helpers/vector_db.py
similarity index 98%
rename from python/helpers/vector_db.py
rename to helpers/vector_db.py
index e2e7731a3..a05fcc0ba 100644
--- a/python/helpers/vector_db.py
+++ b/helpers/vector_db.py
@@ -2,7 +2,7 @@ from typing import Any, List, Sequence
from langchain_community.vectorstores import FAISS
# faiss needs to be patched for python 3.12 on arm #TODO remove once not needed
-from python.helpers import faiss_monkey_patch
+from helpers import faiss_monkey_patch
import faiss
@@ -16,7 +16,7 @@ from langchain.embeddings import CacheBackedEmbeddings
from simpleeval import simple_eval
from agent import Agent
-from python.helpers import guids
+from helpers import guids
class MyFaiss(FAISS):
diff --git a/python/helpers/wait.py b/helpers/wait.py
similarity index 97%
rename from python/helpers/wait.py
rename to helpers/wait.py
index 83f288619..050b08638 100644
--- a/python/helpers/wait.py
+++ b/helpers/wait.py
@@ -1,7 +1,7 @@
import asyncio
from datetime import datetime, timezone
-from python.helpers.print_style import PrintStyle
+from helpers.print_style import PrintStyle
def format_remaining_time(total_seconds: float) -> str:
diff --git a/python/helpers/websocket.py b/helpers/websocket.py
similarity index 99%
rename from python/helpers/websocket.py
rename to helpers/websocket.py
index 772d7259a..fcc8108fd 100644
--- a/python/helpers/websocket.py
+++ b/helpers/websocket.py
@@ -9,7 +9,7 @@ from typing import Any, Iterable, Optional, TYPE_CHECKING
import socketio
if TYPE_CHECKING: # pragma: no cover - hints only
- from python.helpers.websocket_manager import WebSocketManager
+ from helpers.websocket_manager import WebSocketManager
_EVENT_NAME_PATTERN = re.compile(r"^[a-z][a-z0-9_]*$")
_RESERVED_EVENT_NAMES: set[str] = {
@@ -272,7 +272,7 @@ class WebSocketResult:
class WebSocketHandler(ABC):
"""Base class for WebSocket event handlers.
- The interface mirrors :class:`python.helpers.api.ApiHandler` with declarative
+ The interface mirrors :class:`helpers.api.ApiHandler` with declarative
security configuration and lifecycle hooks while enforcing event-naming
conventions.
"""
diff --git a/python/helpers/websocket_manager.py b/helpers/websocket_manager.py
similarity index 99%
rename from python/helpers/websocket_manager.py
rename to helpers/websocket_manager.py
index 8b53df6f0..cf5f46b27 100644
--- a/python/helpers/websocket_manager.py
+++ b/helpers/websocket_manager.py
@@ -11,11 +11,11 @@ from typing import Any, Callable, Deque, Dict, Iterable, List, Optional, Set
import socketio
import uuid
-from python.helpers.defer import DeferredTask
-from python.helpers.print_style import PrintStyle
-from python.helpers import runtime
-from python.helpers.websocket import ConnectionNotFoundError, WebSocketHandler, WebSocketResult
-from python.helpers.state_monitor import _ws_debug_enabled
+from helpers.defer import DeferredTask
+from helpers.print_style import PrintStyle
+from helpers import runtime
+from helpers.websocket import ConnectionNotFoundError, WebSocketHandler, WebSocketResult
+from helpers.state_monitor import _ws_debug_enabled
BUFFER_MAX_SIZE = 100
BUFFER_TTL = timedelta(hours=1)
diff --git a/python/helpers/websocket_namespace_discovery.py b/helpers/websocket_namespace_discovery.py
similarity index 97%
rename from python/helpers/websocket_namespace_discovery.py
rename to helpers/websocket_namespace_discovery.py
index 134317bd8..4f7b60b70 100644
--- a/python/helpers/websocket_namespace_discovery.py
+++ b/helpers/websocket_namespace_discovery.py
@@ -7,9 +7,9 @@ from dataclasses import dataclass
from types import ModuleType
from typing import Iterable
-from python.helpers.files import get_abs_path
-from python.helpers.print_style import PrintStyle
-from python.helpers.websocket import WebSocketHandler
+from helpers.files import get_abs_path
+from helpers.print_style import PrintStyle
+from helpers.websocket import WebSocketHandler
@dataclass(frozen=True)
diff --git a/python/helpers/whisper.py b/helpers/whisper.py
similarity index 93%
rename from python/helpers/whisper.py
rename to helpers/whisper.py
index 830f73686..8a0b7fc79 100644
--- a/python/helpers/whisper.py
+++ b/helpers/whisper.py
@@ -3,9 +3,9 @@ import warnings
import whisper
import tempfile
import asyncio
-from python.helpers import runtime, rfc, settings, files
-from python.helpers.print_style import PrintStyle
-from python.helpers.notification import NotificationManager, NotificationType, NotificationPriority
+from helpers import runtime, rfc, settings, files
+from helpers.print_style import PrintStyle
+from helpers.notification import NotificationManager, NotificationType, NotificationPriority
# Suppress FutureWarning from torch.load
warnings.filterwarnings("ignore", category=FutureWarning)
diff --git a/python/helpers/yaml.py b/helpers/yaml.py
similarity index 100%
rename from python/helpers/yaml.py
rename to helpers/yaml.py
diff --git a/initialize.py b/initialize.py
index 296d2d4f5..b38da9877 100644
--- a/initialize.py
+++ b/initialize.py
@@ -1,7 +1,7 @@
from agent import AgentConfig
import models
-from python.helpers import runtime, settings, defer, extension
-from python.helpers.print_style import PrintStyle
+from helpers import runtime, settings, defer, extension
+from helpers.print_style import PrintStyle
@extension.extensible
@@ -98,9 +98,9 @@ def initialize_agent(override_settings: dict | None = None):
# defer.DeferredTask(thread_name="mcp-initializer").start_task(initialize_mcp_async, config.mcp_servers)
# initialize_mcp(config.mcp_servers)
- # import python.helpers.mcp_handler as mcp_helper
+ # import helpers.mcp_handler as mcp_helper
# import agent as agent_helper
- # import python.helpers.print_style as print_style_helper
+ # import helpers.print_style as print_style_helper
# if not mcp_helper.MCPConfig.get_instance().is_initialized():
# try:
# mcp_helper.MCPConfig.update(config.mcp_servers)
@@ -121,7 +121,7 @@ def initialize_agent(override_settings: dict | None = None):
@extension.extensible
def initialize_chats():
- from python.helpers import persist_chat
+ from helpers import persist_chat
async def initialize_chats_async():
persist_chat.load_tmp_chats()
return defer.DeferredTask().start_task(initialize_chats_async)
@@ -130,13 +130,13 @@ def initialize_chats():
def initialize_mcp():
set = settings.get_settings()
async def initialize_mcp_async():
- from python.helpers.mcp_handler import initialize_mcp as _initialize_mcp
+ from helpers.mcp_handler import initialize_mcp as _initialize_mcp
return _initialize_mcp(set["mcp_servers"])
return defer.DeferredTask().start_task(initialize_mcp_async)
@extension.extensible
def initialize_job_loop():
- from python.helpers.job_loop import run_loop
+ from helpers.job_loop import run_loop
return defer.DeferredTask("JobLoop").start_task(run_loop)
@extension.extensible
@@ -146,7 +146,7 @@ def initialize_preload():
@extension.extensible
def initialize_migration():
- from python.helpers import migration, dotenv
+ from helpers import migration, dotenv
# run migration
migration.startup_migration()
# reload .env as it might have been moved
diff --git a/models.py b/models.py
index dcc19a26c..3e87bec09 100644
--- a/models.py
+++ b/models.py
@@ -19,13 +19,13 @@ import litellm
import openai
from litellm.types.utils import ModelResponse
-from python.helpers import dotenv
-from python.helpers import settings, dirty_json
-from python.helpers.dotenv import load_dotenv
-from python.helpers.providers import ModelType as ProviderModelType, get_provider_config
-from python.helpers.rate_limiter import RateLimiter
-from python.helpers.tokens import approximate_tokens
-from python.helpers import dirty_json, browser_use_monkeypatch
+from helpers import dotenv
+from helpers import settings, dirty_json
+from helpers.dotenv import load_dotenv
+from helpers.providers import ModelType as ProviderModelType, get_provider_config
+from helpers.rate_limiter import RateLimiter
+from helpers.tokens import approximate_tokens
+from helpers import dirty_json, browser_use_monkeypatch
from langchain_core.language_models.chat_models import SimpleChatModel
from langchain_core.outputs.chat_generation import ChatGenerationChunk
diff --git a/plugins/chat_branching/api/branch_chat.py b/plugins/chat_branching/api/branch_chat.py
index 16655856a..e427ab161 100644
--- a/plugins/chat_branching/api/branch_chat.py
+++ b/plugins/chat_branching/api/branch_chat.py
@@ -1,7 +1,7 @@
from datetime import datetime
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers.persist_chat import (
+from helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.persist_chat import (
_serialize_context,
_deserialize_context,
save_tmp_chat,
@@ -65,7 +65,7 @@ class BranchChat(ApiHandler):
save_tmp_chat(new_context)
# Notify all tabs
- from python.helpers.state_monitor_integration import mark_dirty_all
+ from helpers.state_monitor_integration import mark_dirty_all
mark_dirty_all(reason="plugins.chat_branching.BranchChat")
return {
diff --git a/plugins/error_retry/extensions/python/agent_Agent_handle_exception_end/_80_retry_critical_exception.py b/plugins/error_retry/extensions/python/agent_Agent_handle_exception_end/_80_retry_critical_exception.py
index 9d3fa6e87..79938e222 100644
--- a/plugins/error_retry/extensions/python/agent_Agent_handle_exception_end/_80_retry_critical_exception.py
+++ b/plugins/error_retry/extensions/python/agent_Agent_handle_exception_end/_80_retry_critical_exception.py
@@ -1,11 +1,11 @@
import asyncio
from datetime import datetime, timezone
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers.localization import Localization
-from python.helpers.errors import RepairableException, HandledException
-from python.helpers import errors
-from python.helpers.print_style import PrintStyle
+from helpers.localization import Localization
+from helpers.errors import RepairableException, HandledException
+from helpers import errors
+from helpers.print_style import PrintStyle
from plugins.error_retry.extensions.python.agent_Agent_monologue_start._10_reset_critical_exception_counter import DATA_NAME_COUNTER
diff --git a/plugins/error_retry/extensions/python/agent_Agent_monologue_start/_10_reset_critical_exception_counter.py b/plugins/error_retry/extensions/python/agent_Agent_monologue_start/_10_reset_critical_exception_counter.py
index 7f997c6bf..a8b627b25 100644
--- a/plugins/error_retry/extensions/python/agent_Agent_monologue_start/_10_reset_critical_exception_counter.py
+++ b/plugins/error_retry/extensions/python/agent_Agent_monologue_start/_10_reset_critical_exception_counter.py
@@ -1,10 +1,10 @@
from datetime import datetime, timezone
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers.localization import Localization
-from python.helpers.errors import RepairableException
-from python.helpers import errors
-from python.helpers.print_style import PrintStyle
+from helpers.localization import Localization
+from helpers.errors import RepairableException
+from helpers import errors
+from helpers.print_style import PrintStyle
DATA_NAME_COUNTER = "_plugin.error_retry.critical_exception_counter"
diff --git a/plugins/memory/api/import_knowledge.py b/plugins/memory/api/import_knowledge.py
index aa1711442..1fa546cae 100644
--- a/plugins/memory/api/import_knowledge.py
+++ b/plugins/memory/api/import_knowledge.py
@@ -1,6 +1,6 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files
-from python.helpers.security import safe_filename
+from helpers.api import ApiHandler, Request, Response
+from helpers import files
+from helpers.security import safe_filename
from plugins.memory.helpers.memory import Memory, get_custom_knowledge_subdir_abs
import os
diff --git a/plugins/memory/api/knowledge_path_get.py b/plugins/memory/api/knowledge_path_get.py
index 64121449f..02a0978b9 100644
--- a/plugins/memory/api/knowledge_path_get.py
+++ b/plugins/memory/api/knowledge_path_get.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files, projects
+from helpers.api import ApiHandler, Request, Response
+from helpers import files, projects
from plugins.memory.helpers.memory import get_custom_knowledge_subdir_abs
diff --git a/plugins/memory/api/knowledge_reindex.py b/plugins/memory/api/knowledge_reindex.py
index b8c0a8f45..d4f6918b8 100644
--- a/plugins/memory/api/knowledge_reindex.py
+++ b/plugins/memory/api/knowledge_reindex.py
@@ -1,4 +1,4 @@
-from python.helpers.api import ApiHandler, Request, Response
+from helpers.api import ApiHandler, Request, Response
from plugins.memory.helpers.memory import Memory
diff --git a/plugins/memory/api/memory_dashboard.py b/plugins/memory/api/memory_dashboard.py
index 34058264e..35a591517 100644
--- a/plugins/memory/api/memory_dashboard.py
+++ b/plugins/memory/api/memory_dashboard.py
@@ -1,5 +1,5 @@
-from python.helpers.api import ApiHandler, Request, Response
-from python.helpers import files
+from helpers.api import ApiHandler, Request, Response
+from helpers import files
from models import ModelConfig, ModelType
from langchain_core.documents import Document
from agent import AgentContext
diff --git a/plugins/memory/extensions/python/embedding_model_changed/_10_memory_reload.py b/plugins/memory/extensions/python/embedding_model_changed/_10_memory_reload.py
index db561d9b4..be9d87d77 100644
--- a/plugins/memory/extensions/python/embedding_model_changed/_10_memory_reload.py
+++ b/plugins/memory/extensions/python/embedding_model_changed/_10_memory_reload.py
@@ -1,4 +1,4 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
# Direct import - this extension lives inside the memory plugin
from plugins.memory.helpers.memory import reload as memory_reload
diff --git a/plugins/memory/extensions/python/message_loop_prompts_after/_50_recall_memories.py b/plugins/memory/extensions/python/message_loop_prompts_after/_50_recall_memories.py
index 7380a8727..7e090c5a5 100644
--- a/plugins/memory/extensions/python/message_loop_prompts_after/_50_recall_memories.py
+++ b/plugins/memory/extensions/python/message_loop_prompts_after/_50_recall_memories.py
@@ -1,7 +1,7 @@
import asyncio
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
-from python.helpers import dirty_json, errors, log, plugins
+from helpers import dirty_json, errors, log, plugins
# Direct import - this extension lives inside the memory plugin
from plugins.memory.helpers.memory import Memory
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.py
index d108a6da6..9542f3e29 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,7 +1,7 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
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_MEMORIES
-from python.helpers import plugins
+from helpers import plugins
class RecallWait(Extension):
async def execute(self, loop_data: LoopData = LoopData(), **kwargs):
diff --git a/plugins/memory/extensions/python/monologue_end/_50_memorize_fragments.py b/plugins/memory/extensions/python/monologue_end/_50_memorize_fragments.py
index 363bc8971..4ac84f26c 100644
--- a/plugins/memory/extensions/python/monologue_end/_50_memorize_fragments.py
+++ b/plugins/memory/extensions/python/monologue_end/_50_memorize_fragments.py
@@ -1,10 +1,10 @@
import asyncio
-from python.helpers import errors, plugins
-from python.helpers.extension import Extension
-from python.helpers.dirty_json import DirtyJson
+from helpers import errors, plugins
+from helpers.extension import Extension
+from helpers.dirty_json import DirtyJson
from agent import LoopData
-from python.helpers.log import LogItem
-from python.helpers.defer import DeferredTask, THREAD_BACKGROUND
+from helpers.log import LogItem
+from helpers.defer import DeferredTask, THREAD_BACKGROUND
# Direct import - this extension lives inside the memory plugin
from plugins.memory.helpers.memory import Memory
diff --git a/plugins/memory/extensions/python/monologue_end/_51_memorize_solutions.py b/plugins/memory/extensions/python/monologue_end/_51_memorize_solutions.py
index 10ffa20d5..35175cf17 100644
--- a/plugins/memory/extensions/python/monologue_end/_51_memorize_solutions.py
+++ b/plugins/memory/extensions/python/monologue_end/_51_memorize_solutions.py
@@ -1,10 +1,10 @@
import asyncio
-from python.helpers import errors, plugins
-from python.helpers.extension import Extension
-from python.helpers.dirty_json import DirtyJson
+from helpers import errors, plugins
+from helpers.extension import Extension
+from helpers.dirty_json import DirtyJson
from agent import LoopData
-from python.helpers.log import LogItem
-from python.helpers.defer import DeferredTask, THREAD_BACKGROUND
+from helpers.log import LogItem
+from helpers.defer import DeferredTask, THREAD_BACKGROUND
# Direct import - this extension lives inside the memory plugin
from plugins.memory.helpers.memory import Memory
diff --git a/plugins/memory/extensions/python/monologue_start/_10_memory_init.py b/plugins/memory/extensions/python/monologue_start/_10_memory_init.py
index 5a3e3c549..80bcac793 100644
--- a/plugins/memory/extensions/python/monologue_start/_10_memory_init.py
+++ b/plugins/memory/extensions/python/monologue_start/_10_memory_init.py
@@ -1,4 +1,4 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import LoopData
# Direct import - this extension lives inside the memory plugin
diff --git a/plugins/memory/extensions/python/system_prompt/_20_behaviour_prompt.py b/plugins/memory/extensions/python/system_prompt/_20_behaviour_prompt.py
index c2f5e7998..52e733417 100644
--- a/plugins/memory/extensions/python/system_prompt/_20_behaviour_prompt.py
+++ b/plugins/memory/extensions/python/system_prompt/_20_behaviour_prompt.py
@@ -1,6 +1,6 @@
-from python.helpers.extension import Extension
+from helpers.extension import Extension
from agent import Agent, LoopData
-from python.helpers import files
+from helpers import files
# Direct import - this extension lives inside the memory plugin
from plugins.memory.helpers import memory
diff --git a/plugins/memory/helpers/knowledge_import.py b/plugins/memory/helpers/knowledge_import.py
index a68fe9b82..f983cd560 100644
--- a/plugins/memory/helpers/knowledge_import.py
+++ b/plugins/memory/helpers/knowledge_import.py
@@ -8,8 +8,8 @@ from langchain_community.document_loaders import (
TextLoader,
UnstructuredHTMLLoader,
)
-from python.helpers.log import LogItem
-from python.helpers.print_style import PrintStyle
+from helpers.log import LogItem
+from helpers.print_style import PrintStyle
text_loader_kwargs = {"autodetect_encoding": True}
diff --git a/plugins/memory/helpers/memory.py b/plugins/memory/helpers/memory.py
index c3edba92d..1a3ac4d27 100644
--- a/plugins/memory/helpers/memory.py
+++ b/plugins/memory/helpers/memory.py
@@ -2,13 +2,13 @@ from datetime import datetime
from typing import Any, List, Sequence
from langchain.storage import InMemoryByteStore, LocalFileStore
from langchain.embeddings import CacheBackedEmbeddings
-from python.helpers import guids
+from helpers import guids
# from langchain_chroma import Chroma
from langchain_community.vectorstores import FAISS
# faiss needs to be patched for python 3.12 on arm #TODO remove once not needed
-from python.helpers import faiss_monkey_patch
+from helpers import faiss_monkey_patch
import faiss
@@ -22,11 +22,11 @@ import os, json
import numpy as np
-from python.helpers.print_style import PrintStyle
-from python.helpers import files, plugins, projects
+from helpers.print_style import PrintStyle
+from helpers import files, plugins, projects
from langchain_core.documents import Document
from . import knowledge_import
-from python.helpers.log import Log, LogItem
+from helpers.log import Log, LogItem
from enum import Enum
from agent import Agent, AgentContext
import models
@@ -486,7 +486,7 @@ def reload():
def abs_db_dir(memory_subdir: str) -> str:
# patch for projects, this way we don't need to re-work the structure of memory subdirs
if memory_subdir.startswith("projects/"):
- from python.helpers.projects import get_project_meta
+ from helpers.projects import get_project_meta
return files.get_abs_path(get_project_meta(memory_subdir[9:]), "memory")
# standard subdirs
@@ -496,7 +496,7 @@ def abs_db_dir(memory_subdir: str) -> str:
def abs_knowledge_dir(knowledge_subdir: str, *sub_dirs: str) -> str:
# patch for projects, this way we don't need to re-work the structure of knowledge subdirs
if knowledge_subdir.startswith("projects/"):
- from python.helpers.projects import get_project_meta
+ from helpers.projects import get_project_meta
return files.get_abs_path(
get_project_meta(knowledge_subdir[9:]), "knowledge", *sub_dirs
@@ -537,7 +537,7 @@ def get_context_memory_subdir(context: AgentContext) -> str:
def get_existing_memory_subdirs() -> list[str]:
try:
- from python.helpers.projects import (
+ from helpers.projects import (
get_project_meta,
get_projects_parent_folder,
)
@@ -566,7 +566,7 @@ def get_knowledge_subdirs_by_memory_subdir(
memory_subdir: str, default: list[str]
) -> list[str]:
if memory_subdir.startswith("projects/"):
- from python.helpers.projects import get_project_meta
+ from helpers.projects import get_project_meta
default.append(get_project_meta(memory_subdir[9:], "knowledge"))
return default
diff --git a/plugins/memory/helpers/memory_consolidation.py b/plugins/memory/helpers/memory_consolidation.py
index f9f701c78..a9d003d09 100644
--- a/plugins/memory/helpers/memory_consolidation.py
+++ b/plugins/memory/helpers/memory_consolidation.py
@@ -8,9 +8,9 @@ from enum import Enum
from langchain_core.documents import Document
from plugins.memory.helpers.memory import Memory
-from python.helpers.dirty_json import DirtyJson
-from python.helpers.log import LogItem
-from python.helpers.print_style import PrintStyle
+from helpers.dirty_json import DirtyJson
+from helpers.log import LogItem
+from helpers.print_style import PrintStyle
from agent import Agent
from plugins.memory.tools.memory_load import DEFAULT_THRESHOLD as DEFAULT_MEMORY_THRESHOLD
diff --git a/plugins/memory/tools/behaviour_adjustment.py b/plugins/memory/tools/behaviour_adjustment.py
index 3aabf3198..e3fb20971 100644
--- a/plugins/memory/tools/behaviour_adjustment.py
+++ b/plugins/memory/tools/behaviour_adjustment.py
@@ -1,7 +1,7 @@
-from python.helpers import files
-from python.helpers.tool import Tool, Response
+from helpers import files
+from helpers.tool import Tool, Response
from agent import Agent
-from python.helpers.log import LogItem
+from helpers.log import LogItem
from plugins.memory.helpers import memory
diff --git a/plugins/memory/tools/memory_delete.py b/plugins/memory/tools/memory_delete.py
index 9accb6273..503bf3fac 100644
--- a/plugins/memory/tools/memory_delete.py
+++ b/plugins/memory/tools/memory_delete.py
@@ -1,4 +1,4 @@
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
from plugins.memory.helpers.memory import Memory
diff --git a/plugins/memory/tools/memory_forget.py b/plugins/memory/tools/memory_forget.py
index 113f15629..145308711 100644
--- a/plugins/memory/tools/memory_forget.py
+++ b/plugins/memory/tools/memory_forget.py
@@ -1,4 +1,4 @@
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
from plugins.memory.helpers.memory import Memory
from tools.memory_load import DEFAULT_THRESHOLD
diff --git a/plugins/memory/tools/memory_load.py b/plugins/memory/tools/memory_load.py
index bbe226dcc..952b78654 100644
--- a/plugins/memory/tools/memory_load.py
+++ b/plugins/memory/tools/memory_load.py
@@ -1,4 +1,4 @@
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
from plugins.memory.helpers.memory import Memory
DEFAULT_THRESHOLD = 0.7
diff --git a/plugins/memory/tools/memory_save.py b/plugins/memory/tools/memory_save.py
index b33e92ca3..0a9304c06 100644
--- a/plugins/memory/tools/memory_save.py
+++ b/plugins/memory/tools/memory_save.py
@@ -1,4 +1,4 @@
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
from plugins.memory.helpers.memory import Memory
diff --git a/plugins/plugin_installer/api/plugin_install.py b/plugins/plugin_installer/api/plugin_install.py
index 294a36596..54abffabe 100644
--- a/plugins/plugin_installer/api/plugin_install.py
+++ b/plugins/plugin_installer/api/plugin_install.py
@@ -4,8 +4,8 @@ import time
import uuid
from pathlib import Path
-from python.helpers.api import ApiHandler, Input, Request, Output
-from python.helpers import files
+from helpers.api import ApiHandler, Input, Request, Output
+from helpers import files
from werkzeug.datastructures import FileStorage
from werkzeug.utils import secure_filename
@@ -63,7 +63,7 @@ class PluginInstall(ApiHandler):
def _fetch_index(self, input: dict) -> dict:
from plugins.plugin_installer.helpers.install import fetch_plugin_index
- from python.helpers.plugins import get_plugins_list
+ from helpers.plugins import get_plugins_list
index_data = fetch_plugin_index()
installed = get_plugins_list()
return {
diff --git a/plugins/plugin_installer/helpers/install.py b/plugins/plugin_installer/helpers/install.py
index 5fedb47ab..ed92fb063 100644
--- a/plugins/plugin_installer/helpers/install.py
+++ b/plugins/plugin_installer/helpers/install.py
@@ -8,13 +8,13 @@ import zipfile
from pathlib import Path
from typing import Optional
-from python.helpers import files
-from python.helpers.plugins import (
+from helpers import files
+from helpers.plugins import (
META_FILE_NAME,
PluginMetadata,
invalidate_plugin_cache,
)
-from python.helpers import yaml as yaml_helper
+from helpers import yaml as yaml_helper
_SAFE_NAME_RE = re.compile(r"^[a-zA-Z0-9][a-zA-Z0-9_]*$")
@@ -127,7 +127,7 @@ def install_from_zip(zip_path: str) -> dict:
def install_from_git(url: str, token: Optional[str] = None) -> dict:
"""Clone git repo into usr/plugins/, validate plugin.yaml.
Returns dict with plugin name and metadata."""
- from python.helpers.git import clone_repo
+ from helpers.git import clone_repo
# Derive plugin name from URL
repo_name = url.rstrip("/").split("/")[-1]
diff --git a/plugins/plugin_scan/api/plugin_scan_queue.py b/plugins/plugin_scan/api/plugin_scan_queue.py
index 64e1bda2c..ffdcef3ce 100644
--- a/plugins/plugin_scan/api/plugin_scan_queue.py
+++ b/plugins/plugin_scan/api/plugin_scan_queue.py
@@ -1,6 +1,6 @@
from agent import AgentContext
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
-from python.helpers import message_queue as mq
+from helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers import message_queue as mq
class PluginScanQueue(ApiHandler):
diff --git a/plugins/plugin_scan/api/plugin_scan_start.py b/plugins/plugin_scan/api/plugin_scan_start.py
index df7e85559..d277c992c 100644
--- a/plugins/plugin_scan/api/plugin_scan_start.py
+++ b/plugins/plugin_scan/api/plugin_scan_start.py
@@ -1,5 +1,5 @@
from agent import AgentContext, UserMessage
-from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from helpers.api import ApiHandler, Input, Output, Request, Response
class PluginScanStart(ApiHandler):
diff --git a/plugins/text_editor/extensions/python/system_prompt/_15_text_editor_prompt.py b/plugins/text_editor/extensions/python/system_prompt/_15_text_editor_prompt.py
index 96ea55582..0779d9f87 100644
--- a/plugins/text_editor/extensions/python/system_prompt/_15_text_editor_prompt.py
+++ b/plugins/text_editor/extensions/python/system_prompt/_15_text_editor_prompt.py
@@ -1,5 +1,5 @@
-from python.helpers.extension import Extension
-from python.helpers import plugins
+from helpers.extension import Extension
+from helpers import plugins
from agent import Agent, LoopData
diff --git a/plugins/text_editor/helpers/file_ops.py b/plugins/text_editor/helpers/file_ops.py
index 43114773e..c05ec05d2 100644
--- a/plugins/text_editor/helpers/file_ops.py
+++ b/plugins/text_editor/helpers/file_ops.py
@@ -9,7 +9,7 @@ import shutil
import tempfile
from typing import TypedDict
-from python.helpers import tokens
+from helpers import tokens
_BINARY_PEEK = 8192
diff --git a/plugins/text_editor/tools/text_editor.py b/plugins/text_editor/tools/text_editor.py
index edbb627df..fd5cb2d5e 100644
--- a/plugins/text_editor/tools/text_editor.py
+++ b/plugins/text_editor/tools/text_editor.py
@@ -1,6 +1,6 @@
-from python.helpers.tool import Tool, Response
-from python.helpers.extension import call_extensions
-from python.helpers import plugins, runtime
+from helpers.tool import Tool, Response
+from helpers.extension import call_extensions
+from helpers import plugins, runtime
from plugins.text_editor.helpers.file_ops import (
FileInfo,
read_file,
diff --git a/preload.py b/preload.py
index 8ba415fa7..a4cda4208 100644
--- a/preload.py
+++ b/preload.py
@@ -1,7 +1,7 @@
import asyncio
-from python.helpers import runtime, whisper, settings
-from python.helpers.print_style import PrintStyle
-from python.helpers import kokoro_tts
+from helpers import runtime, whisper, settings
+from helpers.print_style import PrintStyle
+from helpers import kokoro_tts
import models
diff --git a/prepare.py b/prepare.py
index a13d95f82..3d64d617c 100644
--- a/prepare.py
+++ b/prepare.py
@@ -1,7 +1,7 @@
-from python.helpers import dotenv, runtime, settings
+from helpers import dotenv, runtime, settings
import string
import random
-from python.helpers.print_style import PrintStyle
+from helpers.print_style import PrintStyle
PrintStyle.standard("Preparing environment...")
diff --git a/prompts/agent.system.main.tips.py b/prompts/agent.system.main.tips.py
index 495444ea6..f4745c912 100644
--- a/prompts/agent.system.main.tips.py
+++ b/prompts/agent.system.main.tips.py
@@ -1,8 +1,8 @@
-from python.helpers.files import VariablesPlugin
-from python.helpers import settings
-from python.helpers import projects
-from python.helpers import runtime
-from python.helpers import files
+from helpers.files import VariablesPlugin
+from helpers import settings
+from helpers import projects
+from helpers import runtime
+from helpers import files
from typing import Any
class WorkdirPath(VariablesPlugin):
diff --git a/prompts/agent.system.tool.call_sub.py b/prompts/agent.system.tool.call_sub.py
index 946bd7f32..964e1c999 100644
--- a/prompts/agent.system.tool.call_sub.py
+++ b/prompts/agent.system.tool.call_sub.py
@@ -1,8 +1,8 @@
import json
from typing import Any, TYPE_CHECKING
-from python.helpers.files import VariablesPlugin
-from python.helpers import files, projects, subagents
-from python.helpers.print_style import PrintStyle
+from helpers.files import VariablesPlugin
+from helpers import files, projects, subagents
+from helpers.print_style import PrintStyle
if TYPE_CHECKING:
from agent import Agent
diff --git a/prompts/agent.system.tools.py b/prompts/agent.system.tools.py
index f94544b30..c9aac059b 100644
--- a/prompts/agent.system.tools.py
+++ b/prompts/agent.system.tools.py
@@ -1,8 +1,8 @@
import os
from typing import Any
-from python.helpers.files import VariablesPlugin
-from python.helpers import files
-from python.helpers.print_style import PrintStyle
+from helpers.files import VariablesPlugin
+from helpers import files
+from helpers.print_style import PrintStyle
class BuidToolsPrompt(VariablesPlugin):
diff --git a/python/websocket_handlers/_default.py b/python/websocket_handlers/_default.py
index cd90a9a75..6de5421d6 100644
--- a/python/websocket_handlers/_default.py
+++ b/python/websocket_handlers/_default.py
@@ -2,7 +2,7 @@ from __future__ import annotations
from typing import Any
-from python.helpers.websocket import WebSocketHandler, WebSocketResult
+from helpers.websocket import WebSocketHandler, WebSocketResult
class RootDefaultHandler(WebSocketHandler):
diff --git a/python/websocket_handlers/dev_websocket_test_handler.py b/python/websocket_handlers/dev_websocket_test_handler.py
index 948dca57b..2ea49f587 100644
--- a/python/websocket_handlers/dev_websocket_test_handler.py
+++ b/python/websocket_handlers/dev_websocket_test_handler.py
@@ -3,9 +3,9 @@ from __future__ import annotations
import asyncio
from typing import Any, Dict
-from python.helpers.print_style import PrintStyle
-from python.helpers import runtime
-from python.helpers.websocket import WebSocketHandler, WebSocketResult
+from helpers.print_style import PrintStyle
+from helpers import runtime
+from helpers.websocket import WebSocketHandler, WebSocketResult
class DevWebsocketTestHandler(WebSocketHandler):
diff --git a/python/websocket_handlers/hello_handler.py b/python/websocket_handlers/hello_handler.py
index 28219ccdc..07eb0ed97 100644
--- a/python/websocket_handlers/hello_handler.py
+++ b/python/websocket_handlers/hello_handler.py
@@ -1,7 +1,7 @@
from __future__ import annotations
-from python.helpers.print_style import PrintStyle
-from python.helpers.websocket import WebSocketHandler
+from helpers.print_style import PrintStyle
+from helpers.websocket import WebSocketHandler
class HelloHandler(WebSocketHandler):
diff --git a/python/websocket_handlers/state_sync_handler.py b/python/websocket_handlers/state_sync_handler.py
index b6689b6ed..353951613 100644
--- a/python/websocket_handlers/state_sync_handler.py
+++ b/python/websocket_handlers/state_sync_handler.py
@@ -1,10 +1,10 @@
from __future__ import annotations
-from python.helpers import runtime
-from python.helpers.print_style import PrintStyle
-from python.helpers.websocket import WebSocketHandler, WebSocketResult
-from python.helpers.state_monitor import get_state_monitor, _ws_debug_enabled
-from python.helpers.state_snapshot import (
+from helpers import runtime
+from helpers.print_style import PrintStyle
+from helpers.websocket import WebSocketHandler, WebSocketResult
+from helpers.state_monitor import get_state_monitor, _ws_debug_enabled
+from helpers.state_snapshot import (
StateRequestValidationError,
parse_state_request_payload,
)
diff --git a/requirements.dev.txt b/requirements.dev.txt
index 93bada795..a5c083ca8 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -1,3 +1,4 @@
pytest>=8.4.2
pytest-asyncio>=1.2.0
-pytest-mock>=3.15.1
\ No newline at end of file
+pytest-mock>=3.15.1
+pyinstrument==5.1.2
\ No newline at end of file
diff --git a/run_tunnel.py b/run_tunnel.py
index 2bc892682..a15f06fcb 100644
--- a/run_tunnel.py
+++ b/run_tunnel.py
@@ -1,9 +1,9 @@
import threading
from flask import Flask, request
-from python.helpers import runtime, dotenv, process
-from python.helpers.print_style import PrintStyle
+from helpers import runtime, dotenv, process
+from helpers.print_style import PrintStyle
-from python.api.tunnel import Tunnel
+from api.tunnel import Tunnel
# initialize the internal Flask server
app = Flask("app")
diff --git a/run_ui.py b/run_ui.py
index 08c4a061a..deb597085 100644
--- a/run_ui.py
+++ b/run_ui.py
@@ -11,20 +11,21 @@ from flask import Flask, request, Response, session, redirect, url_for, render_t
from werkzeug.wrappers.request import Request as WerkzeugRequest
import initialize
-from python.helpers import files, git, mcp_server, fasta2a_server, settings as settings_helper, extension
-from python.helpers.files import get_abs_path
-from python.helpers import runtime, dotenv, process
-from python.helpers.websocket import WebSocketHandler, validate_ws_origin
-from python.helpers.api import register_api_route, requires_auth
-from python.helpers.print_style import PrintStyle
-from python.helpers import login
+from helpers import files, git, mcp_server, fasta2a_server, settings as settings_helper, extension
+from helpers.files import get_abs_path
+from helpers import runtime, dotenv, process
+from helpers.websocket import WebSocketHandler, validate_ws_origin
+from helpers.api import register_api_route, requires_auth
+from helpers.print_style import PrintStyle
+from helpers import login
import socketio # type: ignore[import-untyped]
from socketio import ASGIApp, packet
from starlette.applications import Starlette
from starlette.routing import Mount
from uvicorn.middleware.wsgi import WSGIMiddleware
-from python.helpers.websocket_manager import WebSocketManager
-from python.helpers.websocket_namespace_discovery import discover_websocket_namespaces
+from helpers.websocket_manager import WebSocketManager
+from helpers.websocket_namespace_discovery import discover_websocket_namespaces
+from flask import send_file
# disable logging
import logging
@@ -144,6 +145,14 @@ async def serve_builtin_plugin_asset(plugin_name, asset_path):
async def serve_plugin_asset(plugin_name, asset_path):
return await _serve_plugin_asset(plugin_name, asset_path)
[email protected]("/extensions/webui/<path:asset_path>", methods=["GET"])
+@requires_auth
+async def serve_extension_asset(asset_path):
+ path = files.get_abs_path("extensions/webui", asset_path)
+ if not files.is_in_dir(path, "extensions/webui"):
+ return Response("Access denied", 403)
+ return send_file(path)
+
@extension.extensible
async def _serve_plugin_asset(plugin_name, asset_path):
@@ -151,8 +160,8 @@ async def _serve_plugin_asset(plugin_name, asset_path):
Serve static assets from plugin directories.
Resolves using the plugin system (with overrides).
"""
- from python.helpers import plugins
- from flask import send_file
+ from helpers import plugins
+
# Use the new find_plugin helper
plugin_dir = plugins.find_plugin_dir(plugin_name)
diff --git a/skills/a0-create-plugin/SKILL.md b/skills/a0-create-plugin/SKILL.md
index eeb71aba1..d669dc28d 100644
--- a/skills/a0-create-plugin/SKILL.md
+++ b/skills/a0-create-plugin/SKILL.md
@@ -139,7 +139,7 @@ If your plugin exposes existing core settings rather than plugin-specific ones,
### Sending Messages Proactively
```python
from agent import AgentContext
-from python.helpers.messages import UserMessage
+from helpers.messages import UserMessage
context = AgentContext.use(context_id)
task = context.communicate(UserMessage("Message text"))
@@ -148,7 +148,7 @@ response = await task.result()
### Reading Plugin Settings (backend)
```python
-from python.helpers.plugins import get_plugin_config, save_plugin_config
+from helpers.plugins import get_plugin_config, save_plugin_config
# Runtime (with running agent - resolves project/profile from context)
settings = get_plugin_config("my-plugin", agent=agent) or {}
diff --git a/tests/email_parser_test.py b/tests/email_parser_test.py
index 83bf057ae..88ce1c130 100644
--- a/tests/email_parser_test.py
+++ b/tests/email_parser_test.py
@@ -4,8 +4,8 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import asyncio
import pytest
-from python.helpers.email_client import read_messages
-from python.helpers.dotenv import get_dotenv_value, load_dotenv
+from helpers.email_client import read_messages
+from helpers.dotenv import get_dotenv_value, load_dotenv
@pytest.mark.skip(reason="This test is disabled as it has eternal dependencies and tests nothing automatically, please move it to a script or a manual test")
diff --git a/tests/test_fasta2a_client.py b/tests/test_fasta2a_client.py
index c839e8500..88627c498 100644
--- a/tests/test_fasta2a_client.py
+++ b/tests/test_fasta2a_client.py
@@ -9,7 +9,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import asyncio
import pytest
-from python.helpers import settings
+from helpers import settings
def get_test_urls():
diff --git a/tests/test_file_tree_visualize.py b/tests/test_file_tree_visualize.py
index 834c8d17e..47f2a348e 100644
--- a/tests/test_file_tree_visualize.py
+++ b/tests/test_file_tree_visualize.py
@@ -23,7 +23,7 @@ REPO_ROOT = Path(__file__).resolve().parents[1]
if str(REPO_ROOT) not in sys.path:
sys.path.insert(0, str(REPO_ROOT))
-from python.helpers.file_tree import (
+from helpers.file_tree import (
OUTPUT_MODE_FLAT,
OUTPUT_MODE_NESTED,
OUTPUT_MODE_STRING,
@@ -34,7 +34,7 @@ from python.helpers.file_tree import (
SORT_DESC,
file_tree,
)
-from python.helpers.files import create_dir, delete_dir, get_abs_path, write_file
+from helpers.files import create_dir, delete_dir, get_abs_path, write_file
BASE_TEMP_ROOT = "tmp/tests/file_tree/visualize"
diff --git a/tests/test_http_auth_csrf.py b/tests/test_http_auth_csrf.py
index 52ee4e6b9..73d975055 100644
--- a/tests/test_http_auth_csrf.py
+++ b/tests/test_http_auth_csrf.py
@@ -4,7 +4,7 @@ from flask import Flask, Response
import pytest
-from python.helpers import runtime
+from helpers import runtime
def _make_app() -> Flask:
@@ -32,7 +32,7 @@ def _set_csrf_cookie(client, token: str) -> None:
def test_http_auth_enforced_when_configured(monkeypatch) -> None:
from run_ui import csrf_protect, requires_auth
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: "hash")
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: "hash")
app = _make_app()
@@ -50,7 +50,7 @@ def test_http_auth_enforced_when_configured(monkeypatch) -> None:
def test_http_csrf_required_even_when_auth_not_configured(monkeypatch) -> None:
from run_ui import csrf_protect, requires_auth
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: None)
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: None)
app = _make_app()
@@ -69,7 +69,7 @@ def test_http_csrf_required_even_when_auth_not_configured(monkeypatch) -> None:
def test_http_csrf_rejects_missing_token(monkeypatch) -> None:
from run_ui import csrf_protect, requires_auth
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: "hash")
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: "hash")
app = _make_app()
@@ -88,7 +88,7 @@ def test_http_csrf_rejects_missing_token(monkeypatch) -> None:
def test_http_csrf_accepts_valid_header_without_cookie(monkeypatch) -> None:
from run_ui import csrf_protect, requires_auth
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: "hash")
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: "hash")
app = _make_app()
@@ -107,7 +107,7 @@ def test_http_csrf_accepts_valid_header_without_cookie(monkeypatch) -> None:
def test_http_csrf_accepts_valid_cookie(monkeypatch) -> None:
from run_ui import csrf_protect, requires_auth
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: "hash")
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: "hash")
app = _make_app()
diff --git a/tests/test_multi_tab_isolation.py b/tests/test_multi_tab_isolation.py
index c54f9e85f..e28ab56a9 100644
--- a/tests/test_multi_tab_isolation.py
+++ b/tests/test_multi_tab_isolation.py
@@ -11,9 +11,9 @@ if str(PROJECT_ROOT) not in sys.path:
@pytest.mark.asyncio
async def test_state_monitor_per_sid_isolation_independent_snapshots_seq_and_cursors(monkeypatch):
- import python.helpers.state_monitor as state_monitor_module
- from python.helpers.state_monitor import StateMonitor
- from python.helpers.state_snapshot import StateRequestV1
+ import helpers.state_monitor as state_monitor_module
+ from helpers.state_monitor import StateMonitor
+ from helpers.state_snapshot import StateRequestV1
snapshot_calls: list[dict[str, object]] = []
emitted: list[dict[str, object]] = []
@@ -129,8 +129,8 @@ async def test_state_monitor_per_sid_isolation_independent_snapshots_seq_and_cur
@pytest.mark.asyncio
async def test_state_monitor_mark_dirty_for_context_scopes_to_active_context():
- from python.helpers.state_monitor import StateMonitor
- from python.helpers.state_snapshot import StateRequestV1
+ from helpers.state_monitor import StateMonitor
+ from helpers.state_snapshot import StateRequestV1
monitor = StateMonitor(debounce_seconds=60.0)
namespace = "/state_sync"
diff --git a/tests/test_persist_chat_log_ids.py b/tests/test_persist_chat_log_ids.py
index 9d30a4eca..373ef63de 100644
--- a/tests/test_persist_chat_log_ids.py
+++ b/tests/test_persist_chat_log_ids.py
@@ -2,8 +2,8 @@ from __future__ import annotations
def test_deserialize_log_preserves_item_id() -> None:
- from python.helpers.log import Log
- from python.helpers.persist_chat import _deserialize_log, _serialize_log
+ from helpers.log import Log
+ from helpers.persist_chat import _deserialize_log, _serialize_log
log = Log()
log.log(type="user", heading="User message", content="hello", id="msg-123")
diff --git a/tests/test_snapshot_parity.py b/tests/test_snapshot_parity.py
index f46083d24..4364426b7 100644
--- a/tests/test_snapshot_parity.py
+++ b/tests/test_snapshot_parity.py
@@ -11,7 +11,7 @@ if str(PROJECT_ROOT) not in sys.path:
from agent import AgentContext
from initialize import initialize_agent
-from python.api.poll import Poll
+from api.poll import Poll
@pytest.mark.asyncio
@@ -31,7 +31,7 @@ async def test_snapshot_builder_matches_poll_output_for_null_context():
None, # Poll.process does not access the flask Request object.
)
- from python.helpers import state_snapshot as snapshot
+ from helpers import state_snapshot as snapshot
builder_payload = await snapshot.build_snapshot(
context=None,
@@ -62,7 +62,7 @@ async def test_snapshot_builder_active_context_includes_incremental_logs():
assert first["logs"]
assert first["log_version"] == len(ctx.log.updates)
- from python.helpers import state_snapshot as snapshot
+ from helpers import state_snapshot as snapshot
second = await snapshot.build_snapshot(
context=ctxid,
diff --git a/tests/test_snapshot_schema_v1.py b/tests/test_snapshot_schema_v1.py
index 8e2b0b7d4..f520019d6 100644
--- a/tests/test_snapshot_schema_v1.py
+++ b/tests/test_snapshot_schema_v1.py
@@ -9,7 +9,7 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.api.poll import Poll
+from api.poll import Poll
EXPECTED_SNAPSHOT_KEYS = {
@@ -59,7 +59,7 @@ async def test_poll_snapshot_matches_contract_schema_key_set_null_context():
@pytest.mark.asyncio
async def test_snapshot_builder_produces_contract_schema_key_set_and_defaults():
- from python.helpers import state_snapshot as snapshot
+ from helpers import state_snapshot as snapshot
payload = await snapshot.build_snapshot(
context=None,
@@ -87,7 +87,7 @@ async def test_snapshot_builder_produces_contract_schema_key_set_and_defaults():
def test_snapshot_schema_rejects_unexpected_top_level_keys():
- from python.helpers import state_snapshot as snapshot
+ from helpers import state_snapshot as snapshot
payload = {
"deselect_chat": False,
diff --git a/tests/test_state_monitor.py b/tests/test_state_monitor.py
index ef3b2e245..e0499287c 100644
--- a/tests/test_state_monitor.py
+++ b/tests/test_state_monitor.py
@@ -10,8 +10,8 @@ if str(PROJECT_ROOT) not in sys.path:
@pytest.mark.asyncio
async def test_state_monitor_debounce_coalesces_without_postponing_and_cleanup_cancels_pending():
- from python.helpers.state_monitor import StateMonitor
- from python.helpers.state_snapshot import StateRequestV1
+ from helpers.state_monitor import StateMonitor
+ from helpers.state_snapshot import StateRequestV1
namespace = "/state_sync"
monitor = StateMonitor(debounce_seconds=10.0)
@@ -44,8 +44,8 @@ async def test_state_monitor_namespace_identity_prevents_cross_namespace_state_p
import asyncio
from unittest.mock import AsyncMock
- from python.helpers.state_monitor import StateMonitor
- from python.helpers.state_snapshot import StateRequestV1
+ from helpers.state_monitor import StateMonitor
+ from helpers.state_snapshot import StateRequestV1
loop = asyncio.get_running_loop()
push_ready = asyncio.Event()
@@ -94,7 +94,7 @@ async def test_state_monitor_namespace_identity_prevents_cross_namespace_state_p
}
# Patch build_snapshot used by StateMonitor so this test stays lightweight.
- monkeypatch.setattr("python.helpers.state_monitor.build_snapshot_from_request", _fake_snapshot)
+ monkeypatch.setattr("helpers.state_monitor.build_snapshot_from_request", _fake_snapshot)
monitor.mark_dirty(ns_a, sid, reason="test")
await asyncio.wait_for(push_ready.wait(), timeout=1.0)
diff --git a/tests/test_state_sync_handler.py b/tests/test_state_sync_handler.py
index 959acd2dc..f9aa8362d 100644
--- a/tests/test_state_sync_handler.py
+++ b/tests/test_state_sync_handler.py
@@ -10,7 +10,7 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.helpers.websocket_manager import WebSocketManager
+from helpers.websocket_manager import WebSocketManager
NAMESPACE = "/state_sync"
@@ -28,7 +28,7 @@ async def _create_manager() -> WebSocketManager:
manager = WebSocketManager(socketio, threading.RLock())
from python.websocket_handlers.state_sync_handler import StateSyncHandler
- from python.helpers.state_monitor import _reset_state_monitor_for_testing
+ from helpers.state_monitor import _reset_state_monitor_for_testing
_reset_state_monitor_for_testing()
StateSyncHandler._reset_instance_for_testing()
@@ -43,7 +43,7 @@ async def _create_manager_with_socketio() -> tuple[WebSocketManager, FakeSocketI
manager = WebSocketManager(socketio, threading.RLock())
from python.websocket_handlers.state_sync_handler import StateSyncHandler
- from python.helpers.state_monitor import _reset_state_monitor_for_testing
+ from helpers.state_monitor import _reset_state_monitor_for_testing
_reset_state_monitor_for_testing()
StateSyncHandler._reset_instance_for_testing()
@@ -115,8 +115,8 @@ async def test_state_request_invalid_payload_returns_invalid_request_error():
@pytest.mark.asyncio
async def test_state_push_gating_and_initial_snapshot_delivery():
- from python.helpers.state_monitor import get_state_monitor
- from python.helpers.state_snapshot import validate_snapshot_schema_v1
+ from helpers.state_monitor import get_state_monitor
+ from helpers.state_snapshot import validate_snapshot_schema_v1
manager, socketio = await _create_manager_with_socketio()
diff --git a/tests/test_state_sync_welcome_screen.py b/tests/test_state_sync_welcome_screen.py
index 4e2a22bb7..f4971c188 100644
--- a/tests/test_state_sync_welcome_screen.py
+++ b/tests/test_state_sync_welcome_screen.py
@@ -10,7 +10,7 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.helpers.websocket_manager import WebSocketManager
+from helpers.websocket_manager import WebSocketManager
NAMESPACE = "/state_sync"
@@ -30,8 +30,8 @@ async def test_state_sync_handshake_and_initial_snapshot_work_with_no_selected_c
is null. We must still handshake and receive an initial `state_push` quickly (no hang).
"""
- from python.helpers.state_snapshot import validate_snapshot_schema_v1
- from python.helpers.state_monitor import _reset_state_monitor_for_testing
+ from helpers.state_snapshot import validate_snapshot_schema_v1
+ from helpers.state_monitor import _reset_state_monitor_for_testing
from python.websocket_handlers.state_sync_handler import StateSyncHandler
socketio = FakeSocketIOServer()
diff --git a/tests/test_websocket_csrf.py b/tests/test_websocket_csrf.py
index 45e50db05..1fc61c3c2 100644
--- a/tests/test_websocket_csrf.py
+++ b/tests/test_websocket_csrf.py
@@ -5,7 +5,7 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.helpers.websocket import validate_ws_origin
+from helpers.websocket import validate_ws_origin
def test_validate_ws_origin_allows_same_origin_with_explicit_port():
diff --git a/tests/test_websocket_handlers.py b/tests/test_websocket_handlers.py
index fb76f55ee..7f2c24410 100644
--- a/tests/test_websocket_handlers.py
+++ b/tests/test_websocket_handlers.py
@@ -8,7 +8,7 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.helpers.websocket import (
+from helpers.websocket import (
WebSocketHandler,
WebSocketResult,
SingletonInstantiationError,
@@ -140,9 +140,9 @@ def test_get_instance_returns_singleton():
@pytest.mark.asyncio
async def test_state_sync_handler_registers_and_routes_state_request():
- from python.helpers.websocket_manager import WebSocketManager
+ from helpers.websocket_manager import WebSocketManager
from python.websocket_handlers.state_sync_handler import StateSyncHandler
- from python.helpers.state_monitor import _reset_state_monitor_for_testing
+ from helpers.state_monitor import _reset_state_monitor_for_testing
_reset_state_monitor_for_testing()
StateSyncHandler._reset_instance_for_testing()
diff --git a/tests/test_websocket_harness.py b/tests/test_websocket_harness.py
index 9d56d62f9..b94cfa3d5 100644
--- a/tests/test_websocket_harness.py
+++ b/tests/test_websocket_harness.py
@@ -9,7 +9,7 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.helpers.websocket_manager import WebSocketManager
+from helpers.websocket_manager import WebSocketManager
from python.websocket_handlers.dev_websocket_test_handler import (
DevWebsocketTestHandler,
)
diff --git a/tests/test_websocket_manager.py b/tests/test_websocket_manager.py
index 9f3290c1d..dacdb7c86 100644
--- a/tests/test_websocket_manager.py
+++ b/tests/test_websocket_manager.py
@@ -12,8 +12,8 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.helpers.websocket import ConnectionNotFoundError, WebSocketHandler, WebSocketResult
-from python.helpers.websocket_manager import (
+from helpers.websocket import ConnectionNotFoundError, WebSocketHandler, WebSocketResult
+from helpers.websocket_manager import (
WebSocketManager,
BUFFER_TTL,
DIAGNOSTIC_EVENT,
@@ -354,7 +354,7 @@ async def test_buffer_overflow_drops_oldest(monkeypatch):
await manager.handle_connect(NAMESPACE, "offline")
await manager.handle_disconnect(NAMESPACE, "offline")
- monkeypatch.setattr("python.helpers.websocket_manager.BUFFER_MAX_SIZE", 2)
+ monkeypatch.setattr("helpers.websocket_manager.BUFFER_MAX_SIZE", 2)
await manager.emit_to(NAMESPACE, "offline", "event", {"idx": 0})
await manager.emit_to(NAMESPACE, "offline", "event", {"idx": 1})
@@ -385,7 +385,7 @@ async def test_expired_buffer_entries_are_discarded(monkeypatch):
socketio.emit.reset_mock()
monkeypatch.setattr(
- "python.helpers.websocket_manager._utcnow",
+ "helpers.websocket_manager._utcnow",
lambda: future,
)
await manager.handle_connect(NAMESPACE, "sid-expired")
@@ -479,7 +479,7 @@ async def test_timestamps_are_timezone_aware():
assert info.connected_at.tzinfo is not None
assert info.last_activity.tzinfo is not None
- with patch("python.helpers.websocket_manager._utcnow") as mocked_now:
+ with patch("helpers.websocket_manager._utcnow") as mocked_now:
mocked_now.return_value = info.last_activity
await manager.route_event(NAMESPACE, "unknown", {}, "sid-utc")
assert info.last_activity.tzinfo is not None
@@ -512,7 +512,7 @@ def test_register_handlers_warns_on_duplicates(monkeypatch):
warnings.append(message)
monkeypatch.setattr(
- "python.helpers.print_style.PrintStyle.warning", staticmethod(capture_warning)
+ "helpers.print_style.PrintStyle.warning", staticmethod(capture_warning)
)
DuplicateHandler._reset_instance_for_testing()
@@ -804,13 +804,13 @@ def test_debug_logging_respects_runtime_flag(monkeypatch):
def capture(message: str) -> None:
logs.append(message)
- monkeypatch.setattr("python.helpers.print_style.PrintStyle.debug", staticmethod(capture))
- monkeypatch.setattr("python.helpers.websocket_manager.runtime.is_development", lambda: False)
+ monkeypatch.setattr("helpers.print_style.PrintStyle.debug", staticmethod(capture))
+ monkeypatch.setattr("helpers.websocket_manager.runtime.is_development", lambda: False)
manager._debug("should-not-log") # noqa: SLF001
assert logs == []
- monkeypatch.setattr("python.helpers.websocket_manager.runtime.is_development", lambda: True)
+ monkeypatch.setattr("helpers.websocket_manager.runtime.is_development", lambda: True)
manager._debug("should-log") # noqa: SLF001
assert logs == ["should-log"]
diff --git a/tests/test_websocket_namespace_discovery.py b/tests/test_websocket_namespace_discovery.py
index aa25f2b20..1a0284ebc 100644
--- a/tests/test_websocket_namespace_discovery.py
+++ b/tests/test_websocket_namespace_discovery.py
@@ -55,7 +55,7 @@ def _write_handler_module(path: Path, class_name: str, event_type: str) -> None:
"",
"from typing import Any",
"",
- "from python.helpers.websocket import WebSocketHandler",
+ "from helpers.websocket import WebSocketHandler",
"",
f"class {class_name}(WebSocketHandler):",
" @classmethod",
@@ -80,7 +80,7 @@ def _write_handler_module(path: Path, class_name: str, event_type: str) -> None:
def test_discovery_supports_folder_entries_and_ignores_deeper_nesting(tmp_path: Path) -> None:
- from python.helpers.websocket_namespace_discovery import discover_websocket_namespaces
+ from helpers.websocket_namespace_discovery import discover_websocket_namespaces
folder = tmp_path / "orders"
folder.mkdir()
@@ -100,7 +100,7 @@ def test_discovery_supports_folder_entries_and_ignores_deeper_nesting(tmp_path:
def test_discovery_folder_suffix_handler_stripped(tmp_path: Path) -> None:
- from python.helpers.websocket_namespace_discovery import discover_websocket_namespaces
+ from helpers.websocket_namespace_discovery import discover_websocket_namespaces
folder = tmp_path / "sales_handler"
folder.mkdir()
@@ -115,8 +115,8 @@ def test_discovery_empty_folder_warns_and_treats_namespace_unregistered(tmp_path
from flask import Flask
import socketio
- from python.helpers.websocket_manager import WebSocketManager
- from python.helpers.websocket_namespace_discovery import discover_websocket_namespaces
+ from helpers.websocket_manager import WebSocketManager
+ from helpers.websocket_namespace_discovery import discover_websocket_namespaces
from run_ui import configure_websocket_namespaces
empty = tmp_path / "empty"
@@ -128,7 +128,7 @@ def test_discovery_empty_folder_warns_and_treats_namespace_unregistered(tmp_path
def _warn(message: str) -> None:
warnings.append(message)
- monkeypatch.setattr("python.helpers.print_style.PrintStyle.warning", staticmethod(_warn))
+ monkeypatch.setattr("helpers.print_style.PrintStyle.warning", staticmethod(_warn))
discoveries = discover_websocket_namespaces(handlers_folder=str(tmp_path), include_root_default=False)
assert "/empty" not in {d.namespace for d in discoveries}
@@ -181,7 +181,7 @@ def test_discovery_empty_folder_warns_and_treats_namespace_unregistered(tmp_path
def test_discovery_invalid_modules_fail_fast_with_descriptive_errors(tmp_path: Path) -> None:
- from python.helpers.websocket_namespace_discovery import discover_websocket_namespaces
+ from helpers.websocket_namespace_discovery import discover_websocket_namespaces
# 0 handlers in a *_handler.py module
(tmp_path / "bad_handler.py").write_text(
@@ -196,7 +196,7 @@ def test_discovery_invalid_modules_fail_fast_with_descriptive_errors(tmp_path: P
(tmp_path / "two_handler.py").write_text(
"\n".join(
[
- "from python.helpers.websocket import WebSocketHandler",
+ "from helpers.websocket import WebSocketHandler",
"class A(WebSocketHandler):",
" @classmethod",
" def requires_auth(cls): return False",
diff --git a/tests/test_websocket_namespace_security.py b/tests/test_websocket_namespace_security.py
index 49963a78e..489ec2c20 100644
--- a/tests/test_websocket_namespace_security.py
+++ b/tests/test_websocket_namespace_security.py
@@ -61,9 +61,9 @@ async def test_connect_security_is_computed_per_namespace_and_enforced(monkeypat
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
- from python.helpers import runtime
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
+ from helpers import runtime
from run_ui import configure_websocket_namespaces
class OpenHandler(WebSocketHandler):
@@ -93,7 +93,7 @@ async def test_connect_security_is_computed_per_namespace_and_enforced(monkeypat
OpenHandler._reset_instance_for_testing()
SecureHandler._reset_instance_for_testing()
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: "hash")
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: "hash")
webapp = Flask("test_websocket_namespace_security")
webapp.secret_key = "test-secret"
@@ -181,8 +181,8 @@ async def test_unknown_namespace_rejected_with_deterministic_connect_error_paylo
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
from run_ui import configure_websocket_namespaces
class OpenHandler(WebSocketHandler):
@@ -248,9 +248,9 @@ async def test_secure_namespace_rejects_missing_auth_even_with_valid_csrf(monkey
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
- from python.helpers import runtime
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
+ from helpers import runtime
from run_ui import configure_websocket_namespaces
class SecureHandler(WebSocketHandler):
@@ -263,7 +263,7 @@ async def test_secure_namespace_rejects_missing_auth_even_with_valid_csrf(monkey
SecureHandler._reset_instance_for_testing()
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: "hash")
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: "hash")
webapp = Flask("test_ws_secure_missing_auth")
webapp.secret_key = "test-secret"
@@ -314,9 +314,9 @@ async def test_secure_namespace_rejects_invalid_csrf_cookie(monkeypatch) -> None
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
- from python.helpers import runtime
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
+ from helpers import runtime
from run_ui import configure_websocket_namespaces
class SecureHandler(WebSocketHandler):
@@ -329,7 +329,7 @@ async def test_secure_namespace_rejects_invalid_csrf_cookie(monkeypatch) -> None
SecureHandler._reset_instance_for_testing()
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: "hash")
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: "hash")
webapp = Flask("test_ws_secure_invalid_csrf")
webapp.secret_key = "test-secret"
@@ -381,9 +381,9 @@ async def test_csrf_required_without_auth_is_enforced(monkeypatch) -> None:
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
- from python.helpers import runtime
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
+ from helpers import runtime
from run_ui import configure_websocket_namespaces
class CsrfOnlyHandler(WebSocketHandler):
@@ -404,7 +404,7 @@ async def test_csrf_required_without_auth_is_enforced(monkeypatch) -> None:
CsrfOnlyHandler._reset_instance_for_testing()
- monkeypatch.setattr("python.helpers.login.get_credentials_hash", lambda: None)
+ monkeypatch.setattr("helpers.login.get_credentials_hash", lambda: None)
webapp = Flask("test_ws_csrf_only")
webapp.secret_key = "test-secret"
diff --git a/tests/test_websocket_namespaces.py b/tests/test_websocket_namespaces.py
index f82329107..4c3faca5d 100644
--- a/tests/test_websocket_namespaces.py
+++ b/tests/test_websocket_namespaces.py
@@ -13,8 +13,8 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.helpers.state_monitor import StateMonitor
-from python.helpers.websocket_manager import WebSocketManager
+from helpers.state_monitor import StateMonitor
+from helpers.websocket_manager import WebSocketManager
class FakeSocketIOServer:
@@ -108,8 +108,8 @@ async def test_namespace_isolation_state_sync_vs_dev_websocket_test() -> None:
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
from run_ui import configure_websocket_namespaces
class StateHandler(WebSocketHandler):
@@ -220,8 +220,8 @@ async def test_diagnostics_include_source_namespace_and_deliver_on_dev_namespace
but must include `sourceNamespace` identifying the origin namespace.
"""
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import DIAGNOSTIC_EVENT, WebSocketManager
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import DIAGNOSTIC_EVENT, WebSocketManager
class DummyHandler(WebSocketHandler):
@classmethod
@@ -267,7 +267,7 @@ def test_namespace_discovery_maps_core_handlers_to_expected_namespaces() -> None
(no cross-registration).
"""
- from python.helpers.websocket_namespace_discovery import discover_websocket_namespaces
+ from helpers.websocket_namespace_discovery import discover_websocket_namespaces
discoveries = discover_websocket_namespaces(
handlers_folder="python/websocket_handlers",
@@ -309,7 +309,7 @@ async def test_route_event_dispatches_only_within_connected_namespace_and_result
CONTRACT.NS.ROUTING: inbound routing is restricted to handlers in the connected namespace.
"""
- from python.helpers.websocket import WebSocketHandler
+ from helpers.websocket import WebSocketHandler
socketio = FakeSocketIOServer()
manager = WebSocketManager(socketio, threading.RLock())
@@ -365,7 +365,7 @@ async def test_lifecycle_broadcasts_deliver_only_within_the_namespace() -> None:
CONTRACT.NS.DELIVERY: lifecycle broadcasts are namespace-scoped.
"""
- from python.helpers.websocket_manager import (
+ from helpers.websocket_manager import (
LIFECYCLE_CONNECT_EVENT,
LIFECYCLE_DISCONNECT_EVENT,
)
@@ -422,7 +422,7 @@ async def test_request_semantics_no_handlers_and_timeouts_are_namespace_scoped_a
CONTRACT.REQUEST.RESULTS + CONTRACT.REQUEST.RESULTS.ORDERING + CONTRACT.NS.ROUTING.
"""
- from python.helpers.websocket import WebSocketHandler
+ from helpers.websocket import WebSocketHandler
socketio = FakeSocketIOServer()
manager = WebSocketManager(socketio, threading.RLock())
diff --git a/tests/test_websocket_namespaces_integration.py b/tests/test_websocket_namespaces_integration.py
index 55b3da002..3be3495a8 100644
--- a/tests/test_websocket_namespaces_integration.py
+++ b/tests/test_websocket_namespaces_integration.py
@@ -51,8 +51,8 @@ async def test_unregistered_namespace_connection_fails_with_unknown_namespace_co
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
from run_ui import configure_websocket_namespaces
class OpenHandler(WebSocketHandler):
diff --git a/tests/test_websocket_root_namespace.py b/tests/test_websocket_root_namespace.py
index 53420fc2b..fc3ab0d43 100644
--- a/tests/test_websocket_root_namespace.py
+++ b/tests/test_websocket_root_namespace.py
@@ -51,8 +51,8 @@ async def test_root_namespace_request_style_calls_resolve_with_no_handlers() ->
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
from run_ui import configure_websocket_namespaces
app = Flask("test_ws_root_namespace")
@@ -124,8 +124,8 @@ async def test_root_namespace_fire_and_forget_does_not_invoke_application_handle
from flask import Flask
import socketio
- from python.helpers.websocket import WebSocketHandler
- from python.helpers.websocket_manager import WebSocketManager
+ from helpers.websocket import WebSocketHandler
+ from helpers.websocket_manager import WebSocketManager
from run_ui import configure_websocket_namespaces
app = Flask("test_ws_root_fire_and_forget")
diff --git a/tests/test_webui_extension_surfaces.py b/tests/test_webui_extension_surfaces.py
index b7b60235f..28b5f24e0 100644
--- a/tests/test_webui_extension_surfaces.py
+++ b/tests/test_webui_extension_surfaces.py
@@ -14,7 +14,7 @@ PROJECT_ROOT = Path(__file__).resolve().parents[2]
if str(PROJECT_ROOT) not in sys.path:
sys.path.insert(0, str(PROJECT_ROOT))
-from python.api.load_webui_extensions import LoadWebuiExtensions
+from api.load_webui_extensions import LoadWebuiExtensions
SURFACE_SCENARIOS: list[tuple[str, str]] = [
diff --git a/python/tools/a2a_chat.py b/tools/a2a_chat.py
similarity index 93%
rename from python/tools/a2a_chat.py
rename to tools/a2a_chat.py
index a7cfcc0b0..40f0b8898 100644
--- a/python/tools/a2a_chat.py
+++ b/tools/a2a_chat.py
@@ -1,6 +1,6 @@
-from python.helpers.tool import Tool, Response
-from python.helpers.print_style import PrintStyle
-from python.helpers.fasta2a_client import connect_to_agent, is_client_available
+from helpers.tool import Tool, Response
+from helpers.print_style import PrintStyle
+from helpers.fasta2a_client import connect_to_agent, is_client_available
class A2AChatTool(Tool):
diff --git a/python/tools/browser._py b/tools/browser._py
similarity index 90%
rename from python/tools/browser._py
rename to tools/browser._py
index 533bd9b6a..862f71a97 100644
--- a/python/tools/browser._py
+++ b/tools/browser._py
@@ -1,10 +1,10 @@
# import asyncio
# from dataclasses import dataclass
# import time
-# from python.helpers.tool import Tool, Response
-# from python.helpers import files, rfc_exchange
-# from python.helpers.print_style import PrintStyle
-# from python.helpers.browser import Browser as BrowserManager
+# from helpers.tool import Tool, Response
+# from helpers import files, rfc_exchange
+# from helpers.print_style import PrintStyle
+# from helpers.browser import Browser as BrowserManager
# import uuid
diff --git a/python/tools/browser_agent.py b/tools/browser_agent.py
similarity index 97%
rename from python/tools/browser_agent.py
rename to tools/browser_agent.py
index d9a53f822..67ead4f09 100644
--- a/python/tools/browser_agent.py
+++ b/tools/browser_agent.py
@@ -4,16 +4,16 @@ from typing import Optional, cast
from agent import Agent, InterventionException
from pathlib import Path
-from python.helpers.tool import Tool, Response
-from python.helpers import files, defer, persist_chat, strings
-from python.helpers.browser_use import browser_use # type: ignore[attr-defined]
-from python.helpers.print_style import PrintStyle
-from python.helpers.playwright import ensure_playwright_binary
-from python.helpers.secrets import get_secrets_manager
-from python.extensions.message_loop_start._10_iteration_no import get_iter_no
+from helpers.tool import Tool, Response
+from helpers import files, defer, persist_chat, strings
+from helpers.browser_use import browser_use # type: ignore[attr-defined]
+from helpers.print_style import PrintStyle
+from helpers.playwright import ensure_playwright_binary
+from helpers.secrets import get_secrets_manager
+from extensions.python.message_loop_start._10_iteration_no import get_iter_no
from pydantic import BaseModel
import uuid
-from python.helpers.dirty_json import DirtyJson
+from helpers.dirty_json import DirtyJson
class State:
diff --git a/python/tools/browser_do._py b/tools/browser_do._py
similarity index 94%
rename from python/tools/browser_do._py
rename to tools/browser_do._py
index 2ad7fc244..c78c82089 100644
--- a/python/tools/browser_do._py
+++ b/tools/browser_do._py
@@ -1,7 +1,7 @@
# import asyncio
-# from python.helpers.tool import Tool, Response
-# from python.tools.browser import Browser
-# from python.helpers.browser import NoPageError
+# from helpers.tool import Tool, Response
+# from tools.browser import Browser
+# from helpers.browser import NoPageError
# import asyncio
diff --git a/python/tools/browser_open._py b/tools/browser_open._py
similarity index 88%
rename from python/tools/browser_open._py
rename to tools/browser_open._py
index 75a219db4..96a6a79ed 100644
--- a/python/tools/browser_open._py
+++ b/tools/browser_open._py
@@ -1,7 +1,7 @@
# import asyncio
-# from python.helpers.tool import Tool, Response
-# from python.tools import browser
-# from python.tools.browser import Browser
+# from helpers.tool import Tool, Response
+# from tools import browser
+# from tools.browser import Browser
# class BrowserOpen(Browser):
diff --git a/python/tools/call_subordinate.py b/tools/call_subordinate.py
similarity index 95%
rename from python/tools/call_subordinate.py
rename to tools/call_subordinate.py
index 491249d4d..55b827c92 100644
--- a/python/tools/call_subordinate.py
+++ b/tools/call_subordinate.py
@@ -1,7 +1,7 @@
from agent import Agent, UserMessage
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
from initialize import initialize_agent
-from python.extensions.hist_add_tool_result import _90_save_tool_call_file as save_tool_call_file
+from extensions.python.hist_add_tool_result import _90_save_tool_call_file as save_tool_call_file
class Delegation(Tool):
diff --git a/python/tools/code_execution_tool.py b/tools/code_execution_tool.py
similarity index 97%
rename from python/tools/code_execution_tool.py
rename to tools/code_execution_tool.py
index 3e9f25c2c..44ba61d8f 100644
--- a/python/tools/code_execution_tool.py
+++ b/tools/code_execution_tool.py
@@ -2,13 +2,13 @@ import asyncio
from dataclasses import dataclass
import shlex
import time
-from python.helpers.tool import Tool, Response
-from python.helpers import files, rfc_exchange, projects, runtime, settings
-from python.helpers.print_style import PrintStyle
-from python.helpers.shell_local import LocalInteractiveSession
-from python.helpers.shell_ssh import SSHInteractiveSession
-from python.helpers.strings import truncate_text as truncate_text_string
-from python.helpers.messages import truncate_text as truncate_text_agent
+from helpers.tool import Tool, Response
+from helpers import files, rfc_exchange, projects, runtime, settings
+from helpers.print_style import PrintStyle
+from helpers.shell_local import LocalInteractiveSession
+from helpers.shell_ssh import SSHInteractiveSession
+from helpers.strings import truncate_text as truncate_text_string
+from helpers.messages import truncate_text as truncate_text_agent
import re
# Timeouts for python, nodejs, and terminal runtimes.
diff --git a/python/tools/document_query.py b/tools/document_query.py
similarity index 93%
rename from python/tools/document_query.py
rename to tools/document_query.py
index a05d0f748..9b6c598bb 100644
--- a/python/tools/document_query.py
+++ b/tools/document_query.py
@@ -1,7 +1,7 @@
import asyncio
-from python.helpers.tool import Tool, Response
-from python.helpers.document_query import DocumentQueryHelper
+from helpers.tool import Tool, Response
+from helpers.document_query import DocumentQueryHelper
class DocumentQueryTool(Tool):
diff --git a/python/tools/input.py b/tools/input.py
similarity index 87%
rename from python/tools/input.py
rename to tools/input.py
index 104286ff6..9c85e4a82 100644
--- a/python/tools/input.py
+++ b/tools/input.py
@@ -1,6 +1,6 @@
from agent import Agent, UserMessage
-from python.helpers.tool import Tool, Response
-from python.tools.code_execution_tool import CodeExecution
+from helpers.tool import Tool, Response
+from tools.code_execution_tool import CodeExecution
class Input(Tool):
diff --git a/python/tools/knowledge_tool._py b/tools/knowledge_tool._py
similarity index 98%
rename from python/tools/knowledge_tool._py
rename to tools/knowledge_tool._py
index 386440b6e..e54c07a92 100644
--- a/python/tools/knowledge_tool._py
+++ b/tools/knowledge_tool._py
@@ -1,10 +1,10 @@
import asyncio
-from python.helpers import dotenv, perplexity_search, duckduckgo_search
+from helpers import dotenv, perplexity_search, duckduckgo_search
from plugins.memory.helpers.memory import Memory
from plugins.memory.tools.memory_load import DEFAULT_THRESHOLD as DEFAULT_MEMORY_THRESHOLD
-from python.helpers.tool import Tool, Response
-from python.helpers.document_query import DocumentQueryHelper
+from helpers.tool import Tool, Response
+from helpers.document_query import DocumentQueryHelper
SEARCH_ENGINE_RESULTS = 10
diff --git a/python/tools/notify_user.py b/tools/notify_user.py
similarity index 91%
rename from python/tools/notify_user.py
rename to tools/notify_user.py
index b436cffde..4b627082c 100644
--- a/python/tools/notify_user.py
+++ b/tools/notify_user.py
@@ -1,6 +1,6 @@
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
from agent import AgentContext
-from python.helpers.notification import NotificationPriority, NotificationType
+from helpers.notification import NotificationPriority, NotificationType
class NotifyUserTool(Tool):
diff --git a/python/tools/response.py b/tools/response.py
similarity index 94%
rename from python/tools/response.py
rename to tools/response.py
index ab97669bd..c45485743 100644
--- a/python/tools/response.py
+++ b/tools/response.py
@@ -1,4 +1,4 @@
-from python.helpers.tool import Tool, Response
+from helpers.tool import Tool, Response
class ResponseTool(Tool):
diff --git a/python/tools/scheduler.py b/tools/scheduler.py
similarity index 98%
rename from python/tools/scheduler.py
rename to tools/scheduler.py
index 96c453024..9181bbe1f 100644
--- a/python/tools/scheduler.py
+++ b/tools/scheduler.py
@@ -3,14 +3,14 @@ from datetime import datetime
import json
import random
import re
-from python.helpers.tool import Tool, Response
-from python.helpers.task_scheduler import (
+from helpers.tool import Tool, Response
+from helpers.task_scheduler import (
TaskScheduler, ScheduledTask, AdHocTask, PlannedTask,
serialize_task, TaskState, TaskSchedule, TaskPlan, parse_datetime, serialize_datetime
)
from agent import AgentContext
-from python.helpers import persist_chat
-from python.helpers.projects import get_context_project_name, load_basic_project_data
+from helpers import persist_chat
+from helpers.projects import get_context_project_name, load_basic_project_data
DEFAULT_WAIT_TIMEOUT = 300
diff --git a/python/tools/search_engine.py b/tools/search_engine.py
similarity index 78%
rename from python/tools/search_engine.py
rename to tools/search_engine.py
index 9df4967c7..f1566cc0e 100644
--- a/python/tools/search_engine.py
+++ b/tools/search_engine.py
@@ -1,10 +1,10 @@
import os
import asyncio
-from python.helpers import dotenv, perplexity_search, duckduckgo_search
-from python.helpers.tool import Tool, Response
-from python.helpers.print_style import PrintStyle
-from python.helpers.errors import handle_error
-from python.helpers.searxng import search as searxng
+from helpers import dotenv, perplexity_search, duckduckgo_search
+from helpers.tool import Tool, Response
+from helpers.print_style import PrintStyle
+from helpers.errors import handle_error
+from helpers.searxng import search as searxng
SEARCH_ENGINE_RESULTS = 10
diff --git a/python/tools/skills_tool.py b/tools/skills_tool.py
similarity index 96%
rename from python/tools/skills_tool.py
rename to tools/skills_tool.py
index 654ef38b0..3b4e1d166 100644
--- a/python/tools/skills_tool.py
+++ b/tools/skills_tool.py
@@ -3,9 +3,9 @@ from __future__ import annotations
from pathlib import Path
from typing import List
-from python.helpers.tool import Tool, Response
-from python.helpers import projects, files, file_tree
-from python.helpers import skills as skills_helper, runtime
+from helpers.tool import Tool, Response
+from helpers import projects, files, file_tree
+from helpers import skills as skills_helper, runtime
DATA_NAME_LOADED_SKILLS = "loaded_skills"
diff --git a/python/tools/unknown.py b/tools/unknown.py
similarity index 75%
rename from python/tools/unknown.py
rename to tools/unknown.py
index 57ebd0b81..850724d3c 100644
--- a/python/tools/unknown.py
+++ b/tools/unknown.py
@@ -1,5 +1,5 @@
-from python.helpers.tool import Tool, Response
-from python.extensions.system_prompt._10_system_prompt import (
+from helpers.tool import Tool, Response
+from extensions.python.system_prompt._10_system_prompt import (
get_tools_prompt,
)
diff --git a/python/tools/vision_load.py b/tools/vision_load.py
similarity index 95%
rename from python/tools/vision_load.py
rename to tools/vision_load.py
index 60bfc043e..6bbd8bb9c 100644
--- a/python/tools/vision_load.py
+++ b/tools/vision_load.py
@@ -1,9 +1,9 @@
import base64
-from python.helpers.print_style import PrintStyle
-from python.helpers.tool import Tool, Response
-from python.helpers import runtime, files, images
+from helpers.print_style import PrintStyle
+from helpers.tool import Tool, Response
+from helpers import runtime, files, images
from mimetypes import guess_type
-from python.helpers import history
+from helpers import history
# image optimization and token estimation for context window
MAX_PIXELS = 768_000
diff --git a/python/tools/wait.py b/tools/wait.py
similarity index 93%
rename from python/tools/wait.py
rename to tools/wait.py
index 000573c5f..660d4c127 100644
--- a/python/tools/wait.py
+++ b/tools/wait.py
@@ -1,9 +1,9 @@
import asyncio
from datetime import datetime, timedelta, timezone
-from python.helpers.tool import Tool, Response
-from python.helpers.print_style import PrintStyle
-from python.helpers.wait import managed_wait
-from python.helpers.localization import Localization
+from helpers.tool import Tool, Response
+from helpers.print_style import PrintStyle
+from helpers.wait import managed_wait
+from helpers.localization import Localization
class WaitTool(Tool):
diff --git a/webui/components/sidebar/chats/chats-store.js b/webui/components/sidebar/chats/chats-store.js
index dfba55d2d..a3ad601ef 100644
--- a/webui/components/sidebar/chats/chats-store.js
+++ b/webui/components/sidebar/chats/chats-store.js
@@ -98,8 +98,6 @@ const model = {
return;
}
- console.log("Deleting chat with ID:", id);
-
try {
// Switch to another context if deleting current
if (this.selected === id) {
@@ -111,11 +109,6 @@ const model = {
// Update the UI - remove from contexts
const updatedContexts = this.contexts.filter((ctx) => ctx.id !== id);
- console.log(
- "Updated contexts after deletion:",
- JSON.stringify(updatedContexts.map((c) => ({ id: c.id, name: c.name })))
- );
-
// Force UI update by creating a new array
this.contexts = [...updatedContexts];
diff --git a/webui/js/api.js b/webui/js/api.js
index 84ebea754..89f549aef 100644
--- a/webui/js/api.js
+++ b/webui/js/api.js
@@ -31,6 +31,25 @@ export async function callJsonApi(endpoint, data) {
* @returns {Promise<Response>} The fetch response
*/
export async function fetchApi(url, request) {
+ async function _getExtensions() {
+ try {
+ return await import("./extensions.js");
+ } catch {
+ return null;
+ }
+ }
+
+ /**
+ * @param {string} apiUrl
+ * @returns {Promise<boolean>}
+ */
+ async function _shouldCallApiExtensions(apiUrl) {
+ const extensions = await _getExtensions();
+ if (!extensions) return false;
+ const excluded = extensions.API_EXTENSION_EXCLUDED_ENDPOINTS;
+ return !(excluded instanceof Set && excluded.has(apiUrl));
+ }
+
async function _wrap(retry) {
// get the CSRF token
const token = await getCsrfToken();
@@ -46,21 +65,48 @@ export async function fetchApi(url, request) {
// perform the fetch with the updated request
const apiUrl = url.startsWith('/api/') || url.startsWith('api/') ? `/${url.replace(/^\/+/, '')}` : `/api/${url.replace(/^\/+/, '')}`;
- const response = await fetch(apiUrl, finalRequest);
+
+ /** @type {{ url: string, apiUrl: string, request: any, response: Response | null, retry: boolean }} */
+ const ctx = {
+ url,
+ apiUrl,
+ request: finalRequest,
+ response: null,
+ retry,
+ };
+
+ if (await _shouldCallApiExtensions(apiUrl)) {
+ const extensions = await _getExtensions();
+ if (extensions) {
+ await extensions.callJsExtensions("api_call_before", ctx);
+ }
+ }
+
+ const response = ctx.response || await fetch(ctx.apiUrl, ctx.request);
+ ctx.response = response;
+
+ if (await _shouldCallApiExtensions(apiUrl)) {
+ const extensions = await _getExtensions();
+ if (extensions) {
+ await extensions.callJsExtensions("api_call_after", ctx);
+ }
+ }
+
+ const finalResponse = ctx.response;
// check if there was an CSRF error
- if (response.status === 403 && retry) {
+ if (finalResponse.status === 403 && retry) {
// retry the request with new token
csrfToken = null;
return await _wrap(false);
- } else if (response.redirected && response.url.endsWith("/login")) {
+ } else if (finalResponse.redirected && finalResponse.url.endsWith("/login")) {
// redirect to login
- window.location.href = response.url;
+ window.location.href = finalResponse.url;
return;
}
// return the response
- return response;
+ return finalResponse;
}
// perform the request
diff --git a/webui/js/extensions.js b/webui/js/extensions.js
index 1c190d8ec..f04581ca7 100644
--- a/webui/js/extensions.js
+++ b/webui/js/extensions.js
@@ -21,6 +21,10 @@ import * as cache from "./cache.js";
const JS_CACHE_AREA = "frontend_extensions_js(extensions)(plugins)";
const HTML_CACHE_AREA = "frontend_extensions_html(extensions)(plugins)";
+export const API_EXTENSION_EXCLUDED_ENDPOINTS = new Set([
+ "/api/load_webui_extensions",
+]);
+
export function invalidateCache() {
cache.clear(JS_CACHE_AREA);
cache.clear(HTML_CACHE_AREA);
diff --git a/webui/js/messages.js b/webui/js/messages.js
index a4dbbb69f..fdaccaf8a 100644
--- a/webui/js/messages.js
+++ b/webui/js/messages.js
@@ -122,7 +122,7 @@ export async function getMessageHandler(type) {
async function getHandlerFromExtensions(type){
const extData = { type: type, handler: undefined }
- await callJsExtensions("getMessageHandler", extData);
+ await callJsExtensions("get_message_handler", extData);
// return handler from extensions
if(typeof extData.handler == "function") return extData.handler;
//not set by extensions, return default