mirror of
https://github.com/openai/codex.git
synced 2026-05-16 09:12:54 +00:00
dc1a8f2190
Deferred dynamic tools need to round-trip a namespace so a tool returned by `tool_search` can be called through the same registry key that core uses for dispatch. This change adds namespace support for dynamic tool specs/calls, persists it through app-server thread state, and routes dynamic tool calls by full `ToolName` while still sending the app the leaf tool name. Deferred dynamic tools must provide a namespace; non-deferred dynamic tools may remain top-level. It also introduces `LoadableToolSpec` as the shared function-or-namespace Responses shape used by both `tool_search` output and dynamic tool registration, so dynamic tools use the same wrapping logic in both paths. Validation: - `cargo test -p codex-tools` - `cargo test -p codex-core tool_search` --------- Co-authored-by: Sayan Sisodiya <sayan@openai.com>
71 lines
2.0 KiB
Rust
71 lines
2.0 KiB
Rust
use super::parse_dynamic_tool;
|
|
use crate::JsonSchema;
|
|
use crate::ToolDefinition;
|
|
use codex_protocol::dynamic_tools::DynamicToolSpec;
|
|
use pretty_assertions::assert_eq;
|
|
use std::collections::BTreeMap;
|
|
|
|
#[test]
|
|
fn parse_dynamic_tool_sanitizes_input_schema() {
|
|
let tool = DynamicToolSpec {
|
|
namespace: None,
|
|
name: "lookup_ticket".to_string(),
|
|
description: "Fetch a ticket".to_string(),
|
|
input_schema: serde_json::json!({
|
|
"properties": {
|
|
"id": {
|
|
"description": "Ticket identifier"
|
|
}
|
|
}
|
|
}),
|
|
defer_loading: false,
|
|
};
|
|
|
|
assert_eq!(
|
|
parse_dynamic_tool(&tool).expect("parse dynamic tool"),
|
|
ToolDefinition {
|
|
name: "lookup_ticket".to_string(),
|
|
description: "Fetch a ticket".to_string(),
|
|
input_schema: JsonSchema::object(
|
|
BTreeMap::from([(
|
|
"id".to_string(),
|
|
JsonSchema::string(Some("Ticket identifier".to_string()),),
|
|
)]),
|
|
/*required*/ None,
|
|
/*additional_properties*/ None
|
|
),
|
|
output_schema: None,
|
|
defer_loading: false,
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn parse_dynamic_tool_preserves_defer_loading() {
|
|
let tool = DynamicToolSpec {
|
|
namespace: None,
|
|
name: "lookup_ticket".to_string(),
|
|
description: "Fetch a ticket".to_string(),
|
|
input_schema: serde_json::json!({
|
|
"type": "object",
|
|
"properties": {}
|
|
}),
|
|
defer_loading: true,
|
|
};
|
|
|
|
assert_eq!(
|
|
parse_dynamic_tool(&tool).expect("parse dynamic tool"),
|
|
ToolDefinition {
|
|
name: "lookup_ticket".to_string(),
|
|
description: "Fetch a ticket".to_string(),
|
|
input_schema: JsonSchema::object(
|
|
BTreeMap::new(),
|
|
/*required*/ None,
|
|
/*additional_properties*/ None
|
|
),
|
|
output_schema: None,
|
|
defer_loading: true,
|
|
}
|
|
);
|
|
}
|