mirror of
https://github.com/openai/codex.git
synced 2026-11-16 06:54:36 +00:00
Use Responses compaction for Amazon Bedrock (#39825)
## What changed - Switch Amazon Bedrock remote compaction to `compaction_trigger` items sent through `/v1/responses`. - Remove the legacy dedicated compaction protocol from provider capabilities. - Default remote compaction to unsupported and explicitly enable it for OpenAI, Azure Responses, and Amazon Bedrock providers. ## Testing - Cover manual and automatic Amazon Bedrock compaction requests and their compacted history. - Verify remote-compaction capabilities for configured and Amazon Bedrock providers. GitOrigin-RevId: cf9ba314595367518b37a85f334f0c105ce47e45
This commit is contained in:
1 parent
54201093d4
commit
f20b63e85c
5 files changed
+72
-44
No files matched your search
@@ -1223,7 +1223,7 @@ async fn run_auto_compact(
|
|||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
RemoteCompactionSupport::V1 | RemoteCompactionSupport::V2 => {
|
RemoteCompactionSupport::V2 => {
|
||||||
emit_compact_metric(
|
emit_compact_metric(
|
||||||
&sess.services.session_telemetry,
|
&sess.services.session_telemetry,
|
||||||
"remote",
|
"remote",
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ impl SessionTask for CompactTask {
|
|||||||
);
|
);
|
||||||
crate::compact_remote_v2::run_remote_compact_task(session.clone(), ctx).await
|
crate::compact_remote_v2::run_remote_compact_task(session.clone(), ctx).await
|
||||||
}
|
}
|
||||||
RemoteCompactionSupport::V1 | RemoteCompactionSupport::V2 => {
|
RemoteCompactionSupport::V2 => {
|
||||||
emit_compact_metric(
|
emit_compact_metric(
|
||||||
&session.services.session_telemetry,
|
&session.services.session_telemetry,
|
||||||
"remote",
|
"remote",
|
||||||
|
|||||||
@@ -458,7 +458,7 @@ fn assert_compact_request_omits_harness_metadata(request: &responses::ResponsesR
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||||
async fn amazon_bedrock_uses_remote_compaction_endpoint() -> Result<()> {
|
async fn amazon_bedrock_manual_compaction_uses_v2_responses_endpoint() -> Result<()> {
|
||||||
skip_if_no_network!(Ok(()));
|
skip_if_no_network!(Ok(()));
|
||||||
|
|
||||||
let harness = TestCodexHarness::with_auto_env_builder(amazon_bedrock_test_codex()).await?;
|
let harness = TestCodexHarness::with_auto_env_builder(amazon_bedrock_test_codex()).await?;
|
||||||
@@ -470,6 +470,16 @@ async fn amazon_bedrock_uses_remote_compaction_endpoint() -> Result<()> {
|
|||||||
responses::ev_assistant_message("message-1", "before compaction"),
|
responses::ev_assistant_message("message-1", "before compaction"),
|
||||||
responses::ev_completed("response-1"),
|
responses::ev_completed("response-1"),
|
||||||
]),
|
]),
|
||||||
|
sse(vec![
|
||||||
|
json!({
|
||||||
|
"type": "response.output_item.done",
|
||||||
|
"item": {
|
||||||
|
"type": "compaction",
|
||||||
|
"encrypted_content": "BEDROCK_REMOTE_COMPACTED_SUMMARY",
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
responses::ev_completed("response-compact"),
|
||||||
|
]),
|
||||||
sse(vec![
|
sse(vec![
|
||||||
responses::ev_assistant_message("message-2", "after compaction"),
|
responses::ev_assistant_message("message-2", "after compaction"),
|
||||||
responses::ev_completed("response-2"),
|
responses::ev_completed("response-2"),
|
||||||
@@ -477,19 +487,20 @@ async fn amazon_bedrock_uses_remote_compaction_endpoint() -> Result<()> {
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
let compact_mock = responses::mount_compact_user_history_with_summary_once(
|
|
||||||
harness.server(),
|
|
||||||
"BEDROCK_REMOTE_COMPACTED_SUMMARY",
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
harness.test().submit_turn("before compact").await?;
|
harness.test().submit_turn("before compact").await?;
|
||||||
harness.test().codex.submit(Op::Compact).await?;
|
harness.test().codex.submit(Op::Compact).await?;
|
||||||
wait_for_turn_complete(&harness.test().codex).await;
|
wait_for_turn_complete(&harness.test().codex).await;
|
||||||
harness.test().submit_turn("after compact").await?;
|
harness.test().submit_turn("after compact").await?;
|
||||||
|
|
||||||
let compact_request = compact_mock.single_request();
|
let response_requests = response_mock.requests();
|
||||||
assert_eq!(compact_request.path(), "/v1/responses/compact");
|
assert_eq!(response_requests.len(), 3);
|
||||||
|
assert!(
|
||||||
|
response_requests
|
||||||
|
.iter()
|
||||||
|
.all(|request| request.path() == "/v1/responses")
|
||||||
|
);
|
||||||
|
let compact_request = &response_requests[1];
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
compact_request.header("authorization").as_deref(),
|
compact_request.header("authorization").as_deref(),
|
||||||
Some("Bearer bedrock-test-api-key")
|
Some("Bearer bedrock-test-api-key")
|
||||||
@@ -504,15 +515,11 @@ async fn amazon_bedrock_uses_remote_compaction_endpoint() -> Result<()> {
|
|||||||
compact_request.body_json()["model"],
|
compact_request.body_json()["model"],
|
||||||
AMAZON_BEDROCK_GPT_5_5_MODEL_ID
|
AMAZON_BEDROCK_GPT_5_5_MODEL_ID
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
let response_requests = response_mock.requests();
|
compact_request.inputs_of_type("compaction_trigger").len(),
|
||||||
assert_eq!(response_requests.len(), 2);
|
1
|
||||||
assert!(
|
|
||||||
response_requests
|
|
||||||
.iter()
|
|
||||||
.all(|request| request.inputs_of_type("compaction_trigger").is_empty())
|
|
||||||
);
|
);
|
||||||
assert!(response_requests[1].input().iter().any(|item| {
|
assert!(response_requests[2].input().iter().any(|item| {
|
||||||
item["type"] == "compaction"
|
item["type"] == "compaction"
|
||||||
&& item["encrypted_content"] == "BEDROCK_REMOTE_COMPACTED_SUMMARY"
|
&& item["encrypted_content"] == "BEDROCK_REMOTE_COMPACTED_SUMMARY"
|
||||||
}));
|
}));
|
||||||
@@ -681,7 +688,7 @@ async fn remote_compact_v2_retains_only_client_developer_messages_when_enabled(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||||
async fn amazon_bedrock_automatic_compaction_uses_v1_endpoint_when_v2_is_enabled() -> Result<()> {
|
async fn amazon_bedrock_automatic_compaction_uses_v2_responses_endpoint() -> Result<()> {
|
||||||
skip_if_no_network!(Ok(()));
|
skip_if_no_network!(Ok(()));
|
||||||
|
|
||||||
let harness = TestCodexHarness::with_auto_env_builder(amazon_bedrock_test_codex().with_config(
|
let harness = TestCodexHarness::with_auto_env_builder(amazon_bedrock_test_codex().with_config(
|
||||||
@@ -697,6 +704,16 @@ async fn amazon_bedrock_automatic_compaction_uses_v1_endpoint_when_v2_is_enabled
|
|||||||
responses::ev_assistant_message("message-1", "before automatic compaction"),
|
responses::ev_assistant_message("message-1", "before automatic compaction"),
|
||||||
responses::ev_completed_with_tokens("response-1", /*total_tokens*/ 500),
|
responses::ev_completed_with_tokens("response-1", /*total_tokens*/ 500),
|
||||||
]),
|
]),
|
||||||
|
sse(vec![
|
||||||
|
json!({
|
||||||
|
"type": "response.output_item.done",
|
||||||
|
"item": {
|
||||||
|
"type": "compaction",
|
||||||
|
"encrypted_content": "BEDROCK_AUTOMATIC_REMOTE_COMPACTED_SUMMARY",
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
responses::ev_completed("response-compact"),
|
||||||
|
]),
|
||||||
sse(vec![
|
sse(vec![
|
||||||
responses::ev_assistant_message("message-2", "after automatic compaction"),
|
responses::ev_assistant_message("message-2", "after automatic compaction"),
|
||||||
responses::ev_completed("response-2"),
|
responses::ev_completed("response-2"),
|
||||||
@@ -704,11 +721,6 @@ async fn amazon_bedrock_automatic_compaction_uses_v1_endpoint_when_v2_is_enabled
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
let compact_mock = responses::mount_compact_user_history_with_summary_once(
|
|
||||||
harness.server(),
|
|
||||||
"BEDROCK_AUTOMATIC_REMOTE_COMPACTED_SUMMARY",
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
harness
|
harness
|
||||||
.test()
|
.test()
|
||||||
@@ -719,21 +731,33 @@ async fn amazon_bedrock_automatic_compaction_uses_v1_endpoint_when_v2_is_enabled
|
|||||||
.submit_turn("after automatic compact")
|
.submit_turn("after automatic compact")
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let compact_request = compact_mock.single_request();
|
let response_requests = response_mock.requests();
|
||||||
assert_eq!(compact_request.path(), "/v1/responses/compact");
|
assert_eq!(response_requests.len(), 3);
|
||||||
|
assert!(
|
||||||
|
response_requests
|
||||||
|
.iter()
|
||||||
|
.all(|request| request.path() == "/v1/responses")
|
||||||
|
);
|
||||||
|
let compact_request = &response_requests[1];
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
compact_request.header("authorization").as_deref(),
|
compact_request.header("authorization").as_deref(),
|
||||||
Some("Bearer bedrock-test-api-key")
|
Some("Bearer bedrock-test-api-key")
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
let response_requests = response_mock.requests();
|
compact_request
|
||||||
assert_eq!(response_requests.len(), 2);
|
.header("x-amzn-mantle-client-agent")
|
||||||
assert!(
|
.as_deref(),
|
||||||
response_requests
|
Some("codex")
|
||||||
.iter()
|
|
||||||
.all(|request| request.inputs_of_type("compaction_trigger").is_empty())
|
|
||||||
);
|
);
|
||||||
assert!(response_requests[1].input().iter().any(|item| {
|
assert_eq!(
|
||||||
|
compact_request.body_json()["model"],
|
||||||
|
AMAZON_BEDROCK_GPT_5_5_MODEL_ID
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
compact_request.inputs_of_type("compaction_trigger").len(),
|
||||||
|
1
|
||||||
|
);
|
||||||
|
assert!(response_requests[2].input().iter().any(|item| {
|
||||||
item["type"] == "compaction"
|
item["type"] == "compaction"
|
||||||
&& item["encrypted_content"] == "BEDROCK_AUTOMATIC_REMOTE_COMPACTED_SUMMARY"
|
&& item["encrypted_content"] == "BEDROCK_AUTOMATIC_REMOTE_COMPACTED_SUMMARY"
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ impl ModelProvider for AmazonBedrockModelProvider {
|
|||||||
image_generation: false,
|
image_generation: false,
|
||||||
web_search: self.endpoint == BedrockEndpoint::Mantle,
|
web_search: self.endpoint == BedrockEndpoint::Mantle,
|
||||||
external_web_access: false,
|
external_web_access: false,
|
||||||
remote_compaction: RemoteCompactionSupport::V1,
|
remote_compaction: RemoteCompactionSupport::V2,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -477,13 +477,13 @@ mod tests {
|
|||||||
image_generation: false,
|
image_generation: false,
|
||||||
web_search: true,
|
web_search: true,
|
||||||
external_web_access: false,
|
external_web_access: false,
|
||||||
remote_compaction: RemoteCompactionSupport::V1,
|
remote_compaction: RemoteCompactionSupport::V2,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn runtime_capabilities_disable_web_search_and_support_v1_remote_compaction() {
|
fn runtime_capabilities_disable_web_search_and_support_v2_remote_compaction() {
|
||||||
let provider = AmazonBedrockModelProvider::new(
|
let provider = AmazonBedrockModelProvider::new(
|
||||||
ModelProviderInfo::create_amazon_bedrock_runtime_provider(/*aws*/ None),
|
ModelProviderInfo::create_amazon_bedrock_runtime_provider(/*aws*/ None),
|
||||||
/*auth_manager*/ None,
|
/*auth_manager*/ None,
|
||||||
@@ -496,7 +496,7 @@ mod tests {
|
|||||||
image_generation: false,
|
image_generation: false,
|
||||||
web_search: false,
|
web_search: false,
|
||||||
external_web_access: false,
|
external_web_access: false,
|
||||||
remote_compaction: RemoteCompactionSupport::V1,
|
remote_compaction: RemoteCompactionSupport::V2,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,9 +46,7 @@ pub(crate) fn enforce_managed_residency(provider: &mut Provider) {
|
|||||||
pub enum RemoteCompactionSupport {
|
pub enum RemoteCompactionSupport {
|
||||||
/// The provider does not support remote compaction.
|
/// The provider does not support remote compaction.
|
||||||
Unsupported,
|
Unsupported,
|
||||||
/// The provider supports only the dedicated `/v1/responses/compact` endpoint.
|
/// The provider supports `compaction_trigger` items over the Responses endpoint.
|
||||||
V1,
|
|
||||||
/// The provider supports both the dedicated endpoint and `compaction_trigger` items.
|
|
||||||
V2,
|
V2,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,7 +71,7 @@ impl Default for ProviderCapabilities {
|
|||||||
image_generation: true,
|
image_generation: true,
|
||||||
web_search: true,
|
web_search: true,
|
||||||
external_web_access: true,
|
external_web_access: true,
|
||||||
remote_compaction: RemoteCompactionSupport::V2,
|
remote_compaction: RemoteCompactionSupport::Unsupported,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -629,13 +627,19 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn configured_provider_uses_default_capabilities() {
|
fn openai_provider_enables_remote_compaction() {
|
||||||
let provider = create_model_provider(
|
let provider = create_model_provider(
|
||||||
ModelProviderInfo::create_openai_provider(/*base_url*/ None),
|
ModelProviderInfo::create_openai_provider(/*base_url*/ None),
|
||||||
/*auth_manager*/ None,
|
/*auth_manager*/ None,
|
||||||
);
|
);
|
||||||
|
|
||||||
assert_eq!(provider.capabilities(), ProviderCapabilities::default());
|
assert_eq!(
|
||||||
|
provider.capabilities(),
|
||||||
|
ProviderCapabilities {
|
||||||
|
remote_compaction: RemoteCompactionSupport::V2,
|
||||||
|
..ProviderCapabilities::default()
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
Reference in new issue
Block a user