From 0ce1ed78e467cab75956b4db11277e4146ee93f4 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Tue, 18 Nov 2025 12:00:05 -0800 Subject: [PATCH] tests --- codex-rs/common/src/model_presets.rs | 19 +++++-------------- codex-rs/tui/src/chatwidget.rs | 2 +- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/codex-rs/common/src/model_presets.rs b/codex-rs/common/src/model_presets.rs index 79ce7210c5..033cea60b4 100644 --- a/codex-rs/common/src/model_presets.rs +++ b/codex-rs/common/src/model_presets.rs @@ -40,19 +40,10 @@ impl ReasoningEffortPreset { } } - pub fn label(&self) -> &'static str { + pub fn label(&self) -> String { self.label - .unwrap_or_else(|| default_reasoning_effort_label(self.effort)) - } -} - -const fn default_reasoning_effort_label(effort: ReasoningEffort) -> &'static str { - match effort { - ReasoningEffort::None => "None", - ReasoningEffort::Minimal => "Minimal", - ReasoningEffort::Low => "Low", - ReasoningEffort::Medium => "Medium", - ReasoningEffort::High => "High", + .map(ToString::to_string) + .unwrap_or_else(|| self.effort.to_string()) } } @@ -271,12 +262,12 @@ pub fn all_model_presets() -> &'static Vec { } impl ModelPreset { - pub fn reasoning_effort_label(&self, effort: ReasoningEffort) -> &'static str { + pub fn reasoning_effort_label(&self, effort: ReasoningEffort) -> String { self.supported_reasoning_efforts .iter() .find(|option| option.effort == effort) .map(ReasoningEffortPreset::label) - .unwrap_or_else(|| default_reasoning_effort_label(effort)) + .unwrap_or_else(|| effort.to_string()) } } #[cfg(test)] diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index 8efe810501..4af7e1655e 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -2195,7 +2195,7 @@ impl ChatWidget { let mut effort_label = supported .iter() .find(|option| option.effort == effort) - .map(|option| option.label().to_string()) + .map(codex_common::model_presets::ReasoningEffortPreset::label) .unwrap_or_else(|| effort.to_string()); let is_current_choice = is_current_model && choice.stored == highlight_choice; if choice.stored == default_choice && !is_current_choice {