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

fix(antigravity): harden tool schemas and Claude thought replay

Browse Source 
Preserve tool schemas across provider-scoped format conversion and OpenAI gateway planners until the Antigravity boundary. Bound reference expansion, safely merge schema constraints, and lower unsupported Claude unions.

Drop unsigned historical Claude thinking without changing Gemini behavior. Add cross-format regression fixtures and retain the project's original error output policy.

Validation: 945 format tests and 527 transport tests passed; gateway cargo check passed.
This commit is contained in:
wangpengxiang
2026-09-17 15:38:27 +08:00
parent 681ce56c4f
commit 5a55116b62
10 changed files with 1730 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-ai/formats/src/formats/context.rs
+3
View File
@@ -10,6 +10,8 @@ pub struct FormatContext {
pub upstream_is_stream: bool,
pub report_context: Option<Value>,
pub history_scope: Option<String>,
/// Defer tool schema lowering to the private provider transport boundary.
pub preserve_gemini_tool_schemas: bool,
}
impl FormatContext {
@@ -45,6 +47,7 @@ impl FormatContext {
upstream_is_stream: false,
report_context: self.report_context.clone(),
history_scope: self.history_scope.clone(),
preserve_gemini_tool_schemas: false,
}
}
crates/aether-ai/formats/src/formats/gemini/generate_content/request.rs
+92 -57
View File
@@ -31,10 +31,11 @@ pub fn from(body: &Value, ctx: &FormatContext) -> Option<CanonicalRequest> {
}
pub fn to(request: &CanonicalRequest, ctx: &FormatContext) -> Option<Value> {
to_raw(
to_raw_with_schema_policy(
request,
ctx.mapped_model_or(request.model.as_str()),
ctx.upstream_is_stream,
ctx.preserve_gemini_tool_schemas,
)
}
@@ -187,7 +188,21 @@ pub fn to_raw(
mapped_model: &str,
upstream_is_stream: bool,
) -> Option<Value> {
let mut output = canonical_to_gemini_request_body(canonical, mapped_model, upstream_is_stream)?;
to_raw_with_schema_policy(canonical, mapped_model, upstream_is_stream, false)
}
fn to_raw_with_schema_policy(
canonical: &CanonicalRequest,
mapped_model: &str,
upstream_is_stream: bool,
preserve_tool_schemas: bool,
) -> Option<Value> {
let mut output = canonical_to_gemini_request_body(
canonical,
mapped_model,
upstream_is_stream,
preserve_tool_schemas,
)?;
apply_gemini_request_extensions(&mut output, &canonical.extensions)?;
if !canonical_has_raw_gemini_tools(canonical) {
enable_server_side_tool_invocations_for_mixed_tools(&mut output, mapped_model)?;
@@ -244,7 +259,8 @@ pub fn ensure_server_side_tool_invocations_for_mixed_tools(output: &mut Value) -
}
pub(crate) fn canonical_has_mixed_gemini_tools(canonical: &CanonicalRequest) -> bool {
canonical_tools_to_gemini(canonical)
// Only tool kinds matter here; do not lower/expand schemas just to count them.
canonical_tools_to_gemini(canonical, true)
.and_then(|tools| tools.as_array().cloned())
.is_some_and(|tools| gemini_tools_are_mixed(&tools))
}
@@ -275,6 +291,7 @@ fn canonical_to_gemini_request_body(
canonical: &CanonicalRequest,
mapped_model: &str,
_upstream_is_stream: bool,
preserve_tool_schemas: bool,
) -> Option<Value> {
let mut output = Map::new();
if !mapped_model.trim().is_empty() {
@@ -297,7 +314,7 @@ fn canonical_to_gemini_request_body(
{
output.insert("generationConfig".to_string(), generation_config);
}
if let Some(tools) = canonical_tools_to_gemini(canonical) {
if let Some(tools) = canonical_tools_to_gemini(canonical, preserve_tool_schemas) {
output.insert("tools".to_string(), tools);
}
if let Some(tool_config) = canonical_tool_choice_to_gemini(canonical.tool_choice.as_ref()) {
@@ -701,7 +718,10 @@ fn apply_response_format_to_gemini_generation_config(
}
}
fn canonical_tools_to_gemini(canonical: &CanonicalRequest) -> Option<Value> {
fn canonical_tools_to_gemini(
canonical: &CanonicalRequest,
preserve_tool_schemas: bool,
) -> Option<Value> {
let mut declarations = Vec::new();
let mut tools = Vec::new();
let mut google_search = canonical
@@ -747,7 +767,10 @@ fn canonical_tools_to_gemini(canonical: &CanonicalRequest) -> Option<Value> {
google_search = true;
continue;
}
declarations.push(canonical_tool_to_gemini_declaration(tool));
declarations.push(canonical_tool_to_gemini_declaration(
tool,
preserve_tool_schemas,
));
}
let mut emitted_google_search = false;
let mut emitted_code_execution = false;
@@ -877,7 +900,10 @@ fn gemini_unhandled_builtin_tool_portion(tool_object: &Map<String, Value>) -> Op
(!builtin.is_empty()).then_some(Value::Object(builtin))
}
fn canonical_tool_to_gemini_declaration(tool: &CanonicalToolDefinition) -> Value {
fn canonical_tool_to_gemini_declaration(
tool: &CanonicalToolDefinition,
preserve_tool_schema: bool,
) -> Value {
let mut declaration = Map::new();
declaration.insert("name".to_string(), Value::String(tool.name.clone()));
if let Some(description) = &tool.description {
@@ -898,7 +924,7 @@ fn canonical_tool_to_gemini_declaration(tool: &CanonicalToolDefinition) -> Value
.clone()
.or_else(|| tool.parameters.clone())
.map(|mut schema| {
if raw_parameters.is_none() {
if raw_parameters.is_none() && !preserve_tool_schema {
clean_gemini_schema(&mut schema);
}
schema
@@ -1217,43 +1243,46 @@ mod tests {
#[test]
fn canonical_tool_declaration_sanitizes_json_schema_for_gemini() {
let declaration = canonical_tool_to_gemini_declaration(&CanonicalToolDefinition {
name: "inspect".to_string(),
description: None,
parameters: Some(json!({
"$defs": {
"Target": {
"type": "object",
"properties": {
"secret": {
"type": "string",
"encrypted": true
}
let declaration = canonical_tool_to_gemini_declaration(
&CanonicalToolDefinition {
name: "inspect".to_string(),
description: None,
parameters: Some(json!({
"$defs": {
"Target": {
"type": "object",
"properties": {
"secret": {
"type": "string",
"encrypted": true
}
},
"required": ["secret"],
"additionalProperties": false
}
},
"type": "object",
"properties": {
"target": {
"oneOf": [
{"$ref": "#/$defs/Target"},
{"type": "null"}
]
},
"required": ["secret"],
"additionalProperties": false
"mode": {
"type": ["string", "null"],
"enum": [1, "fast"]
},
"value": {
"type": ["string", "integer"]
}
}
},
"type": "object",
"properties": {
"target": {
"oneOf": [
{"$ref": "#/$defs/Target"},
{"type": "null"}
]
},
"mode": {
"type": ["string", "null"],
"enum": [1, "fast"]
},
"value": {
"type": ["string", "integer"]
}
}
})),
strict: None,
extensions: BTreeMap::new(),
});
})),
strict: None,
extensions: BTreeMap::new(),
},
false,
);
assert_eq!(
declaration["parameters"],
@@ -1361,17 +1390,20 @@ mod tests {
..CanonicalRequest::default()
};
let tools = canonical_tools_to_gemini(&canonical).expect("tools should be emitted");
let tools = tools.as_array().expect("tools should be an array");
for preserve_tool_schemas in [false, true] {
let tools = canonical_tools_to_gemini(&canonical, preserve_tool_schemas)
.expect("tools should be emitted");
let tools = tools.as_array().expect("tools should be an array");
assert!(
tools.iter().all(|tool| tool.get("googleSearch").is_none()),
"a client tool named WebSearch must not become server-side grounding: {tools:?}"
);
assert_eq!(
tools[0]["functionDeclarations"][0]["name"], "WebSearch",
"the client declaration must survive: {tools:?}"
);
assert!(
tools.iter().all(|tool| tool.get("googleSearch").is_none()),
"a client tool named WebSearch must not become server-side grounding: {tools:?}"
);
assert_eq!(
tools[0]["functionDeclarations"][0]["name"], "WebSearch",
"the client declaration must survive: {tools:?}"
);
}
}
#[test]
@@ -1388,10 +1420,13 @@ mod tests {
..CanonicalRequest::default()
};
let tools = canonical_tools_to_gemini(&canonical).expect("tools should be emitted");
let tools = tools.as_array().expect("tools should be an array");
for preserve_tool_schemas in [false, true] {
let tools = canonical_tools_to_gemini(&canonical, preserve_tool_schemas)
.expect("tools should be emitted");
let tools = tools.as_array().expect("tools should be an array");
assert_eq!(tools.len(), 1, "{tools:?}");
assert_eq!(tools[0]["googleSearch"], json!({}));
assert_eq!(tools.len(), 1, "{tools:?}");
assert_eq!(tools[0]["googleSearch"], json!({}));
}
}
}
crates/aether-ai/formats/src/formats/shared/standard_matrix.rs
+27 -2
View File
@@ -131,6 +131,10 @@ pub fn build_standard_request_body_with_model_directives_and_request_headers_and
.with_mapped_model(mapped_model)
.with_request_path(request_path)
.with_upstream_stream(upstream_is_stream);
format_context.preserve_gemini_tool_schemas =
provider_type.trim().eq_ignore_ascii_case("antigravity")
&& aether_ai_formats::normalize_api_format_alias(provider_api_format)
== "gemini:generate_content";
if let Some(history_scope) = user_api_key_id {
format_context = format_context.with_history_scope(history_scope);
}
@@ -139,6 +143,23 @@ pub fn build_standard_request_body_with_model_directives_and_request_headers_and
client_api_format,
provider_api_format,
);
// Keep the specialized OpenAI builders' compatibility/history preprocessing
// when routing them through the provider-aware schema-preserving path.
let antigravity_chat_body = if format_context.preserve_gemini_tool_schemas
&& matches!(
aether_ai_formats::normalize_api_format_alias(source_api_format.as_ref()).as_str(),
"openai:chat" | "openai:responses" | "openai:responses:compact"
) {
Some(
crate::formats::shared::standard_normalize::chat_compatible_body_for_standard_source(
body_json,
source_api_format.as_ref(),
user_api_key_id,
)?,
)
} else {
None
};
// DeepSeek and xAI replay opaque provider state. Preserve their native
// Responses input items: canonical conversion can lose reasoning IDs and
// encrypted-only items even when source and destination formats are equal.
@@ -152,9 +173,13 @@ pub fn build_standard_request_body_with_model_directives_and_request_headers_and
Value::Object(object)
} else {
convert_request(
source_api_format.as_ref(),
if antigravity_chat_body.is_some() {
"openai:chat"
} else {
source_api_format.as_ref()
},
provider_api_format,
body_json,
antigravity_chat_body.as_deref().unwrap_or(body_json),
&format_context,
)
.ok()?
crates/aether-ai/formats/src/formats/shared/standard_normalize.rs
+1 -1
View File
@@ -65,7 +65,7 @@ fn chat_compatible_body_for_openai_chat_endpoint(body_json: &Value) -> Option<Co
Some(Cow::Borrowed(body_json))
}
fn chat_compatible_body_for_standard_source<'a>(
pub(crate) fn chat_compatible_body_for_standard_source<'a>(
body_json: &'a Value,
client_api_format: &str,
history_scope: Option<&str>,