admin/CC-Switch
1
0
Fork 0
mirror of https://github.com/farion1231/cc-switch.git synced 2026-07-24 12:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(proxy/gemini): share build_anthropic_usage between stream and non-stream paths

Browse Source 
`streaming_gemini::anthropic_usage_from_gemini` and
`transform_gemini::build_anthropic_usage` were byte-for-byte identical
(32 lines each) — both converting Gemini `usageMetadata` into the
Anthropic `usage` shape including `cache_read_input_tokens` mapping.

Promote the non-streaming version to `pub(crate)` and reuse it from the
streaming SSE converter. Removes ~30 lines of duplication and guarantees
the two paths cannot drift apart.

No behavioral change; all 854 lib tests pass; cargo fmt + clippy -D
warnings clean.
This commit is contained in:
Jason
2026-04-16 17:50:58 +08:00
parent b02b8f3b1b
commit 1e04f68745
2 changed files with 9 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/proxy/providers/streaming_gemini.rs
+5 -38
View File
@@ -5,8 +5,8 @@
use super::gemini_shadow::{GeminiShadowStore, GeminiToolCallMeta};
use super::transform_gemini::{
is_synthesized_tool_call_id, rectify_tool_call_parts, synthesize_tool_call_id,
AnthropicToolSchemaHints,
build_anthropic_usage, is_synthesized_tool_call_id, rectify_tool_call_parts,
synthesize_tool_call_id, AnthropicToolSchemaHints,
};
use crate::proxy::sse::{append_utf8_safe, strip_sse_field, take_sse_block};
use bytes::Bytes;
@@ -15,39 +15,6 @@ use serde_json::{json, Value};
use std::collections::HashSet;
use std::sync::Arc;
fn anthropic_usage_from_gemini(usage: Option<&Value>) -> Value {
let Some(usage) = usage else {
return json!({
"input_tokens": 0,
"output_tokens": 0
});
};
let input_tokens = usage
.get("promptTokenCount")
.and_then(|value| value.as_u64())
.unwrap_or(0);
let total_tokens = usage
.get("totalTokenCount")
.and_then(|value| value.as_u64())
.unwrap_or(0);
let output_tokens = total_tokens.saturating_sub(input_tokens);
let mut result = json!({
"input_tokens": input_tokens,
"output_tokens": output_tokens
});
if let Some(cached) = usage
.get("cachedContentTokenCount")
.and_then(|value| value.as_u64())
{
result["cache_read_input_tokens"] = json!(cached);
}
result
}
fn map_finish_reason(reason: Option<&str>, has_tool_use: bool, blocked: bool) -> &'static str {
if blocked {
return "refusal";
@@ -309,7 +276,7 @@ pub fn create_anthropic_sse_stream_from_gemini<E: std::error::Error + Send + 'st
"type": "message",
"role": "assistant",
"model": current_model.clone().unwrap_or_default(),
"usage": anthropic_usage_from_gemini(chunk_json.get("usageMetadata"))
"usage": build_anthropic_usage(chunk_json.get("usageMetadata"))
}
});
yield Ok(encode_sse("message_start", &event));
@@ -413,7 +380,7 @@ pub fn create_anthropic_sse_stream_from_gemini<E: std::error::Error + Send + 'st
"type": "message",
"role": "assistant",
"model": current_model.clone().unwrap_or_default(),
"usage": anthropic_usage_from_gemini(latest_usage.as_ref())
"usage": build_anthropic_usage(latest_usage.as_ref())
}
});
yield Ok(encode_sse("message_start", &event));
@@ -526,7 +493,7 @@ pub fn create_anthropic_sse_stream_from_gemini<E: std::error::Error + Send + 'st
!tool_calls.is_empty(),
blocked_text.is_some(),
);
let usage = anthropic_usage_from_gemini(latest_usage.as_ref());
let usage = build_anthropic_usage(latest_usage.as_ref());
let message_delta = json!({
"type": "message_delta",
"delta": {
src-tauri/src/proxy/providers/transform_gemini.rs
+4 -1
View File
@@ -959,7 +959,10 @@ fn map_tool_choice(tool_choice: Option<&Value>) -> Result<Option<Value>, ProxyEr
}
}
fn build_anthropic_usage(usage: Option<&Value>) -> Value {
/// Convert a Gemini `usageMetadata` object into an Anthropic-style `usage`
/// object. Used by both the streaming SSE converter and the non-streaming
/// transform path so the two emit identical shapes.
pub(crate) fn build_anthropic_usage(usage: Option<&Value>) -> Value {
let Some(usage) = usage else {
return json!({
"input_tokens": 0,