Agent Zero AI framework
Settings prototype
frdela5d671904d4d
diff --git a/initialize.py b/initialize.pyindex b741eae90..9c7103f00 100644--- a/initialize.py+++ b/initialize.py@@ -1,11 +1,11 @@import modelsfrom agent import AgentConfig-from python.helpers import files+from python.helpers import files, settingsdef initialize():# main chat model used by agents (smarter, more accurate)- chat_llm = models.get_openai_chat(model_name="gpt-4o-mini", temperature=0)+ # chat_llm = models.get_openai_chat(model_name="gpt-4o-mini", temperature=0)# chat_llm = models.get_ollama_chat(model_name="llama3.2:3b-instruct-fp16", temperature=0)# chat_llm = models.get_lmstudio_chat(model_name="lmstudio-community/Meta-Llama-3.1-8B-Instruct-GGUF", temperature=0)# chat_llm = models.get_openrouter_chat(model_name="openai/o1-mini-2024-09-12")@@ -15,22 +15,25 @@ def initialize():# chat_llm = models.get_mistral_chat(model_name="mistral-small-latest", temperature=0)# chat_llm = models.get_groq_chat(model_name="llama-3.2-90b-text-preview", temperature=0)# chat_llm = models.get_sambanova_chat(model_name="Meta-Llama-3.1-70B-Instruct-8k", temperature=0)+ chat_llm = settings.get_chat_model() # chat model from user settings# utility model used for helper functions (cheaper, faster)- utility_llm = chat_llm+ # utility_llm = chat_llm+ utility_llm = settings.get_utility_model() # utility model from user settings# embedding model used for memory- embedding_llm = models.get_openai_embedding(model_name="text-embedding-3-small")+ # embedding_llm = models.get_openai_embedding(model_name="text-embedding-3-small")# embedding_llm = models.get_ollama_embedding(model_name="nomic-embed-text")# embedding_llm = models.get_huggingface_embedding(model_name="sentence-transformers/all-MiniLM-L6-v2")# embedding_llm = models.get_lmstudio_embedding(model_name="nomic-ai/nomic-embed-text-v1.5-GGUF")-+ embedding_llm = settings.get_embedding_model() # embedding model from user settings+# agent configurationconfig = AgentConfig(chat_model = chat_llm,utility_model = utility_llm,embeddings_model = embedding_llm,- # prompts_subdir = "default",+ prompts_subdir = "dianoia-xl",# memory_subdir = "",knowledge_subdirs = ["default","custom"],auto_memory_count = 0,diff --git a/models.py b/models.pyindex fa7c8d032..8f773f94e 100644--- a/models.py+++ b/models.py@@ -1,5 +1,13 @@+from enum import Enumimport os-from langchain_openai import ChatOpenAI, OpenAI, OpenAIEmbeddings, AzureChatOpenAI, AzureOpenAIEmbeddings, AzureOpenAI+from langchain_openai import (+ ChatOpenAI,+ OpenAI,+ OpenAIEmbeddings,+ AzureChatOpenAI,+ AzureOpenAIEmbeddings,+ AzureOpenAI,+)from langchain_community.llms.ollama import Ollamafrom langchain_ollama import ChatOllamafrom langchain_community.embeddings import OllamaEmbeddings@@ -17,74 +25,226 @@ load_dotenv()# ConfigurationDEFAULT_TEMPERATURE = 0.0++class ModelType(Enum):+ CHAT = "Chat"+ EMBEDDING = "Embedding"+++class ModelProvider(Enum):+ ANTHROPIC = "Anthropic"+ HUGGINGFACE = "HuggingFace"+ GOOGLE = "Google"+ GROQ = "Groq"+ LMSTUDIO = "LM Studio"+ MISTRALAI = "Mistral AI"+ OLLAMA = "Ollama"+ OPENAI = "OpenAI"+ OPENAI_AZURE = "OpenAI Azure"+ OPENROUTER = "OpenRouter"+ SAMBANOVA = "Sambanova"++# Utility function to get API keys from environment variablesdef get_api_key(service):- return os.getenv(f"API_KEY_{service.upper()}") or os.getenv(f"{service.upper()}_API_KEY")+ return os.getenv(f"API_KEY_{service.upper()}") or os.getenv(+ f"{service.upper()}_API_KEY"+ )+++def get_model(type: ModelType, provider: ModelProvider, name: str, **kwargs):+ fnc_name = f"get_{provider.name.lower()}_{type.name.lower()}" # function name of model getter+ model = globals()[fnc_name](name, **kwargs) # call function by name+ return model# Ollama models-def get_ollama_chat(model_name:str, temperature=DEFAULT_TEMPERATURE, base_url=os.getenv("OLLAMA_BASE_URL") or "http://127.0.0.1:11434", num_ctx=8192):- return ChatOllama(model=model_name,temperature=temperature, base_url=base_url, num_ctx=num_ctx)+def get_ollama_chat(+ model_name: str,+ temperature=DEFAULT_TEMPERATURE,+ base_url=os.getenv("OLLAMA_BASE_URL") or "http://127.0.0.1:11434",+ num_ctx=8192,+ **kwargs,+):+ return ChatOllama(+ model=model_name,+ temperature=temperature,+ base_url=base_url,+ num_ctx=num_ctx,+ **kwargs,+ )+++def get_ollama_embedding(+ model_name: str,+ temperature=DEFAULT_TEMPERATURE,+ base_url=os.getenv("OLLAMA_BASE_URL") or "http://127.0.0.1:11434",+ **kwargs,+):+ return OllamaEmbeddings(+ model=model_name, temperature=temperature, base_url=base_url, **kwargs+ )-def get_ollama_embedding(model_name:str, temperature=DEFAULT_TEMPERATURE, base_url=os.getenv("OLLAMA_BASE_URL") or "http://127.0.0.1:11434"):-- return OllamaEmbeddings(model=model_name,temperature=temperature, base_url=base_url)# HuggingFace models-def get_huggingface_embedding(model_name:str):- return HuggingFaceEmbeddings(model_name=model_name)++def get_huggingface_embedding(model_name: str, **kwargs):+ return HuggingFaceEmbeddings(model_name=model_name, **kwargs)+# LM Studio and other OpenAI compatible interfaces-def get_lmstudio_chat(model_name:str, temperature=DEFAULT_TEMPERATURE, base_url=os.getenv("LM_STUDIO_BASE_URL") or "http://127.0.0.1:1234/v1"):- return ChatOpenAI(model_name=model_name, base_url=base_url, temperature=temperature, api_key="none") # type: ignore+def get_lmstudio_chat(+ model_name: str,+ temperature=DEFAULT_TEMPERATURE,+ base_url=os.getenv("LM_STUDIO_BASE_URL") or "http://127.0.0.1:1234/v1",+ **kwargs,+):+ return ChatOpenAI(model_name=model_name, base_url=base_url, temperature=temperature, api_key="none", **kwargs) # type: ignore+++def get_lmstudio_embedding(+ model_name: str,+ base_url=os.getenv("LM_STUDIO_BASE_URL") or "http://127.0.0.1:1234/v1",+ **kwargs,+):+ return OpenAIEmbeddings(model=model_name, api_key="none", base_url=base_url, check_embedding_ctx_length=False, **kwargs) # type: ignore-def get_lmstudio_embedding(model_name:str, base_url=os.getenv("LM_STUDIO_BASE_URL") or "http://127.0.0.1:1234/v1"):- return OpenAIEmbeddings(model=model_name, api_key="none", base_url=base_url, check_embedding_ctx_length=False) # type: ignore# Anthropic models-def get_anthropic_chat(model_name:str, api_key=get_api_key("anthropic"), temperature=DEFAULT_TEMPERATURE):- return ChatAnthropic(model_name=model_name, temperature=temperature, api_key=api_key) # type: ignore+def get_anthropic_chat(+ model_name: str,+ api_key=get_api_key("anthropic"),+ temperature=DEFAULT_TEMPERATURE,+ **kwargs,+):+ return ChatAnthropic(model_name=model_name, temperature=temperature, api_key=api_key, **kwargs) # type: ignore+# OpenAI models-def get_openai_chat(model_name:str, api_key=get_api_key("openai"), temperature=DEFAULT_TEMPERATURE):- return ChatOpenAI(model_name=model_name, temperature=temperature, api_key=api_key) # type: ignore+def get_openai_chat(+ model_name: str,+ api_key=get_api_key("openai"),+ temperature=DEFAULT_TEMPERATURE,+ **kwargs,+):+ return ChatOpenAI(model_name=model_name, temperature=temperature, api_key=api_key, **kwargs) # type: ignore+-def get_openai_instruct(model_name:str, api_key=get_api_key("openai"), temperature=DEFAULT_TEMPERATURE):- return OpenAI(model=model_name, temperature=temperature, api_key=api_key) # type: ignore+def get_openai_instruct(+ model_name: str,+ api_key=get_api_key("openai"),+ temperature=DEFAULT_TEMPERATURE,+ **kwargs,+):+ return OpenAI(model=model_name, temperature=temperature, api_key=api_key, **kwargs) # type: ignore-def get_openai_embedding(model_name:str, api_key=get_api_key("openai")):- return OpenAIEmbeddings(model=model_name, api_key=api_key) # type: ignore-def get_azure_openai_chat(deployment_name:str, api_key=get_api_key("openai_azure"), temperature=DEFAULT_TEMPERATURE, azure_endpoint=os.getenv("OPENAI_AZURE_ENDPOINT")):- return AzureChatOpenAI(deployment_name=deployment_name, temperature=temperature, api_key=api_key, azure_endpoint=azure_endpoint) # type: ignore+def get_openai_embedding(model_name: str, api_key=get_api_key("openai"), **kwargs):+ return OpenAIEmbeddings(model=model_name, api_key=api_key, **kwargs) # type: ignore-def get_azure_openai_instruct(deployment_name:str, api_key=get_api_key("openai_azure"), temperature=DEFAULT_TEMPERATURE, azure_endpoint=os.getenv("OPENAI_AZURE_ENDPOINT")):- return AzureOpenAI(deployment_name=deployment_name, temperature=temperature, api_key=api_key, azure_endpoint=azure_endpoint) # type: ignore-def get_azure_openai_embedding(deployment_name:str, api_key=get_api_key("openai_azure"), azure_endpoint=os.getenv("OPENAI_AZURE_ENDPOINT")):- return AzureOpenAIEmbeddings(deployment_name=deployment_name, api_key=api_key, azure_endpoint=azure_endpoint) # type: ignore+def get_azure_openai_chat(+ deployment_name: str,+ api_key=get_api_key("openai_azure"),+ temperature=DEFAULT_TEMPERATURE,+ azure_endpoint=os.getenv("OPENAI_AZURE_ENDPOINT"),+ **kwargs,+):+ return AzureChatOpenAI(deployment_name=deployment_name, temperature=temperature, api_key=api_key, azure_endpoint=azure_endpoint, **kwargs) # type: ignore+++def get_azure_openai_instruct(+ deployment_name: str,+ api_key=get_api_key("openai_azure"),+ temperature=DEFAULT_TEMPERATURE,+ azure_endpoint=os.getenv("OPENAI_AZURE_ENDPOINT"),+ **kwargs,+):+ return AzureOpenAI(deployment_name=deployment_name, temperature=temperature, api_key=api_key, azure_endpoint=azure_endpoint, **kwargs) # type: ignore+++def get_azure_openai_embedding(+ deployment_name: str,+ api_key=get_api_key("openai_azure"),+ azure_endpoint=os.getenv("OPENAI_AZURE_ENDPOINT"),+ **kwargs,+):+ return AzureOpenAIEmbeddings(deployment_name=deployment_name, api_key=api_key, azure_endpoint=azure_endpoint, **kwargs) # type: ignore+# Google models-def get_google_chat(model_name:str, api_key=get_api_key("google"), temperature=DEFAULT_TEMPERATURE):- return GoogleGenerativeAI(model=model_name, temperature=temperature, google_api_key=api_key, safety_settings={HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_NONE }) # type: ignore+def get_google_chat(+ model_name: str,+ api_key=get_api_key("google"),+ temperature=DEFAULT_TEMPERATURE,+ **kwargs,+):+ return GoogleGenerativeAI(model=model_name, temperature=temperature, google_api_key=api_key, safety_settings={HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_NONE}, **kwargs) # type: ignore+# Mistral models-def get_mistral_chat(model_name:str, api_key=get_api_key("mistral"), temperature=DEFAULT_TEMPERATURE):- return ChatMistralAI(model=model_name, temperature=temperature, api_key=api_key) # type: ignore+def get_mistral_chat(+ model_name: str,+ api_key=get_api_key("mistral"),+ temperature=DEFAULT_TEMPERATURE,+ **kwargs,+):+ return ChatMistralAI(model=model_name, temperature=temperature, api_key=api_key, **kwargs) # type: ignore+# Groq models-def get_groq_chat(model_name:str, api_key=get_api_key("groq"), temperature=DEFAULT_TEMPERATURE):- return ChatGroq(model_name=model_name, temperature=temperature, api_key=api_key) # type: ignore-+def get_groq_chat(+ model_name: str,+ api_key=get_api_key("groq"),+ temperature=DEFAULT_TEMPERATURE,+ **kwargs,+):+ return ChatGroq(model_name=model_name, temperature=temperature, api_key=api_key, **kwargs) # type: ignore++# OpenRouter models-def get_openrouter_chat(model_name: str, api_key=get_api_key("openrouter"), temperature=DEFAULT_TEMPERATURE, base_url=os.getenv("OPEN_ROUTER_BASE_URL") or "https://openrouter.ai/api/v1"):- return ChatOpenAI(api_key=api_key, model=model_name, temperature=temperature, base_url=base_url) # type: ignore--def get_openrouter_embedding(model_name: str, api_key=get_api_key("openrouter"), base_url=os.getenv("OPEN_ROUTER_BASE_URL") or "https://openrouter.ai/api/v1"):- return OpenAIEmbeddings(model=model_name, api_key=api_key, base_url=base_url) # type: ignore+def get_openrouter_chat(+ model_name: str,+ api_key=get_api_key("openrouter"),+ temperature=DEFAULT_TEMPERATURE,+ base_url=os.getenv("OPEN_ROUTER_BASE_URL") or "https://openrouter.ai/api/v1",+ **kwargs,+):+ return ChatOpenAI(api_key=api_key, model=model_name, temperature=temperature, base_url=base_url, **kwargs) # type: ignore+++def get_openrouter_embedding(+ model_name: str,+ api_key=get_api_key("openrouter"),+ base_url=os.getenv("OPEN_ROUTER_BASE_URL") or "https://openrouter.ai/api/v1",+ **kwargs,+):+ return OpenAIEmbeddings(model=model_name, api_key=api_key, base_url=base_url, **kwargs) # type: ignore+# Sambanova models-def get_sambanova_chat(model_name: str, api_key=get_api_key("sambanova"), temperature=DEFAULT_TEMPERATURE, base_url=os.getenv("SAMBANOVA_BASE_URL") or "https://fast-api.snova.ai/v1", max_tokens=1024):- return ChatOpenAI(api_key=api_key, model=model_name, temperature=temperature, base_url=base_url, max_tokens=max_tokens) # type: ignore-+def get_sambanova_chat(+ model_name: str,+ api_key=get_api_key("sambanova"),+ temperature=DEFAULT_TEMPERATURE,+ base_url=os.getenv("SAMBANOVA_BASE_URL") or "https://fast-api.snova.ai/v1",+ max_tokens=1024,+ **kwargs,+):+ return ChatOpenAI(api_key=api_key, model=model_name, temperature=temperature, base_url=base_url, max_tokens=max_tokens, **kwargs) # type: ignore+++# Other OpenAI compatible models+def get_other_chat(+ model_name: str,+ api_key=None,+ temperature=DEFAULT_TEMPERATURE,+ base_url=None,+ **kwargs,+):+ return ChatOpenAI(api_key=api_key, model=model_name, temperature=temperature, base_url=base_url, **kwargs) # type: ignore+++def get_other_embedding(model_name: str, api_key=None, base_url=None, **kwargs):+ return OpenAIEmbeddings(model=model_name, api_key=api_key, base_url=base_url, **kwargs) # type: ignorediff --git a/python/helpers/settings.py b/python/helpers/settings.pynew file mode 100644index 000000000..dc8dc80eb--- /dev/null+++ b/python/helpers/settings.py@@ -0,0 +1,273 @@+import json+import os+import re+from typing import Any, Optional, TypedDict+from . import files+from models import get_model, ModelProvider, ModelType+from langchain_core.language_models.chat_models import BaseChatModel+from langchain_core.embeddings import Embeddings++class Settings(TypedDict):+ chat_model_provider: str+ chat_model_name: str+ chat_model_temperature: float+ chat_model_kwargs: dict[str, str]++ util_model_provider: str+ util_model_name: str+ util_model_temperature: float+ util_model_kwargs: dict[str, str]++ embed_model_provider: str+ embed_model_name: str+ embed_model_temperature: float+ embed_model_kwargs: dict[str, str]+++class PartialSettings(Settings, total=False):+ pass+++SETTINGS_FILE = files.get_abs_path("tmp/settings.json")+_settings: Settings | None = None+++def convert_out(settings: Settings) -> dict[str, Any]:++ # main model section+ chat_model_fields = []+ chat_model_fields.append(+ {+ "id": "chat_model_provider",+ "title": "Chat model provider",+ "description": "Select provider for main chat model used by Agent Zero",+ "type": "select",+ "value": settings["chat_model_provider"],+ "options": [{"value": p.name, "label": p.value} for p in ModelProvider],+ }+ )+ chat_model_fields.append(+ {+ "id": "chat_model_name",+ "title": "Chat model name",+ "description": "Exact name of model from selected provider",+ "type": "input",+ "value": settings["chat_model_name"],+ }+ )++ chat_model_fields.append(+ {+ "id": "chat_model_temperature",+ "title": "Chat model temperature",+ "description": "Determines the randomness of generated responses. 0 is deterministic, 1 is random",+ "type": "range",+ "min": 0,+ "max": 1,+ "step": 0.01,+ "value": settings["chat_model_temperature"],+ }+ )++ chat_model_fields.append(+ {+ "id": "chat_model_kwargs",+ "title": "Chat model additional parameters",+ "description": "Any other parameters supported by the model. Format is KEY=VALUE on individual lines, just like .env file.",+ "type": "textarea",+ "value": _dict_to_env(settings["chat_model_kwargs"]),+ }+ )++ chat_model_seciton = {+ "title": "Chat Model",+ "description": "Selection and settings for main chat model used by Agent Zero",+ "fields": chat_model_fields,+ }++ # main model section+ util_model_fields = []+ util_model_fields.append(+ {+ "id": "util_model_provider",+ "title": "Utility model provider",+ "description": "Select provider for utility model used by the framework",+ "type": "select",+ "value": settings["util_model_provider"],+ "options": [{"value": p.name, "label": p.value} for p in ModelProvider],+ }+ )+ util_model_fields.append(+ {+ "id": "util_model_name",+ "title": "Utility model name",+ "description": "Exact name of model from selected provider",+ "type": "input",+ "value": settings["util_model_name"],+ }+ )++ util_model_fields.append(+ {+ "id": "util_model_temperature",+ "title": "Utility model temperature",+ "description": "Determines the randomness of generated responses. 0 is deterministic, 1 is random",+ "type": "range",+ "min": 0,+ "max": 1,+ "step": 0.01,+ "value": settings["util_model_temperature"],+ }+ )++ util_model_fields.append(+ {+ "id": "util_model_kwargs",+ "title": "Utility model additional parameters",+ "description": "Any other parameters supported by the model. Format is KEY=VALUE on individual lines, just like .env file.",+ "type": "textarea",+ "value": _dict_to_env(settings["util_model_kwargs"]),+ }+ )++ util_model_seciton = {+ "title": "Utility model",+ "description": "Smaller, cheaper, faster model for handling utility tasks like organizing memory, preparing prompts, summarizing.",+ "fields": util_model_fields,+ }++ result = {"sections": [chat_model_seciton, util_model_seciton]}+ return result++def convert_in(settings: dict[str, Any]) -> Settings:+ current = get_settings()+ for section in settings["sections"]:+ for field in section["fields"]:+ if field["id"].endswith("_kwargs"):+ current[field["id"]] = _env_to_dict(field["value"]) #parse KWARGS from env format+ else:+ current[field["id"]] = field["value"]+ return current+++def get_settings() -> Settings:+ global _settings+ if not _settings:+ _settings = _read_settings_file()+ if not _settings:+ _settings = _get_default_settings()+ return _settings.copy()+++def set_settings(settings: Settings):+ global _settings+ _settings = normalize_settings(settings)+ _apply_settings()+ _write_settings_file(_settings)+++def normalize_settings(settings: Settings) -> Settings:+ copy = settings.copy()+ default = _get_default_settings()+ for key, value in default.items():+ if key not in copy:+ copy[key] = value+ return copy+++def get_chat_model() -> BaseChatModel:+ settings = get_settings()+ return get_model(+ type=ModelType.CHAT,+ provider=ModelProvider[settings["chat_model_provider"]],+ name=settings["chat_model_name"],+ temperature=settings["chat_model_temperature"],+ **settings["chat_model_kwargs"],+ )+++def get_utility_model() -> BaseChatModel:+ settings = get_settings()+ return get_model(+ type=ModelType.CHAT,+ provider=ModelProvider[settings["util_model_provider"]],+ name=settings["util_model_name"],+ temperature=settings["util_model_temperature"],+ **settings["util_model_kwargs"],+ )+++def get_embedding_model() -> Embeddings:+ settings = get_settings()+ return get_model(+ type=ModelType.EMBEDDING,+ provider=ModelProvider[settings["embed_model_provider"]],+ name=settings["embed_model_name"],+ temperature=settings["embed_model_temperature"],+ **settings["embed_model_kwargs"],+ )+++def _read_settings_file() -> Settings | None:+ if os.path.exists(SETTINGS_FILE):+ content = files.read_file(SETTINGS_FILE)+ parsed = json.loads(content)+ return normalize_settings(parsed)+++def _write_settings_file(settings: Settings):+ content = json.dumps(settings, indent=4)+ files.write_file(SETTINGS_FILE, content)+++def _get_default_settings() -> Settings:+ return Settings(+ chat_model_provider=ModelProvider.OPENAI.name,+ chat_model_name="gpt-4o-mini",+ chat_model_temperature=0,+ chat_model_kwargs={},+ util_model_provider=ModelProvider.OPENAI.name,+ util_model_name="gpt-4o-mini",+ util_model_temperature=0,+ util_model_kwargs={},+ embed_model_provider=ModelProvider.OPENAI.name,+ embed_model_name="text-embedding-3-small",+ embed_model_temperature=0,+ embed_model_kwargs={},+ )++def _apply_settings():+ global _settings+ if _settings:+ from agent import AgentContext+ from initialize import initialize++ for ctx in AgentContext._contexts.values():+ ctx.config = initialize() # reinitialize context config with new settings+ #apply config to agents+ agent = ctx.agent0+ while agent:+ agent.config = ctx.config+ agent = agent.get_data("subordinate")++def _env_to_dict(data:str):+ env_dict = {}+ line_pattern = re.compile(r'\s*([^#][^=]*)\s*=\s*(.*)')+ for line in data.splitlines():+ match = line_pattern.match(line)+ if match:+ key, value = match.groups()+ # Remove optional surrounding quotes (single or double)+ value = value.strip().strip('"').strip("'")+ env_dict[key.strip()] = value+ return env_dict++def _dict_to_env(data_dict):+ lines = []+ for key, value in data_dict.items():+ if '\n' in value:+ value = f"'{value}'"+ elif ' ' in value or value == '' or any(c in value for c in '"\''):+ value = f'"{value}"'+ lines.append(f"{key}={value}")+ return "\n".join(lines)\ No newline at end of filediff --git a/python/helpers/whisper_oai.py b/python/helpers/whisper_oai.pynew file mode 100644index 000000000..3c79f11c0--- /dev/null+++ b/python/helpers/whisper_oai.py@@ -0,0 +1,13 @@+# Import the necessary libraries+import whisper+import files++# Load the base model from Whisper+model = whisper.load_model("base")++# Add your Audio File+audio = files.get_abs_path("audio.ogg")++# Transcribe the audio file+result = model.transcribe(audio, fp16=False)+print(result["text"])\ No newline at end of filediff --git a/run_ui.py b/run_ui.pyindex a03eab9c5..713084068 100644--- a/run_ui.py+++ b/run_ui.py@@ -12,7 +12,7 @@ from python.helpers import filesfrom python.helpers.files import get_abs_pathfrom python.helpers.print_style import PrintStylefrom python.helpers.dotenv import load_dotenv-from python.helpers import persist_chat+from python.helpers import persist_chat, settings# initialize the internal Flask server@@ -348,6 +348,51 @@ async def poll():# return jsonify(response)+# get current settings[email protected]("/getSettings", methods=["POST"])+async def get_settings():+ try:++ # data sent to the server+ input = request.get_json()++ set = settings.convert_out(settings.get_settings())++ response = {"ok": True, "settings": set}++ except Exception as e:+ response = {+ "ok": False,+ "message": str(e),+ }+ PrintStyle.error(str(e))++ # respond with json+ return jsonify(response)++# set current settings[email protected]("/setSettings", methods=["POST"])+async def set_settings():+ try:++ # data sent to the server+ input = request.get_json()++ set = settings.convert_in(input)+ set = settings.set_settings(set)++ response = {"ok": True, "settings": set}++ except Exception as e:+ response = {+ "ok": False,+ "message": str(e),+ }+ PrintStyle.error(str(e))++ # respond with json+ return jsonify(response)+def run():print("Initializing framework...")diff --git a/webui/index.html b/webui/index.htmlindex a350afb57..3e0727d52 100644--- a/webui/index.html+++ b/webui/index.html@@ -7,6 +7,7 @@<title>Agent Zero</title><link rel="stylesheet" href="index.css"><link rel="stylesheet" href="toast.css">+ <link rel="stylesheet" href="settings.css"><script>window.safeCall = function (name, ...args) {@@ -15,6 +16,7 @@</script><script defer src="https://cdn.jsdelivr.net/npm/[email protected]/dist/cdn.min.js"></script><script type="module" src="index.js"></script>+ <script type="text/javascript" src="settings.js"></script></head>@@ -47,6 +49,8 @@<button class="config-button" id="newChat" @click="newChat()">New Chat</button><button class="config-button" id="loadChats" @click="loadChats()">Load Chat</button><button class="config-button" id="loadChat" @click="saveChat()">Save Chat</button>+ <button class="config-button" id="settings"+ @click="settingsModalProxy.openModal()">Settings</button></div><div class="config-section" id="chats-section" x-data="{ contexts: [], selected: '' }"@@ -153,6 +157,116 @@</div></div></div>++ <div id="settingsModal" x-data="settingsModalProxy">+ <h1 x-text="settings.title"></h1>+ <template x-teleport="body">+ <div x-show="isOpen" class="modal-overlay" @click.self="handleCancel()"+ x-transition:enter="transition ease-out duration-300" x-transition:enter-start="opacity-0"+ x-transition:enter-end="opacity-100" x-transition:leave="transition ease-in duration-200"+ x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0">+ <div class="modal-container">+ <div class="modal-header">+ <h2 x-text="settings.title"></h2>+ <!-- Dynamically generated navigation -->+ <nav>+ <ul>+ <!-- Loop over sections to generate links dynamically -->+ <template x-for="(section, index) in settings.sections" :key="index">+ <li>+ <a :href="'#section' + (index + 1)" x-text="section.title"></a>+ </li>+ </template>+ </ul>+ </nav>+ </div>++ <div class="modal-content">+ <template x-for="(section, sectionIndex) in settings.sections" :key="sectionIndex">+ <div :id="'section' + (sectionIndex + 1)" class="section">+ <div class="section-title" x-text="section.title"></div>+ <div class="section-description" x-text="section.description"></div>++ <template x-for="(field, fieldIndex) in section.fields" :key="fieldIndex">+ <div :class="{'field': true, 'field-full': field.type === 'textarea'}">+ <div class="field-label">+ <div class="field-title" x-text="field.title"></div>+ <div class="field-description" x-text="field.description"></div>+ </div>++ <div class="field-control">+ <!-- Input field -->+ <template x-if="field.type === 'input'">+ <input type="text" :class="field.classes" :value="field.value"+ :readonly="field.readonly === true"+ @input="field.value = $event.target.value">+ </template>++ <!-- Textarea field -->+ <template x-if="field.type === 'textarea'">+ <textarea :class="field.classes" :value="field.value"+ :readonly="field.readonly === true"+ @input="field.value = $event.target.value"></textarea>+ </template>++ <!-- Switch field -->+ <template x-if="field.type === 'switch'">+ <label class="toggle">+ <input type="checkbox" :checked="field.value"+ :disabled="field.readonly === true"+ @change="field.value = $event.target.checked">+ <span class="toggler"></span>+ </label>+ </template>++ <!-- Range field -->+ <template x-if="field.type === 'range'">+ <div class="field-control">+ <input type="range" :min="field.min" :max="field.max"+ :step="field.step" :value="field.value"+ :disabled="field.readonly === true"+ @input="field.value = $event.target.value"+ :class="field.classes">+ <span class="range-value" x-text="field.value"></span>+ </div>+ </template>++ <!-- Button field -->+ <template x-if="field.type === 'button'">+ <button class="btn btn-field" :class="field.classes"+ :disabled="field.readonly === true"+ @click="handleFieldButton(field)" x-text="field.value"></button>+ </template>++ <!-- Select field -->+ <template x-if="field.type === 'select'">+ <select :class="field.classes" x-model="field.value"+ :disabled="field.readonly === true">+ <template x-for="option in field.options" :key="option.value">+ <option :value="option.value" x-text="option.label"+ :selected="option.value === field.value"></option>+ </template>+ </select>+ </template>+ </div>+ </div>+ </template>+ </div>+ </template>+ </div>++ <div class="modal-footer">+ <template x-for="button in settings.buttons" :key="button.id">+ <button :class="button.classes" @click="handleButton(button.id)"+ x-text="button.title"></button>+ </template>+ </div>+ </div>+ </div>+ </template>+ </div>++</body></html>\ No newline at end of filediff --git a/webui/index.js b/webui/index.jsindex c75b28f55..19ec79277 100644--- a/webui/index.js+++ b/webui/index.js@@ -153,7 +153,7 @@ function adjustTextareaHeight() {chatInput.style.height = (chatInput.scrollHeight) + 'px';}-async function sendJsonData(url, data) {+window.sendJsonData = async function (url, data) {const response = await fetch(url, {method: 'POST',headers: {diff --git a/webui/settings.css b/webui/settings.cssnew file mode 100644index 000000000..edfa23ce7--- /dev/null+++ b/webui/settings.css@@ -0,0 +1,231 @@+.modal-overlay {+ position: fixed;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ background: rgba(0, 0, 0, 0.5);+ display: flex;+ align-items: center;+ justify-content: center;+}++.modal-container {+ background: var(--color-panel);+ color: var(--color-primary);+ border-radius: 0.5rem;+ width: 90%;+ max-width: 800px;+ max-height: 90vh;+ display: flex;+ flex-direction: column;+}++.modal-header {+ padding: 1.5rem 2rem;+ border-bottom: 1px solid #eee;+}++.modal-content {+ padding: 2rem;+ overflow-y: auto;+ flex-grow: 1;+}++.modal-footer {+ padding: 1.5rem 2rem;+ border-top: 1px solid #eee;+ display: flex;+ justify-content: flex-end;+ gap: 1rem;+ background: var(--color-background);+}++.section {+ margin-bottom: 2rem;+ padding: 1rem;+ border: 1px solid #eee;+ border-radius: 0.5rem;+}++.section-title {+ font-size: 1.25rem;+ font-weight: bold;+ margin-bottom: 0.5rem;+}++.section-description {+ color: #666;+ margin-bottom: 1rem;+}++.field {+ margin-bottom: 1.5rem;+ display: grid;+ grid-template-columns: 200px 1fr;+ gap: 1rem;+ align-items: center;+}++.field.field-full {+ grid-template-columns: 1fr;+}++.field-label {+ display: flex;+ flex-direction: column;+}++.field-title {+ font-weight: bold;+}++.field-description {+ color: #666;+ font-size: 0.875rem;+ margin-top: 0.25rem;+}++.field-control {+ display: flex;+ align-items: center;+ gap: 0.5rem;+}++input[type="text"] {+ width: 100%;+ padding: 0.5rem;+ border: 1px solid #ddd;+ border-radius: 0.25rem;+}++textarea {+ width: 100%;+ min-height: 100px;+ padding: 0.5rem;+ border: 1px solid #ddd;+ border-radius: 0.25rem;+ margin-top: 1rem;+ font-family: inherit;+ resize: vertical;+}++.toggle {+ position: relative;+ display: inline-block;+ width: 60px;+ height: 34px;+ margin: 0;+}++.toggle input {+ opacity: 0;+ width: 0;+ height: 0;+}++.toggler {+ position: absolute;+ cursor: pointer;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ background-color: #ccc;+ transition: .4s;+ border-radius: 34px;+}++.toggler:before {+ position: absolute;+ content: "";+ height: 26px;+ width: 26px;+ left: 4px;+ bottom: 4px;+ background-color: white;+ transition: .4s;+ border-radius: 50%;+}++input:checked+.toggler {+ background-color: #2196F3;+}++input:checked+.toggler:before {+ transform: translateX(26px);+}++input[type="range"] {+ width: 100%;+}++.range-value {+ min-width: 3em;+ text-align: right;+}++.btn {+ padding: 0.5rem 1rem;+ border-radius: 0.25rem;+ cursor: pointer;+ border: none;+ font-size: 0.875rem;+}++.btn-ok {+ background: #2196F3;+ color: white;+}++.btn-cancel {+ background: #ddd;+ color: #333;+}++.btn-field {+ background: #2196F3;+ color: white;+ width: fit-content;+}++.btn-field:disabled {+ background: #ccc;+ cursor: not-allowed;+}++select {+ width: 100%;+ padding: 0.5rem;+ border: 1px solid #ddd;+ border-radius: 0.25rem;+ background-color: white;+ font-size: inherit;+ cursor: pointer;+}++select:disabled {+ background-color: #f5f5f5;+ cursor: not-allowed;+}++/* Style for navigation links */+nav ul {+ list-style-type: none;+ padding: 0;+}++nav ul li {+ display: inline;+ margin-right: 1rem;+}++nav ul li a {+ text-decoration: none;+ color: #2196F3;+ font-weight: bold;+}++nav ul li a:hover {+ text-decoration: underline;+}\ No newline at end of filediff --git a/webui/settings.js b/webui/settings.jsnew file mode 100644index 000000000..94493c163--- /dev/null+++ b/webui/settings.js@@ -0,0 +1,87 @@+const settingsModalProxy = {+ isOpen: false,+ settings: {},+ resolvePromise: null,+++ async openModal() {++ const modalEl = document.getElementById('settingsModal');+ const modalAD = Alpine.$data(modalEl);++ //get settings from backend+ const set = await sendJsonData("/getSettings", null);++ const settings = {+ "title": "Settings page",+ "buttons": [+ {+ "id": "save",+ "title": "Save",+ "classes": "btn btn-ok"+ },+ {+ "id": "cancel",+ "title": "Cancel",+ "type": "secondary",+ "classes": "btn btn-cancel"+ }+ ],+ "sections": set.settings.sections+ }++ modalAD.isOpen = true; // Update directly+ modalAD.settings = settings; // Update directly++ return new Promise(resolve => {+ this.resolvePromise = resolve;+ });+ },++ async handleButton(buttonId) {+ if (buttonId === 'save') {++ const modalEl = document.getElementById('settingsModal');+ const modalAD = Alpine.$data(modalEl);+ resp = await window.sendJsonData("/setSettings", modalAD.settings);++ this.resolvePromise({+ status: 'saved',+ data: resp.settings+ });+ } else if (buttonId === 'cancel') {+ this.handleCancel();+ }+ this.isOpen = false;+ },++ async handleCancel() {+ this.resolvePromise({+ status: 'cancelled',+ data: null+ });+ this.isOpen = false;+ },++ handleFieldButton(field) {+ console.log(`Button clicked: ${field.action}`);+ }+};+++// function initSettingsModal() {++// window.openSettings = function () {+// proxy.openModal().then(result => {+// console.log(result); // This will log the result when the modal is closed+// });+// }++// return proxy+// }+++// document.addEventListener('alpine:init', () => {+// Alpine.store('settingsModal', initSettingsModal());+// });+