From 42219fe744fdd74393644f01300c555554c142c5 Mon Sep 17 00:00:00 2001
From: Musa <malikmusa1323@gmail.com>
Date: Fri, 16 Jan 2026 13:12:01 -0800
Subject: [PATCH] remove serde changes

---
 crates/brightstaff/src/handlers/function_calling.rs   |  1 -
 crates/hermesllm/src/apis/openai.rs                   |  5 -----
 crates/hermesllm/src/transforms/lib.rs                |  1 -
 .../hermesllm/src/transforms/request/from_openai.rs   | 11 ++++++++---
 crates/hermesllm/src/transforms/response/to_openai.rs |  1 -
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/crates/brightstaff/src/handlers/function_calling.rs b/crates/brightstaff/src/handlers/function_calling.rs
index 163ef6f0..8f641df6 100644
--- a/crates/brightstaff/src/handlers/function_calling.rs
+++ b/crates/brightstaff/src/handlers/function_calling.rs
@@ -649,7 +649,6 @@ impl ArchFunctionHandler {
         for (idx, message) in messages.iter().enumerate() {
             let mut role = message.role.clone();
             let mut content = match &message.content {
-                MessageContent::Null => String::new(),
                 MessageContent::Text(text) => text.clone(),
                 MessageContent::Parts(_) => String::new(),
             };
diff --git a/crates/hermesllm/src/apis/openai.rs b/crates/hermesllm/src/apis/openai.rs
index 278d2053..834c33ec 100644
--- a/crates/hermesllm/src/apis/openai.rs
+++ b/crates/hermesllm/src/apis/openai.rs
@@ -219,7 +219,6 @@ impl ResponseMessage {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(untagged)]
 pub enum MessageContent {
-    Null,
     Text(String),
     Parts(Vec<ContentPart>),
 }
@@ -228,7 +227,6 @@ pub enum MessageContent {
 impl ExtractText for MessageContent {
     fn extract_text(&self) -> String {
         match self {
-            MessageContent::Null => String::new(),
             MessageContent::Text(text) => text.clone(),
             MessageContent::Parts(parts) => parts.extract_text(),
         }
@@ -250,7 +248,6 @@ impl ExtractText for Vec<ContentPart> {
 impl Display for MessageContent {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            MessageContent::Null => write!(f, ""),
             MessageContent::Text(text) => write!(f, "{}", text),
             MessageContent::Parts(parts) => {
                 let text_parts: Vec<String> = parts
@@ -627,7 +624,6 @@ impl ProviderRequest for ChatCompletionsRequest {
         self.messages.iter().fold(String::new(), |acc, m| {
             acc + " "
                 + &match &m.content {
-                    MessageContent::Null => String::new(),
                     MessageContent::Text(text) => text.clone(),
                     MessageContent::Parts(parts) => parts
                         .iter()
@@ -644,7 +640,6 @@ impl ProviderRequest for ChatCompletionsRequest {
     fn get_recent_user_message(&self) -> Option<String> {
         self.messages.last().and_then(|msg| {
             match &msg.content {
-                MessageContent::Null => None,
                 MessageContent::Text(text) => Some(text.clone()),
                 MessageContent::Parts(_) => None, // No user message in parts
             }
diff --git a/crates/hermesllm/src/transforms/lib.rs b/crates/hermesllm/src/transforms/lib.rs
index 13d2dac3..a44f8d79 100644
--- a/crates/hermesllm/src/transforms/lib.rs
+++ b/crates/hermesllm/src/transforms/lib.rs
@@ -188,7 +188,6 @@ pub fn convert_openai_message_to_anthropic_content(
 
     // Handle regular content
     match &message.content {
-        MessageContent::Null => {}
         MessageContent::Text(text) => {
             if !text.is_empty() {
                 blocks.push(MessagesContentBlock::Text {
diff --git a/crates/hermesllm/src/transforms/request/from_openai.rs b/crates/hermesllm/src/transforms/request/from_openai.rs
index 0667f53a..e39cfed3 100644
--- a/crates/hermesllm/src/transforms/request/from_openai.rs
+++ b/crates/hermesllm/src/transforms/request/from_openai.rs
@@ -174,7 +174,10 @@ impl TryFrom<ResponsesInputConverter> for Vec<Message> {
 
 impl From<Message> for MessagesSystemPrompt {
     fn from(val: Message) -> Self {
-        let system_text = val.content.extract_text();
+        let system_text = match val.content {
+            MessageContent::Text(text) => text,
+            MessageContent::Parts(parts) => parts.extract_text(),
+        };
         MessagesSystemPrompt::Single(system_text)
     }
 }
@@ -245,7 +248,6 @@ impl TryFrom<Message> for BedrockMessage {
             Role::User => {
                 // Convert user message content to content blocks
                 match message.content {
-                    MessageContent::Null => {}
                     MessageContent::Text(text) => {
                         if !text.is_empty() {
                             content_blocks.push(ContentBlock::Text { text });
@@ -548,7 +550,10 @@ impl TryFrom<ChatCompletionsRequest> for ConverseRequest {
         for message in req.messages {
             match message.role {
                 Role::System => {
-                    let system_text = message.content.extract_text();
+                    let system_text = match message.content {
+                        MessageContent::Text(text) => text,
+                        MessageContent::Parts(parts) => parts.extract_text(),
+                    };
                     system_messages.push(SystemContentBlock::Text { text: system_text });
                 }
                 _ => {
diff --git a/crates/hermesllm/src/transforms/response/to_openai.rs b/crates/hermesllm/src/transforms/response/to_openai.rs
index 7848e6b9..9e3276c9 100644
--- a/crates/hermesllm/src/transforms/response/to_openai.rs
+++ b/crates/hermesllm/src/transforms/response/to_openai.rs
@@ -209,7 +209,6 @@ impl TryFrom<MessagesResponse> for ChatCompletionsResponse {
 
         // Convert MessageContent to String for response
         let content_string = match content {
-            MessageContent::Null => None,
             MessageContent::Text(text) => Some(text),
             MessageContent::Parts(parts) => {
                 let text = parts.extract_text();