Skip to content
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

fix: fixed computation of assembled_response #648

Merged
merged 4 commits into from
Jan 21, 2025
Merged

fix: fixed computation of assembled_response #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5224491
fix: fixed computation of assembled_response
adubovik Jan 20, 2025
5ed188c
fix: fixed test
adubovik Jan 20, 2025
3c7d7dd
fix: improved test
adubovik Jan 20, 2025
0e6c1ca
chore: renamings
adubovik Jan 20, 2025
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
15 changes: 14 additions & 1 deletion server/src/main/java/com/epam/aidial/core/server/log/GfLogStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,20 @@ static String assembleStreamingResponse(@Nullable Buffer response) {
}

if (choices != null) {
MergeChunks.removeIndices(choices);
if (choices.isArray()) {
for (JsonNode choice : choices) {
MergeChunks.removeIndices(choice);
if (choice.isObject()) {
ObjectNode choiceObj = (ObjectNode) choice;
JsonNode delta = choiceObj.get("delta");
if (delta != null) {
choiceObj.set("message", delta);
choiceObj.remove("delta");
}
}
}
}

result.set("choices", choices);
}
return ProxyUtil.convertToString(result);
Expand Down
9 changes: 5 additions & 4 deletions server/src/test/java/com/epam/aidial/core/server/log/GfLogStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public void testAssembleStreamingResponse() {
String res = GfLogStore.assembleStreamingResponse(Buffer.buffer(streamingResponse));
assertNotNull(res);
String expected = """
{"id":"1d84aa54-e476-405d-9713-386bdfc85993","object":"chat.completion","created":"1687222196","model":"gpt-35-turbo","usage":{"junk_string":"junk","junk_integer":1,"junk_float":1.0,"junk_null":null,"junk_true":true,"junk_false":false,"completion_tokens":10,"prompt_tokens":20,"total_tokens":30},"statistics":{"usage_per_model":[{"name":"text-embedding-ada-002","prompt_tokens":23,"total_tokens":23},{"name":"gpt-4","prompt_tokens":123,"completion_tokens":17,"total_tokens":140}]},"choices":[{"finish_reason":"stop","delta":{"role":"assistant","content":"As an AI language model, I don't have emotions, but I'm functioning perfectly well. How can I assist you today?","custom_content":{"attachments":[{"url":"url2"},{"url":"url1"}],"stages":[{"name":"stage1","status":"completed"},{"name":"stage2","status":"completed"}],"controls":[{"label":"label1"},{"label":"label2"}],"state":{"p1":1,"p2":1}}}}]}""";
{"id":"1d84aa54-e476-405d-9713-386bdfc85993","object":"chat.completion","created":"1687222196","model":"gpt-35-turbo","usage":{"junk_string":"junk","junk_integer":1,"junk_float":1.0,"junk_null":null,"junk_true":true,"junk_false":false,"completion_tokens":10,"prompt_tokens":20,"total_tokens":30},"statistics":{"usage_per_model":[{"name":"text-embedding-ada-002","prompt_tokens":23,"total_tokens":23},{"name":"gpt-4","prompt_tokens":123,"completion_tokens":17,"total_tokens":140}]},"choices":[{"index":0,"finish_reason":"stop","message":{"role":"assistant","content":"As an AI language model, I don't have emotions, but I'm functioning perfectly well. How can I assist you today?","custom_content":{"attachments":[{"url":"url2"},{"url":"url1"}],"stages":[{"name":"stage1","status":"completed"},{"name":"stage2","status":"completed"}],"controls":[{"label":"label1"},{"label":"label2"}],"state":{"p1":1,"p2":1}}}}]}""";
assertEquals(expected, res);
}

Expand All @@ -194,9 +194,10 @@ public void testAssembleStreamingResponse2() {
""";

String res = GfLogStore.assembleStreamingResponse(Buffer.buffer(streamingResponse));
System.out.println(res);


assertNotNull(res);
String expected = """
{"id":"3c9c699a-d1ef-4ec2-82ff-47a07206fa99","object":"chat.completion","created":1724242846,"model":null,"choices":[{"index":0,"finish_reason":null,"message":{"role":"assistant","custom_content":{"attachments":[{"type":"text/markdown","title":"[0] 'Architecture'","data":"data","reference_url":"url1"},{"type":"text/markdown","title":"[1] 'User Guide'","data":"data","reference_url":"url2"},{"type":"text/markdown","title":"[2] 'Knowledge Base'","data":"data","reference_url":"url3"},{"type":"text/markdown","title":"[3] 'Documentation'","data":"you can pick one of three formats to copy its data: CSV, Markdown or Text.\\n\\n","reference_url":"url4"}]},"content":"A B C"}}]}""";
assertEquals(expected, res);
}

@Test
Expand Down
Loading