Skip to content

fix(dashscope): preserve SSE error response body #2278

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
zouyx wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −10
Open

fix(dashscope): preserve SSE error response body #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32e4d3b
fix(dashscope): preserve SSE error response body
zouyx Jul 18, 2026
1cd5194
fix(dashscope): ignore malformed SSE events
zouyx Jul 19, 2026
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
23 changes: 14 additions & 9 deletions ...dashscope/src/main/java/io/agentscope/extensions/model/dashscope/DashScopeHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,33 +270,36 @@ public Flux<DashScopeResponse> stream(
.build();

return transport.stream(httpRequest)
.map(
data -> {
.<ParsedStreamResponse>handle(
(data, sink) -> {
try {
// Decrypt response if encryption is enabled
if (finalEncryptionContext != null) {
data = decryptResponse(data, finalEncryptionContext);
}
return JsonUtils.getJsonCodec()
.fromJson(data, DashScopeResponse.class);
sink.next(
new ParsedStreamResponse(
data,
JsonUtils.getJsonCodec()
.fromJson(
data,
DashScopeResponse.class)));
} catch (JsonException e) {
log.warn(
"Failed to parse SSE data: {}. Error: {}",
data,
e.getMessage());
// Return null and filter out later
return null;
}
})
.filter(response -> response != null)
.handle(
(response, sink) -> {
(streamResponse, sink) -> {
DashScopeResponse response = streamResponse.response();
if (response.isError()) {
sink.error(
new DashScopeHttpException(
"DashScope API error: " + response.getMessage(),
response.getCode(),
null));
streamResponse.responseBody()));
} else {
sink.next(response);
}
Expand Down Expand Up @@ -834,6 +837,8 @@ public DashScopeHttpClient build() {
}
}

@AgentScopeJavaBot AgentScopeJavaBot Jul 19, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[praise] Clean use of a private record to thread the raw response body alongside the parsed response through the reactive pipeline. Minimal change surface, no side channels, and makes the streaming error path symmetric with the sync execute() path at line 215. Well done.

@AgentScopeJavaBot AgentScopeJavaBot Jul 19, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[praise] Clean use of a private record to thread the raw response body alongside the parsed response through the reactive pipeline. Minimal change surface, no side channels, and makes the streaming error path symmetric with the sync execute() path at line 215. Well done.


private record ParsedStreamResponse(String responseBody, DashScopeResponse response) {}

/**
* Exception thrown when DashScope HTTP operations fail.
*/
Expand Down
18 changes: 17 additions & 1 deletion ...scope/src/test/java/io/agentscope/extensions/model/dashscope/DashScopeHttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,10 +647,26 @@ void testStreamErrorHandling() {
&& dashScopeHttpException.getErrorCode().equals(errorCode)
&& dashScopeHttpException
.getMessage()
.equals("DashScope API error: " + errorMessage))
.equals("DashScope API error: " + errorMessage)
&& dashScopeHttpException
.getResponseBody()

@AgentScopeJavaBot AgentScopeJavaBot Jul 19, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[praise] Good regression test — asserting getResponseBody().contains("request_id") directly validates the fix for #2197 and guards against future regressions.

@AgentScopeJavaBot AgentScopeJavaBot Jul 19, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[praise] Good regression test — asserting getResponseBody().contains("request_id") directly validates the fix for #2197 and guards against future regressions.

.contains("\"request_id\":\"request_id_123\""))
.verify();
}

@Test
void testStreamIgnoresMalformedSseData() {
mockServer.enqueue(
new MockResponse()
.setResponseCode(200)
.setBody("data: malformed-json\\n\\n")
.setHeader("Content-Type", "text/event-stream"));

DashScopeRequest request = createTestRequest("qwen-plus", "test");

StepVerifier.create(client.stream(request, null, null, null)).verifyComplete();
}

@Test
void testHeaderOverride() throws Exception {
mockServer.enqueue(
Expand Down
Loading