Agent Zero AI framework
model providers polishing
frdela4f13fc26f0e
diff --git a/agent.py b/agent.pyindex 63f94d823..34f5a662f 100644--- a/agent.py+++ b/agent.py@@ -671,7 +671,7 @@ class Agent:type="util",update_progress="none",heading=msg,- model=f"{model_config.provider.value}\\{model_config.name}",+ model=f"{model_config.provider}\\{model_config.name}",)wait_log.update(heading=msg, key=key, value=total, limit=limit)if not background:diff --git a/conf/model_providers.yaml b/conf/model_providers.yamlindex 60ce6fb8c..aab79dbae 100644--- a/conf/model_providers.yaml+++ b/conf/model_providers.yaml@@ -70,6 +70,9 @@ embedding:huggingface:name: HuggingFacelitellm_provider: huggingface+ google:+ name: Google+ litellm_provider: geminilm_studio:name: LM Studiolitellm_provider: lm_studiodiff --git a/models.py b/models.pyindex de2f9ccb1..d8894848e 100644--- a/models.py+++ b/models.py@@ -469,11 +469,6 @@ def _merge_provider_defaults(for k, v in extra_kwargs.items():kwargs.setdefault(k, v)- # Copy any additional top-level fields except metadata keys- for k, v in cfg.items():- if k not in ("id", "name", "value", "litellm_provider", "kwargs"):- kwargs.setdefault(k, v)-# Inject API key based on the *original* provider id if still missingif "api_key" not in kwargs:key = get_api_key(original_provider)@@ -483,19 +478,7 @@ def _merge_provider_defaults(return provider_name, kwargs-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:- return _get_litellm_embedding(name, provider_name, **kwargs)- else:- raise ValueError(f"Unsupported model type: {type}")---def get_chat_model(- provider: str, name: str, **kwargs: Any-) -> LiteLLMChatWrapper:+def get_chat_model(provider: str, name: str, **kwargs: Any) -> LiteLLMChatWrapper:orig = provider.lower()provider_name, kwargs = _merge_provider_defaults("chat", orig, kwargs)return _get_litellm_chat(LiteLLMChatWrapper, name, provider_name, **kwargs)@@ -506,7 +489,9 @@ def get_browser_model() -> BrowserCompatibleChatWrapper:orig = provider.lower()provider_name, kwargs = _merge_provider_defaults("chat", orig, kwargs)- return _get_litellm_chat(BrowserCompatibleChatWrapper, name, provider_name, **kwargs)+ return _get_litellm_chat(+ BrowserCompatibleChatWrapper, name, provider_name, **kwargs+ )def get_embedding_model(