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

fix(gateway): preserve image generation tools

Browse Source
This commit is contained in:
RWDai
2026-05-20 11:02:41 +08:00
parent bdc848b19e
commit 84c4c2f9c2
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/aether-gateway/src/ai_serving/planner/standard/openai/chat/decision/request.rs
View File

@@ -1027,6 +1027,15 @@ fn build_openai_image_provider_body_from_openai_chat_body(
body.insert("model".to_string(), Value::String(model.to_string())); body.insert("model".to_string(), Value::String(model.to_string()));
} }
body.insert("input".to_string(), input); body.insert("input".to_string(), input);
let mut image_tool = image_options.clone();
image_tool.insert(
"type".to_string(),
Value::String("image_generation".to_string()),
);
body.insert(
"tools".to_string(),
Value::Array(vec![Value::Object(image_tool)]),
);
if upstream_is_stream { if upstream_is_stream {
body.insert("stream".to_string(), Value::Bool(true)); body.insert("stream".to_string(), Value::Bool(true));
} }
@@ -1507,7 +1516,7 @@ mod tests {
} }
#[test] #[test]
fn openai_chat_image_bridge_body_does_not_inject_tools() { fn openai_chat_image_bridge_body_injects_image_generation_tool() {
let body_json = json!({ let body_json = json!({
"model": "gpt-image-2", "model": "gpt-image-2",
"messages": [ "messages": [
@@ -1521,7 +1530,9 @@ mod tests {
build_openai_image_provider_body_from_openai_chat_body(&body_json, "gpt-image-2", true) build_openai_image_provider_body_from_openai_chat_body(&body_json, "gpt-image-2", true)
.expect("chat image body should convert"); .expect("chat image body should convert");
assert!(provider_body.get("tools").is_none()); assert_eq!(provider_body["tools"][0]["type"], "image_generation");
assert_eq!(provider_body["tools"][0]["size"], "1024x1024");
assert_eq!(provider_body["tools"][0]["output_format"], "png");
assert_eq!(provider_body["model"], "gpt-image-2"); assert_eq!(provider_body["model"], "gpt-image-2");
assert_eq!(provider_body["stream"], true); assert_eq!(provider_body["stream"], true);
assert_eq!(provider_body["input"][0]["content"], "Draw a glass city"); assert_eq!(provider_body["input"][0]["content"], "Draw a glass city");

18
apps/aether-gateway/src/ai_serving/planner/standard/openai/responses/decision/request.rs
View File

@@ -843,6 +843,18 @@ fn build_openai_image_provider_body_from_openai_responses_body(
} else if let Some(value) = object.get("stream") { } else if let Some(value) = object.get("stream") {
body.insert("stream".to_string(), value.clone()); body.insert("stream".to_string(), value.clone());
} }
let image_tool = tool.clone().unwrap_or_else(|| {
let mut tool = serde_json::Map::new();
tool.insert(
"type".to_string(),
Value::String("image_generation".to_string()),
);
tool
});
body.insert(
"tools".to_string(),
Value::Array(vec![Value::Object(image_tool)]),
);
let mut summary = serde_json::Map::new(); let mut summary = serde_json::Map::new();
summary.insert( summary.insert(
@@ -1226,7 +1238,7 @@ mod tests {
use super::*; use super::*;
#[test] #[test]
fn openai_responses_image_bridge_body_does_not_inject_tools() { fn openai_responses_image_bridge_body_preserves_image_generation_tool() {
let body_json = json!({ let body_json = json!({
"model": "gpt-image-2", "model": "gpt-image-2",
"input": "Draw a glass city", "input": "Draw a glass city",
@@ -1249,7 +1261,9 @@ mod tests {
) )
.expect("responses image body should convert"); .expect("responses image body should convert");
assert!(provider_body.get("tools").is_none()); assert_eq!(provider_body["tools"][0]["type"], "image_generation");
assert_eq!(provider_body["tools"][0]["size"], "1024x1024");
assert_eq!(provider_body["tools"][0]["output_format"], "png");
assert_eq!(provider_body["model"], "gpt-image-2"); assert_eq!(provider_body["model"], "gpt-image-2");
assert_eq!(provider_body["input"], "Draw a glass city"); assert_eq!(provider_body["input"], "Draw a glass city");
assert_eq!(provider_body["stream"], true); assert_eq!(provider_body["stream"], true);