🥅 Handle unsupported media type errors (#386)

* 🥅 Handle unsupported media type errors

Signed-off-by: Evaline Ju <69598118+evaline-ju@users.noreply.github.com>

* ♻️ Use mutable headers

Signed-off-by: Evaline Ju <69598118+evaline-ju@users.noreply.github.com>

* ♻️ Use HeaderValue

Signed-off-by: Evaline Ju <69598118+evaline-ju@users.noreply.github.com>

---------

Signed-off-by: Evaline Ju <69598118+evaline-ju@users.noreply.github.com>

Author: evaline-ju

src/clients/detector.rs

@@ -25,7 +25,7 @@ use url::Url;
 
 use super::{
     Error,
-    http::{HttpClientExt, RequestBody, ResponseBody},
+    http::{HttpClientExt, JSON_CONTENT_TYPE, RequestBody, ResponseBody},
 };
 
 pub mod text_contents;
@@ -82,12 +82,11 @@ impl<C: DetectorClient + HttpClientExt> DetectorClientExt for C {
         &self,
         model_id: &str,
         url: Url,
-        headers: HeaderMap,
+        mut headers: HeaderMap,
         request: impl RequestBody,
     ) -> Result<U, Error> {
-        let mut headers = headers;
         headers.append(DETECTOR_ID_HEADER_NAME, model_id.parse().unwrap());
-        headers.append(CONTENT_TYPE, "application/json".parse().unwrap());
+        headers.append(CONTENT_TYPE, JSON_CONTENT_TYPE);
         // Header used by a router component, if available
         headers.append(MODEL_HEADER_NAME, model_id.parse().unwrap());
 

src/clients/http.rs

@@ -17,6 +17,7 @@
 
 use std::{fmt::Debug, ops::Deref, time::Duration};
 
+use http::header::HeaderValue;
 use http_body_util::{BodyExt, Full, combinators::BoxBody};
 use hyper::{
     HeaderMap, Method, Request, StatusCode,
@@ -46,6 +47,8 @@ use crate::{
     utils::{AsUriExt, trace},
 };
 
+pub const JSON_CONTENT_TYPE: HeaderValue = HeaderValue::from_static("application/json");
+
 /// Any type that implements Debug and Serialize can be used as a request body
 pub trait RequestBody: Debug + Serialize {}
 

src/orchestrator/common/client.rs

@@ -16,7 +16,7 @@
 */
 //! Client helpers
 use futures::{StreamExt, TryStreamExt};
-use http::HeaderMap;
+use http::{HeaderMap, header::CONTENT_TYPE};
 use tokio::sync::broadcast;
 use tokio_stream::wrappers::{BroadcastStream, ReceiverStream};
 use tracing::{debug, instrument};
@@ -30,6 +30,7 @@ use crate::{
             GenerationDetectionRequest, TextChatDetectorClient, TextContextDocDetectorClient,
             TextGenerationDetectorClient,
         },
+        http::JSON_CONTENT_TYPE,
         openai::{self, ChatCompletionsResponse, OpenAiClient},
     },
     models::{
@@ -246,11 +247,12 @@ pub async fn detect_text_context(
 #[instrument(skip_all, fields(model_id))]
 pub async fn chat_completion(
     client: &OpenAiClient,
-    headers: HeaderMap,
+    mut headers: HeaderMap,
     request: openai::ChatCompletionsRequest,
 ) -> Result<openai::ChatCompletionsResponse, Error> {
     let model_id = request.model.clone();
     debug!(%model_id, ?request, "sending chat completions request");
+    headers.append(CONTENT_TYPE, JSON_CONTENT_TYPE);
     let response = client
         .chat_completions(request, headers)
         .await
@@ -266,11 +268,12 @@ pub async fn chat_completion(
 #[instrument(skip_all, fields(model_id))]
 pub async fn chat_completion_stream(
     client: &OpenAiClient,
-    headers: HeaderMap,
+    mut headers: HeaderMap,
     request: openai::ChatCompletionsRequest,
 ) -> Result<ChatCompletionStream, Error> {
     let model_id = request.model.clone();
     debug!(%model_id, ?request, "sending chat completions stream request");
+    headers.append(CONTENT_TYPE, JSON_CONTENT_TYPE);
     let response = client
         .chat_completions(request, headers)
         .await