Agent Zero AI framework
openai compatible providers
frdel872ab4ade4c0
diff --git a/models.py b/models.pyindex 68be88a32..77f48d14e 100644--- a/models.py+++ b/models.py@@ -471,7 +471,7 @@ def get_litellm_embedding(model_name: str, provider: str, **kwargs: Any):def get_model(type: ModelType, provider: ModelProvider, name: str, **kwargs: Any):provider_name = provider.name.lower()- kwargs = _normalize_chat_kwargs(kwargs)+ kwargs = _normalize_chat_kwargs(provider, kwargs)if type == ModelType.CHAT:return _get_litellm_chat(LiteLLMChatWrapper, name, provider_name, **kwargs)elif type == ModelType.EMBEDDING:@@ -484,7 +484,7 @@ def get_chat_model(provider: ModelProvider, name: str, **kwargs: Any) -> LiteLLMChatWrapper:provider_name = _get_litellm_provider(provider)- kwargs = _normalize_chat_kwargs(kwargs)+ kwargs = _normalize_chat_kwargs(provider, kwargs)model = _get_litellm_chat(LiteLLMChatWrapper, name, provider_name, **kwargs)return model@@ -493,7 +493,7 @@ def get_browser_model(provider: ModelProvider, name: str, **kwargs: Any) -> BrowserCompatibleChatWrapper:provider_name = provider.name.lower()- kwargs = _normalize_chat_kwargs(kwargs)+ kwargs = _normalize_chat_kwargs(provider, kwargs)model = _get_litellm_chat(BrowserCompatibleChatWrapper, name, provider_name, **kwargs)@@ -509,7 +509,11 @@ def get_embedding_model(return model-def _normalize_chat_kwargs(kwargs: Any) -> Any:+def _normalize_chat_kwargs(provider: ModelProvider, kwargs: Any) -> Any:+ # this prevents using openai api key for other providers+ if provider == ModelProvider.OTHER:+ if "api_key" not in kwargs:+ kwargs["api_key"] = "None"return kwargs@@ -523,5 +527,7 @@ def _get_litellm_provider(provider: ModelProvider) -> str:# exceptionsif name == "google":name = "gemini"+ elif name == "other":+ name = "openai"return namediff --git a/python/helpers/settings.py b/python/helpers/settings.pyindex dbf7e35c1..dc3bd71eb 100644--- a/python/helpers/settings.py+++ b/python/helpers/settings.py@@ -208,7 +208,8 @@ def convert_out(settings: Settings) -> SettingsOutput:{"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.",+ "description": """Any other parameters supported by the model. Format is KEY=VALUE on individual lines, just like .env file.+ For OpenAI compatible providers not listed here, select 'other' and specify api_base=https://... and api_key=... as additional parameters.""","type": "textarea","value": _dict_to_env(settings["chat_model_kwargs"]),}@@ -278,7 +279,8 @@ def convert_out(settings: Settings) -> SettingsOutput:{"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.",+ "description": """Any other parameters supported by the model. Format is KEY=VALUE on individual lines, just like .env file.+ For OpenAI compatible providers not listed here, select 'other' and specify api_base=https://... and api_key=... as additional parameters.""","type": "textarea","value": _dict_to_env(settings["util_model_kwargs"]),}@@ -338,7 +340,8 @@ def convert_out(settings: Settings) -> SettingsOutput:{"id": "embed_model_kwargs","title": "Embedding model additional parameters",- "description": "Any other parameters supported by the model. Format is KEY=VALUE on individual lines, just like .env file.",+ "description": """Any other parameters supported by the model. Format is KEY=VALUE on individual lines, just like .env file.+ For OpenAI compatible providers not listed here, select 'other' and specify api_base=https://... and api_key=... as additional parameters.""","type": "textarea","value": _dict_to_env(settings["embed_model_kwargs"]),}