Skip to content

Commit a6e9eaa

Browse files
celia-oaicopyberry
authored andcommitted
Add GPT-6.1 Sol to Bedrock catalogs and make it the default (#49339)
## What changed Add `openai.gpt-6.1-sol` to the Bedrock Mantle catalog and its `global.` and `us.` variants to the Bedrock Runtime catalog. Make GPT-6.1 Sol the default and provider fallback model, preferring the global variant for Runtime. Keep existing models available. ## Testing Update catalog and provider assertions, thread-start fallback tests, and TUI model-picker snapshots to cover GPT-6.1 Sol and the new defaults. GitOrigin-RevId: ec65744ff9409980474cc1faf516beed0b2430da
1 parent ed9e5a2 commit a6e9eaa

9 files changed

Lines changed: 102 additions & 50 deletions

File tree

‎codex-rs/app-server/tests/suite/v2/thread_start.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ model = "gpt-5.4-mini"
115115
})
116116
.await?;
117117

118-
assert_eq!(response.model, "openai.gpt-6-sol");
118+
assert_eq!(response.model, "openai.gpt-6.1-sol");
119119
Ok(())
120120
}
121121

@@ -245,6 +245,7 @@ async fn thread_start_provider_model_fallback_uses_bedrock_static_catalog() -> R
245245
)
246246
.await?;
247247
for model in [
248+
"openai.gpt-6.1-sol",
248249
"openai.gpt-6-sol",
249250
"openai.gpt-6-luna",
250251
"openai.gpt-5.6-sol",
@@ -273,7 +274,7 @@ async fn thread_start_provider_model_fallback_uses_bedrock_static_catalog() -> R
273274
supported_with_fallback.model,
274275
unsupported_without_fallback.model,
275276
],
276-
vec!["openai.gpt-6-sol", "openai.gpt-5.5", "gpt-5.4-mini"]
277+
vec!["openai.gpt-6.1-sol", "openai.gpt-5.5", "gpt-5.4-mini"]
277278
);
278279
Ok(())
279280
}
@@ -292,6 +293,8 @@ async fn thread_start_bedrock_runtime_prefers_global_cross_region_models() -> Re
292293
.await?;
293294

294295
for model in [
296+
"global.openai.gpt-6.1-sol",
297+
"us.openai.gpt-6.1-sol",
295298
"global.openai.gpt-6-sol",
296299
"us.openai.gpt-6-sol",
297300
"global.openai.gpt-6-luna",
@@ -311,7 +314,7 @@ async fn thread_start_bedrock_runtime_prefers_global_cross_region_models() -> Re
311314
/*allow_provider_model_fallback*/ true,
312315
)
313316
.await?;
314-
assert_eq!(response.model, "global.openai.gpt-6-sol");
317+
assert_eq!(response.model, "global.openai.gpt-6.1-sol");
315318

316319
Ok(())
317320
}

‎codex-rs/model-provider-info/src/lib.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const AMAZON_BEDROCK_RUNTIME_PROVIDER_NAME: &str = "Amazon Bedrock Runtime";
8181
pub const AMAZON_BEDROCK_RUNTIME_PROVIDER_ID: &str = "amazon-bedrock-runtime";
8282
pub const AMAZON_BEDROCK_GPT_5_5_MODEL_ID: &str = "openai.gpt-5.5";
8383
pub const AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID: &str = "openai.gpt-5.6-sol";
84+
pub const AMAZON_BEDROCK_GPT_6_1_SOL_MODEL_ID: &str = "openai.gpt-6.1-sol";
8485
pub const AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID: &str = "openai.gpt-6-sol";
8586
pub const AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID: &str = "openai.gpt-6-luna";
8687
pub const AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID: &str = "openai.gpt-6-astra";

‎codex-rs/model-provider/src/amazon_bedrock/catalog.rs‎

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_5_MODEL_ID;
22
use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID;
33
use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID;
44
use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID;
5+
use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_1_SOL_MODEL_ID;
56
use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID;
67
use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID;
78
use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID;
@@ -17,6 +18,7 @@ const GPT_5_BEDROCK_CONTEXT_WINDOW: i64 = 272_000;
1718
const GPT_5_6_SOL_OPENAI_MODEL_ID: &str = "gpt-5.6-sol";
1819
const GPT_5_6_TERRA_OPENAI_MODEL_ID: &str = "gpt-5.6-terra";
1920
const GPT_5_6_LUNA_OPENAI_MODEL_ID: &str = "gpt-5.6-luna";
21+
const GPT_6_1_SOL_OPENAI_MODEL_ID: &str = "gpt-6.1-sol";
2022
const GPT_6_SOL_OPENAI_MODEL_ID: &str = "gpt-6-sol";
2123
const GPT_6_LUNA_OPENAI_MODEL_ID: &str = "gpt-6-luna";
2224
const GPT_6_ASTRA_OPENAI_MODEL_ID: &str = "gpt-6-astra";
@@ -26,9 +28,9 @@ pub(crate) fn static_model_catalog() -> ModelsResponse {
2628
normalize_bedrock_catalog(ModelsResponse {
2729
models: vec![
2830
bedrock_model(
29-
bundled_openai_model(GPT_6_SOL_OPENAI_MODEL_ID),
30-
AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,
31-
"GPT-6 Sol",
31+
bundled_openai_model(GPT_6_1_SOL_OPENAI_MODEL_ID),
32+
AMAZON_BEDROCK_GPT_6_1_SOL_MODEL_ID,
33+
"GPT-6.1 Sol",
3234
/*priority*/ 0,
3335
),
3436
bedrock_model(
@@ -37,35 +39,41 @@ pub(crate) fn static_model_catalog() -> ModelsResponse {
3739
"GPT-6-Astra",
3840
/*priority*/ 1,
3941
),
42+
bedrock_model(
43+
bundled_openai_model(GPT_6_SOL_OPENAI_MODEL_ID),
44+
AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,
45+
"GPT-6 Sol",
46+
/*priority*/ 2,
47+
),
4048
bedrock_model(
4149
bundled_openai_model(GPT_6_LUNA_OPENAI_MODEL_ID),
4250
AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID,
4351
"GPT-6 Luna",
44-
/*priority*/ 2,
52+
/*priority*/ 3,
4553
),
4654
bedrock_model(
4755
bundled_openai_model(GPT_5_6_SOL_OPENAI_MODEL_ID),
4856
AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,
4957
"GPT-5.6 Sol",
50-
/*priority*/ 3,
58+
/*priority*/ 4,
5159
),
5260
bedrock_model(
5361
bundled_openai_model(GPT_5_6_TERRA_OPENAI_MODEL_ID),
5462
AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID,
5563
"GPT-5.6 Terra",
56-
/*priority*/ 4,
64+
/*priority*/ 5,
5765
),
5866
bedrock_model(
5967
bundled_openai_model(GPT_5_6_LUNA_OPENAI_MODEL_ID),
6068
AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID,
6169
"GPT-5.6 Luna",
62-
/*priority*/ 5,
70+
/*priority*/ 6,
6371
),
6472
gpt_5_bedrock_model(
6573
GPT_5_5_OPENAI_MODEL_ID,
6674
AMAZON_BEDROCK_GPT_5_5_MODEL_ID,
6775
"GPT-5.5",
68-
/*priority*/ 6,
76+
/*priority*/ 7,
6977
),
7078
],
7179
})
@@ -161,8 +169,9 @@ mod tests {
161169
.map(|model| model.slug.as_str())
162170
.collect::<Vec<_>>(),
163171
vec![
164-
AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,
172+
AMAZON_BEDROCK_GPT_6_1_SOL_MODEL_ID,
165173
AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID,
174+
AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,
166175
AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID,
167176
AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,
168177
AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID,
@@ -189,7 +198,7 @@ mod tests {
189198
.collect::<Vec<_>>(),
190199
vec![
191200
(
192-
AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,
201+
AMAZON_BEDROCK_GPT_6_1_SOL_MODEL_ID,
193202
Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
194203
Some(872_000),
195204
WebSearchToolType::Text,
@@ -200,6 +209,12 @@ mod tests {
200209
Some(872_000),
201210
WebSearchToolType::Text,
202211
),
212+
(
213+
AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,
214+
Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
215+
Some(872_000),
216+
WebSearchToolType::Text,
217+
),
203218
(
204219
AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID,
205220
Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
@@ -277,35 +292,41 @@ mod tests {
277292
let catalog = static_model_catalog();
278293

279294
for (mut expected, slug, display_name, priority) in [
295+
(
296+
bundled_openai_model(GPT_6_1_SOL_OPENAI_MODEL_ID),
297+
AMAZON_BEDROCK_GPT_6_1_SOL_MODEL_ID,
298+
"GPT-6.1 Sol",
299+
0,
300+
),
280301
(
281302
bundled_openai_model(GPT_6_SOL_OPENAI_MODEL_ID),
282303
AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,
283304
"GPT-6 Sol",
284-
0,
305+
2,
285306
),
286307
(
287308
bundled_openai_model(GPT_6_LUNA_OPENAI_MODEL_ID),
288309
AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID,
289310
"GPT-6 Luna",
290-
2,
311+
3,
291312
),
292313
(
293314
bundled_openai_model(GPT_5_6_SOL_OPENAI_MODEL_ID),
294315
AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,
295316
"GPT-5.6 Sol",
296-
3,
317+
4,
297318
),
298319
(
299320
bundled_openai_model(GPT_5_6_TERRA_OPENAI_MODEL_ID),
300321
AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID,
301322
"GPT-5.6 Terra",
302-
4,
323+
5,
303324
),
304325
(
305326
bundled_openai_model(GPT_5_6_LUNA_OPENAI_MODEL_ID),
306327
AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID,
307328
"GPT-5.6 Luna",
308-
5,
329+
6,
309330
),
310331
(
311332
bundled_openai_model(GPT_6_ASTRA_OPENAI_MODEL_ID),

‎codex-rs/model-provider/src/amazon_bedrock/runtime_catalog.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID;
22
use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID;
33
use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID;
4+
use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_1_SOL_MODEL_ID;
45
use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID;
56
use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID;
67
use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID;
@@ -21,6 +22,7 @@ pub(super) fn static_runtime_model_catalog() -> ModelsResponse {
2122
AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID
2223
| AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID
2324
| AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID
25+
| AMAZON_BEDROCK_GPT_6_1_SOL_MODEL_ID
2426
| AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID
2527
| AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID
2628
| AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID

‎codex-rs/model-provider/src/amazon_bedrock/runtime_catalog_tests.rs‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,27 @@ fn runtime_catalog_includes_supported_cross_region_models_in_priority_order() {
1818
))
1919
.collect::<Vec<_>>(),
2020
vec![
21-
("global.openai.gpt-6-sol", "GPT-6 Sol (Global)", 0),
21+
("global.openai.gpt-6.1-sol", "GPT-6.1 Sol (Global)", 0),
2222
("global.openai.gpt-6-astra", "GPT-6-Astra (Global)", 1),
23-
("global.openai.gpt-6-luna", "GPT-6 Luna (Global)", 2),
24-
("global.openai.gpt-5.6-sol", "GPT-5.6 Sol (Global)", 3),
25-
("global.openai.gpt-5.6-terra", "GPT-5.6 Terra (Global)", 4),
26-
("global.openai.gpt-5.6-luna", "GPT-5.6 Luna (Global)", 5),
27-
("us.openai.gpt-6-sol", "GPT-6 Sol (US cross-region)", 6),
28-
("us.openai.gpt-6-astra", "GPT-6-Astra (US cross-region)", 7),
29-
("us.openai.gpt-6-luna", "GPT-6 Luna (US cross-region)", 8),
30-
("us.openai.gpt-5.6-sol", "GPT-5.6 Sol (US cross-region)", 9),
23+
("global.openai.gpt-6-sol", "GPT-6 Sol (Global)", 2),
24+
("global.openai.gpt-6-luna", "GPT-6 Luna (Global)", 3),
25+
("global.openai.gpt-5.6-sol", "GPT-5.6 Sol (Global)", 4),
26+
("global.openai.gpt-5.6-terra", "GPT-5.6 Terra (Global)", 5),
27+
("global.openai.gpt-5.6-luna", "GPT-5.6 Luna (Global)", 6),
28+
("us.openai.gpt-6.1-sol", "GPT-6.1 Sol (US cross-region)", 7),
29+
("us.openai.gpt-6-astra", "GPT-6-Astra (US cross-region)", 8),
30+
("us.openai.gpt-6-sol", "GPT-6 Sol (US cross-region)", 9),
31+
("us.openai.gpt-6-luna", "GPT-6 Luna (US cross-region)", 10),
32+
("us.openai.gpt-5.6-sol", "GPT-5.6 Sol (US cross-region)", 11),
3133
(
3234
"us.openai.gpt-5.6-terra",
3335
"GPT-5.6 Terra (US cross-region)",
34-
10
36+
12
3537
),
3638
(
3739
"us.openai.gpt-5.6-luna",
3840
"GPT-5.6 Luna (US cross-region)",
39-
11
41+
13
4042
),
4143
]
4244
);
@@ -59,7 +61,7 @@ fn runtime_catalog_disables_web_search_without_overriding_review_models() {
5961
.collect::<Vec<_>>(),
6062
vec![
6163
(
62-
"global.openai.gpt-6-sol",
64+
"global.openai.gpt-6.1-sol",
6365
None,
6466
false,
6567
Some(MultiAgentVersion::V1),
@@ -70,6 +72,12 @@ fn runtime_catalog_disables_web_search_without_overriding_review_models() {
7072
false,
7173
Some(MultiAgentVersion::V1),
7274
),
75+
(
76+
"global.openai.gpt-6-sol",
77+
None,
78+
false,
79+
Some(MultiAgentVersion::V1),
80+
),
7381
(
7482
"global.openai.gpt-6-luna",
7583
None,
@@ -95,7 +103,7 @@ fn runtime_catalog_disables_web_search_without_overriding_review_models() {
95103
Some(MultiAgentVersion::V1),
96104
),
97105
(
98-
"us.openai.gpt-6-sol",
106+
"us.openai.gpt-6.1-sol",
99107
None,
100108
false,
101109
Some(MultiAgentVersion::V1),
@@ -106,6 +114,12 @@ fn runtime_catalog_disables_web_search_without_overriding_review_models() {
106114
false,
107115
Some(MultiAgentVersion::V1),
108116
),
117+
(
118+
"us.openai.gpt-6-sol",
119+
None,
120+
false,
121+
Some(MultiAgentVersion::V1),
122+
),
109123
(
110124
"us.openai.gpt-6-luna",
111125
None,

‎codex-rs/model-provider/src/provider.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,6 +1267,7 @@ printf '%s\n' '{"AccessKeyId":"exported","SecretAccessKey":"secret"}'
12671267
.await;
12681268
assert_eq!(uncached_catalog, catalog);
12691269
for slug in [
1270+
"openai.gpt-6.1-sol",
12701271
"openai.gpt-6-sol",
12711272
"openai.gpt-6-luna",
12721273
"openai.gpt-5.6-sol",
@@ -1297,8 +1298,9 @@ printf '%s\n' '{"AccessKeyId":"exported","SecretAccessKey":"secret"}'
12971298
assert_eq!(
12981299
models,
12991300
vec![
1300-
("openai.gpt-6-sol", "GPT-6 Sol"),
1301+
("openai.gpt-6.1-sol", "GPT-6.1 Sol"),
13011302
("openai.gpt-6-astra", "GPT-6-Astra"),
1303+
("openai.gpt-6-sol", "GPT-6 Sol"),
13021304
("openai.gpt-6-luna", "GPT-6 Luna"),
13031305
("openai.gpt-5.6-sol", "GPT-5.6 Sol"),
13041306
("openai.gpt-5.6-terra", "GPT-5.6 Terra"),
@@ -1319,8 +1321,9 @@ printf '%s\n' '{"AccessKeyId":"exported","SecretAccessKey":"secret"}'
13191321
.map(|preset| preset.model.as_str())
13201322
.collect::<Vec<_>>(),
13211323
vec![
1322-
"openai.gpt-6-sol",
1324+
"openai.gpt-6.1-sol",
13231325
"openai.gpt-6-astra",
1326+
"openai.gpt-6-sol",
13241327
"openai.gpt-6-luna",
13251328
"openai.gpt-5.6-sol",
13261329
"openai.gpt-5.6-terra",
@@ -1334,7 +1337,7 @@ printf '%s\n' '{"AccessKeyId":"exported","SecretAccessKey":"secret"}'
13341337
.find(|preset| preset.is_default)
13351338
.expect("Bedrock catalog should have a default model");
13361339

1337-
assert_eq!(default_model.model, "openai.gpt-6-sol");
1340+
assert_eq!(default_model.model, "openai.gpt-6.1-sol");
13381341
}
13391342

13401343
#[tokio::test]

‎codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_mantle_models.snap‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ expression: "render_bottom_popup(&chat, 100)"
55
Select Model and Effort
66

77

8-
› 1. GPT-6 Sol (current) Previous generation workhorse model.
9-
2. GPT-6-Astra Frontier intelligence for the most demanding work.
10-
3. GPT-6 Luna Fast and affordable model for easier tasks.
11-
4. GPT-5.6 Sol Older generation workhorse model.
12-
5. GPT-5.6 Terra Older balanced model for straightforward work.
13-
6. GPT-5.6 Luna Older fast and efficient model.
14-
7. GPT-5.5 Legacy coding model.
8+
› 1. GPT-6.1 Sol (current) Latest workhorse model for coding and everyday work.
9+
2. GPT-6-Astra Frontier intelligence for the most demanding work.
10+
3. GPT-6 Sol Previous generation workhorse model.
11+
4. GPT-6 Luna Fast and affordable model for easier tasks.
12+
5. GPT-5.6 Sol Older generation workhorse model.
13+
6. GPT-5.6 Terra Older balanced model for straightforward work.
14+
7. GPT-5.6 Luna Older fast and efficient model.
15+
8. GPT-5.5 Legacy coding model.
1516

1617
enter select · esc back

‎codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_runtime_models.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ expression: "render_bottom_popup(&chat, 100)"
55
Select Model and Effort
66

77

8-
› 1. GPT-6 Sol (Global) (current) Previous generation workhorse model.
8+
› 1. GPT-6.1 Sol (Global) (current) Latest workhorse model for coding and everyday work.
99
2. GPT-6-Astra (Global) Frontier intelligence for the most demanding work.
10-
3. GPT-6 Luna (Global) Fast and affordable model for easier tasks.
11-
4. GPT-5.6 Sol (Global) Older generation workhorse model.
12-
5. GPT-5.6 Terra (Global) Older balanced model for straightforward work.
13-
6. GPT-5.6 Luna (Global) Older fast and efficient model.
14-
7. GPT-6 Sol (US cross-region) Previous generation workhorse model.
15-
8. GPT-6-Astra (US cross-region) Frontier intelligence for the most demanding work.
10+
3. GPT-6 Sol (Global) Previous generation workhorse model.
11+
4. GPT-6 Luna (Global) Fast and affordable model for easier tasks.
12+
5. GPT-5.6 Sol (Global) Older generation workhorse model.
13+
6. GPT-5.6 Terra (Global) Older balanced model for straightforward work.
14+
7. GPT-5.6 Luna (Global) Older fast and efficient model.
15+
8. GPT-6.1 Sol (US cross-region) Latest workhorse model for coding and everyday work.
1616
↓
1717
enter select · esc back

0 commit comments

Comments
 (0)