Agent Zero AI framework
refactor: Remove ModelProvider enum
linuztx4c45b5cf8c10
diff --git a/initialize.py b/initialize.pyindex 20ce69bbc..f92372202 100644--- a/initialize.py+++ b/initialize.py@@ -1,5 +1,5 @@-import modelsfrom agent import AgentConfig+import modelsfrom python.helpers import runtime, settings, deferfrom python.helpers.print_style import PrintStyle@@ -28,7 +28,7 @@ def initialize_agent():# chat model from user settingschat_llm = models.ModelConfig(type=models.ModelType.CHAT,- provider=models.ModelProvider[current_settings["chat_model_provider"]],+ provider=current_settings["chat_model_provider"],name=current_settings["chat_model_name"],api_base=current_settings["chat_model_api_base"],ctx_length=current_settings["chat_model_ctx_length"],@@ -42,7 +42,7 @@ def initialize_agent():# utility model from user settingsutility_llm = models.ModelConfig(type=models.ModelType.CHAT,- provider=models.ModelProvider[current_settings["util_model_provider"]],+ provider=current_settings["util_model_provider"],name=current_settings["util_model_name"],api_base=current_settings["util_model_api_base"],ctx_length=current_settings["util_model_ctx_length"],@@ -54,7 +54,7 @@ def initialize_agent():# embedding model from user settingsembedding_llm = models.ModelConfig(type=models.ModelType.EMBEDDING,- provider=models.ModelProvider[current_settings["embed_model_provider"]],+ provider=current_settings["embed_model_provider"],name=current_settings["embed_model_name"],api_base=current_settings["embed_model_api_base"],limit_requests=current_settings["embed_model_rl_requests"],@@ -63,7 +63,7 @@ def initialize_agent():# browser model from user settingsbrowser_llm = models.ModelConfig(type=models.ModelType.CHAT,- provider=models.ModelProvider[current_settings["browser_model_provider"]],+ provider=current_settings["browser_model_provider"],name=current_settings["browser_model_name"],api_base=current_settings["browser_model_api_base"],vision=current_settings["browser_model_vision"],@@ -77,7 +77,7 @@ def initialize_agent():browser_model=browser_llm,prompts_subdir=current_settings["agent_prompts_subdir"],memory_subdir=current_settings["agent_memory_subdir"],- knowledge_subdirs=["default", current_settings["agent_knowledge_subdir"]],+ knowledge_subdirs=[current_settings["agent_knowledge_subdir"], "default"],mcp_servers=current_settings["mcp_servers"],code_exec_docker_enabled=False,# code_exec_docker_name = "A0-dev",diff --git a/models.py b/models.pyindex 1182f5251..571f001cb 100644--- a/models.py+++ b/models.py@@ -58,26 +58,10 @@ class ModelType(Enum):EMBEDDING = "Embedding"-class ModelProvider(Enum):- ANTHROPIC = "Anthropic"- DEEPSEEK = "DeepSeek"- GEMINI = "Google"- GROQ = "Groq"- HUGGINGFACE = "HuggingFace"- LM_STUDIO = "LM Studio"- MISTRAL = "Mistral AI"- OLLAMA = "Ollama"- OPENAI = "OpenAI"- AZURE = "OpenAI Azure"- OPENROUTER = "OpenRouter"- SAMBANOVA = "Sambanova"- OTHER = "Other OpenAI compatible"--@dataclassclass ModelConfig:type: ModelType- provider: ModelProvider+ provider: strname: strapi_base: str = ""ctx_length: int = 0@@ -114,9 +98,9 @@ def get_api_key(service: str) -> str:def get_rate_limiter(- provider: ModelProvider, name: str, requests: int, input: int, output: int+ provider: str, name: str, requests: int, input: int, output: int) -> RateLimiter:- key = f"{provider.name}\\{name}"+ key = f"{provider}\\{name}"rate_limiters[key] = limiter = rate_limiters.get(key, RateLimiter(seconds=60))limiter.limits["requests"] = requests or 0limiter.limits["input"] = input or 0@@ -467,8 +451,8 @@ def _adjust_call_args(provider_name: str, model_name: str, kwargs: dict):return provider_name, model_name, kwargs-def get_model(type: ModelType, provider: ModelProvider, name: str, **kwargs: Any):- provider_name = provider.name.lower()+def get_model(type: ModelType, provider: str, name: str, **kwargs: Any):+ provider_name = provider.lower()if type == ModelType.CHAT:return _get_litellm_chat(LiteLLMChatWrapper, name, provider_name, **kwargs)elif type == ModelType.EMBEDDING:@@ -478,17 +462,17 @@ def get_model(type: ModelType, provider: ModelProvider, name: str, **kwargs: Anydef get_chat_model(- provider: ModelProvider, name: str, **kwargs: Any+ provider: str, name: str, **kwargs: Any) -> LiteLLMChatWrapper:- provider_name = provider.name.lower()+ provider_name = provider.lower()model = _get_litellm_chat(LiteLLMChatWrapper, name, provider_name, **kwargs)return modeldef get_browser_model(- provider: ModelProvider, name: str, **kwargs: Any+ provider: str, name: str, **kwargs: Any) -> BrowserCompatibleChatWrapper:- provider_name = provider.name.lower()+ provider_name = provider.lower()model = _get_litellm_chat(BrowserCompatibleChatWrapper, name, provider_name, **kwargs)@@ -496,8 +480,8 @@ def get_browser_model(def get_embedding_model(- provider: ModelProvider, name: str, **kwargs: Any+ provider: str, name: str, **kwargs: Any) -> LiteLLMEmbeddingWrapper | LocalSentenceTransformerWrapper:- provider_name = provider.name.lower()+ provider_name = provider.lower()model = _get_litellm_embedding(name, provider_name, **kwargs)return modeldiff --git a/preload.py b/preload.pyindex 4da2a05dc..6db54f1cb 100644--- a/preload.py+++ b/preload.py@@ -21,11 +21,11 @@ async def preload():# preload embedding modelasync def preload_embedding():- if set["embed_model_provider"] == models.ModelProvider.HUGGINGFACE.name:+ if set["embed_model_provider"] == "HuggingFace":try:# Use the new LiteLLM-based model systememb_mod = models.get_embedding_model(- models.ModelProvider.HUGGINGFACE, set["embed_model_name"]+ "HuggingFace", set["embed_model_name"])emb_txt = await emb_mod.aembed_query("test")return emb_txtdiff --git a/python/helpers/memory.py b/python/helpers/memory.pyindex 23e2f0d86..68ad9454f 100644--- a/python/helpers/memory.py+++ b/python/helpers/memory.py@@ -129,7 +129,7 @@ class Memory:**model_config.build_kwargs(),)embeddings_model_id = files.safe_file_name(- model_config.provider.name + "_" + model_config.name+ model_config.provider + "_" + model_config.name)# here we setup the embeddings model with the chosen cache storage@@ -160,7 +160,7 @@ class Memory:if files.exists(emb_set_file):embedding_set = json.loads(files.read_file(emb_set_file))if (- embedding_set["model_provider"] == model_config.provider.name+ embedding_set["model_provider"] == model_config.providerand embedding_set["model_name"] == model_config.name):# model matches@@ -200,7 +200,7 @@ class Memory:meta_file_path,json.dumps({- "model_provider": model_config.provider.name,+ "model_provider": model_config.provider,"model_name": model_config.name,}),diff --git a/python/helpers/settings.py b/python/helpers/settings.pyindex 522e7268d..1d97e5d88 100644--- a/python/helpers/settings.py+++ b/python/helpers/settings.py@@ -121,9 +121,25 @@ PASSWORD_PLACEHOLDER = "****PSWD****"SETTINGS_FILE = files.get_abs_path("tmp/settings.json")_settings: Settings | None = None+# TODO: this is temporary, will be replaced by a proper solution+PROVIDERS: list[FieldOption] = [+ {"value": "ANTHROPIC", "label": "Anthropic"},+ {"value": "DEEPSEEK", "label": "DeepSeek"},+ {"value": "GEMINI", "label": "Google"},+ {"value": "GROQ", "label": "Groq"},+ {"value": "HUGGINGFACE", "label": "HuggingFace"},+ {"value": "LM_STUDIO", "label": "LM Studio"},+ {"value": "MISTRAL", "label": "Mistral AI"},+ {"value": "OLLAMA", "label": "Ollama"},+ {"value": "OPENAI", "label": "OpenAI"},+ {"value": "AZURE", "label": "OpenAI Azure"},+ {"value": "OPENROUTER", "label": "OpenRouter"},+ {"value": "SAMBANOVA", "label": "Sambanova"},+ {"value": "OTHER", "label": "Other OpenAI compatible"},+]+def convert_out(settings: Settings) -> SettingsOutput:- from models import ModelProviderdefault_settings = get_default_settings()# main model section@@ -135,7 +151,7 @@ def convert_out(settings: Settings) -> SettingsOutput:"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],+ "options": PROVIDERS,})chat_model_fields.append(@@ -248,7 +264,7 @@ def convert_out(settings: Settings) -> SettingsOutput:"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],+ "options": PROVIDERS,})util_model_fields.append(@@ -328,7 +344,7 @@ def convert_out(settings: Settings) -> SettingsOutput:"description": "Select provider for embedding model used by the framework","type": "select","value": settings["embed_model_provider"],- "options": [{"value": p.name, "label": p.value} for p in ModelProvider],+ "options": PROVIDERS,})embed_model_fields.append(@@ -398,7 +414,7 @@ def convert_out(settings: Settings) -> SettingsOutput:"description": "Select provider for web browser model used by <a href='https://github.com/browser-use/browser-use' target='_blank'>browser-use</a> framework","type": "select","value": settings["browser_model_provider"],- "options": [{"value": p.name, "label": p.value} for p in ModelProvider],+ "options": PROVIDERS,})browser_model_fields.append(@@ -499,8 +515,8 @@ def convert_out(settings: Settings) -> SettingsOutput:# api keys model sectionapi_keys_fields: list[SettingsField] = []- for provider in ModelProvider:- api_keys_fields.append(_get_api_key_field(settings, provider.name.lower(), provider.value))+ for provider in PROVIDERS:+ api_keys_fields.append(_get_api_key_field(settings, provider["value"].lower(), provider["label"]))api_keys_section: SettingsSection = {"id": "api_keys",@@ -990,11 +1006,9 @@ def _write_sensitive_settings(settings: Settings):def get_default_settings() -> Settings:- from models import ModelProvider-return Settings(version=_get_version(),- chat_model_provider=ModelProvider.OPENROUTER.name,+ chat_model_provider="OPENROUTER",chat_model_name="openai/gpt-4.1",chat_model_api_base="",chat_model_kwargs={"temperature": "0"},@@ -1004,7 +1018,7 @@ def get_default_settings() -> Settings:chat_model_rl_requests=0,chat_model_rl_input=0,chat_model_rl_output=0,- util_model_provider=ModelProvider.OPENROUTER.name,+ util_model_provider="OPENROUTER",util_model_name="openai/gpt-4.1-nano",util_model_api_base="",util_model_ctx_length=100000,@@ -1013,13 +1027,13 @@ def get_default_settings() -> Settings:util_model_rl_requests=0,util_model_rl_input=0,util_model_rl_output=0,- embed_model_provider=ModelProvider.HUGGINGFACE.name,+ embed_model_provider="HUGGINGFACE",embed_model_name="sentence-transformers/all-MiniLM-L6-v2",embed_model_api_base="",embed_model_kwargs={},embed_model_rl_requests=0,embed_model_rl_input=0,- browser_model_provider=ModelProvider.OPENROUTER.name,+ browser_model_provider="OPENROUTER",browser_model_name="openai/gpt-4.1",browser_model_api_base="",browser_model_vision=True,