i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-01 17:00:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(gateway): ignore OpenAI tools for image intent routing

Browse Source
This commit is contained in:
ZheFox
2026-05-18 09:54:10 +08:00
parent f5ace4fd6d
commit a3094fda53
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/aether-gateway/src/ai_serving/planner/standard/openai/image_intent.rs
View File

@@ -7,7 +7,6 @@ pub(crate) fn openai_request_is_image_generation_intent(
.get("model")
.and_then(serde_json::Value::as_str)
.is_some_and(openai_model_is_image_generation)
|| openai_tools_contain_image_generation(body_json.get("tools"))
|| openai_tool_choice_selects_image_generation(body_json.get("tool_choice"))
}
@@ -15,18 +14,6 @@ fn openai_model_is_image_generation(model: &str) -> bool {
model.trim().to_ascii_lowercase().starts_with("gpt-image-")
}
fn openai_tools_contain_image_generation(tools: Option<&serde_json::Value>) -> bool {
tools
.and_then(serde_json::Value::as_array)
.is_some_and(|items| {
items.iter().any(|item| {
item.get("type")
.and_then(serde_json::Value::as_str)
.is_some_and(|value| value.trim().eq_ignore_ascii_case("image_generation"))
})
})
}
fn openai_tool_choice_selects_image_generation(choice: Option<&serde_json::Value>) -> bool {
let Some(choice) = choice else {
return false;
@@ -70,11 +57,15 @@ mod tests {
));
assert!(openai_request_is_image_generation_intent(
"gpt-5",
&json!({"tools":[{"type":"image_generation"}]})
&json!({"tool_choice":{"function":{"name":"image_generation"}}})
));
assert!(openai_request_is_image_generation_intent(
"gpt-5",
&json!({"tool_choice":{"function":{"name":"image_generation"}}})
&json!({"tool_choice":{"type":"image_generation"}})
));
assert!(!openai_request_is_image_generation_intent(
"gpt-5",
&json!({"tools":[{"type":"image_generation"}]})
));
assert!(!openai_request_is_image_generation_intent(
"gpt-5",