Move service tier helpers out of data types

This commit is contained in:
Ahmed Ibrahim
2026-05-03 07:24:16 +03:00
parent e9a3e91f3c
commit 7ee21cc692
15 changed files with 109 additions and 94 deletions
+4 -3
View File
@@ -1,6 +1,7 @@
use anyhow::Result;
use codex_features::Feature;
use codex_protocol::config_types::ServiceTier;
use codex_protocol::config_types::priority_service_tier;
use core_test_support::responses::WebSocketConnectionConfig;
use core_test_support::responses::ev_assistant_message;
use core_test_support::responses::ev_completed;
@@ -269,7 +270,7 @@ async fn websocket_v2_first_turn_uses_updated_fast_tier_after_startup_prewarm()
assert_eq!(warmup["generate"].as_bool(), Some(false));
assert_eq!(warmup.get("service_tier"), None);
test.submit_turn_with_service_tier("hello", Some(ServiceTier::priority()))
test.submit_turn_with_service_tier("hello", Some(priority_service_tier()))
.await?;
assert_eq!(server.handshakes().len(), 1);
@@ -313,7 +314,7 @@ async fn websocket_v2_first_turn_drops_fast_tier_after_startup_prewarm() -> Resu
.features
.enable(Feature::ResponsesWebsocketsV2)
.expect("test config should allow feature update");
config.service_tier = Some(ServiceTier::priority());
config.service_tier = Some(priority_service_tier());
});
let test = builder.build_with_websocket_server(&server).await?;
@@ -385,7 +386,7 @@ async fn websocket_v2_next_turn_uses_updated_service_tier() -> Result<()> {
assert_eq!(warmup["generate"].as_bool(), Some(false));
assert_eq!(warmup.get("service_tier"), None);
test.submit_turn_with_service_tier("first", Some(ServiceTier::priority()))
test.submit_turn_with_service_tier("first", Some(priority_service_tier()))
.await?;
test.submit_turn_with_service_tier("second", /*service_tier*/ None)
.await?;
+4 -2
View File
@@ -5,6 +5,8 @@ use codex_login::CodexAuth;
use codex_models_manager::manager::RefreshStrategy;
use codex_protocol::config_types::ReasoningSummary;
use codex_protocol::config_types::ServiceTier;
use codex_protocol::config_types::flex_service_tier;
use codex_protocol::config_types::priority_service_tier;
use codex_protocol::models::PermissionProfile;
use codex_protocol::openai_models::ConfigShellToolType;
use codex_protocol::openai_models::InputModality;
@@ -297,7 +299,7 @@ async fn service_tier_change_is_applied_on_next_http_turn() -> Result<()> {
let test = test_codex().build(&server).await?;
test.submit_turn_with_service_tier("fast turn", Some(ServiceTier::priority()))
test.submit_turn_with_service_tier("fast turn", Some(priority_service_tier()))
.await?;
test.submit_turn_with_service_tier("standard turn", /*service_tier*/ None)
.await?;
@@ -323,7 +325,7 @@ async fn flex_service_tier_is_applied_to_http_turn() -> Result<()> {
let test = test_codex().build(&server).await?;
test.submit_turn_with_service_tier("flex turn", Some(ServiceTier::flex()))
test.submit_turn_with_service_tier("flex turn", Some(flex_service_tier()))
.await?;
let request = resp_mock.single_request();