mirror of
https://github.com/openai/codex.git
synced 2026-05-01 11:52:10 +03:00
Move compression into the request builder
This commit is contained in:
40
codex-rs/codex-api/src/requests/body.rs
Normal file
40
codex-rs/codex-api/src/requests/body.rs
Normal file
@@ -0,0 +1,40 @@
|
||||
use crate::error::ApiError;
|
||||
use crate::provider::RequestCompression;
|
||||
use bytes::Bytes;
|
||||
use codex_client::Body;
|
||||
use http::HeaderMap;
|
||||
use http::HeaderValue;
|
||||
use http::header::CONTENT_ENCODING;
|
||||
use serde_json::Value;
|
||||
use std::time::Instant;
|
||||
use tracing::info;
|
||||
use zstd::stream::encode_all;
|
||||
|
||||
pub(crate) fn encode_body(body: &Value, compression: RequestCompression) -> Result<Body, ApiError> {
|
||||
match compression {
|
||||
RequestCompression::None => Ok(Body::Json(body.clone())),
|
||||
RequestCompression::Zstd => {
|
||||
let json = serde_json::to_vec(body).map_err(|err| {
|
||||
ApiError::Stream(format!("failed to encode request body as json: {err}"))
|
||||
})?;
|
||||
let started_at = Instant::now();
|
||||
let compressed = encode_all(json.as_slice(), 0).map_err(|err| {
|
||||
ApiError::Stream(format!("failed to compress request body: {err}"))
|
||||
})?;
|
||||
let elapsed = started_at.elapsed();
|
||||
info!(
|
||||
input_bytes = json.len(),
|
||||
output_bytes = compressed.len(),
|
||||
elapsed_ms = elapsed.as_millis(),
|
||||
"compressed request body"
|
||||
);
|
||||
Ok(Body::Bytes(Bytes::from(compressed)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn insert_compression_headers(headers: &mut HeaderMap, compression: RequestCompression) {
|
||||
if matches!(compression, RequestCompression::Zstd) {
|
||||
headers.insert(CONTENT_ENCODING, HeaderValue::from_static("zstd"));
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
pub(crate) mod body;
|
||||
pub mod chat;
|
||||
pub(crate) mod headers;
|
||||
pub mod responses;
|
||||
|
||||
@@ -3,9 +3,13 @@ use crate::common::ResponsesApiRequest;
|
||||
use crate::common::TextControls;
|
||||
use crate::error::ApiError;
|
||||
use crate::provider::Provider;
|
||||
use crate::provider::RequestCompression;
|
||||
use crate::requests::body::encode_body;
|
||||
use crate::requests::body::insert_compression_headers;
|
||||
use crate::requests::headers::build_conversation_headers;
|
||||
use crate::requests::headers::insert_header;
|
||||
use crate::requests::headers::subagent_header;
|
||||
use codex_client::Body;
|
||||
use codex_protocol::models::ResponseItem;
|
||||
use codex_protocol::protocol::SessionSource;
|
||||
use http::HeaderMap;
|
||||
@@ -13,7 +17,7 @@ use serde_json::Value;
|
||||
|
||||
/// Assembled request body plus headers for a Responses stream request.
|
||||
pub struct ResponsesRequest {
|
||||
pub body: Value,
|
||||
pub body: Body,
|
||||
pub headers: HeaderMap,
|
||||
}
|
||||
|
||||
@@ -32,6 +36,7 @@ pub struct ResponsesRequestBuilder<'a> {
|
||||
session_source: Option<SessionSource>,
|
||||
store_override: Option<bool>,
|
||||
headers: HeaderMap,
|
||||
request_compression: RequestCompression,
|
||||
}
|
||||
|
||||
impl<'a> ResponsesRequestBuilder<'a> {
|
||||
@@ -94,6 +99,11 @@ impl<'a> ResponsesRequestBuilder<'a> {
|
||||
self
|
||||
}
|
||||
|
||||
pub fn request_compression(mut self, request_compression: RequestCompression) -> Self {
|
||||
self.request_compression = request_compression;
|
||||
self
|
||||
}
|
||||
|
||||
pub fn build(self, provider: &Provider) -> Result<ResponsesRequest, ApiError> {
|
||||
let model = self
|
||||
.model
|
||||
@@ -137,6 +147,8 @@ impl<'a> ResponsesRequestBuilder<'a> {
|
||||
if let Some(subagent) = subagent_header(&self.session_source) {
|
||||
insert_header(&mut headers, "x-openai-subagent", &subagent);
|
||||
}
|
||||
insert_compression_headers(&mut headers, self.request_compression);
|
||||
let body = encode_body(&body, self.request_compression)?;
|
||||
|
||||
Ok(ResponsesRequest { body, headers })
|
||||
}
|
||||
@@ -175,6 +187,7 @@ mod tests {
|
||||
|
||||
use crate::provider::RetryConfig;
|
||||
use crate::provider::WireApi;
|
||||
use codex_client::Body;
|
||||
use codex_protocol::protocol::SubAgentSource;
|
||||
use http::HeaderValue;
|
||||
use pretty_assertions::assert_eq;
|
||||
@@ -220,10 +233,12 @@ mod tests {
|
||||
.build(&provider)
|
||||
.expect("request");
|
||||
|
||||
assert_eq!(request.body.get("store"), Some(&Value::Bool(true)));
|
||||
let Body::Json(body) = &request.body else {
|
||||
panic!("expected json body for responses request");
|
||||
};
|
||||
assert_eq!(body.get("store"), Some(&Value::Bool(true)));
|
||||
|
||||
let ids: Vec<Option<String>> = request
|
||||
.body
|
||||
let ids: Vec<Option<String>> = body
|
||||
.get("input")
|
||||
.and_then(|v| v.as_array())
|
||||
.into_iter()
|
||||
|
||||
Reference in New Issue
Block a user