Agent Zero AI framework
setting refactor - backend conversions
frdelef82fc8bb9b6
diff --git a/models.py b/models.pyindex 55c58a369..4676352c2 100644--- a/models.py+++ b/models.py@@ -22,7 +22,7 @@ from litellm.types.utils import ModelResponsefrom python.helpers import dotenvfrom python.helpers import settings, dirty_jsonfrom python.helpers.dotenv import load_dotenv-from python.helpers.providers import get_provider_config+from python.helpers.providers import ModelType as ProviderModelType, get_provider_configfrom python.helpers.rate_limiter import RateLimiterfrom python.helpers.tokens import approximate_tokensfrom python.helpers import dirty_json, browser_use_monkeypatch@@ -844,7 +844,7 @@ def _adjust_call_args(provider_name: str, model_name: str, kwargs: dict):def _merge_provider_defaults(- provider_type: str, original_provider: str, kwargs: dict+ provider_type: ProviderModelType, original_provider: str, kwargs: dict) -> tuple[str, dict]:# Normalize .env-style numeric strings (e.g., "timeout=30") into ints/floats for LiteLLMdef _normalize_values(values: dict) -> dict:diff --git a/python/api/settings_get.py b/python/api/settings_get.pyindex 5b5bf95c7..5285b4fd4 100644--- a/python/api/settings_get.py+++ b/python/api/settings_get.py@@ -4,8 +4,9 @@ from python.helpers import settingsclass GetSettings(ApiHandler):async def process(self, input: dict, request: Request) -> dict | Response:- set = settings.convert_out(settings.get_settings())- return {"settings": set}+ backend = settings.get_settings()+ out = settings.convert_out(backend)+ return dict(out)@classmethoddef get_methods(cls) -> list[str]:diff --git a/python/api/settings_set.py b/python/api/settings_set.pyindex c24a3cc66..3213eada7 100644--- a/python/api/settings_set.py+++ b/python/api/settings_set.py@@ -7,6 +7,8 @@ from typing import Anyclass SetSettings(ApiHandler):async def process(self, input: dict[Any, Any], request: Request) -> dict[Any, Any] | Response:- set = settings.convert_in(input)- set = settings.set_settings(set)- return {"settings": set}+ frontend = input.get("settings", input)+ backend = settings.convert_in(settings.Settings(**frontend))+ backend = settings.set_settings(backend)+ out = settings.convert_out(backend)+ return dict(out)diff --git a/python/helpers/providers.py b/python/helpers/providers.pyindex cd139e88a..f60238bd5 100644--- a/python/helpers/providers.py+++ b/python/helpers/providers.py@@ -1,7 +1,8 @@import yamlfrom python.helpers import files-from typing import List, Dict, Optional, TypedDict+from typing import List, Dict, Optional, TypedDict, Literal+ModelType = Literal["chat", "embedding"]# Type alias for UI option itemsclass FieldOption(TypedDict):@@ -68,16 +69,15 @@ class ProviderManager:opts.append({"value": pid, "label": name})self._options[p_type] = opts- def get_providers(self, provider_type: str) -> List[FieldOption]:+ def get_providers(self, provider_type: ModelType) -> List[FieldOption]:"""Returns a list of providers for a given type (e.g., 'chat', 'embedding')."""return self._options.get(provider_type, []) if self._options else []-- def get_raw_providers(self, provider_type: str) -> List[Dict[str, str]]:+ def get_raw_providers(self, provider_type: ModelType) -> List[Dict[str, str]]:"""Return raw provider dictionaries for advanced use-cases."""return self._raw.get(provider_type, []) if self._raw else []- def get_provider_config(self, provider_type: str, provider_id: str) -> Optional[Dict[str, str]]:+ def get_provider_config(self, provider_type: ModelType, provider_id: str) -> Optional[Dict[str, str]]:"""Return the metadata dict for a single provider id (case-insensitive)."""provider_id_low = provider_id.lower()for p in self.get_raw_providers(provider_type):@@ -86,16 +86,16 @@ class ProviderManager:return None-def get_providers(provider_type: str) -> List[FieldOption]:+def get_providers(provider_type: ModelType) -> List[FieldOption]:"""Convenience function to get providers of a specific type."""return ProviderManager.get_instance().get_providers(provider_type)-def get_raw_providers(provider_type: str) -> List[Dict[str, str]]:+def get_raw_providers(provider_type: ModelType) -> List[Dict[str, str]]:"""Return full metadata for providers of a given type."""return ProviderManager.get_instance().get_raw_providers(provider_type)-def get_provider_config(provider_type: str, provider_id: str) -> Optional[Dict[str, str]]:+def get_provider_config(provider_type: ModelType, provider_id: str) -> Optional[Dict[str, str]]:"""Return metadata for a single provider (None if not found)."""- return ProviderManager.get_instance().get_provider_config(provider_type, provider_id)\ No newline at end of file+ return ProviderManager.get_instance().get_provider_config(provider_type, provider_id)\ No newline at end of filediff --git a/python/helpers/settings.py b/python/helpers/settings.pyindex f09124bd7..be4d6e889 100644--- a/python/helpers/settings.py+++ b/python/helpers/settings.py@@ -10,7 +10,7 @@ import modelsfrom python.helpers import runtime, whisper, defer, gitfrom . import files, dotenvfrom python.helpers.print_style import PrintStyle-from python.helpers.providers import get_providers+from python.helpers.providers import get_providers, FieldOption as ProvidersFOfrom python.helpers.secrets import get_default_secrets_managerfrom python.helpers import dirty_json@@ -156,7 +156,6 @@ class FieldOption(TypedDict):value: strlabel: str-class SettingsField(TypedDict, total=False):id: strtitle: str@@ -188,9 +187,20 @@ class SettingsSection(TypedDict, total=False):fields: list[SettingsField]tab: str # Indicates which tab this section belongs to+class ModelProvider(ProvidersFO):+ pass++class SettingsOutputAdditional(TypedDict):+ chat_providers: list[ModelProvider]+ embedding_providers: list[ModelProvider]+ shell_interfaces: list[FieldOption]+ agent_subdirs: list[FieldOption]+ stt_models: list[FieldOption]+ is_dockerized: boolclass SettingsOutput(TypedDict):- sections: list[SettingsSection]+ settings: Settings+ additional: SettingsOutputAdditionalPASSWORD_PLACEHOLDER = "****PSWD****"@@ -199,8 +209,55 @@ API_KEY_PLACEHOLDER = "************"SETTINGS_FILE = files.get_abs_path("tmp/settings.json")_settings: Settings | None = None-def convert_out(settings: Settings) -> SettingsOutput:+ out = SettingsOutput(+ settings = settings.copy(),+ additional = SettingsOutputAdditional(+ chat_providers=get_providers("chat"),+ embedding_providers=get_providers("embedding"),+ shell_interfaces=[{"value": "local", "label": "Local Python TTY"}, {"value": "ssh", "label": "SSH"}],+ is_dockerized=runtime.is_dockerized(),+ agent_subdirs=[{"value": subdir, "label": subdir}+ for subdir in files.get_subdirectories("agents")+ if subdir != "_example"],+ stt_models=[+ {"value": "tiny", "label": "Tiny (39M, English)"},+ {"value": "base", "label": "Base (74M, English)"},+ {"value": "small", "label": "Small (244M, English)"},+ {"value": "medium", "label": "Medium (769M, English)"},+ {"value": "large", "label": "Large (1.5B, Multilingual)"},+ {"value": "turbo", "label": "Turbo (Multilingual)"},+ ]++ )+ )++ # load auth from dotenv+ out["settings"]["auth_login"] = dotenv.get_dotenv_value(dotenv.KEY_AUTH_LOGIN) or ""+ out["settings"]["auth_password"] = (+ PASSWORD_PLACEHOLDER if dotenv.get_dotenv_value(dotenv.KEY_AUTH_PASSWORD) else ""+ )+ out["settings"]["rfc_password"] = (+ PASSWORD_PLACEHOLDER if dotenv.get_dotenv_value(dotenv.KEY_RFC_PASSWORD) else ""+ )++ #secrets+ secrets_manager = get_default_secrets_manager()+ try:+ out["settings"]["secrets"] = secrets_manager.get_masked_secrets()+ except Exception:+ out["settings"]["secrets"] = ""++ # normalize certain fields+ for key, value in list(out["settings"].items()):+ # convert kwargs dicts to .env format+ if (key.endswith("_kwargs") or key=="browser_http_headers") and isinstance(value, dict):+ out["settings"][key] = _dict_to_env(value)+ return out+++#TODO just for reference, remove+def _convert_out_old(settings: Settings) -> SettingsOutput:default_settings = get_default_settings()# main model section@@ -1347,7 +1404,34 @@ def _get_api_key_field(settings: Settings, provider: str, title: str) -> Setting}-def convert_in(settings: dict) -> Settings:+def 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 fields+ for 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)+ continue++ current[key] = value+ return current++#TODO just for reference, remove+def _convert_in_old(settings: dict) -> Settings:current = get_settings()for section in settings["sections"]:if "fields" in section:@@ -1368,6 +1452,7 @@ def convert_in(settings: dict) -> Settings:current[field["id"]] = field["value"]return current+def get_settings() -> Settings:global _settingsif not _settings:@@ -1385,12 +1470,13 @@ def set_settings(settings: Settings, apply: bool = True):_write_settings_file(_settings)if apply:_apply_settings(previous)+ return _settingsdef set_settings_delta(delta: dict, apply: bool = True):current = get_settings()new = {**current, **delta}- set_settings(new, apply) # type: ignore+ return set_settings(new, apply) # type: ignoredef merge_settings(original: Settings, delta: dict) -> Settings: