Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

open_ai: Preserve separators between reasoning summaries (#62466)

Lukas Wirtha49162656edf
diff --git a/crates/open_ai/src/completion.rs b/crates/open_ai/src/completion.rs
index 8b8da6e657e..12f99440e3e 100644
--- a/crates/open_ai/src/completion.rs
+++ b/crates/open_ai/src/completion.rs
@@ -875,6 +875,7 @@ pub struct OpenAiResponseEventMapper {
function_calls_by_item: HashMap<String, PendingResponseFunctionCall>,
custom_tool_calls_by_item: HashMap<String, PendingResponseCustomToolCall>,
reasoning_items: Vec<ResponseReasoningInputItem>,
+ current_reasoning_summary_part: Option<(String, usize)>,
current_message_phase: Option<String>,
pending_stop_reason: Option<StopReason>,
pending_compaction_items: usize,
@@ -900,6 +901,7 @@ impl OpenAiResponseEventMapper {
function_calls_by_item: HashMap::default(),
custom_tool_calls_by_item: HashMap::default(),
reasoning_items: Vec::new(),
+ current_reasoning_summary_part: None,
current_message_phase: None,
pending_stop_reason: None,
pending_compaction_items: 0,
@@ -980,8 +982,24 @@ impl OpenAiResponseEventMapper {
}
events
}
- ResponsesStreamEvent::ReasoningSummaryTextDelta { delta, .. }
- | ResponsesStreamEvent::ReasoningDelta { delta, .. } => {
+ ResponsesStreamEvent::ReasoningSummaryTextDelta {
+ item_id,
+ summary_index,
+ delta,
+ ..
+ } => {
+ if delta.is_empty() {
+ Vec::new()
+ } else {
+ let mut events = self.begin_reasoning_summary_part(&item_id, summary_index);
+ events.push(Ok(LanguageModelCompletionEvent::Thinking {
+ text: delta,
+ signature: None,
+ }));
+ events
+ }
+ }
+ ResponsesStreamEvent::ReasoningDelta { delta, .. } => {
if delta.is_empty() {
Vec::new()
} else {
@@ -1134,16 +1152,11 @@ impl OpenAiResponseEventMapper {
let error = error.into_response_error();
vec![Err(completion_error_from_response_error(&error))]
}
- ResponsesStreamEvent::ReasoningSummaryPartAdded { summary_index, .. } => {
- if summary_index > 0 {
- vec![Ok(LanguageModelCompletionEvent::Thinking {
- text: "\n\n".to_string(),
- signature: None,
- })]
- } else {
- Vec::new()
- }
- }
+ ResponsesStreamEvent::ReasoningSummaryPartAdded {
+ item_id,
+ summary_index,
+ ..
+ } => self.begin_reasoning_summary_part(&item_id, summary_index),
ResponsesStreamEvent::OutputItemDone { item, .. } => match item {
ResponseOutputItem::Reasoning(reasoning) => self.capture_reasoning_item(&reasoning),
ResponseOutputItem::Message(message) => self.capture_message_phase(&message),
@@ -1184,6 +1197,27 @@ impl OpenAiResponseEventMapper {
}
}
+ fn begin_reasoning_summary_part(
+ &mut self,
+ item_id: &str,
+ summary_index: usize,
+ ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+ let part = (item_id.to_string(), summary_index);
+ if self.current_reasoning_summary_part.as_ref() == Some(&part) {
+ return Vec::new();
+ }
+
+ let separator = self.current_reasoning_summary_part.replace(part).is_some();
+ if separator {
+ vec![Ok(LanguageModelCompletionEvent::Thinking {
+ text: "\n\n".to_string(),
+ signature: None,
+ })]
+ } else {
+ Vec::new()
+ }
+ }
+
fn handle_completion(
&mut self,
response: ResponsesSummary,
@@ -3442,11 +3476,13 @@ mod tests {
ResponsesStreamEvent::ReasoningSummaryTextDelta {
item_id: "rs_123".into(),
output_index: 0,
+ summary_index: 0,
delta: "Thinking about".into(),
},
ResponsesStreamEvent::ReasoningSummaryTextDelta {
item_id: "rs_123".into(),
output_index: 0,
+ summary_index: 0,
delta: " the answer".into(),
},
ResponsesStreamEvent::ReasoningSummaryTextDone {
@@ -3459,14 +3495,10 @@ mod tests {
output_index: 0,
summary_index: 0,
},
- ResponsesStreamEvent::ReasoningSummaryPartAdded {
- item_id: "rs_123".into(),
- output_index: 0,
- summary_index: 1,
- },
ResponsesStreamEvent::ReasoningSummaryTextDelta {
item_id: "rs_123".into(),
output_index: 0,
+ summary_index: 1,
delta: "Second part".into(),
},
ResponsesStreamEvent::ReasoningSummaryTextDone {
@@ -3543,6 +3575,65 @@ mod tests {
));
}
+ #[test]
+ fn responses_stream_separates_reasoning_summary_items() {
+ let events = vec![
+ ResponsesStreamEvent::OutputItemAdded {
+ output_index: 0,
+ sequence_number: None,
+ item: ResponseOutputItem::Reasoning(response_reasoning_item(
+ "rs_1",
+ vec![],
+ None,
+ None,
+ )),
+ },
+ ResponsesStreamEvent::ReasoningSummaryPartAdded {
+ item_id: "rs_1".into(),
+ output_index: 0,
+ summary_index: 0,
+ },
+ ResponsesStreamEvent::ReasoningSummaryTextDelta {
+ item_id: "rs_1".into(),
+ output_index: 0,
+ summary_index: 0,
+ delta: "**First item**".into(),
+ },
+ ResponsesStreamEvent::OutputItemAdded {
+ output_index: 1,
+ sequence_number: None,
+ item: ResponseOutputItem::Reasoning(response_reasoning_item(
+ "rs_2",
+ vec![],
+ None,
+ None,
+ )),
+ },
+ ResponsesStreamEvent::ReasoningSummaryPartAdded {
+ item_id: "rs_2".into(),
+ output_index: 1,
+ summary_index: 0,
+ },
+ ResponsesStreamEvent::ReasoningSummaryTextDelta {
+ item_id: "rs_2".into(),
+ output_index: 1,
+ summary_index: 0,
+ delta: "**Second item**".into(),
+ },
+ ];
+
+ let mapped = map_response_events(events);
+ let thinking = mapped
+ .into_iter()
+ .filter_map(|event| match event {
+ LanguageModelCompletionEvent::Thinking { text, signature: _ } => Some(text),
+ _ => None,
+ })
+ .collect::<String>();
+
+ assert_eq!(thinking, "**First item**\n\n**Second item**");
+ }
+
#[test]
fn responses_stream_maps_reasoning_from_done_only() {
let events = vec![
diff --git a/crates/open_ai/src/responses.rs b/crates/open_ai/src/responses.rs
index b166f762dc7..68159c1720c 100644
--- a/crates/open_ai/src/responses.rs
+++ b/crates/open_ai/src/responses.rs
@@ -509,6 +509,7 @@ pub enum StreamEvent {
ReasoningSummaryTextDelta {
item_id: String,
output_index: usize,
+ summary_index: usize,
delta: String,
},
#[serde(rename = "response.reasoning_summary_text.done")]
@@ -876,12 +877,15 @@ pub async fn stream_response(
}
ResponseOutputItem::Reasoning(reasoning) => {
if let Some(ref item_id) = reasoning.id {
- for part in &reasoning.summary {
+ for (summary_index, part) in
+ reasoning.summary.iter().enumerate()
+ {
if let ReasoningSummaryPart::SummaryText { text } = part {
all_events.push(
StreamEvent::ReasoningSummaryTextDelta {
item_id: item_id.clone(),
output_index,
+ summary_index,
delta: text.clone(),
},
);