Agent Zero AI framework
sensitive settings store/load, short guids in scheduler and vdb
frdeled0964a857b9
diff --git a/agent.py b/agent.pyindex f6001098c..4121f73b8 100644--- a/agent.py+++ b/agent.py@@ -8,7 +8,6 @@ from dataclasses import dataclass, fieldfrom datetime import datetime, timezonefrom typing import Any, Awaitable, Coroutine, Dict, Literalfrom enum import Enum-import uuidimport modelsfrom python.helpers import (diff --git a/python/helpers/settings.py b/python/helpers/settings.pyindex 073a3418c..7a2b8b0d6 100644--- a/python/helpers/settings.py+++ b/python/helpers/settings.py@@ -264,6 +264,13 @@ def convert_out(settings: Settings) -> SettingsOutput:additional["knowledge_subdirs"] = _ensure_option_present(additional.get("knowledge_subdirs"), current.get("agent_knowledge_subdir"))additional["stt_models"] = _ensure_option_present(additional.get("stt_models"), current.get("stt_model_size"))+ # masked api keys+ providers = get_providers("chat") + get_providers("embedding")+ for provider in providers:+ provider_name = provider["value"]+ api_key = settings["api_keys"].get(provider_name, models.get_api_key(provider_name))+ settings["api_keys"][provider_name] = API_KEY_PLACEHOLDER if api_key and api_key != "None" else ""+# load auth from dotenvout["settings"]["auth_login"] = dotenv.get_dotenv_value(dotenv.KEY_AUTH_LOGIN) or ""out["settings"]["auth_password"] = (@@ -311,21 +318,7 @@ def _get_api_key_field(settings: Settings, provider: str, title: str) -> Settingdef convert_in(settings: Settings) -> Settings:current = get_settings()- # api keys- if "api_keys" in settings and isinstance(settings["api_keys"], dict):- for provider, value in settings["api_keys"].items():- if value != API_KEY_PLACEHOLDER:- current["api_keys"][provider] = value-- # all other fieldsfor key, value in settings.items():- if key == "api_keys":- continue-- # Skip saving if value is a placeholder- if value == PASSWORD_PLACEHOLDER or value == API_KEY_PLACEHOLDER:- continue-# Special handling for browser_http_headers and *_kwargs (stored as .env text)if (key == "browser_http_headers" or key.endswith("_kwargs")) and isinstance(value, str):current[key] = _env_to_dict(value)@@ -436,17 +429,16 @@ def _remove_sensitive_settings(settings: Settings):def _write_sensitive_settings(settings: Settings):for key, val in settings["api_keys"].items():- dotenv.save_dotenv_value(key.upper(), val)+ if val != API_KEY_PLACEHOLDER:+ dotenv.save_dotenv_value(key.upper(), val)dotenv.save_dotenv_value(dotenv.KEY_AUTH_LOGIN, settings["auth_login"])- if settings["auth_password"]:+ if settings["auth_password"] != PASSWORD_PLACEHOLDER:dotenv.save_dotenv_value(dotenv.KEY_AUTH_PASSWORD, settings["auth_password"])- if settings["rfc_password"]:+ if settings["rfc_password"] != PASSWORD_PLACEHOLDER:dotenv.save_dotenv_value(dotenv.KEY_RFC_PASSWORD, settings["rfc_password"])-- if settings["root_password"]:+ if settings["root_password"] != PASSWORD_PLACEHOLDER:dotenv.save_dotenv_value(dotenv.KEY_ROOT_PASSWORD, settings["root_password"])- if settings["root_password"]:set_root_password(settings["root_password"])# Handle secrets separately - merge with existing preserving comments/order and support deletionsdiff --git a/python/helpers/task_scheduler.py b/python/helpers/task_scheduler.pyindex 5f9321754..1938db367 100644--- a/python/helpers/task_scheduler.py+++ b/python/helpers/task_scheduler.py@@ -22,7 +22,7 @@ from python.helpers.print_style import PrintStylefrom python.helpers.defer import DeferredTaskfrom python.helpers.files import get_abs_path, make_dirs, read_file, write_filefrom python.helpers.localization import Localization-from python.helpers import projects+from python.helpers import projects, guidsimport pytzfrom typing import Annotated@@ -118,7 +118,7 @@ class TaskPlan(BaseModel):class BaseTask(BaseModel):- uuid: str = Field(default_factory=lambda: str(uuid.uuid4()))+ uuid: str = Field(default_factory=lambda: guids.generate_id())context_id: Optional[str] = Field(default=None)state: TaskState = Field(default=TaskState.IDLE)name: str = Field()diff --git a/python/helpers/vector_db.py b/python/helpers/vector_db.pyindex 2b94960e3..8a813caba 100644--- a/python/helpers/vector_db.py+++ b/python/helpers/vector_db.py@@ -1,5 +1,4 @@from typing import Any, List, Sequence-import uuidfrom langchain_community.vectorstores import FAISS# faiss needs to be patched for python 3.12 on arm #TODO remove once not needed@@ -17,6 +16,7 @@ from langchain.embeddings import CacheBackedEmbeddingsfrom simpleeval import simple_evalfrom agent import Agent+from python.helpers import guidsclass MyFaiss(FAISS):@@ -99,7 +99,7 @@ class VectorDB:return resultasync def insert_documents(self, docs: list[Document]):- ids = [str(uuid.uuid4()) for _ in range(len(docs))]+ ids = [guids.generate_id() for _ in range(len(docs))]if ids:for doc, id in zip(docs, ids):