admin/CC-Switch
1
0
Fork 0
mirror of https://github.com/farion1231/cc-switch.git synced 2026-08-01 04:02:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(proxy): default Codex tool parameters to object schema (#5315)

Browse Source 
Normalize function tool parameters on the Codex Responses -> Chat Completions bridge: default null/missing parameters (direct and nested function forms) to {"type":"object","properties":{}}, coerce explicit type:null, and add a root type for top-level oneOf schemas so strict OpenAI-compatible upstreams (DeepSeek etc.) no longer reject built-in Codex tools like codex_app__automation_update. Also hardens the Codex -> Anthropic tool path with the same object-type guarantee and adds regression coverage for all reported shapes.
This commit is contained in:
Komi
2026-07-21 10:13:00 +08:00
committed by GitHub
parent 613fef70bc
commit 08710d51fc
2 changed files with 185 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/proxy/providers/transform_codex_anthropic.rs
+49 -8
View File
@@ -440,14 +440,17 @@ fn chat_tool_to_anthropic_tool(chat_tool: &Value) -> Option<Value> {
.and_then(|value| value.as_str())
.map(str::trim)
.filter(|value| !value.is_empty())?;
let mut tool = json!({
"name": name,
"input_schema": function
.get("parameters")
.cloned()
.filter(|value| value.as_object().is_some_and(|object| !object.is_empty()))
.unwrap_or_else(|| json!({ "type": "object", "properties": {} }))
});
let mut input_schema = function
.get("parameters")
.cloned()
.filter(|value| value.as_object().is_some_and(|object| !object.is_empty()))
.unwrap_or_else(|| json!({ "type": "object", "properties": {} }));
if let Some(schema) = input_schema.as_object_mut() {
if schema.get("type").and_then(Value::as_str) != Some("object") {
schema.insert("type".to_string(), json!("object"));
}
}
let mut tool = json!({ "name": name, "input_schema": input_schema });
if let Some(description) = function.get("description").and_then(|value| value.as_str()) {
tool["description"] = json!(description);
}
@@ -1545,6 +1548,44 @@ mod tests {
assert_eq!(tools[1]["name"], "apply_patch");
}
#[test]
fn test_request_tool_search_output_schema_defaults_root_type_to_object() {
let input = json!({
"model": "claude",
"max_output_tokens": 100,
"input": [
{ "role": "user", "content": "hi" },
{
"type": "tool_search_output",
"call_id": "tool_demo123",
"tools": [{
"type": "function",
"name": "demo_union_tool",
"parameters": {
"oneOf": [
{ "type": "object", "properties": { "mode": { "type": "string" } } },
{ "type": "object", "properties": { "name": { "type": "string" } } }
]
}
}]
}
]
});
let result = responses_request_to_anthropic(input, 4096).unwrap();
let input_schema = &result["tools"][0]["input_schema"];
assert_eq!(input_schema["type"], "object");
assert_eq!(
input_schema["oneOf"][0]["properties"]["mode"]["type"],
"string"
);
assert_eq!(
input_schema["oneOf"][1]["properties"]["name"]["type"],
"string"
);
}
#[test]
fn test_request_tool_choice_mapping() {
// A function tool must be present, else tool_choice is (correctly) dropped.