mirror of
https://github.com/openai/codex.git
synced 2026-05-03 02:46:39 +00:00
## Why `core/src/tools/spec.rs` still had a few built-in tool specs assembled inline even though those definitions are pure metadata and already live conceptually in `codex-tools`. Keeping that construction in `codex-core` makes `spec.rs` do more than registry orchestration and slows the migration toward a right-sized `codex-tools` crate. This continues the extraction stack from #16379, #16471, #16477, #16481, and #16482. ## What Changed - added `create_local_shell_tool()`, `create_web_search_tool(...)`, and `create_image_generation_tool(...)` to `codex-rs/tools/src/tool_spec.rs` - exported those helpers from `codex-rs/tools/src/lib.rs` - switched `codex-rs/core/src/tools/spec.rs` to call those helpers instead of constructing `ToolSpec::LocalShell`, `ToolSpec::WebSearch`, and `ToolSpec::ImageGeneration` inline - removed the remaining core-local web-search content-type constant and made the affected spec test assert the literal expected values directly This is intended to be a straight refactor: tool behavior and wire shape should not change. ## Testing - `cargo test -p codex-tools` - `cargo test -p codex-core tools::spec::tests`
195 lines
6.4 KiB
Rust
195 lines
6.4 KiB
Rust
use crate::FreeformTool;
|
|
use crate::JsonSchema;
|
|
use crate::ResponsesApiTool;
|
|
use codex_protocol::config_types::WebSearchConfig;
|
|
use codex_protocol::config_types::WebSearchContextSize;
|
|
use codex_protocol::config_types::WebSearchFilters as ConfigWebSearchFilters;
|
|
use codex_protocol::config_types::WebSearchMode;
|
|
use codex_protocol::config_types::WebSearchUserLocation as ConfigWebSearchUserLocation;
|
|
use codex_protocol::config_types::WebSearchUserLocationType;
|
|
use codex_protocol::openai_models::WebSearchToolType;
|
|
use serde::Serialize;
|
|
use serde_json::Value;
|
|
|
|
const WEB_SEARCH_TEXT_AND_IMAGE_CONTENT_TYPES: [&str; 2] = ["text", "image"];
|
|
|
|
/// When serialized as JSON, this produces a valid "Tool" in the OpenAI
|
|
/// Responses API.
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
#[serde(tag = "type")]
|
|
pub enum ToolSpec {
|
|
#[serde(rename = "function")]
|
|
Function(ResponsesApiTool),
|
|
#[serde(rename = "tool_search")]
|
|
ToolSearch {
|
|
execution: String,
|
|
description: String,
|
|
parameters: JsonSchema,
|
|
},
|
|
#[serde(rename = "local_shell")]
|
|
LocalShell {},
|
|
#[serde(rename = "image_generation")]
|
|
ImageGeneration { output_format: String },
|
|
// TODO: Understand why we get an error on web_search although the API docs
|
|
// say it's supported.
|
|
// https://platform.openai.com/docs/guides/tools-web-search?api-mode=responses#:~:text=%7B%20type%3A%20%22web_search%22%20%7D%2C
|
|
// The `external_web_access` field determines whether the web search is over
|
|
// cached or live content.
|
|
// https://platform.openai.com/docs/guides/tools-web-search#live-internet-access
|
|
#[serde(rename = "web_search")]
|
|
WebSearch {
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
external_web_access: Option<bool>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
filters: Option<ResponsesApiWebSearchFilters>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
user_location: Option<ResponsesApiWebSearchUserLocation>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
search_context_size: Option<WebSearchContextSize>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
search_content_types: Option<Vec<String>>,
|
|
},
|
|
#[serde(rename = "custom")]
|
|
Freeform(FreeformTool),
|
|
}
|
|
|
|
impl ToolSpec {
|
|
pub fn name(&self) -> &str {
|
|
match self {
|
|
ToolSpec::Function(tool) => tool.name.as_str(),
|
|
ToolSpec::ToolSearch { .. } => "tool_search",
|
|
ToolSpec::LocalShell {} => "local_shell",
|
|
ToolSpec::ImageGeneration { .. } => "image_generation",
|
|
ToolSpec::WebSearch { .. } => "web_search",
|
|
ToolSpec::Freeform(tool) => tool.name.as_str(),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn create_local_shell_tool() -> ToolSpec {
|
|
ToolSpec::LocalShell {}
|
|
}
|
|
|
|
pub fn create_image_generation_tool(output_format: &str) -> ToolSpec {
|
|
ToolSpec::ImageGeneration {
|
|
output_format: output_format.to_string(),
|
|
}
|
|
}
|
|
|
|
pub struct WebSearchToolOptions<'a> {
|
|
pub web_search_mode: Option<WebSearchMode>,
|
|
pub web_search_config: Option<&'a WebSearchConfig>,
|
|
pub web_search_tool_type: WebSearchToolType,
|
|
}
|
|
|
|
pub fn create_web_search_tool(options: WebSearchToolOptions<'_>) -> Option<ToolSpec> {
|
|
let external_web_access = match options.web_search_mode {
|
|
Some(WebSearchMode::Cached) => Some(false),
|
|
Some(WebSearchMode::Live) => Some(true),
|
|
Some(WebSearchMode::Disabled) | None => None,
|
|
}?;
|
|
|
|
let search_content_types = match options.web_search_tool_type {
|
|
WebSearchToolType::Text => None,
|
|
WebSearchToolType::TextAndImage => Some(
|
|
WEB_SEARCH_TEXT_AND_IMAGE_CONTENT_TYPES
|
|
.into_iter()
|
|
.map(str::to_string)
|
|
.collect(),
|
|
),
|
|
};
|
|
|
|
Some(ToolSpec::WebSearch {
|
|
external_web_access: Some(external_web_access),
|
|
filters: options
|
|
.web_search_config
|
|
.and_then(|config| config.filters.clone().map(Into::into)),
|
|
user_location: options
|
|
.web_search_config
|
|
.and_then(|config| config.user_location.clone().map(Into::into)),
|
|
search_context_size: options
|
|
.web_search_config
|
|
.and_then(|config| config.search_context_size),
|
|
search_content_types,
|
|
})
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
pub struct ConfiguredToolSpec {
|
|
pub spec: ToolSpec,
|
|
pub supports_parallel_tool_calls: bool,
|
|
}
|
|
|
|
impl ConfiguredToolSpec {
|
|
pub fn new(spec: ToolSpec, supports_parallel_tool_calls: bool) -> Self {
|
|
Self {
|
|
spec,
|
|
supports_parallel_tool_calls,
|
|
}
|
|
}
|
|
|
|
pub fn name(&self) -> &str {
|
|
self.spec.name()
|
|
}
|
|
}
|
|
|
|
/// Returns JSON values that are compatible with Function Calling in the
|
|
/// Responses API:
|
|
/// https://platform.openai.com/docs/guides/function-calling?api-mode=responses
|
|
pub fn create_tools_json_for_responses_api(
|
|
tools: &[ToolSpec],
|
|
) -> Result<Vec<Value>, serde_json::Error> {
|
|
let mut tools_json = Vec::new();
|
|
|
|
for tool in tools {
|
|
let json = serde_json::to_value(tool)?;
|
|
tools_json.push(json);
|
|
}
|
|
|
|
Ok(tools_json)
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
pub struct ResponsesApiWebSearchFilters {
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub allowed_domains: Option<Vec<String>>,
|
|
}
|
|
|
|
impl From<ConfigWebSearchFilters> for ResponsesApiWebSearchFilters {
|
|
fn from(filters: ConfigWebSearchFilters) -> Self {
|
|
Self {
|
|
allowed_domains: filters.allowed_domains,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
pub struct ResponsesApiWebSearchUserLocation {
|
|
#[serde(rename = "type")]
|
|
pub r#type: WebSearchUserLocationType,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub country: Option<String>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub region: Option<String>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub city: Option<String>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub timezone: Option<String>,
|
|
}
|
|
|
|
impl From<ConfigWebSearchUserLocation> for ResponsesApiWebSearchUserLocation {
|
|
fn from(user_location: ConfigWebSearchUserLocation) -> Self {
|
|
Self {
|
|
r#type: user_location.r#type,
|
|
country: user_location.country,
|
|
region: user_location.region,
|
|
city: user_location.city,
|
|
timezone: user_location.timezone,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "tool_spec_tests.rs"]
|
|
mod tests;
|