mirror of
https://github.com/openai/codex.git
synced 2026-09-20 12:47:38 +00:00
## What changed - Replace dedicated Guardian endpoints with `/responses`, sending `x-codex-guardian: reviewer` or `x-codex-guardian: classifier` for eligible Codex backend requests over HTTP and WebSocket. - Add model-scoped thread headers, recheck backend authentication on each request attempt, and reconnect WebSockets when the applicable headers change. - Retain `features.guardianv2.free_guardian` for configuration compatibility while removing its routing gate; the backend now controls Guardian billing. ## Testing Update tests for reviewer and classifier headers, model and authentication scoping, HTTP fallback, WebSocket reuse, and parent-response metadata across retries. GitOrigin-RevId: 1c2b3c458ab77fb40aae4ee6784f6d827c60e76c
160 lines
4.8 KiB
Rust
160 lines
4.8 KiB
Rust
use crate::auth::SharedAuthProvider;
|
|
use crate::common::ResponseStream;
|
|
use crate::common::ResponsesApiRequest;
|
|
use crate::endpoint::session::EndpointSession;
|
|
use crate::error::ApiError;
|
|
use crate::provider::Provider;
|
|
use crate::requests::Compression;
|
|
use crate::requests::headers::build_session_headers;
|
|
use crate::requests::headers::insert_header;
|
|
use crate::requests::headers::subagent_header;
|
|
use crate::sse::spawn_response_stream;
|
|
use crate::telemetry::SseTelemetry;
|
|
use codex_client::EncodedJsonBody;
|
|
use codex_client::HttpTransport;
|
|
use codex_client::RequestCompression;
|
|
use codex_client::RequestTelemetry;
|
|
use codex_protocol::protocol::SessionSource;
|
|
use http::HeaderMap;
|
|
use http::HeaderValue;
|
|
use http::Method;
|
|
use serde_json::Value;
|
|
use std::sync::Arc;
|
|
use std::sync::OnceLock;
|
|
use tracing::instrument;
|
|
|
|
pub struct ResponsesClient<T: HttpTransport> {
|
|
session: EndpointSession<T>,
|
|
sse_telemetry: Option<Arc<dyn SseTelemetry>>,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
pub struct ResponsesOptions {
|
|
pub session_id: Option<String>,
|
|
pub thread_id: Option<String>,
|
|
pub session_source: Option<SessionSource>,
|
|
pub extra_headers: HeaderMap,
|
|
pub compression: Compression,
|
|
pub turn_state: Option<Arc<OnceLock<String>>>,
|
|
}
|
|
|
|
impl<T: HttpTransport> ResponsesClient<T> {
|
|
pub fn new(transport: T, provider: Provider, auth: SharedAuthProvider) -> Self {
|
|
Self {
|
|
session: EndpointSession::new(transport, provider, auth),
|
|
sse_telemetry: None,
|
|
}
|
|
}
|
|
|
|
pub fn with_telemetry(
|
|
self,
|
|
request: Option<Arc<dyn RequestTelemetry>>,
|
|
sse: Option<Arc<dyn SseTelemetry>>,
|
|
) -> Self {
|
|
Self {
|
|
session: self.session.with_request_telemetry(request),
|
|
sse_telemetry: sse,
|
|
}
|
|
}
|
|
|
|
#[instrument(
|
|
name = "responses.stream_request",
|
|
level = "info",
|
|
skip_all,
|
|
fields(
|
|
transport = "responses_http",
|
|
http.method = "POST",
|
|
api.path = "/responses"
|
|
)
|
|
)]
|
|
pub async fn stream_request(
|
|
&self,
|
|
request: ResponsesApiRequest,
|
|
options: ResponsesOptions,
|
|
) -> Result<ResponseStream, ApiError> {
|
|
let ResponsesOptions {
|
|
session_id,
|
|
thread_id,
|
|
session_source,
|
|
extra_headers,
|
|
compression,
|
|
turn_state,
|
|
} = options;
|
|
let body = EncodedJsonBody::encode(&request)
|
|
.map_err(|e| ApiError::Stream(format!("failed to encode responses request: {e}")))?;
|
|
|
|
let mut headers = extra_headers;
|
|
if let Some(ref thread_id) = thread_id {
|
|
insert_header(&mut headers, "x-client-request-id", thread_id);
|
|
}
|
|
headers.extend(build_session_headers(session_id, thread_id));
|
|
if let Some(subagent) = subagent_header(&session_source) {
|
|
insert_header(&mut headers, "x-openai-subagent", &subagent);
|
|
}
|
|
|
|
self.stream_encoded(body, headers, compression, turn_state)
|
|
.await
|
|
}
|
|
|
|
#[instrument(
|
|
name = "responses.stream",
|
|
level = "info",
|
|
skip_all,
|
|
fields(
|
|
transport = "responses_http",
|
|
http.method = "POST",
|
|
api.path = "/responses",
|
|
turn.has_state = turn_state.is_some()
|
|
)
|
|
)]
|
|
pub async fn stream(
|
|
&self,
|
|
body: Value,
|
|
extra_headers: HeaderMap,
|
|
compression: Compression,
|
|
turn_state: Option<Arc<OnceLock<String>>>,
|
|
) -> Result<ResponseStream, ApiError> {
|
|
let body = EncodedJsonBody::encode(&body)
|
|
.map_err(|e| ApiError::Stream(format!("failed to encode responses request: {e}")))?;
|
|
self.stream_encoded(body, extra_headers, compression, turn_state)
|
|
.await
|
|
}
|
|
|
|
async fn stream_encoded(
|
|
&self,
|
|
body: EncodedJsonBody,
|
|
extra_headers: HeaderMap,
|
|
compression: Compression,
|
|
turn_state: Option<Arc<OnceLock<String>>>,
|
|
) -> Result<ResponseStream, ApiError> {
|
|
let request_compression = match compression {
|
|
Compression::None => RequestCompression::None,
|
|
Compression::Zstd => RequestCompression::Zstd,
|
|
};
|
|
|
|
let stream_response = self
|
|
.session
|
|
.stream_encoded_json_with(
|
|
Method::POST,
|
|
"/responses",
|
|
extra_headers,
|
|
Some(body),
|
|
|req| {
|
|
req.headers.insert(
|
|
http::header::ACCEPT,
|
|
HeaderValue::from_static("text/event-stream"),
|
|
);
|
|
req.compression = request_compression;
|
|
},
|
|
)
|
|
.await?;
|
|
|
|
Ok(spawn_response_stream(
|
|
stream_response,
|
|
self.session.provider().stream_idle_timeout,
|
|
self.sse_telemetry.clone(),
|
|
turn_state,
|
|
))
|
|
}
|
|
}
|