Skip to content

fix: handle null content in SSE stream chunks for REST and Zhipu AI #1816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
octo-patch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: handle null content in SSE stream chunks for REST and Zhipu AI #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...java/ai/chat2db/server/web/api/controller/ai/rest/listener/RestAIEventSourceListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ public void onEvent(EventSource eventSource, String id, String type, String data
String text = chatCompletions.getChoices().get(0).getDelta()==null?
chatCompletions.getChoices().get(0).getText()
:chatCompletions.getChoices().get(0).getDelta().getContent();
// Local LLMs (e.g. llama.cpp) may return null content in the first SSE chunk
// (only role is present). Treat null as empty string to avoid NullPointerException.
if (text == null) {
text = "";
}
message.setContent(text);
sseEmitter.send(SseEmitter.event()
.id(id)
Expand Down
5 changes: 5 additions & 0 deletions ...i/chat2db/server/web/api/controller/ai/zhipu/listener/ZhipuChatAIEventSourceListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ public void onEvent(EventSource eventSource, String id, String type, @NotNull St
String text = chatCompletions.getChoices().get(0).getDelta()==null?
chatCompletions.getChoices().get(0).getText()
:chatCompletions.getChoices().get(0).getDelta().getContent();
// The first SSE chunk may carry only "role" with null "content".
// Guard against NullPointerException from Message.setContent().
if (text == null) {
text = "";
}

Message message = new Message();
message.setContent(text);
Expand Down