0feb16a0c0
1.1.1 omits the model from normalizeModel's allowlist, so requests for gpt-6.1-terra are rewritten to gpt-5.5. ChatGPT accounts are not entitled to gpt-5.5, so the request fails with model_not_found. Add the model to the allowlist, allowed reasoning efforts, and default effort. Covered by the transform tests.
66 lines
3.4 KiB
Diff
66 lines
3.4 KiB
Diff
diff --git a/internal/server/models.go b/internal/server/models.go
|
|
index 5f253c22aad5..7c8531d0a9cb 100644
|
|
--- a/internal/server/models.go
|
|
+++ b/internal/server/models.go
|
|
@@ -20,6 +20,7 @@ const (
|
|
modelGPT6Astra = "gpt-6-astra"
|
|
modelGPT6Sol = "gpt-6-sol"
|
|
modelGPT61Sol = "gpt-6.1-sol"
|
|
+ modelGPT61Terra = "gpt-6.1-terra"
|
|
modelGPT6Luna = "gpt-6-luna"
|
|
modelDaybreakBlue = "gpt-daybreak-blue-latest"
|
|
|
|
@@ -41,6 +42,7 @@ var modelAllowedEfforts = map[string][]string{
|
|
modelGPT6Astra: {"low", "medium", "high", "xhigh", "max"},
|
|
modelGPT6Sol: {"low", "medium", "high", "xhigh", "max"},
|
|
modelGPT61Sol: {"low", "medium", "high", "xhigh", "max"},
|
|
+ modelGPT61Terra: {"low", "medium", "high", "xhigh", "max"},
|
|
modelGPT6Luna: {"low", "medium", "high", "xhigh", "max"},
|
|
modelDaybreakBlue: {"none", "low", "medium", "high", "xhigh", "max"},
|
|
}
|
|
@@ -57,6 +59,7 @@ var modelDefaultEffort = map[string]string{
|
|
modelGPT6Astra: "medium",
|
|
modelGPT6Sol: "medium",
|
|
modelGPT61Sol: "low",
|
|
+ modelGPT61Terra: "low",
|
|
modelGPT6Luna: "medium",
|
|
modelDaybreakBlue: "low",
|
|
}
|
|
diff --git a/internal/server/transform.go b/internal/server/transform.go
|
|
index 142fa2afc5a4..6f035742e42b 100644
|
|
--- a/internal/server/transform.go
|
|
+++ b/internal/server/transform.go
|
|
@@ -281,7 +281,7 @@ func normalizeModel(model string) string {
|
|
// Exact matches on currently-served models first, so a valid ID is never
|
|
// rewritten by the looser prefix matching below.
|
|
switch lower {
|
|
- case modelGPT53Spark, modelGPT54Mini, modelGPT55, modelGPT5Sol, modelGPT5Terra, modelGPT5Luna, modelGPT6Astra, modelGPT6Sol, modelGPT61Sol, modelGPT6Luna, modelDaybreakBlue:
|
|
+ case modelGPT53Spark, modelGPT54Mini, modelGPT55, modelGPT5Sol, modelGPT5Terra, modelGPT5Luna, modelGPT6Astra, modelGPT6Sol, modelGPT61Sol, modelGPT61Terra, modelGPT6Luna, modelDaybreakBlue:
|
|
return lower
|
|
}
|
|
|
|
diff --git a/internal/server/transform_test.go b/internal/server/transform_test.go
|
|
index b5d289bbb479..35064bc85452 100644
|
|
--- a/internal/server/transform_test.go
|
|
+++ b/internal/server/transform_test.go
|
|
@@ -159,6 +159,9 @@ func TestNormalizeModel(t *testing.T) {
|
|
{"gpt-6.1-sol with max suffix", "gpt-6.1-sol-max", modelGPT61Sol},
|
|
{"gpt-6.1-sol with high suffix", "gpt-6.1-sol-high", modelGPT61Sol},
|
|
{"gpt-6.1-sol uppercase and whitespace", " GPT-6.1-SOL-XHIGH ", modelGPT61Sol},
|
|
+ {"gpt-6.1-terra base", "gpt-6.1-terra", modelGPT61Terra},
|
|
+ {"gpt-6.1-terra with max suffix", "gpt-6.1-terra-max", modelGPT61Terra},
|
|
+ {"gpt-6.1-terra uppercase and whitespace", " GPT-6.1-TERRA-HIGH ", modelGPT61Terra},
|
|
{"gpt-6-luna base", "gpt-6-luna", modelGPT6Luna},
|
|
{"gpt-6-luna with high suffix", "gpt-6-luna-high", modelGPT6Luna},
|
|
{"gpt-5.3-codex-spark base", "gpt-5.3-codex-spark", "gpt-5.3-codex-spark"},
|
|
@@ -334,6 +337,9 @@ func TestClampReasoningEffortForModel(t *testing.T) {
|
|
{"gpt-6.1-sol allows xhigh", modelGPT61Sol, "xhigh", "xhigh"},
|
|
{"gpt-6.1-sol rejects none -> default", modelGPT61Sol, "none", "low"},
|
|
{"gpt-6.1-sol rejects ultra -> default", modelGPT61Sol, "ultra", "low"},
|
|
+ {"gpt-6.1-terra defaults to low", modelGPT61Terra, "", "low"},
|
|
+ {"gpt-6.1-terra allows max", modelGPT61Terra, "max", "max"},
|
|
+ {"gpt-6.1-terra rejects none -> default", modelGPT61Terra, "none", "low"},
|
|
{"gpt-6-luna defaults to medium", modelGPT6Luna, "", "medium"},
|
|
{"gpt-6-luna rejects none -> default", modelGPT6Luna, "none", "medium"},
|
|
{"gpt-6-luna allows xhigh", modelGPT6Luna, "xhigh", "xhigh"},
|