mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 01:10:23 +08:00
refactor(gateway): route decoded body access through ai_serving
This commit is contained in:
@@ -70,10 +70,13 @@ pub(crate) fn parse_direct_request_body(
|
||||
parts: &http::request::Parts,
|
||||
body_bytes: &axum::body::Bytes,
|
||||
) -> Option<(serde_json::Value, Option<String>)> {
|
||||
aether_ai_formats::api::parse_direct_request_body(
|
||||
is_json_request(&parts.headers),
|
||||
body_bytes.as_ref(),
|
||||
)
|
||||
let is_json_request = is_json_request(&parts.headers);
|
||||
let body_bytes = if is_json_request {
|
||||
crate::ai_serving::decoded_request_body_bytes(&parts.headers, body_bytes.as_ref()).ok()?
|
||||
} else {
|
||||
std::borrow::Cow::Borrowed(body_bytes.as_ref())
|
||||
};
|
||||
aether_ai_formats::api::parse_direct_request_body(is_json_request, body_bytes.as_ref())
|
||||
}
|
||||
|
||||
pub(crate) fn resolve_execution_runtime_stream_plan_kind(
|
||||
@@ -215,3 +218,32 @@ fn value_has_non_empty_text(value: Option<&serde_json::Value>) -> bool {
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::parse_direct_request_body;
|
||||
use axum::body::Bytes;
|
||||
use axum::http::{header, Request};
|
||||
|
||||
#[test]
|
||||
fn parse_direct_request_body_reads_zstd_encoded_json_body() {
|
||||
let (parts, _) = Request::builder()
|
||||
.method("POST")
|
||||
.uri("/v1/responses")
|
||||
.header(header::CONTENT_TYPE, "application/json")
|
||||
.header(header::CONTENT_ENCODING, "zstd")
|
||||
.body(())
|
||||
.expect("request should build")
|
||||
.into_parts();
|
||||
let encoded =
|
||||
zstd::stream::encode_all(br#"{"model":"gpt-5.4","stream":true}"#.as_slice(), 0)
|
||||
.expect("zstd body should encode");
|
||||
|
||||
let (body_json, body_base64) =
|
||||
parse_direct_request_body(&parts, &Bytes::from(encoded)).expect("body should parse");
|
||||
|
||||
assert_eq!(body_json["model"].as_str(), Some("gpt-5.4"));
|
||||
assert_eq!(body_json["stream"].as_bool(), Some(true));
|
||||
assert!(body_base64.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,6 +150,13 @@ pub(crate) fn is_json_request(headers: &http::HeaderMap) -> bool {
|
||||
crate::headers::is_json_request(headers)
|
||||
}
|
||||
|
||||
pub(crate) fn decoded_request_body_bytes<'a>(
|
||||
headers: &http::HeaderMap,
|
||||
body_bytes: &'a [u8],
|
||||
) -> Result<std::borrow::Cow<'a, [u8]>, crate::headers::RequestBodyNormalizationError> {
|
||||
crate::headers::decoded_request_body_bytes(headers, body_bytes)
|
||||
}
|
||||
|
||||
pub(crate) fn tls_fingerprint_from_headers(headers: &http::HeaderMap) -> Option<serde_json::Value> {
|
||||
crate::headers::tls_fingerprint_from_headers(headers)
|
||||
}
|
||||
|
||||
@@ -31,7 +31,13 @@ pub(crate) fn parse_direct_request_body(
|
||||
parts: &http::request::Parts,
|
||||
body_bytes: &Bytes,
|
||||
) -> Option<(serde_json::Value, Option<String>)> {
|
||||
parse_direct_request_body_impl(is_json_request(&parts.headers), body_bytes.as_ref())
|
||||
let is_json_request = is_json_request(&parts.headers);
|
||||
let body_bytes = if is_json_request {
|
||||
crate::ai_serving::decoded_request_body_bytes(&parts.headers, body_bytes.as_ref()).ok()?
|
||||
} else {
|
||||
std::borrow::Cow::Borrowed(body_bytes.as_ref())
|
||||
};
|
||||
parse_direct_request_body_impl(is_json_request, body_bytes.as_ref())
|
||||
}
|
||||
|
||||
pub(crate) fn force_upstream_streaming_for_provider(
|
||||
|
||||
Reference in New Issue
Block a user