9285350842
This adds support for easily running Codex backed by a local Ollama instance running our new open source models. See https://github.com/openai/gpt-oss for details. If you pass in `--oss` you'll be prompted to install/launch ollama, and it will automatically download the 20b model and attempt to use it. We'll likely want to expand this with some options later to make the experience smoother for users who can't run the 20b or want to run the 120b. Co-authored-by: Michael Bolin <mbolin@openai.com>
83 lines
2.7 KiB
Rust
83 lines
2.7 KiB
Rust
use serde_json::Value as JsonValue;
|
|
|
|
use crate::pull::PullEvent;
|
|
|
|
// Convert a single JSON object representing a pull update into one or more events.
|
|
pub(crate) fn pull_events_from_value(value: &JsonValue) -> Vec<PullEvent> {
|
|
let mut events = Vec::new();
|
|
if let Some(status) = value.get("status").and_then(|s| s.as_str()) {
|
|
events.push(PullEvent::Status(status.to_string()));
|
|
if status == "success" {
|
|
events.push(PullEvent::Success);
|
|
}
|
|
}
|
|
let digest = value
|
|
.get("digest")
|
|
.and_then(|d| d.as_str())
|
|
.unwrap_or("")
|
|
.to_string();
|
|
let total = value.get("total").and_then(|t| t.as_u64());
|
|
let completed = value.get("completed").and_then(|t| t.as_u64());
|
|
if total.is_some() || completed.is_some() {
|
|
events.push(PullEvent::ChunkProgress {
|
|
digest,
|
|
total,
|
|
completed,
|
|
});
|
|
}
|
|
events
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_pull_events_decoder_status_and_success() {
|
|
let v: JsonValue = serde_json::json!({"status":"verifying"});
|
|
let events = pull_events_from_value(&v);
|
|
assert!(matches!(events.as_slice(), [PullEvent::Status(s)] if s == "verifying"));
|
|
|
|
let v2: JsonValue = serde_json::json!({"status":"success"});
|
|
let events2 = pull_events_from_value(&v2);
|
|
assert_eq!(events2.len(), 2);
|
|
assert!(matches!(events2[0], PullEvent::Status(ref s) if s == "success"));
|
|
assert!(matches!(events2[1], PullEvent::Success));
|
|
}
|
|
|
|
#[test]
|
|
fn test_pull_events_decoder_progress() {
|
|
let v: JsonValue = serde_json::json!({"digest":"sha256:abc","total":100});
|
|
let events = pull_events_from_value(&v);
|
|
assert_eq!(events.len(), 1);
|
|
match &events[0] {
|
|
PullEvent::ChunkProgress {
|
|
digest,
|
|
total,
|
|
completed,
|
|
} => {
|
|
assert_eq!(digest, "sha256:abc");
|
|
assert_eq!(*total, Some(100));
|
|
assert_eq!(*completed, None);
|
|
}
|
|
_ => panic!("expected ChunkProgress"),
|
|
}
|
|
|
|
let v2: JsonValue = serde_json::json!({"digest":"sha256:def","completed":42});
|
|
let events2 = pull_events_from_value(&v2);
|
|
assert_eq!(events2.len(), 1);
|
|
match &events2[0] {
|
|
PullEvent::ChunkProgress {
|
|
digest,
|
|
total,
|
|
completed,
|
|
} => {
|
|
assert_eq!(digest, "sha256:def");
|
|
assert_eq!(*total, None);
|
|
assert_eq!(*completed, Some(42));
|
|
}
|
|
_ => panic!("expected ChunkProgress"),
|
|
}
|
|
}
|
|
}
|