A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: preserve generic OpenAI provider for shared endpoints (#11499)
Shahmir Varqhaa0f12cfe9b26
diff --git a/marimo/_server/ai/providers.py b/marimo/_server/ai/providers.pyindex ca220f54f2..dfaffd2473 100644--- a/marimo/_server/ai/providers.py+++ b/marimo/_server/ai/providers.py@@ -866,7 +866,9 @@ def _known_provider_base_urls() -> dict[str, str]:)continuenormalized = _normalize_base_url(base_url)- if normalized:+ # OpenAI API keys and ChatGPT OAuth share a URL, so it cannot+ # identify which provider to use. Preserve the generic OpenAI fallback.+ if normalized and normalized != "api.openai.com":mapping.setdefault(normalized, name)return mappingdiff --git a/tests/_server/ai/test_providers.py b/tests/_server/ai/test_providers.pyindex 92bbff979a..1fe2a1fc51 100644--- a/tests/_server/ai/test_providers.py+++ b/tests/_server/ai/test_providers.py@@ -1067,9 +1067,7 @@ def test_normalize_base_url(pytest.param("https://openrouter.ai/api/v1/", "openrouter", id="openrouter"),- # Hosts not discovered from pydantic-ai's providers -> no match, so we- # fall back to the generic OpenAI provider (preserving prior behavior).- # `api.openai.com` is LiteLLM's client-derived default, which we skip.+ # Unknown and shared OpenAI endpoints retain the generic fallback.pytest.param("https://my.internal.llm/v1", None, id="unknown_host"),pytest.param("https://api.openai.com/v1", None, id="openai_host"),pytest.param(None, None, id="no_base_url"),@@ -1081,6 +1079,23 @@ def test_infer_provider_name_from_base_url(assert _infer_provider_name_from_base_url(base_url) == expected[email protected]("openai", "pydantic_ai")+def test_custom_provider_keeps_openai_api_key_auth() -> None:+ from pydantic_ai.providers.openai import (+ OpenAIProvider as PydanticOpenAI,+ )++ provider = CustomProvider(+ AiModelId.from_model("my_provider/gpt-4"),+ AnyProviderConfig(+ api_key="test-key", base_url="https://api.openai.com/v1"+ ),+ )++ assert type(provider.provider) is PydanticOpenAI+ assert provider.provider.client.api_key == "test-key"++@pytest.mark.requires("pydantic_ai")def test_custom_provider_inherits_profile_from_base_url() -> None:"""A custom provider whose name we don't recognize, but whose base URL