Skip to content

Commit 1bf4c40

Browse files
jackxu2011jackxu2011
authored
Fix Tool calls occur error（NPE） when using stream output (#1015)
fixes #1004 and #992
1 parent 3941921 commit 1bf4c40

File tree

5 files changed

+26
-32
lines changed

5 files changed

+26
-32
lines changed

‎spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/api/DashScopeAiStreamFunctionCallingHelper.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,15 @@ public ChatCompletionChunk merge(ChatCompletionChunk previous, ChatCompletionChu
6363
String id = (current.requestId() != null ? current.requestId() : previous.requestId());
6464
TokenUsage usage = (current.usage() != null ? current.usage() : previous.usage());
6565

66-
Choice previousChoice0 = previous.output() == null ? null : previous.output().choices().get(0);
67-
Choice currentChoice0 = current.output() == null ? null : current.output().choices().get(0);
66+
Choice previousChoice0 = previous.output() == null ? null
67+
: CollectionUtils.isEmpty(previous.output().choices()) ? null : previous.output().choices().get(0);
68+
Choice currentChoice0 = current.output() == null ? null
69+
: CollectionUtils.isEmpty(current.output().choices()) ? null : current.output().choices().get(0);
6870

6971
// compatibility of incremental_output false for streaming function call
7072
if (!incrementalOutput && isStreamingToolFunctionCall(current)) {
7173
if (!isStreamingToolFunctionCallFinish(current)) {
72-
return new ChatCompletionChunk(id, new ChatCompletionOutput(null, List.of(new Choice(null, null))),
73-
usage);
74+
return new ChatCompletionChunk(id, new ChatCompletionOutput(null, List.of()), usage);
7475
}
7576
else {
7677
return new ChatCompletionChunk(id, new ChatCompletionOutput(null, List.of(currentChoice0)), usage);

‎spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/api/DashScopeApi.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@
6565
import org.springframework.web.client.RestTemplate;
6666
import org.springframework.web.reactive.function.client.WebClient;
6767

68-
import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.DEFAULT_BASE_URL;
69-
import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.DEFAULT_PARSER_NAME;
70-
import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.HEADER_WORK_SPACE_ID;
68+
import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.*;
7169

7270
/**
7371
* @author nuocheng.lxm
@@ -100,8 +98,6 @@ public class DashScopeApi {
10098

10199
private final ResponseErrorHandler responseErrorHandler;
102100

103-
private DashScopeAiStreamFunctionCallingHelper chunkMerger = new DashScopeAiStreamFunctionCallingHelper();
104-
105101
/**
106102
* Returns a builder pre-populated with the current configuration for mutation.
107103
*/
@@ -1417,7 +1413,8 @@ public Flux<ChatCompletionChunk> chatCompletionStream(ChatCompletionRequest chat
14171413
AtomicBoolean isInsideTool = new AtomicBoolean(false);
14181414
boolean incrementalOutput = chatRequest.parameters() != null
14191415
&& chatRequest.parameters().incrementalOutput != null && chatRequest.parameters().incrementalOutput;
1420-
1416+
DashScopeAiStreamFunctionCallingHelper chunkMerger = new DashScopeAiStreamFunctionCallingHelper(
1417+
incrementalOutput);
14211418
String uri = "/api/v1/services/aigc/text-generation/generation";
14221419
if (chatRequest.multiModel()) {
14231420
uri = "/api/v1/services/aigc/multimodal-generation/generation";

‎spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/api/DashScopeAiStreamFunctionCallingHelperTests.java‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,8 @@
1515
*/
1616
package com.alibaba.cloud.ai.dashscope.api;
1717

18-
import static org.junit.jupiter.api.Assertions.assertEquals;
19-
import static org.junit.jupiter.api.Assertions.assertFalse;
20-
import static org.junit.jupiter.api.Assertions.assertNotNull;
21-
import static org.junit.jupiter.api.Assertions.assertNull;
22-
import static org.junit.jupiter.api.Assertions.assertTrue;
23-
2418
import java.util.List;
2519

26-
import org.junit.jupiter.api.BeforeEach;
27-
import org.junit.jupiter.api.Test;
28-
2920
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletionChunk;
3021
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletionFinishReason;
3122
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletionMessage;
@@ -35,6 +26,10 @@
3526
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletionOutput;
3627
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletionOutput.Choice;
3728
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.TokenUsage;
29+
import org.junit.jupiter.api.BeforeEach;
30+
import org.junit.jupiter.api.Test;
31+
32+
import static org.junit.jupiter.api.Assertions.*;
3833

3934
/**
4035
* Tests for DashScopeAiStreamFunctionCallingHelper class functionality
@@ -146,7 +141,8 @@ void testChunkToChatCompletion() {
146141
void testMergeWithNonIncrementalOutput() {
147142
// Test merging in non-incremental output mode
148143
ChatCompletionChunk previous = createChunkWithToolCall("request-1", "tool-1", "function-1", "{\"param");
149-
ChatCompletionChunk current = createChunkWithToolCall("request-1", "tool-1", "function-1", "\":\"value\"}");
144+
ChatCompletionChunk current = createChunkWithToolCall("request-1", "tool-1", "function-1",
145+
"{\"param\":\"value\"}");
150146

151147
// Use helper with non-incremental output
152148
ChatCompletionChunk result = helper.merge(previous, current);
@@ -156,16 +152,15 @@ void testMergeWithNonIncrementalOutput() {
156152
assertNotNull(result);
157153
assertEquals("request-1", result.requestId());
158154
assertNotNull(result.output().choices());
159-
assertEquals(1, result.output().choices().size());
160-
assertNull(result.output().choices().get(0).message());
155+
assertEquals(0, result.output().choices().size());
161156
}
162157

163158
@Test
164159
void testMergeWithNonIncrementalOutputFinished() {
165160
// Test merging of finished tool calls in non-incremental output mode
166161
ChatCompletionChunk previous = createChunkWithToolCall("request-1", "tool-1", "function-1", "{\"param");
167-
ChatCompletionChunk current = createChunkWithToolCall("request-1", "tool-1", "function-1", "\":\"value\"}",
168-
ChatCompletionFinishReason.TOOL_CALLS);
162+
ChatCompletionChunk current = createChunkWithToolCall("request-1", "tool-1", "function-1",
163+
"{\"param\":\"value\"}", ChatCompletionFinishReason.TOOL_CALLS);
169164

170165
// Use helper with non-incremental output
171166
ChatCompletionChunk result = helper.merge(previous, current);
@@ -182,7 +177,7 @@ void testMergeWithNonIncrementalOutputFinished() {
182177
assertEquals(1, toolCalls.size());
183178
assertEquals("tool-1", toolCalls.get(0).id());
184179
assertEquals("function-1", toolCalls.get(0).function().name());
185-
assertEquals("\":\"value\"}", toolCalls.get(0).function().arguments());
180+
assertEquals("{\"param\":\"value\"}", toolCalls.get(0).function().arguments());
186181
}
187182

188183
@Test

‎spring-ai-alibaba-graph/spring-ai-alibaba-graph-core/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34

45
<!--
56
Copyright 2025-2026 the original author or authors.

‎spring-ai-alibaba-graph/spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/checkpoint/savers/MemorySaver.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@
1515
*/
1616
package com.alibaba.cloud.ai.graph.checkpoint.savers;
1717

18-
import com.alibaba.cloud.ai.graph.RunnableConfig;
19-
import com.alibaba.cloud.ai.graph.checkpoint.BaseCheckpointSaver;
20-
import com.alibaba.cloud.ai.graph.checkpoint.Checkpoint;
21-
2218
import java.util.Collection;
23-
import java.util.HashMap;
2419
import java.util.LinkedList;
2520
import java.util.Map;
2621
import java.util.NoSuchElementException;
2722
import java.util.Optional;
23+
import java.util.concurrent.ConcurrentHashMap;
2824
import java.util.concurrent.locks.Lock;
2925
import java.util.concurrent.locks.ReentrantReadWriteLock;
3026
import java.util.stream.IntStream;
3127

28+
import com.alibaba.cloud.ai.graph.RunnableConfig;
29+
import com.alibaba.cloud.ai.graph.checkpoint.BaseCheckpointSaver;
30+
import com.alibaba.cloud.ai.graph.checkpoint.Checkpoint;
31+
3232
import static java.lang.String.format;
3333
import static java.util.Collections.unmodifiableCollection;
3434

3535
public class MemorySaver implements BaseCheckpointSaver {
3636

37-
private final Map<String, LinkedList<Checkpoint>> _checkpointsByThread = new HashMap<>();
37+
private final Map<String, LinkedList<Checkpoint>> _checkpointsByThread = new ConcurrentHashMap<>();
3838

3939
private final LinkedList<Checkpoint> _defaultCheckpoints = new LinkedList<>();
4040

0 commit comments

Comments
 (0)