hobokenchicken/GopherGate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve merge conflict in streaming code
Some checks failed
CI / Check (push) Has been cancelled
Details
CI / Clippy (push) Has been cancelled
Details
CI / Formatting (push) Has been cancelled
Details
CI / Test (push) Has been cancelled
Details
CI / Release Build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dustin Newkirk
2026-03-03 12:34:39 -05:00
parent 69c0d8c886
commit 2040b068e6
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/mod.rs
View File

@@ -283,10 +283,6 @@ async fn chat_completions(
// Many OpenAI-compatible clients expect a terminal [DONE] marker. // Many OpenAI-compatible clients expect a terminal [DONE] marker.
// Emit it when the upstream stream ends to avoid clients treating // Emit it when the upstream stream ends to avoid clients treating
// the response as incomplete. // the response as incomplete.
<<<<<<< HEAD
// Convert to a Vec first, then append [DONE], then stream it
=======
>>>>>>> refs/remotes/origin/main
let done_event = Ok::<Event, AppError>(Event::default().data("[DONE]")); let done_event = Ok::<Event, AppError>(Event::default().data("[DONE]"));
let done_stream = futures::stream::iter(vec![done_event]); let done_stream = futures::stream::iter(vec![done_event]);
let out = sse_stream.chain(done_stream); let out = sse_stream.chain(done_stream);