mirror of
https://github.com/openai/codex.git
synced 2026-11-02 19:43:24 +00:00
## What changed - Send the active turn ID in the `x-codex-image-turn-id` header for image generation and edit requests. - Add `explicit_client_interrupt_requested_at_ms` to turn analytics. Record the earliest explicit interrupt request that receives a successful response, while excluding rejected requests. - Track errors returned by `turn/interrupt` so pending analytics state is cleaned up correctly. ## Testing - Cover turn ID headers for image generation and editing. - Cover accepted, retried, and rejected explicit interrupt requests in analytics tests. GitOrigin-RevId: 80fe996a161b4952b79c5c38238f75b7661b92af
91 lines
2.7 KiB
Rust
91 lines
2.7 KiB
Rust
use codex_api::ImageEditRequest;
|
|
use codex_api::ImageGenerationRequest;
|
|
use codex_api::ImageResponse;
|
|
use codex_api::ImagesClient;
|
|
use codex_api::ReqwestTransport;
|
|
use codex_login::default_client::add_originator_header;
|
|
use codex_login::default_client::create_client;
|
|
use codex_model_provider::SharedModelProvider;
|
|
use http::HeaderMap;
|
|
use http::HeaderValue;
|
|
|
|
const X_CODEX_IMAGE_TURN_ID_HEADER: &str = "x-codex-image-turn-id";
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct CodexImagesBackend {
|
|
provider: SharedModelProvider,
|
|
originator: Option<String>,
|
|
}
|
|
|
|
impl CodexImagesBackend {
|
|
/// Creates a backend that sends image requests through the active model provider.
|
|
pub(crate) fn new(provider: SharedModelProvider, originator: Option<String>) -> Self {
|
|
Self {
|
|
provider,
|
|
originator,
|
|
}
|
|
}
|
|
|
|
/// Resolves the provider and auth required for the current image API request.
|
|
async fn client(&self) -> Result<ImagesClient<ReqwestTransport>, String> {
|
|
let provider = self
|
|
.provider
|
|
.api_provider()
|
|
.await
|
|
.map_err(|err| err.to_string())?;
|
|
let auth = self
|
|
.provider
|
|
.api_auth()
|
|
.await
|
|
.map_err(|err| err.to_string())?;
|
|
Ok(ImagesClient::new(
|
|
ReqwestTransport::from_http_client(create_client()),
|
|
provider,
|
|
auth,
|
|
))
|
|
}
|
|
|
|
/// Sends a standalone image generation request through the configured Images client.
|
|
pub(crate) async fn generate(
|
|
&self,
|
|
request: ImageGenerationRequest,
|
|
turn_id: &str,
|
|
) -> Result<ImageResponse, String> {
|
|
self.client()
|
|
.await?
|
|
.generate(
|
|
&request,
|
|
image_request_headers(self.originator.as_deref(), turn_id),
|
|
)
|
|
.await
|
|
.map_err(|err| err.to_string())
|
|
}
|
|
|
|
/// Sends a standalone image edit request through the configured Images client.
|
|
pub(crate) async fn edit(
|
|
&self,
|
|
request: ImageEditRequest,
|
|
turn_id: &str,
|
|
) -> Result<ImageResponse, String> {
|
|
self.client()
|
|
.await?
|
|
.edit(
|
|
&request,
|
|
image_request_headers(self.originator.as_deref(), turn_id),
|
|
)
|
|
.await
|
|
.map_err(|err| err.to_string())
|
|
}
|
|
}
|
|
|
|
fn image_request_headers(originator: Option<&str>, turn_id: &str) -> HeaderMap {
|
|
let mut headers = HeaderMap::new();
|
|
if let Ok(turn_id) = HeaderValue::from_str(turn_id) {
|
|
headers.insert(X_CODEX_IMAGE_TURN_ID_HEADER, turn_id);
|
|
}
|
|
if let Some(originator) = originator {
|
|
add_originator_header(&mut headers, originator);
|
|
}
|
|
headers
|
|
}
|