mirror of
https://github.com/openai/codex.git
synced 2026-11-16 14:55:43 +00:00
Remove the unused legacy remote compaction implementation (#44273)
## Why Remote compaction already uses the normal Responses API, leaving the legacy `/responses/compact` runner unused. ## What changed - Remove the legacy runner, endpoint client, request types, analytics variant, and obsolete test helpers and snapshots. - Move tool-output trimming and its metadata tests into `compact_remote_history` for reuse by remote compaction v2. - Consolidate retained-history filtering in the v2 implementation and remove redundant `RemoteCompactionV2` settings from tests. ## Testing Extend the retained-history unit test to explicitly check that hook prompts survive compaction. GitOrigin-RevId: 999bb1391aa22c3c281d6a96f98817d6c9e46ed9
This commit is contained in:
1 parent
a3ba42b010
commit
1ac689cc7d
44 files changed
+169
-1964
No files matched your search
@@ -1084,14 +1084,6 @@ fn base_mock() -> (MockBuilder, ResponseMock) {
|
||||
(mock, response_mock)
|
||||
}
|
||||
|
||||
fn compact_mock() -> (MockBuilder, ResponseMock) {
|
||||
let response_mock = ResponseMock::new();
|
||||
let mock = Mock::given(method("POST"))
|
||||
.and(path_regex(".*/responses/compact$"))
|
||||
.and(response_mock.clone());
|
||||
(mock, response_mock)
|
||||
}
|
||||
|
||||
fn models_mock() -> (MockBuilder, ModelsMock) {
|
||||
let models_mock = ModelsMock::new();
|
||||
let mock = Mock::given(method("GET"))
|
||||
@@ -1122,119 +1114,6 @@ pub async fn mount_sse_once(server: &MockServer, body: String) -> ResponseMock {
|
||||
response_mock
|
||||
}
|
||||
|
||||
pub async fn mount_compact_json_once(server: &MockServer, body: serde_json::Value) -> ResponseMock {
|
||||
mount_compact_response_once(
|
||||
server,
|
||||
ResponseTemplate::new(200)
|
||||
.insert_header("content-type", "application/json")
|
||||
.set_body_json(body),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Mount a `/responses/compact` mock that mirrors the default remote compaction shape:
|
||||
/// keep user+developer messages from the request, drop assistant/tool artifacts, and append one
|
||||
/// compaction item carrying the provided summary text.
|
||||
pub async fn mount_compact_user_history_with_summary_once(
|
||||
server: &MockServer,
|
||||
summary_text: &str,
|
||||
) -> ResponseMock {
|
||||
mount_compact_user_history_with_summary_sequence(server, vec![summary_text.to_string()]).await
|
||||
}
|
||||
|
||||
/// Same as [`mount_compact_user_history_with_summary_once`], but for multiple compact calls.
|
||||
/// Each incoming compact request receives the next summary text in order.
|
||||
pub async fn mount_compact_user_history_with_summary_sequence(
|
||||
server: &MockServer,
|
||||
summary_texts: Vec<String>,
|
||||
) -> ResponseMock {
|
||||
use std::sync::atomic::AtomicUsize;
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
#[derive(Debug)]
|
||||
struct UserHistorySummaryResponder {
|
||||
num_calls: AtomicUsize,
|
||||
summary_texts: Vec<String>,
|
||||
}
|
||||
|
||||
impl Respond for UserHistorySummaryResponder {
|
||||
fn respond(&self, request: &wiremock::Request) -> ResponseTemplate {
|
||||
let call_num = self.num_calls.fetch_add(1, Ordering::SeqCst);
|
||||
let summary_text = self
|
||||
.summary_texts
|
||||
.get(call_num)
|
||||
.expect("missing summary text for compact request");
|
||||
let body_bytes = decode_body_bytes(
|
||||
&request.body,
|
||||
request
|
||||
.headers
|
||||
.get("content-encoding")
|
||||
.and_then(|value| value.to_str().ok()),
|
||||
);
|
||||
let body_json: Value =
|
||||
serde_json::from_slice(&body_bytes).expect("failed to parse compact request body");
|
||||
let mut output = body_json
|
||||
.get("input")
|
||||
.and_then(Value::as_array)
|
||||
.cloned()
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
// TODO(ccunningham): Update this mock to match future compaction model behavior:
|
||||
// return user/developer/assistant messages since the last compaction item, then
|
||||
// append a single newest compaction item.
|
||||
// Match current remote compaction behavior: keep user/developer messages and
|
||||
// omit assistant/tool history entries.
|
||||
.filter(|item| {
|
||||
item.get("type").and_then(Value::as_str) == Some("message")
|
||||
&& matches!(
|
||||
item.get("role").and_then(Value::as_str),
|
||||
Some("user") | Some("developer")
|
||||
)
|
||||
})
|
||||
.collect::<Vec<Value>>();
|
||||
let compaction_turn_id = body_json["client_metadata"]["turn_id"].as_str();
|
||||
// Match Responses API: generated compaction items inherit the compact request turn.
|
||||
let mut compaction_item = serde_json::json!({
|
||||
"type": "compaction",
|
||||
"encrypted_content": summary_text,
|
||||
});
|
||||
if let Some(turn_id) = compaction_turn_id {
|
||||
compaction_item["internal_chat_message_metadata_passthrough"] =
|
||||
serde_json::json!({ "turn_id": turn_id });
|
||||
}
|
||||
output.push(compaction_item);
|
||||
ResponseTemplate::new(200)
|
||||
.insert_header("content-type", "application/json")
|
||||
.set_body_json(serde_json::json!({ "output": output }))
|
||||
}
|
||||
}
|
||||
|
||||
let num_calls = summary_texts.len();
|
||||
let responder = UserHistorySummaryResponder {
|
||||
num_calls: AtomicUsize::new(0),
|
||||
summary_texts,
|
||||
};
|
||||
let (mock, response_mock) = compact_mock();
|
||||
mock.respond_with(responder)
|
||||
.up_to_n_times(num_calls as u64)
|
||||
.expect(num_calls as u64)
|
||||
.mount(server)
|
||||
.await;
|
||||
response_mock
|
||||
}
|
||||
|
||||
pub async fn mount_compact_response_once(
|
||||
server: &MockServer,
|
||||
response: ResponseTemplate,
|
||||
) -> ResponseMock {
|
||||
let (mock, response_mock) = compact_mock();
|
||||
mock.respond_with(response)
|
||||
.up_to_n_times(1)
|
||||
.mount(server)
|
||||
.await;
|
||||
response_mock
|
||||
}
|
||||
|
||||
pub async fn mount_models_once(server: &MockServer, body: ModelsResponse) -> ModelsMock {
|
||||
let (mock, models_mock) = models_mock();
|
||||
mock.respond_with(
|
||||
@@ -1622,45 +1501,6 @@ pub async fn mount_response_sequence(
|
||||
response_mock
|
||||
}
|
||||
|
||||
/// Mounts a sequence of responses for each POST to `/v1/responses/compact`.
|
||||
/// Panics if more requests are received than responses provided.
|
||||
pub async fn mount_compact_response_sequence(
|
||||
server: &MockServer,
|
||||
responses: Vec<ResponseTemplate>,
|
||||
) -> ResponseMock {
|
||||
use std::sync::atomic::AtomicUsize;
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
struct SeqResponder {
|
||||
num_calls: AtomicUsize,
|
||||
responses: Vec<ResponseTemplate>,
|
||||
}
|
||||
|
||||
impl Respond for SeqResponder {
|
||||
fn respond(&self, _: &wiremock::Request) -> ResponseTemplate {
|
||||
let call_num = self.num_calls.fetch_add(1, Ordering::SeqCst);
|
||||
self.responses
|
||||
.get(call_num)
|
||||
.expect("missing response for compact call")
|
||||
.clone()
|
||||
}
|
||||
}
|
||||
|
||||
let num_calls = responses.len();
|
||||
let responder = SeqResponder {
|
||||
num_calls: AtomicUsize::new(0),
|
||||
responses,
|
||||
};
|
||||
|
||||
let (mock, response_mock) = compact_mock();
|
||||
mock.respond_with(responder)
|
||||
.up_to_n_times(num_calls as u64)
|
||||
.expect(num_calls as u64)
|
||||
.mount(server)
|
||||
.await;
|
||||
response_mock
|
||||
}
|
||||
|
||||
/// Validate invariants on the request body sent to `/v1/responses`.
|
||||
///
|
||||
/// - A `function_call_output` with missing/empty `call_id` must have a nonempty `name`.
|
||||
|
||||
Reference in new issue
Block a user