mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
Ahmed Ibrahim
cb9a189857
- Make Config.model optional and centralize default-selection logic in ModelsManager, including a default_model helper (with codex-auto-balanced when available) so sessions now carry an explicit chosen model separate from the base config. - Resolve `model` once in `core` and `tui` from config. Then store the state of it on other structs. - Move refreshing models to be before resolving the default model
48 lines
1.5 KiB
Rust
48 lines
1.5 KiB
Rust
mod client;
|
|
mod parser;
|
|
mod pull;
|
|
mod url;
|
|
|
|
pub use client::OllamaClient;
|
|
use codex_core::config::Config;
|
|
pub use pull::CliProgressReporter;
|
|
pub use pull::PullEvent;
|
|
pub use pull::PullProgressReporter;
|
|
pub use pull::TuiProgressReporter;
|
|
|
|
/// Default OSS model to use when `--oss` is passed without an explicit `-m`.
|
|
pub const DEFAULT_OSS_MODEL: &str = "gpt-oss:20b";
|
|
|
|
/// Prepare the local OSS environment when `--oss` is selected.
|
|
///
|
|
/// - Ensures a local Ollama server is reachable.
|
|
/// - Checks if the model exists locally and pulls it if missing.
|
|
pub async fn ensure_oss_ready(config: &Config) -> std::io::Result<()> {
|
|
// Only download when the requested model is the default OSS model (or when -m is not provided).
|
|
let model = match config.model.as_ref() {
|
|
Some(model) => model,
|
|
None => DEFAULT_OSS_MODEL,
|
|
};
|
|
|
|
// Verify local Ollama is reachable.
|
|
let ollama_client = crate::OllamaClient::try_from_oss_provider(config).await?;
|
|
|
|
// If the model is not present locally, pull it.
|
|
match ollama_client.fetch_models().await {
|
|
Ok(models) => {
|
|
if !models.iter().any(|m| m == model) {
|
|
let mut reporter = crate::CliProgressReporter::new();
|
|
ollama_client
|
|
.pull_with_reporter(model, &mut reporter)
|
|
.await?;
|
|
}
|
|
}
|
|
Err(err) => {
|
|
// Not fatal; higher layers may still proceed and surface errors later.
|
|
tracing::warn!("Failed to query local models from Ollama: {}.", err);
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|