fix(#4536): reject openai-codex provider before empty-model early return
This commit is contained in:
1 parent
2f2d36d4eb
commit
61ea7360a0
3 files changed
+9
No files matched your search
@@ -3513,6 +3513,9 @@ def _main_model_supports_service_tier(
|
||||
"""Return True when the current main-model selection can use OpenAI service tier."""
|
||||
if not _is_openai_family_provider(provider):
|
||||
return False
|
||||
resolved = str(provider or "").strip().lower()
|
||||
if resolved == "openai-codex":
|
||||
return False
|
||||
raw_model = str(model_id or "").strip().lower()
|
||||
if not raw_model:
|
||||
return True
|
||||
|
||||
@@ -9693,6 +9693,7 @@ function _mainModelSupportsServiceTier(cfg){
|
||||
const optgroup=selectedOpt&&selectedOpt.parentElement&&selectedOpt.parentElement.tagName==='OPTGROUP'?selectedOpt.parentElement:null;
|
||||
const provider=((selectedOpt&&selectedOpt.dataset&&selectedOpt.dataset.provider)||(optgroup&&optgroup.dataset&&optgroup.dataset.provider)||(cfg&&cfg.provider)||'').trim().toLowerCase();
|
||||
if(provider!=='openai'&&provider!=='openai-api'&&provider!=='openai-codex') return false;
|
||||
if(provider==='openai-codex') return false;
|
||||
const rawModel=String((selectedOpt&&selectedOpt.value)||(selected&&selected.value)||(cfg&&cfg.model)||'').trim().toLowerCase();
|
||||
if(!rawModel) return true;
|
||||
let bareModel=rawModel;
|
||||
|
||||
@@ -74,6 +74,11 @@ class TestIssue4536ServiceTier:
|
||||
)
|
||||
assert codex_payload == {}
|
||||
|
||||
codex_empty_model_payload = config._main_model_request_overrides(
|
||||
{"model": {"provider": "openai-codex", "service_tier": "priority"}},
|
||||
)
|
||||
assert codex_empty_model_payload == {}
|
||||
|
||||
stale_openai_payload = config._main_model_request_overrides(
|
||||
{"model": {"provider": "openai", "default": "meta-llama/llama-3.1", "service_tier": "priority"}},
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user