From 4c1e352bc98aeb2d59d4bc0d5b4fe3fc2b35d62b Mon Sep 17 00:00:00 2001
From: Adil Hafeez <adil.hafeez@gmail.com>
Date: Thu, 26 Jun 2025 22:16:05 -0700
Subject: [PATCH] remove metadata and remove content-length after request
 mutation

---
 .../src/handlers/chat_completions.rs          | 49 ++++++++++++++++++-
 crates/llm_gateway/src/stream_context.rs      | 12 ++++-
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/crates/brightstaff/src/handlers/chat_completions.rs b/crates/brightstaff/src/handlers/chat_completions.rs
index 1c0e8905..6bd17497 100644
--- a/crates/brightstaff/src/handlers/chat_completions.rs
+++ b/crates/brightstaff/src/handlers/chat_completions.rs
@@ -31,6 +31,48 @@ pub async fn chat_completions(
 
     let chat_request_bytes = request.collect().await?.to_bytes();
 
+    let chat_request_parsed = serde_json::from_slice::<serde_json::Value>(&chat_request_bytes)
+        .map_err(|err| {
+            warn!(
+                "Failed to parse request body as JSON: {}",
+                String::from_utf8_lossy(&chat_request_bytes)
+            );
+            err
+        })
+        .unwrap_or_else(|_| {
+            warn!(
+                "Failed to parse request body as JSON: {}",
+                String::from_utf8_lossy(&chat_request_bytes)
+            );
+            serde_json::Value::Null
+        });
+
+    if chat_request_parsed == serde_json::Value::Null {
+        warn!("Request body is not valid JSON");
+        let err_msg = "Request body is not valid JSON".to_string();
+        let mut bad_request = Response::new(full(err_msg));
+        *bad_request.status_mut() = StatusCode::BAD_REQUEST;
+        return Ok(bad_request);
+    }
+
+    // remove metadata from the request
+    let mut chat_request_parsed = chat_request_parsed;
+    if let Some(metadata) = chat_request_parsed.get_mut("metadata") {
+        info!("Removing metadata from request");
+        metadata.as_object_mut().map(|m| {
+            m.remove("archgw_preference_config");
+            info!("Removed archgw_preference_config from metadata");
+        });
+
+        // if metadata is empty, remove it
+        if metadata.as_object().map_or(false, |m| m.is_empty()) {
+            info!("Removing empty metadata from request");
+            chat_request_parsed
+                .as_object_mut()
+                .map(|m| m.remove("metadata"));
+        }
+    }
+
     let chat_completion_request: ChatCompletionsRequest =
         match ChatCompletionsRequest::try_from(chat_request_bytes.as_ref()) {
             Ok(request) => request,
@@ -111,10 +153,15 @@ pub async fn chat_completions(
         );
     }
 
+    let chat_request_parsed_bytes = serde_json::to_string(&chat_request_parsed).unwrap();
+
+    // remove content-length header if it exists
+    request_headers.remove(header::CONTENT_LENGTH);
+
     let llm_response = match reqwest::Client::new()
         .post(llm_provider_endpoint)
         .headers(request_headers)
-        .body(chat_request_bytes)
+        .body(chat_request_parsed_bytes)
         .send()
         .await
     {
diff --git a/crates/llm_gateway/src/stream_context.rs b/crates/llm_gateway/src/stream_context.rs
index 050afce9..6eebb398 100644
--- a/crates/llm_gateway/src/stream_context.rs
+++ b/crates/llm_gateway/src/stream_context.rs
@@ -569,7 +569,11 @@ impl HttpContext for StreamContext {
                 match SseChatCompletionIter::try_from((body.as_slice(), &hermes_llm_provider)) {
                     Ok(events) => events,
                     Err(e) => {
-                        warn!("could not parse response: {}", e);
+                        warn!(
+                            "could not parse response: {}, body str: {}",
+                            e,
+                            String::from_utf8_lossy(&body)
+                        );
                         return Action::Continue;
                     }
                 };
@@ -614,7 +618,11 @@ impl HttpContext for StreamContext {
                 match ChatCompletionsResponse::try_from((body.as_slice(), &hermes_llm_provider)) {
                     Ok(de) => de,
                     Err(e) => {
-                        warn!("could not parse response: {}", e);
+                        warn!(
+                            "could not parse response: {}, body str: {}",
+                            e,
+                            String::from_utf8_lossy(&body)
+                        );
                         debug!(
                             "on_http_response_body: S[{}], response body: {}",
                             self.context_id,