added support inside openai_compatible.rs

Author: pycoder49

tensorzero-core/src/endpoints/openai_compatible.rs

@@ -670,6 +670,8 @@ enum OpenAICompatibleContentBlock {
     Text(TextContent),
     ImageUrl { image_url: OpenAICompatibleImageUrl },
     File { file: OpenAICompatibleFile },
+    #[serde(rename = "tensorzero::raw_text")]
+    RawText { value: String },
 }
 
 #[derive(Deserialize, Debug)]
@@ -689,8 +691,6 @@ struct OpenAICompatibleFile {
 #[derive(Debug)]
 // Two mutually exclusive modes - the standard OpenAI text, and our special TensorZero mode
 pub enum TextContent {
-    /// "content": [{"type": "tensorzero::raw_text", "value": "Write a haiku about artificial intelligence"}]
-    RawText { value: String },
     /// A normal openai text content block: `{"type": "text", "text": "Some content"}`. The `type` key comes from the parent `OpenAICompatibleContentBlock`
     Text { text: String },
     /// A special TensorZero mode: `{"type": "text", "tensorzero::arguments": {"custom_key": "custom_val"}}`.
@@ -703,42 +703,29 @@ impl<'de> Deserialize<'de> for TextContent {
     fn deserialize<D: Deserializer<'de>>(de: D) -> Result<Self, D::Error> {
         let mut object: Map<String, Value> = Map::deserialize(de)?;
         let text = object.remove("text");
-        let raw_text = object.remove("tensorzero::raw_text");
         let arguments = object.remove("tensorzero::arguments");
-        match (text, raw_text, arguments) {
-            (Some(text), None, None) => Ok(TextContent::Text {
+        match (text, arguments) {
+            (Some(text), None) => Ok(TextContent::Text {
                 text: match text {
                     Value::String(text) => text,
                     _ => return Err(serde::de::Error::custom(
                         "`text` must be a string when using `\"type\": \"text\"`",
                     )),
                 },
             }),
-            (None, Some(arguments), None) => Ok(TextContent::RawText {
-                value: match arguments {
-                    Value::String(value) => value,
-                    _ => return Err(serde::de::Error::custom(
-                        "`tensorzero::raw_text` must be a string when using `\"type\": \"text\"`",
-                    )),
-                },
-            }),
-            (None, None, Some(arguments)) => Ok(TextContent::TensorZeroArguments {
+            (None, Some(arguments)) => Ok(TextContent::TensorZeroArguments {
                 tensorzero_arguments: match arguments {
                     Value::Object(arguments) => arguments,
                     _ => return Err(serde::de::Error::custom(
                         "`tensorzero::arguments` must be an object when using `\"type\": \"text\"`",
                     )),
                 },
             }),
-            (Some(_), None, Some(_)) => Err(serde::de::Error::custom(
+            (Some(_), Some(_)) => Err(serde::de::Error::custom(
                 "Only one of `text` or `tensorzero::arguments` can be set when using `\"type\": \"text\"`",
             )),
-            (None, None, None) => Err(serde::de::Error::custom(
-                "Either `text` or `tensorzero::arguments` must be set when using `\"type\": \"text\"` or 
-                `tensorzero::raw_text` must be set when using `\"type\": \"tensorzero::raw_text\"`",
-            )),
-            _ => Err(serde::de::Error::custom(
-                "Invalid content block: must be one of `text`, `tensorzero::raw_text`, or `tensorzero::arguments`",
+            (None, None) => Err(serde::de::Error::custom(
+                "Either `text` or `tensorzero::arguments` must be set when using `\"type\": \"text\"`",
             )),
         }
     }
@@ -771,7 +758,8 @@ fn convert_openai_message_content(content: Value) -> Result<Vec<InputMessageCont
             for val in a {
                 let block = serde_json::from_value::<OpenAICompatibleContentBlock>(val.clone());
                 let output = match block {
-                    Ok(OpenAICompatibleContentBlock::Text(TextContent::RawText { text })) => InputMessageContent::Text(TextKind::Text {text }),
+                    Ok(OpenAICompatibleContentBlock::RawText{ value }) => InputMessageContent::RawText { value },
+                    Ok(OpenAICompatibleContentBlock::Text(TextContent::Text { text })) => InputMessageContent::Text(TextKind::Text {text }),
                     Ok(OpenAICompatibleContentBlock::Text(TextContent::TensorZeroArguments { tensorzero_arguments })) => InputMessageContent::Text(TextKind::Arguments { arguments: tensorzero_arguments }),
                     Ok(OpenAICompatibleContentBlock::ImageUrl { image_url }) => {
                         if image_url.url.scheme() == "data" {