mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-07 02:59:05 +00:00
fix(custom-openai): avoid OpenAI API key fallback during discovery
This commit is contained in:
parent
db61d672b1
commit
44062f382b
2 changed files with 19 additions and 1 deletions
|
|
@ -172,5 +172,5 @@ class CustomOpenAIChatConfig(OpenAILikeChatConfig):
|
|||
def get_models(self, api_key: Optional[str] = None, api_base: Optional[str] = None) -> list[str]:
|
||||
if api_base is None:
|
||||
raise ValueError("api_base must be set to discover models for the custom_openai provider")
|
||||
models = super().get_models(api_key=api_key, api_base=api_base)
|
||||
models = super().get_models(api_key=api_key or "", api_base=api_base)
|
||||
return [f"custom_openai/{model}" for model in models]
|
||||
|
|
|
|||
|
|
@ -96,6 +96,24 @@ def test_custom_openai_get_models_requires_api_base():
|
|||
CustomOpenAIChatConfig().get_models(api_base=None)
|
||||
|
||||
|
||||
def test_custom_openai_get_models_does_not_use_openai_api_key(monkeypatch):
|
||||
mock_response = MagicMock()
|
||||
mock_response.status_code = 200
|
||||
mock_response.json.return_value = {"data": [{"id": "my-custom-model"}]}
|
||||
monkeypatch.setenv("OPENAI_API_KEY", "unrelated-openai-api-key")
|
||||
|
||||
with patch.object(litellm.module_level_client, "get", return_value=mock_response) as mock_get:
|
||||
models = CustomOpenAIChatConfig().get_models(
|
||||
api_base="https://my-openai-compatible-endpoint/v1"
|
||||
)
|
||||
|
||||
assert models == ["custom_openai/my-custom-model"]
|
||||
mock_get.assert_called_once_with(
|
||||
url="https://my-openai-compatible-endpoint/v1/models",
|
||||
headers={"Authorization": "Bearer "},
|
||||
)
|
||||
|
||||
|
||||
def test_openai_model_info_uses_openai_config():
|
||||
config = ProviderConfigManager.get_provider_model_info(
|
||||
model=None,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue