mirror of
https://github.com/openai/codex.git
synced 2026-11-10 21:00:47 +00:00
alexsong-oai
b2a8e68c74
## What changed - Add Space to set the default provider from Model providers settings, persisting `model_provider` on the connected server. Keep provider details available and disable selection when server configuration or client launch settings fix the provider. - Apply the choice to `/new` while preserving the current chat. Refresh account details for new chats and reject account data that does not match the started provider. - Block stale `/model` choices during saves and after confirmed or uncertain provider changes, including across reconnects. Tell users to restart the app server and TUI to refresh the model list, and discard queued picker actions from another backend or chat. ## Testing Add coverage for provider saves, retry after disconnection, concurrent-save prevention, stale model choices, and account/provider matching, with updated provider-picker snapshots. GitOrigin-RevId: af6d149f7de7a2eaa09a31935f7088faa64d6a59
77 lines
2.3 KiB
Rust
77 lines
2.3 KiB
Rust
//! TUI model and collaboration inventories; refreshing models preserves the server mode catalog.
|
|
|
|
use crate::backend_id::BackendId;
|
|
use codex_protocol::config_types::CollaborationModeMask;
|
|
use codex_protocol::openai_models::ModelPreset;
|
|
use std::collections::HashMap;
|
|
use std::convert::Infallible;
|
|
use std::sync::Arc;
|
|
use tokio::sync::Mutex;
|
|
|
|
/// Held during the config RPC. A confirmed or possible switch makes this backend's untagged model list
|
|
/// unsafe to apply for the rest of this TUI session, including after reconnecting.
|
|
pub(crate) type ProviderWrite = Arc<Mutex<bool>>;
|
|
|
|
pub(crate) const LUNA_RESERVE_MODEL: &str = "gpt-reserve";
|
|
pub(crate) const LUNA_MODEL: &str = "gpt-6-luna";
|
|
|
|
pub(crate) fn model_display_name(model: &str) -> &str {
|
|
if model.eq_ignore_ascii_case(LUNA_RESERVE_MODEL) {
|
|
"Luna Reserve"
|
|
} else {
|
|
model
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub(crate) struct ModelCatalog {
|
|
pub(crate) backend: Option<BackendId>,
|
|
pub(crate) provider_write: ProviderWrite,
|
|
pub(crate) models: Vec<ModelPreset>,
|
|
pub(crate) collaboration_modes: Vec<CollaborationModeMask>,
|
|
}
|
|
|
|
impl ModelCatalog {
|
|
pub(crate) fn new(models: Vec<ModelPreset>) -> Self {
|
|
Self {
|
|
backend: None,
|
|
provider_write: ProviderWrite::default(),
|
|
models,
|
|
collaboration_modes: Vec::new(),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn for_backend(
|
|
mut self,
|
|
backend: BackendId,
|
|
writes: &mut HashMap<BackendId, ProviderWrite>,
|
|
) -> Self {
|
|
self.backend = Some(backend);
|
|
self.provider_write = writes.entry(backend).or_default().clone();
|
|
self
|
|
}
|
|
|
|
pub(crate) fn provider_may_have_changed(&self) -> bool {
|
|
self.provider_write
|
|
.try_lock()
|
|
.map_or(true, |changed| *changed)
|
|
}
|
|
|
|
pub(crate) fn with_collaboration_modes(mut self, modes: Vec<CollaborationModeMask>) -> Self {
|
|
self.collaboration_modes = modes;
|
|
self
|
|
}
|
|
|
|
pub(crate) fn try_list_models(&self) -> Result<Vec<ModelPreset>, Infallible> {
|
|
Ok(self.models.clone())
|
|
}
|
|
|
|
pub(crate) fn display_name<'a>(&'a self, model: &'a str) -> &'a str {
|
|
self.models
|
|
.iter()
|
|
.find(|preset| preset.model == model)
|
|
.map(|preset| preset.display_name.as_str())
|
|
.unwrap_or_else(|| model_display_name(model))
|
|
}
|
|
}
|