mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 09:20:22 +08:00
refactor: 拆分 gateway 单体为独立 crate，新增 systemd 部署方案
将 gateway 内部的 model-fetch、provider-transport、scheduler-core、 usage-runtime、video-tasks-core 模块提取为独立 crate；重构 gateway 内部模块结构（state/router/cache/data/query 等）；移除大量遗留模块 文件；新增 systemd 二进制部署骨架及相关文档；更新前端 usage 相关 API 和组件。
This commit is contained in:
fawney19
8
crates/aether-provider-transport/src/claude_code/auth.rs
Normal file
8
crates/aether-provider-transport/src/claude_code/auth.rs
Normal file
@@ -0,0 +1,8 @@
|
||||
use super::super::auth::resolve_local_standard_auth;
|
||||
use super::super::snapshot::GatewayProviderTransportSnapshot;
|
||||
use super::super::supports_local_oauth_request_auth_resolution;
|
||||
|
||||
pub fn supports_local_claude_code_auth(transport: &GatewayProviderTransportSnapshot) -> bool {
|
||||
resolve_local_standard_auth(transport).is_some()
|
||||
|| supports_local_oauth_request_auth_resolution(transport)
|
||||
}
|
||||
53
crates/aether-provider-transport/src/claude_code/policy.rs
Normal file
53
crates/aether-provider-transport/src/claude_code/policy.rs
Normal file
@@ -0,0 +1,53 @@
|
||||
use super::super::snapshot::GatewayProviderTransportSnapshot;
|
||||
use super::super::{
|
||||
body_rules_are_locally_supported, header_rules_are_locally_supported,
|
||||
resolve_transport_tls_profile, supports_local_oauth_request_auth_resolution,
|
||||
transport_proxy_is_locally_supported,
|
||||
};
|
||||
use super::auth::supports_local_claude_code_auth;
|
||||
|
||||
pub fn supports_local_claude_code_transport_with_network(
|
||||
transport: &GatewayProviderTransportSnapshot,
|
||||
api_format: &str,
|
||||
) -> bool {
|
||||
if !transport.provider.is_active || !transport.endpoint.is_active || !transport.key.is_active {
|
||||
return false;
|
||||
}
|
||||
if !transport
|
||||
.provider
|
||||
.provider_type
|
||||
.trim()
|
||||
.eq_ignore_ascii_case("claude_code")
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if !transport
|
||||
.endpoint
|
||||
.api_format
|
||||
.trim()
|
||||
.eq_ignore_ascii_case(api_format.trim())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if !header_rules_are_locally_supported(transport.endpoint.header_rules.as_ref())
|
||||
|| !body_rules_are_locally_supported(transport.endpoint.body_rules.as_ref())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if !supports_local_claude_code_auth(transport) {
|
||||
return false;
|
||||
}
|
||||
if transport.key.decrypted_auth_config.is_some()
|
||||
&& !supports_local_oauth_request_auth_resolution(transport)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if !transport_proxy_is_locally_supported(transport) {
|
||||
return false;
|
||||
}
|
||||
if transport.key.fingerprint.is_some() && resolve_transport_tls_profile(transport).is_none() {
|
||||
return false;
|
||||
}
|
||||
|
||||
true
|
||||
}
|
||||
330
crates/aether-provider-transport/src/claude_code/request.rs
Normal file
330
crates/aether-provider-transport/src/claude_code/request.rs
Normal file
@@ -0,0 +1,330 @@
|
||||
use std::collections::{BTreeMap, BTreeSet};
|
||||
|
||||
use serde_json::{Map, Value};
|
||||
|
||||
use super::super::auth::build_openai_passthrough_headers;
|
||||
|
||||
const DEFAULT_ANTHROPIC_VERSION: &str = "2023-06-01";
|
||||
const DEFAULT_ACCEPT: &str = "application/json";
|
||||
const STREAM_HELPER_METHOD: &str = "stream";
|
||||
const DUMMY_THINKING_SIGNATURE: &str = "skip_thought_signature_validator";
|
||||
const REQUIRED_BETA_TOKENS: &[&str] = &[
|
||||
"claude-code-20250219",
|
||||
"oauth-2025-04-20",
|
||||
"interleaved-thinking-2025-05-14",
|
||||
];
|
||||
const EXCLUDED_BETA_TOKENS: &[&str] = &["context-1m-2025-08-07"];
|
||||
|
||||
pub fn build_claude_code_passthrough_headers(
|
||||
headers: &http::HeaderMap,
|
||||
auth_header: &str,
|
||||
auth_value: &str,
|
||||
extra_headers: &BTreeMap<String, String>,
|
||||
stream: bool,
|
||||
fingerprint: Option<&Value>,
|
||||
) -> BTreeMap<String, String> {
|
||||
let mut out = build_openai_passthrough_headers(
|
||||
headers,
|
||||
auth_header,
|
||||
auth_value,
|
||||
extra_headers,
|
||||
Some("application/json"),
|
||||
);
|
||||
|
||||
out.insert("accept".to_string(), DEFAULT_ACCEPT.to_string());
|
||||
out.insert(
|
||||
"anthropic-version".to_string(),
|
||||
DEFAULT_ANTHROPIC_VERSION.to_string(),
|
||||
);
|
||||
out.insert(
|
||||
"anthropic-beta".to_string(),
|
||||
merge_anthropic_beta_tokens(out.get("anthropic-beta").map(String::as_str)),
|
||||
);
|
||||
out.insert("x-stainless-lang".to_string(), "js".to_string());
|
||||
out.insert(
|
||||
"x-stainless-package-version".to_string(),
|
||||
"0.70.0".to_string(),
|
||||
);
|
||||
out.insert("x-stainless-os".to_string(), "Linux".to_string());
|
||||
out.insert("x-stainless-arch".to_string(), "arm64".to_string());
|
||||
out.insert("x-stainless-runtime".to_string(), "node".to_string());
|
||||
out.insert(
|
||||
"x-stainless-runtime-version".to_string(),
|
||||
"v24.13.0".to_string(),
|
||||
);
|
||||
out.insert("x-stainless-retry-count".to_string(), "0".to_string());
|
||||
out.insert("x-stainless-timeout".to_string(), "600".to_string());
|
||||
out.insert("x-app".to_string(), "cli".to_string());
|
||||
out.insert(
|
||||
"anthropic-dangerous-direct-browser-access".to_string(),
|
||||
"true".to_string(),
|
||||
);
|
||||
|
||||
if stream {
|
||||
out.insert(
|
||||
"x-stainless-helper-method".to_string(),
|
||||
STREAM_HELPER_METHOD.to_string(),
|
||||
);
|
||||
} else {
|
||||
out.remove("x-stainless-helper-method");
|
||||
}
|
||||
|
||||
if let Some(fingerprint) = fingerprint.and_then(Value::as_object) {
|
||||
override_header_from_fingerprint(
|
||||
&mut out,
|
||||
fingerprint,
|
||||
"stainless_package_version",
|
||||
"x-stainless-package-version",
|
||||
);
|
||||
override_header_from_fingerprint(&mut out, fingerprint, "stainless_os", "x-stainless-os");
|
||||
override_header_from_fingerprint(
|
||||
&mut out,
|
||||
fingerprint,
|
||||
"stainless_arch",
|
||||
"x-stainless-arch",
|
||||
);
|
||||
override_header_from_fingerprint(
|
||||
&mut out,
|
||||
fingerprint,
|
||||
"stainless_runtime_version",
|
||||
"x-stainless-runtime-version",
|
||||
);
|
||||
override_header_from_fingerprint(
|
||||
&mut out,
|
||||
fingerprint,
|
||||
"stainless_timeout",
|
||||
"x-stainless-timeout",
|
||||
);
|
||||
override_header_from_fingerprint(&mut out, fingerprint, "user_agent", "user-agent");
|
||||
}
|
||||
|
||||
out
|
||||
}
|
||||
|
||||
pub fn sanitize_claude_code_request_body(body: &mut Value) {
|
||||
let Some(body_object) = body.as_object_mut() else {
|
||||
return;
|
||||
};
|
||||
let thinking_enabled = body_object
|
||||
.get("thinking")
|
||||
.and_then(Value::as_object)
|
||||
.and_then(|thinking| thinking.get("type"))
|
||||
.and_then(Value::as_str)
|
||||
.map(str::trim)
|
||||
.is_some_and(|value| matches!(value.to_ascii_lowercase().as_str(), "enabled" | "adaptive"));
|
||||
|
||||
let Some(messages) = body_object
|
||||
.get_mut("messages")
|
||||
.and_then(Value::as_array_mut)
|
||||
else {
|
||||
return;
|
||||
};
|
||||
|
||||
for message in messages {
|
||||
let Some(message_object) = message.as_object_mut() else {
|
||||
continue;
|
||||
};
|
||||
let role = message_object
|
||||
.get("role")
|
||||
.and_then(Value::as_str)
|
||||
.map(str::trim)
|
||||
.unwrap_or_default()
|
||||
.to_string();
|
||||
let Some(content) = message_object
|
||||
.get_mut("content")
|
||||
.and_then(Value::as_array_mut)
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
|
||||
let mut filtered = Vec::with_capacity(content.len());
|
||||
for block in std::mem::take(content) {
|
||||
let Value::Object(block_object) = block else {
|
||||
filtered.push(block);
|
||||
continue;
|
||||
};
|
||||
if keep_claude_code_block(&block_object, &role, thinking_enabled) {
|
||||
filtered.push(Value::Object(block_object));
|
||||
}
|
||||
}
|
||||
*content = filtered;
|
||||
}
|
||||
}
|
||||
|
||||
fn keep_claude_code_block(
|
||||
block_object: &Map<String, Value>,
|
||||
role: &str,
|
||||
thinking_enabled: bool,
|
||||
) -> bool {
|
||||
let block_type = block_object
|
||||
.get("type")
|
||||
.and_then(Value::as_str)
|
||||
.map(str::trim)
|
||||
.unwrap_or_default();
|
||||
if matches!(block_type, "thinking" | "redacted_thinking") {
|
||||
let signature = block_object
|
||||
.get("signature")
|
||||
.and_then(Value::as_str)
|
||||
.map(str::trim)
|
||||
.unwrap_or_default();
|
||||
return thinking_enabled
|
||||
&& role.eq_ignore_ascii_case("assistant")
|
||||
&& !signature.is_empty()
|
||||
&& signature != DUMMY_THINKING_SIGNATURE;
|
||||
}
|
||||
if block_type.is_empty() && block_object.contains_key("thinking") {
|
||||
return false;
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
fn merge_anthropic_beta_tokens(incoming: Option<&str>) -> String {
|
||||
let mut seen = BTreeSet::new();
|
||||
let mut merged = Vec::new();
|
||||
|
||||
for token in REQUIRED_BETA_TOKENS {
|
||||
append_beta_token(&mut seen, &mut merged, token);
|
||||
}
|
||||
for token in incoming.unwrap_or_default().split(',') {
|
||||
let token = token.trim();
|
||||
if EXCLUDED_BETA_TOKENS
|
||||
.iter()
|
||||
.any(|excluded| token.eq_ignore_ascii_case(excluded))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
append_beta_token(&mut seen, &mut merged, token);
|
||||
}
|
||||
|
||||
merged.join(",")
|
||||
}
|
||||
|
||||
fn append_beta_token(seen: &mut BTreeSet<String>, merged: &mut Vec<String>, token: &str) {
|
||||
let normalized = token.trim();
|
||||
if normalized.is_empty() {
|
||||
return;
|
||||
}
|
||||
let key = normalized.to_ascii_lowercase();
|
||||
if seen.insert(key) {
|
||||
merged.push(normalized.to_string());
|
||||
}
|
||||
}
|
||||
|
||||
fn override_header_from_fingerprint(
|
||||
headers: &mut BTreeMap<String, String>,
|
||||
fingerprint: &Map<String, Value>,
|
||||
fingerprint_key: &str,
|
||||
header_key: &str,
|
||||
) {
|
||||
let Some(value) = fingerprint
|
||||
.get(fingerprint_key)
|
||||
.and_then(Value::as_str)
|
||||
.map(str::trim)
|
||||
.filter(|value| !value.is_empty())
|
||||
else {
|
||||
return;
|
||||
};
|
||||
headers.insert(header_key.to_string(), value.to_string());
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{build_claude_code_passthrough_headers, sanitize_claude_code_request_body};
|
||||
use serde_json::json;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
#[test]
|
||||
fn claude_code_headers_merge_required_betas_and_stream_helper() {
|
||||
let mut headers = http::HeaderMap::new();
|
||||
headers.insert(
|
||||
"anthropic-beta",
|
||||
http::HeaderValue::from_static("context-1m-2025-08-07,custom-beta"),
|
||||
);
|
||||
headers.insert(
|
||||
"user-agent",
|
||||
http::HeaderValue::from_static("Claude-Code/Test"),
|
||||
);
|
||||
let built = build_claude_code_passthrough_headers(
|
||||
&headers,
|
||||
"authorization",
|
||||
"Bearer upstream-token",
|
||||
&BTreeMap::new(),
|
||||
true,
|
||||
Some(&json!({
|
||||
"user_agent":"Claude-Code/9.9",
|
||||
"stainless_package_version":"1.0.5",
|
||||
"stainless_runtime_version":"v22.12.0",
|
||||
"stainless_timeout":"900"
|
||||
})),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
built.get("anthropic-beta").map(String::as_str),
|
||||
Some(
|
||||
"claude-code-20250219,oauth-2025-04-20,interleaved-thinking-2025-05-14,custom-beta"
|
||||
)
|
||||
);
|
||||
assert_eq!(
|
||||
built.get("anthropic-version").map(String::as_str),
|
||||
Some("2023-06-01")
|
||||
);
|
||||
assert_eq!(
|
||||
built.get("accept").map(String::as_str),
|
||||
Some("application/json")
|
||||
);
|
||||
assert_eq!(
|
||||
built.get("x-stainless-helper-method").map(String::as_str),
|
||||
Some("stream")
|
||||
);
|
||||
assert_eq!(built.get("x-app").map(String::as_str), Some("cli"));
|
||||
assert_eq!(
|
||||
built.get("x-stainless-package-version").map(String::as_str),
|
||||
Some("1.0.5")
|
||||
);
|
||||
assert_eq!(
|
||||
built.get("x-stainless-runtime-version").map(String::as_str),
|
||||
Some("v22.12.0")
|
||||
);
|
||||
assert_eq!(
|
||||
built.get("x-stainless-timeout").map(String::as_str),
|
||||
Some("900")
|
||||
);
|
||||
assert_eq!(
|
||||
built.get("user-agent").map(String::as_str),
|
||||
Some("Claude-Code/9.9")
|
||||
);
|
||||
assert_eq!(
|
||||
built.get("authorization").map(String::as_str),
|
||||
Some("Bearer upstream-token")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn claude_code_body_sanitizer_drops_invalid_thinking_blocks() {
|
||||
let mut body = json!({
|
||||
"thinking": {"type":"enabled"},
|
||||
"messages": [{
|
||||
"role":"assistant",
|
||||
"content":[
|
||||
{"type":"thinking","thinking":"keep","signature":"sig_valid"},
|
||||
{"type":"thinking","thinking":"drop-empty","signature":""},
|
||||
{"type":"redacted_thinking","data":"keep-redacted","signature":"sig_redacted"},
|
||||
{"type":"redacted_thinking","data":"drop-no-signature"},
|
||||
{"thinking":"drop-no-type"},
|
||||
{"type":"text","text":"ok"}
|
||||
]
|
||||
}]
|
||||
});
|
||||
|
||||
sanitize_claude_code_request_body(&mut body);
|
||||
|
||||
assert_eq!(
|
||||
body["messages"][0]["content"],
|
||||
json!([
|
||||
{"type":"thinking","thinking":"keep","signature":"sig_valid"},
|
||||
{"type":"redacted_thinking","data":"keep-redacted","signature":"sig_redacted"},
|
||||
{"type":"text","text":"ok"}
|
||||
])
|
||||
);
|
||||
}
|
||||
}
|
||||
81
crates/aether-provider-transport/src/claude_code/url.rs
Normal file
81
crates/aether-provider-transport/src/claude_code/url.rs
Normal file
@@ -0,0 +1,81 @@
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use url::form_urlencoded;
|
||||
|
||||
pub fn build_claude_code_messages_url(upstream_base_url: &str, query: Option<&str>) -> String {
|
||||
let (trimmed_base_url, base_query) = split_query(upstream_base_url.trim());
|
||||
let trimmed_base_url = trimmed_base_url.trim_end_matches('/');
|
||||
let mut url =
|
||||
if trimmed_base_url.ends_with("/v1/messages") || trimmed_base_url.ends_with("/messages") {
|
||||
trimmed_base_url.to_string()
|
||||
} else if trimmed_base_url.ends_with("/v1") {
|
||||
format!("{trimmed_base_url}/messages")
|
||||
} else {
|
||||
format!("{trimmed_base_url}/v1/messages")
|
||||
};
|
||||
append_merged_query(&mut url, base_query, query);
|
||||
url
|
||||
}
|
||||
|
||||
fn split_query(value: &str) -> (&str, Option<&str>) {
|
||||
value
|
||||
.split_once('?')
|
||||
.map(|(base, query)| (base, Some(query)))
|
||||
.unwrap_or((value, None))
|
||||
}
|
||||
|
||||
fn append_merged_query(url: &mut String, base_query: Option<&str>, request_query: Option<&str>) {
|
||||
let Some(query) = merge_query_layers(base_query, request_query) else {
|
||||
return;
|
||||
};
|
||||
if url.contains('?') {
|
||||
url.push('&');
|
||||
} else {
|
||||
url.push('?');
|
||||
}
|
||||
url.push_str(&query);
|
||||
}
|
||||
|
||||
fn merge_query_layers(base_query: Option<&str>, request_query: Option<&str>) -> Option<String> {
|
||||
let mut merged = BTreeMap::new();
|
||||
for source in [base_query, request_query] {
|
||||
let Some(source) = source.map(str::trim).filter(|value| !value.is_empty()) else {
|
||||
continue;
|
||||
};
|
||||
for (key, value) in form_urlencoded::parse(source.as_bytes()) {
|
||||
merged.insert(key.into_owned(), value.into_owned());
|
||||
}
|
||||
}
|
||||
if merged.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let mut serializer = form_urlencoded::Serializer::new(String::new());
|
||||
for (key, value) in merged {
|
||||
serializer.append_pair(&key, &value);
|
||||
}
|
||||
Some(serializer.finish())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::build_claude_code_messages_url;
|
||||
|
||||
#[test]
|
||||
fn keeps_existing_messages_suffix_without_duplication() {
|
||||
assert_eq!(
|
||||
build_claude_code_messages_url("https://api.anthropic.com/v1/messages", None),
|
||||
"https://api.anthropic.com/v1/messages"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn appends_messages_and_merges_query() {
|
||||
assert_eq!(
|
||||
build_claude_code_messages_url(
|
||||
"https://api.anthropic.com/v1?beta=true",
|
||||
Some("foo=bar"),
|
||||
),
|
||||
"https://api.anthropic.com/v1/messages?beta=true&foo=bar"
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user