context_servers: fixup protocol

zed-industries · Sep 13, 2024 · 99f04ec · 99f04ec
1 parent 6684f70
commit 99f04ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/crates/assistant/src/slash_command/context_server_command.rs b/crates/assistant/src/slash_command/context_server_command.rs
@@ -230,7 +230,7 @@ fn format_messages(messages: &[SamplingMessage]) -> String {
             .iter()
             .map(|msg| {
                 match &msg.content {
-                    SamplingContent::Text(text) => text,
+                    SamplingContent::Text { text } => text,
                     SamplingContent::Image { .. } => "", // Ignore images for now
                 }
             })
@@ -245,7 +245,7 @@ fn format_messages(messages: &[SamplingMessage]) -> String {
                     SamplingRole::Assistant => "Assistant",
                 };
                 let content = match &msg.content {
-                    SamplingContent::Text(text) => text,
+                    SamplingContent::Text { text } => text,
                     SamplingContent::Image { .. } => "",
                 };
                 format!("{}: {}", role, content)

diff --git a/crates/context_servers/src/types.rs b/crates/context_servers/src/types.rs
@@ -160,10 +160,11 @@ pub enum SamplingRole {
 }
 
 #[derive(Debug, Deserialize)]
-#[serde(tag = "type", content = "content")]
+#[serde(tag = "type")]
 pub enum SamplingContent {
     #[serde(rename = "text")]
-    Text(String),
+    Text { text: String },
+    // Keep the Image variant if it's still needed
     #[serde(rename = "image")]
     Image { data: String, mime_type: String },
 }