clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: preserve how response_error was set prior to #2103

Browse Source
This commit is contained in:
Michael Bolin
2025-10-07 23:55:39 -07:00
parent a43ae86b6c
commit c986aeb0c1
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
codex-rs/core/src/client.rs
View File

@@ -22,6 +22,7 @@ use tokio::sync::mpsc;
use tokio::time::timeout;
use tokio_util::io::ReaderStream;
use tracing::debug;
use tracing::error;
use tracing::trace;
use tracing::warn;
@@ -655,7 +656,7 @@ async fn process_sse<S>(
{
Ok(Some(Ok(sse))) => sse,
Ok(Some(Err(e))) => {
debug!("SSE Error: {e:#}");
error!("SSE Error: {e:#}");
let event = CodexErr::Stream(e.to_string(), None);
let _ = tx_event.send(Err(event)).await;
return;
@@ -716,7 +717,7 @@ async fn process_sse<S>(
let event: SseEvent = match serde_json::from_str(&sse.data) {
Ok(event) => event,
Err(e) => {
debug!("Failed to parse SSE event: {e}, data: {}", &sse.data);
error!("Failed to parse SSE event: {e}, data: {}", &sse.data);
continue;
}
};
@@ -743,7 +744,7 @@ async fn process_sse<S>(
"response.output_item.done" => {
let Some(item_val) = event.item else { continue };
let Ok(item) = serde_json::from_value::<ResponseItem>(item_val) else {
debug!("failed to parse ResponseItem from output_item.done");
error!("failed to parse ResponseItem from output_item.done");
continue;
};
@@ -802,9 +803,7 @@ async fn process_sse<S>(
}
}
Err(e) => {
let error = format!("failed to parse ErrorResponse: {e}");
debug!(error);
response_error = Some(CodexErr::Stream(error, None))
error!("failed to parse ErrorResponse: {e}");
}
}
}
@@ -818,9 +817,7 @@ async fn process_sse<S>(
response_completed = Some(r);
}
Err(e) => {
let error = format!("failed to parse ResponseCompleted: {e}");
debug!(error);
response_error = Some(CodexErr::Stream(error, None));
error!("failed to parse ResponseCompleted: {e}");
continue;
}
};