Skip to content

Manage the "close" event for SSE #85

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

Merged
merged 1 commit into from
Sep 13, 2025
Merged

Manage the "close" event for SSE #85

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
8 changes: 3 additions & 5 deletions ...nx-ai-core/src/main/java/com/ibm/watsonx/ai/core/http/interceptors/LoggerInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,10 @@ private String formatBase64ImageForLogging(String body) {
return body;

Matcher matcher = BASE64_IMAGE_PATTERN.matcher(body);

StringBuilder sb = new StringBuilder();
while (matcher.find()) {
matcher.appendReplacement(sb,
matcher.group(1) + matcher.group(2) + "...");
}

while (matcher.find())
matcher.appendReplacement(sb, matcher.group(1) + matcher.group(2) + "...");

matcher.appendTail(sb);
return sb.toString();
Expand Down
5 changes: 4 additions & 1 deletion modules/watsonx-ai/src/main/java/com/ibm/watsonx/ai/chat/ChatProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ public void onNext(String partialMessage) {
return;
}

if (partialMessage.startsWith("event: close"))
return;

if (!partialMessage.startsWith("data:"))
return;

Expand Down Expand Up @@ -226,7 +229,7 @@ public void onNext(String partialMessage) {
// There is a bug in the Streaming API: it does not return an empty object for tools without arguments.
// Open an issue.
var toolHasParameter = toolHasParameters.get(toolFetcher.getName());
var arguments = toolHasParameter ? deltaTool.function().arguments() : "{}";
var arguments = isNull(toolHasParameter) || toolHasParameter ? deltaTool.function().arguments() : "{}";

if (!arguments.isEmpty()) {
var partialToolCall =
Expand Down
4 changes: 4 additions & 0 deletions modules/watsonx-ai/src/test/java/com/ibm/watsonx/ai/chat/ChatServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3155,6 +3155,10 @@ void test_async_interceptors() {
id: 3
event: message
data: {"id":"chatcmpl-5d8c131decbb6978cba5df10267aa3ff","object":"chat.completion.chunk","model_id":"meta-llama/llama-4-maverick-17b-128e-instruct-fp8","model":"meta-llama/llama-4-maverick-17b-128e-instruct-fp8","choices":[{"index":0,"finish_reason":null,"delta":{"content":"llo"}}],"created":1749736055,"model_version":"4.0.0","created_at":"2025-06-12T13:47:35.552Z"}

id: 4
event: close
data: {}
""")));

var chatService = ChatService.builder()
Expand Down