mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
Add default model provider selection to the app server (#61397)
## What changed Add `modelProvider/default/set` with a `providerId` parameter to persist the default provider for new threads and model lists. Return `ConfigWriteResponse`, reject unconfigured providers, and respect managed requirements, read-only configuration, and CLI overrides. Reload the model catalog on its next read when the default changes effectively. Resolve explicit `model/list` provider selections against the current catalog configuration so clients can continue listing models for a retained provider after switching defaults. Update the protocol schemas, generated TypeScript and Python types, and app-server documentation. ## Testing Add coverage for switching defaults and switching back, rejecting unknown providers without changing the catalog, retaining explicit provider selections, reporting CLI overrides, and rejecting writes blocked by configuration restrictions. GitOrigin-RevId: 3615835f58045d33a21b3c57d47932d6d1e3fb12
This commit is contained in:
@@ -347,13 +347,24 @@ impl ConfigManager {
|
||||
));
|
||||
}
|
||||
|
||||
self.persist_user_edits(&layers, &user_layer, provided_path, edits)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn persist_user_edits(
|
||||
&self,
|
||||
layers: &ConfigLayerStack,
|
||||
user_layer: &ConfigLayerEntry,
|
||||
provided_path: AbsolutePathBuf,
|
||||
edits: Vec<(String, JsonValue, MergeStrategy)>,
|
||||
) -> Result<ConfigWriteResponse, ConfigManagerError> {
|
||||
let mut user_config = user_layer.config.clone();
|
||||
let mut credential_provider_edits = CredentialProviderEdits::new(&user_config);
|
||||
let mut parsed_segments = Vec::new();
|
||||
let mut config_edits = Vec::new();
|
||||
|
||||
for (key_path, value, strategy) in edits.into_iter() {
|
||||
let mut segments = writable_key_path(&layers, &key_path)?;
|
||||
let mut segments = writable_key_path(layers, &key_path)?;
|
||||
if (value.is_null() || matches!(strategy, MergeStrategy::Upsert))
|
||||
&& let Some(pattern) = shell_environment_filter_entry(&user_config, &segments)
|
||||
.map(|(pattern, _)| pattern.clone())
|
||||
|
||||
@@ -3,7 +3,11 @@
|
||||
use super::ConfigManager;
|
||||
use super::ConfigManagerError;
|
||||
use super::TomlValue;
|
||||
use codex_app_server_protocol::ConfigWriteErrorCode;
|
||||
use codex_app_server_protocol::ConfigWriteResponse;
|
||||
use codex_app_server_protocol::GatewayAuth;
|
||||
use codex_app_server_protocol::MergeStrategy;
|
||||
use codex_app_server_protocol::ModelProviderDefaultSetParams;
|
||||
use codex_app_server_protocol::ModelProviderListParams;
|
||||
use codex_app_server_protocol::ModelProviderListResponse;
|
||||
use codex_app_server_protocol::ModelProviderSummary;
|
||||
@@ -62,6 +66,50 @@ pub(super) fn valid_endpoint(value: &str) -> bool {
|
||||
}
|
||||
|
||||
impl ConfigManager {
|
||||
pub(crate) async fn model_provider_default_set(
|
||||
&self,
|
||||
params: ModelProviderDefaultSetParams,
|
||||
) -> Result<ConfigWriteResponse, ConfigManagerError> {
|
||||
let layers = self
|
||||
.load_thread_agnostic_config()
|
||||
.await
|
||||
.map_err(|err| ConfigManagerError::io("failed to read providers", err))?;
|
||||
let user_layer =
|
||||
writable_user_layer(&layers, self.loader_overrides()).ok_or_else(|| {
|
||||
ConfigManagerError::write(
|
||||
ConfigWriteErrorCode::ConfigLayerReadonly,
|
||||
"The user configuration is not writable.",
|
||||
)
|
||||
})?;
|
||||
let provider_id = params.provider_id;
|
||||
if !built_in_model_providers(/*openai_base_url*/ None).contains_key(&provider_id)
|
||||
&& layers
|
||||
.effective_config()
|
||||
.get("model_providers")
|
||||
.and_then(|providers| providers.get(&provider_id))
|
||||
.is_none()
|
||||
{
|
||||
return Err(ConfigManagerError::write(
|
||||
ConfigWriteErrorCode::ConfigValidationError,
|
||||
format!("Model provider `{provider_id}` is not configured."),
|
||||
));
|
||||
}
|
||||
let user_path = self
|
||||
.user_config_path()
|
||||
.map_err(|err| ConfigManagerError::io("failed to resolve user config path", err))?;
|
||||
self.persist_user_edits(
|
||||
&layers,
|
||||
user_layer,
|
||||
user_path,
|
||||
vec![(
|
||||
"model_provider".into(),
|
||||
provider_id.into(),
|
||||
MergeStrategy::Replace,
|
||||
)],
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn model_provider_list(
|
||||
&self,
|
||||
_params: ModelProviderListParams,
|
||||
|
||||
@@ -3454,6 +3454,29 @@ async fn cloud_desktop_storage_requirements_control_reads_and_writes() {
|
||||
.expect("unmanaged desktop settings stay writable");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_provider_default_set_reports_a_cli_override() -> Result<()> {
|
||||
let tmp = tempdir()?;
|
||||
std::fs::write(tmp.path().join(CONFIG_TOML_FILE), "")?;
|
||||
let service = ConfigManager::new_for_tests(
|
||||
tmp.path().to_path_buf(),
|
||||
vec![("model_provider".into(), TomlValue::String("openai".into()))],
|
||||
LoaderOverrides::without_managed_config_for_tests(),
|
||||
CloudConfigBundleLoader::default(),
|
||||
);
|
||||
let result = service
|
||||
.model_provider_default_set(codex_app_server_protocol::ModelProviderDefaultSetParams {
|
||||
provider_id: "amazon-bedrock".into(),
|
||||
})
|
||||
.await?;
|
||||
assert_eq!(result.status, WriteStatus::OkOverridden);
|
||||
assert_eq!(
|
||||
result.overridden_metadata.unwrap().effective_value,
|
||||
serde_json::json!("openai")
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_provider_list_allows_user_overrides_of_system_defaults() -> Result<()> {
|
||||
use codex_app_server_protocol::ModelProviderListParams;
|
||||
@@ -3550,6 +3573,20 @@ async fn model_provider_list_allows_user_overrides_of_system_defaults() -> Resul
|
||||
.model_provider_list(ModelProviderListParams {})
|
||||
.await?;
|
||||
assert_eq!(response.can_change_default, can_change_default);
|
||||
if ignore_user_config {
|
||||
let error = service
|
||||
.model_provider_default_set(
|
||||
codex_app_server_protocol::ModelProviderDefaultSetParams {
|
||||
provider_id: "openai".into(),
|
||||
},
|
||||
)
|
||||
.await
|
||||
.unwrap_err();
|
||||
assert_eq!(
|
||||
error.write_error_code(),
|
||||
Some(ConfigWriteErrorCode::ConfigLayerReadonly)
|
||||
);
|
||||
}
|
||||
assert_eq!(response.default_provider_id, "team");
|
||||
assert_eq!(
|
||||
serde_json::to_value(response.data)?,
|
||||
|
||||
@@ -1353,6 +1353,11 @@ impl MessageProcessor {
|
||||
.model_provider_config_write(params)
|
||||
.await
|
||||
.map(|r| Some(r.into())),
|
||||
ClientRequest::ModelProviderDefaultSet { params, .. } => self
|
||||
.config_processor
|
||||
.model_provider_default_set(params)
|
||||
.await
|
||||
.map(Some),
|
||||
ClientRequest::ModelProviderCapabilitiesRead { .. } => self
|
||||
.config_processor
|
||||
.model_provider_capabilities_read()
|
||||
|
||||
@@ -63,7 +63,7 @@ impl ModelCatalog {
|
||||
self.config_manager.load_config_layers(cwd).await
|
||||
}
|
||||
|
||||
/// Marks catalog configuration stale after an account transition.
|
||||
/// Reloads catalog configuration on the next read.
|
||||
pub(crate) async fn invalidate(&self) {
|
||||
self.state.lock().await.needs_reload = true;
|
||||
}
|
||||
|
||||
@@ -187,12 +187,10 @@ impl CatalogRequestProcessor {
|
||||
let (config, models_manager) = match params.model_provider.as_deref() {
|
||||
None => (active_config, active_models_manager),
|
||||
Some(provider_id) => {
|
||||
let config = config_for_provider(&self.config, provider_id)?;
|
||||
if provider_id == active_config.model_provider_id
|
||||
&& config.model_provider == active_config.model_provider
|
||||
{
|
||||
if provider_id == active_config.model_provider_id {
|
||||
(active_config, active_models_manager)
|
||||
} else {
|
||||
let config = config_for_provider(&active_config, provider_id)?;
|
||||
// Temporary catalogs must not replace the active provider's disk cache.
|
||||
let manager = self.thread_manager.temporary_models_manager_for_config(
|
||||
&config,
|
||||
|
||||
@@ -240,6 +240,25 @@ impl ConfigRequestProcessor {
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
pub(crate) fn model_provider_default_set(
|
||||
&self,
|
||||
params: codex_app_server_protocol::ModelProviderDefaultSetParams,
|
||||
) -> futures::future::BoxFuture<'_, Result<ClientResponsePayload, JSONRPCErrorError>> {
|
||||
// Keep provider config resolution off the shared request dispatcher stack.
|
||||
Box::pin(async move {
|
||||
let result = self
|
||||
.config_manager
|
||||
.model_provider_default_set(params)
|
||||
.await
|
||||
.map_err(map_error);
|
||||
let response = self.handle_config_mutation_result(result).await?;
|
||||
if response.status == codex_app_server_protocol::WriteStatus::Ok {
|
||||
self.model_catalog.invalidate().await;
|
||||
}
|
||||
Ok(ClientResponsePayload::ModelProviderDefaultSet(response))
|
||||
})
|
||||
}
|
||||
|
||||
pub(crate) async fn model_provider_capabilities_read(
|
||||
&self,
|
||||
) -> Result<ModelProviderCapabilitiesReadResponse, JSONRPCErrorError> {
|
||||
|
||||
Reference in New Issue
Block a user