mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
Expose Daybreak availability in model discovery (#62499)
## Why Clients need to distinguish a caller who must enroll in Daybreak from a model that does not support it. The list of accepted access programs alone cannot express that distinction. ## What changed Carry the server-resolved status for each caller and model from the model catalog into `model/list` as `availableAccessPrograms.daybreakAvailability`. Update the JSON schemas, TypeScript bindings, and Python SDK to expose the field. Rust decoders use `default` for missing or unrecognized statuses. The Python SDK also defaults missing statuses and preserves new strings from newer hosts. ## Testing Cover catalog decoding, app-server response serialization, and Python SDK round trips with known, missing, and future status values. GitOrigin-RevId: c1e5ddef68fd19b25e583bb6996a93fd78ab9d18
This commit is contained in:
committed by
copyberry
parent
b0ecad9cf9
commit
1826d80eca
@@ -58,6 +58,7 @@ mod guardian_v2;
|
||||
#[path = "openai_models/reasoning_effort.rs"]
|
||||
mod reasoning_effort;
|
||||
|
||||
pub use access_programs::DaybreakAvailability;
|
||||
pub use access_programs::ModelAccessPrograms;
|
||||
pub use access_programs::SavedDaybreakChoice;
|
||||
pub use guardian_v2::AsyncClassifierMode;
|
||||
@@ -2229,13 +2230,17 @@ mod tests {
|
||||
(Some(serde_json::Value::Null), None),
|
||||
(
|
||||
Some(serde_json::json!({ "cyber": [] })),
|
||||
Some(ModelAccessPrograms { cyber: vec![] }),
|
||||
Some(ModelAccessPrograms {
|
||||
cyber: vec![],
|
||||
daybreak_availability: Default::default(),
|
||||
}),
|
||||
),
|
||||
(
|
||||
Some(serde_json::json!({
|
||||
"cyber": ["standard", "daybreak_blue", "future_program", "daybreak_red"]
|
||||
})),
|
||||
Some(ModelAccessPrograms {
|
||||
daybreak_availability: Default::default(),
|
||||
cyber: vec![
|
||||
CyberAccessProgram::Standard,
|
||||
CyberAccessProgram::DaybreakBlue,
|
||||
@@ -2243,7 +2248,46 @@ mod tests {
|
||||
],
|
||||
}),
|
||||
),
|
||||
] {
|
||||
]
|
||||
.into_iter()
|
||||
.chain(
|
||||
[
|
||||
(
|
||||
serde_json::json!("available"),
|
||||
DaybreakAvailability::Available,
|
||||
),
|
||||
(
|
||||
serde_json::json!("enrollment_required"),
|
||||
DaybreakAvailability::EnrollmentRequired,
|
||||
),
|
||||
(
|
||||
serde_json::json!("unavailable_for_model"),
|
||||
DaybreakAvailability::UnavailableForModel,
|
||||
),
|
||||
(serde_json::json!("default"), DaybreakAvailability::Default),
|
||||
(
|
||||
serde_json::json!("future_status"),
|
||||
DaybreakAvailability::Default,
|
||||
),
|
||||
]
|
||||
.into_iter()
|
||||
.map(|(availability, expected_availability)| {
|
||||
(
|
||||
Some(serde_json::json!({
|
||||
"cyber": ["standard", "daybreak_blue", "future_program", "daybreak_red"],
|
||||
"daybreak_availability": availability,
|
||||
})),
|
||||
Some(ModelAccessPrograms {
|
||||
cyber: vec![
|
||||
CyberAccessProgram::Standard,
|
||||
CyberAccessProgram::DaybreakBlue,
|
||||
CyberAccessProgram::DaybreakRed,
|
||||
],
|
||||
daybreak_availability: expected_availability,
|
||||
}),
|
||||
)
|
||||
}),
|
||||
) {
|
||||
let mut value = serde_json::to_value(test_model(/*spec*/ None)).unwrap();
|
||||
if let Some(metadata) = metadata {
|
||||
value["available_access_programs"] = metadata;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//! Caller-specific explicit access programs advertised by the model catalog.
|
||||
//! Caller-specific access programs and Daybreak availability from the model catalog.
|
||||
//!
|
||||
//! Discovery metadata does not grant access; inference still enforces authorization.
|
||||
|
||||
@@ -15,6 +15,21 @@ pub struct ModelAccessPrograms {
|
||||
/// Accepted explicit selections. An empty list is distinct from missing metadata.
|
||||
#[serde(deserialize_with = "deserialize_known_cyber_access_programs")]
|
||||
pub cyber: Vec<CyberAccessProgram>,
|
||||
/// Server-resolved Daybreak availability for this caller and model.
|
||||
#[serde(default)]
|
||||
pub daybreak_availability: DaybreakAvailability,
|
||||
}
|
||||
|
||||
/// Server-resolved Daybreak availability for this caller and model.
|
||||
#[derive(Debug, Default, Serialize, Deserialize, Clone, Copy, PartialEq, Eq, TS, JsonSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum DaybreakAvailability {
|
||||
Available,
|
||||
EnrollmentRequired,
|
||||
UnavailableForModel,
|
||||
#[default]
|
||||
#[serde(other)]
|
||||
Default,
|
||||
}
|
||||
|
||||
/// Saved preference to resolve against the selected model's advertised programs.
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#![cfg(test)]
|
||||
|
||||
use super::DaybreakAvailability;
|
||||
use super::ModelAccessPrograms;
|
||||
use super::SavedDaybreakChoice;
|
||||
use crate::turn_input::CyberAccessProgram;
|
||||
@@ -18,22 +19,32 @@ fn selects_only_advertised_programs_with_blue_preferred() {
|
||||
(vec![Standard], None, Some(Standard)),
|
||||
(vec![], None, None),
|
||||
] {
|
||||
let programs = ModelAccessPrograms { cyber };
|
||||
assert_eq!(
|
||||
(
|
||||
programs.daybreak(),
|
||||
programs.standard(),
|
||||
programs.select_saved(SavedDaybreakChoice::from(Some(true))),
|
||||
programs.select_saved(SavedDaybreakChoice::from(Some(false))),
|
||||
programs.select_saved(SavedDaybreakChoice::from(/* enabled */ None)),
|
||||
),
|
||||
(
|
||||
expected_daybreak,
|
||||
expected_standard,
|
||||
expected_daybreak,
|
||||
expected_standard,
|
||||
None,
|
||||
)
|
||||
);
|
||||
for availability in [
|
||||
DaybreakAvailability::Available,
|
||||
DaybreakAvailability::EnrollmentRequired,
|
||||
DaybreakAvailability::UnavailableForModel,
|
||||
DaybreakAvailability::Default,
|
||||
] {
|
||||
let programs = ModelAccessPrograms {
|
||||
cyber: cyber.clone(),
|
||||
daybreak_availability: availability,
|
||||
};
|
||||
assert_eq!(
|
||||
(
|
||||
programs.daybreak(),
|
||||
programs.standard(),
|
||||
programs.select_saved(SavedDaybreakChoice::from(Some(true))),
|
||||
programs.select_saved(SavedDaybreakChoice::from(Some(false))),
|
||||
programs.select_saved(SavedDaybreakChoice::from(/* enabled */ None)),
|
||||
),
|
||||
(
|
||||
expected_daybreak,
|
||||
expected_standard,
|
||||
expected_daybreak,
|
||||
expected_standard,
|
||||
None,
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user