scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-11-15 09:12:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 485

fix(proxy): honor the global OpenAI base override when picking the Codex catalog key

Browse source 
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
mateo 2026-11-03 22:46:57 +00:00
parent 7ecabd79a5
commit 7bb1aeec4e
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
litellm/proxy/common_utils/codex_model_catalog.py
View file

@ -36,6 +36,7 @@ from urllib.parse import urlparse
from packaging.version import Version
from pydantic import ConfigDict, Field, StringConstraints, TypeAdapter, ValidationError
import litellm
from litellm._logging import verbose_proxy_logger
from litellm.litellm_core_utils.reasoning_effort_strength import nearest_declared_reasoning_effort
from litellm.secret_managers.main import get_secret_str
@ -574,10 +575,13 @@ OPENAI_API_HOST: Final = "api.openai.com"
def _is_openai_origin(api_base: object) -> bool:
"""Whether a deployment's api_base is OpenAI itself, so its key may go to OpenAI's catalog endpoint."""
if not api_base:
"""Whether a deployment's OpenAI requests go to OpenAI itself, so its key may go to OpenAI's catalog
endpoint: its own api_base, else the global `litellm.api_base`, `OPENAI_BASE_URL` or `OPENAI_API_BASE`
override the OpenAI handler would apply, else OpenAI."""
resolved: Final = api_base or litellm.api_base or os.getenv("OPENAI_BASE_URL") or os.getenv("OPENAI_API_BASE")
if not resolved:
return True
return isinstance(api_base, str) and urlparse(api_base).hostname == OPENAI_API_HOST
return isinstance(resolved, str) and urlparse(resolved).hostname == OPENAI_API_HOST
def _deployment_openai_key(deployment: DeploymentTypedDict) -> str | None:
@ -596,9 +600,7 @@ def _deployment_openai_key(deployment: DeploymentTypedDict) -> str | None:
def _environment_openai_key() -> str | None:
if not _is_openai_origin(os.getenv("OPENAI_BASE_URL") or os.getenv("OPENAI_API_BASE")):
return None
return os.getenv("OPENAI_API_KEY") or None
return (os.getenv("OPENAI_API_KEY") or None) if _is_openai_origin(None) else None
def codex_catalog_openai_key(

10
tests/unit/proxy/common_utils/test_codex_model_catalog.py
View file

@ -991,8 +991,14 @@ def test_a_key_for_an_openai_compatible_server_or_a_redirected_environment_never
"api_key": "sk-internal-server",
"api_base": "https://inference.internal.example/v1",
},
{"model": "openai/gpt-5.5", "api_key": "sk-through-the-gateway"},
{"model": "openai/gpt-5.5", "api_key": "sk-real-openai", "api_base": "https://api.openai.com/v1"},
)
entries: Final = [(f"catalog-model-{index}", f"catalog-model-{index}") for index in range(2)]
assert codex_catalog_openai_key(router, entries[:1]) is None
entries: Final = [(f"catalog-model-{index}", f"catalog-model-{index}") for index in range(3)]
assert codex_catalog_openai_key(router, entries[:2]) is None
assert codex_catalog_openai_key(router, entries) == "sk-real-openai"
monkeypatch.delenv("OPENAI_BASE_URL")
monkeypatch.setattr(litellm, "api_base", "https://llm-gateway.internal.example/v1")
assert codex_catalog_openai_key(router, entries[:2]) is None
monkeypatch.setattr(litellm, "api_base", None)
assert codex_catalog_openai_key(router, entries[:2]) == "sk-through-the-gateway"