Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

optimize: OpenAI chat model code cleanup (#2483)

Browse Source 
* optimize: use already defined variables

Signed-off-by: yuluo-yx <yuluo08290126@gmail.com>
This commit is contained in:
shown
2025-03-17 23:51:10 +08:00
committed by GitHub
parent 3f344a311d
commit 0164b5dcf9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java
View File

@@ -196,26 +196,26 @@ public class OpenAiChatModel implements ChatModel {
return new ChatResponse(List.of());
}
List<Generation> generations = choices.stream().map(choice -> {
// @formatter:off
List<Generation> generations = choices.stream().map(choice -> {
Map<String, Object> metadata = Map.of(
"id", chatCompletion.id() != null ? chatCompletion.id() : "",
"role", choice.message().role() != null ? choice.message().role().name() : "",
"index", choice.index(),
"finishReason", choice.finishReason() != null ? choice.finishReason().name() : "",
"refusal", StringUtils.hasText(choice.message().refusal()) ? choice.message().refusal() : "");
// @formatter:on
return buildGeneration(choice, metadata, request);
}).toList();
// @formatter:on
RateLimit rateLimit = OpenAiResponseHeaderExtractor.extractAiResponseHeaders(completionEntity);
// Current usage
OpenAiApi.Usage usage = completionEntity.getBody().usage();
OpenAiApi.Usage usage = chatCompletion.usage();
Usage currentChatResponseUsage = usage != null ? getDefaultUsage(usage) : new EmptyUsage();
Usage accumulatedUsage = UsageUtils.getCumulativeUsage(currentChatResponseUsage, previousChatResponse);
ChatResponse chatResponse = new ChatResponse(generations,
from(completionEntity.getBody(), rateLimit, accumulatedUsage));
from(chatCompletion, rateLimit, accumulatedUsage));
observationContext.setResponse(chatResponse);