mirror of
https://github.com/openai/codex.git
synced 2026-11-22 15:15:18 +00:00
Enable cached web search for Amazon Bedrock (#36938)
## Why Amazon Bedrock supports hosted text web search, but it rejects the `search_content_types` field used for multimodal search and does not support external live or indexed web access. ## What changed - Advertise hosted web search for Amazon Bedrock while marking external web access as unsupported. - Resolve unsupported live and indexed modes to cached search, or disable the tool when cached search is prohibited by managed requirements. - Normalize built-in and configured Bedrock model catalogs to text-only web search, and retain the runtime provider in session configuration so turn setup can apply its capabilities. ## Testing - Cover cached fallback, managed-mode restrictions, text-only tool payloads, provider capabilities, and catalog normalization. GitOrigin-RevId: 310473849257401654388a4ebb42920e03aa3228
This commit is contained in:
1 parent
1e59dc5bda
commit
3ca9f375aa
13 files changed
+365
-50
No files matched your search
@@ -71,6 +71,7 @@ use codex_core_plugins::PluginsManager;
|
||||
use codex_exec_server::LOCAL_FS;
|
||||
use codex_features::Feature;
|
||||
use codex_features::FeaturesToml;
|
||||
use codex_model_provider::ProviderCapabilities;
|
||||
use codex_model_provider_info::LMSTUDIO_OSS_PROVIDER_ID;
|
||||
use codex_model_provider_info::OLLAMA_OSS_PROVIDER_ID;
|
||||
use codex_model_provider_info::WireApi;
|
||||
@@ -5797,7 +5798,11 @@ fn web_search_mode_disabled_overrides_legacy_request() {
|
||||
#[test]
|
||||
fn web_search_mode_for_turn_preserves_indexed_for_disabled_permissions() {
|
||||
let web_search_mode = Constrained::allow_any(WebSearchMode::Indexed);
|
||||
let mode = resolve_web_search_mode_for_turn(&web_search_mode, &PermissionProfile::Disabled);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
|
||||
assert_eq!(mode, WebSearchMode::Indexed);
|
||||
}
|
||||
@@ -5806,7 +5811,11 @@ fn web_search_mode_for_turn_preserves_indexed_for_disabled_permissions() {
|
||||
fn web_search_mode_for_turn_uses_preference_for_read_only() {
|
||||
let web_search_mode = Constrained::allow_any(WebSearchMode::Cached);
|
||||
let permission_profile = PermissionProfile::read_only();
|
||||
let mode = resolve_web_search_mode_for_turn(&web_search_mode, &permission_profile);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
&permission_profile,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
|
||||
assert_eq!(mode, WebSearchMode::Cached);
|
||||
}
|
||||
@@ -5814,15 +5823,75 @@ fn web_search_mode_for_turn_uses_preference_for_read_only() {
|
||||
#[test]
|
||||
fn web_search_mode_for_turn_prefers_live_for_disabled_permissions() {
|
||||
let web_search_mode = Constrained::allow_any(WebSearchMode::Cached);
|
||||
let mode = resolve_web_search_mode_for_turn(&web_search_mode, &PermissionProfile::Disabled);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
|
||||
assert_eq!(mode, WebSearchMode::Live);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn web_search_mode_for_turn_falls_back_when_provider_disallows_external_web_access() {
|
||||
for preferred in [WebSearchMode::Live, WebSearchMode::Indexed] {
|
||||
let web_search_mode = Constrained::allow_any(preferred);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities {
|
||||
external_web_access: false,
|
||||
..ProviderCapabilities::default()
|
||||
},
|
||||
);
|
||||
|
||||
assert_eq!(mode, WebSearchMode::Cached);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn web_search_mode_for_turn_disables_when_external_access_and_cached_are_disallowed()
|
||||
-> anyhow::Result<()> {
|
||||
let allowed = [
|
||||
WebSearchMode::Disabled,
|
||||
WebSearchMode::Live,
|
||||
WebSearchMode::Indexed,
|
||||
];
|
||||
for preferred in [WebSearchMode::Live, WebSearchMode::Indexed] {
|
||||
let web_search_mode = Constrained::new(preferred, move |candidate| {
|
||||
if allowed.contains(candidate) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(ConstraintError::InvalidValue {
|
||||
field_name: "web_search_mode",
|
||||
candidate: format!("{candidate:?}"),
|
||||
allowed: format!("{allowed:?}"),
|
||||
requirement_source: RequirementSource::Unknown,
|
||||
})
|
||||
}
|
||||
})?;
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities {
|
||||
external_web_access: false,
|
||||
..ProviderCapabilities::default()
|
||||
},
|
||||
);
|
||||
|
||||
assert_eq!(mode, WebSearchMode::Disabled);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn web_search_mode_for_turn_respects_disabled_for_disabled_permissions() {
|
||||
let web_search_mode = Constrained::allow_any(WebSearchMode::Disabled);
|
||||
let mode = resolve_web_search_mode_for_turn(&web_search_mode, &PermissionProfile::Disabled);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
|
||||
assert_eq!(mode, WebSearchMode::Disabled);
|
||||
}
|
||||
@@ -5842,7 +5911,11 @@ fn web_search_mode_for_turn_falls_back_when_live_is_disallowed() -> anyhow::Resu
|
||||
})
|
||||
}
|
||||
})?;
|
||||
let mode = resolve_web_search_mode_for_turn(&web_search_mode, &PermissionProfile::Disabled);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
|
||||
assert_eq!(mode, WebSearchMode::Cached);
|
||||
Ok(())
|
||||
@@ -5867,7 +5940,11 @@ fn web_search_mode_for_turn_does_not_implicitly_select_indexed() -> anyhow::Resu
|
||||
})
|
||||
}
|
||||
})?;
|
||||
let mode = resolve_web_search_mode_for_turn(&web_search_mode, &PermissionProfile::Disabled);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
|
||||
assert_eq!(mode, WebSearchMode::Cached);
|
||||
Ok(())
|
||||
@@ -10332,6 +10409,7 @@ async fn requirements_web_search_mode_overrides_danger_full_access_default() ->
|
||||
resolve_web_search_mode_for_turn(
|
||||
&config.web_search_mode,
|
||||
&config.permissions.effective_permission_profile(),
|
||||
ProviderCapabilities::default(),
|
||||
),
|
||||
WebSearchMode::Cached,
|
||||
);
|
||||
|
||||
@@ -81,6 +81,7 @@ use codex_mcp::McpProtocolMode;
|
||||
use codex_mcp::McpServerRegistration;
|
||||
use codex_mcp::ResolvedMcpCatalog;
|
||||
use codex_memories_read::memory_root;
|
||||
use codex_model_provider::ProviderCapabilities;
|
||||
use codex_model_provider_info::LEGACY_OLLAMA_CHAT_PROVIDER_ID;
|
||||
use codex_model_provider_info::ModelProviderInfo;
|
||||
use codex_model_provider_info::OLLAMA_CHAT_PROVIDER_REMOVED_ERROR;
|
||||
@@ -2990,8 +2991,19 @@ pub fn resolve_bootstrap_http_client_factory(
|
||||
pub(crate) fn resolve_web_search_mode_for_turn(
|
||||
web_search_mode: &Constrained<WebSearchMode>,
|
||||
permission_profile: &PermissionProfile,
|
||||
provider_capabilities: ProviderCapabilities,
|
||||
) -> WebSearchMode {
|
||||
let preferred = web_search_mode.value();
|
||||
let is_allowed = |mode: WebSearchMode| {
|
||||
let provider_supports_mode = match mode {
|
||||
WebSearchMode::Live | WebSearchMode::Indexed => {
|
||||
provider_capabilities.external_web_access
|
||||
}
|
||||
WebSearchMode::Cached | WebSearchMode::Disabled => true,
|
||||
};
|
||||
|
||||
provider_supports_mode && web_search_mode.can_set(&mode).is_ok()
|
||||
};
|
||||
|
||||
if matches!(permission_profile, PermissionProfile::Disabled)
|
||||
&& !matches!(preferred, WebSearchMode::Disabled | WebSearchMode::Indexed)
|
||||
@@ -3001,12 +3013,12 @@ pub(crate) fn resolve_web_search_mode_for_turn(
|
||||
WebSearchMode::Cached,
|
||||
WebSearchMode::Disabled,
|
||||
] {
|
||||
if web_search_mode.can_set(&mode).is_ok() {
|
||||
if is_allowed(mode) {
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if web_search_mode.can_set(&preferred).is_ok() {
|
||||
if is_allowed(preferred) {
|
||||
return preferred;
|
||||
}
|
||||
for mode in [
|
||||
@@ -3014,7 +3026,7 @@ pub(crate) fn resolve_web_search_mode_for_turn(
|
||||
WebSearchMode::Live,
|
||||
WebSearchMode::Disabled,
|
||||
] {
|
||||
if web_search_mode.can_set(&mode).is_ok() {
|
||||
if is_allowed(mode) {
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user