Skip to content

Include metadata when creating ChatResponse in Bedrock Titan ChatModel #1791

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

Closed
wants to merge 1 commit into from
Closed

Include metadata when creating ChatResponse in Bedrock Titan ChatModel #1791

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
32 changes: 25 additions & 7 deletions ...-ai-bedrock/src/main/java/org/springframework/ai/bedrock/titan/BedrockTitanChatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,20 @@
package org.springframework.ai.bedrock.titan;

import java.util.List;
import java.util.concurrent.atomic.AtomicLong;

import reactor.core.publisher.Flux;

import org.springframework.ai.bedrock.BedrockUsage;
import org.springframework.ai.bedrock.MessageToPromptConverter;
import org.springframework.ai.bedrock.titan.api.TitanChatBedrockApi;
import org.springframework.ai.bedrock.titan.api.TitanChatBedrockApi.TitanChatRequest;
import org.springframework.ai.bedrock.titan.api.TitanChatBedrockApi.TitanChatResponse;
import org.springframework.ai.bedrock.titan.api.TitanChatBedrockApi.TitanChatResponseChunk;
import org.springframework.ai.chat.messages.AssistantMessage;
import org.springframework.ai.chat.metadata.ChatGenerationMetadata;
import org.springframework.ai.chat.metadata.ChatResponseMetadata;
import org.springframework.ai.chat.metadata.DefaultUsage;
import org.springframework.ai.chat.metadata.Usage;
import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.chat.model.ChatResponse;
Expand All @@ -42,6 +46,7 @@
* uses the Titan Chat API.
*
* @author Christian Tzolov
* @author Jihoon Kim
* @since 0.8.0
*/
public class BedrockTitanChatModel implements ChatModel, StreamingChatModel {
Expand All @@ -63,13 +68,19 @@ public BedrockTitanChatModel(TitanChatBedrockApi chatApi, BedrockTitanChatOption

@Override
public ChatResponse call(Prompt prompt) {
AtomicLong generationTokenCount = new AtomicLong(0L);
TitanChatResponse response = this.chatApi.chatCompletion(this.createRequest(prompt));
List<Generation> generations = response.results()
.stream()
.map(result -> new Generation(new AssistantMessage(result.outputText())))
.toList();

return new ChatResponse(generations);
List<Generation> generations = response.results().stream().map(result -> {
generationTokenCount.addAndGet(result.tokenCount());
return new Generation(new AssistantMessage(result.outputText()));
}).toList();

ChatResponseMetadata chatResponseMetadata = ChatResponseMetadata.builder()
.withModel(prompt.getOptions().getModel())
.withUsage(new DefaultUsage(Long.parseLong(String.valueOf(response.inputTextTokenCount())),
generationTokenCount.get()))
.build();
return new ChatResponse(generations, chatResponseMetadata);
}

@Override
Expand All @@ -85,8 +96,15 @@ else if (chunk.inputTextTokenCount() != null && chunk.totalOutputTextTokenCount(
String completionReason = chunk.completionReason().name();
chatGenerationMetadata = ChatGenerationMetadata.from(completionReason, extractUsage(chunk));
}

ChatResponseMetadata chatResponseMetadata = ChatResponseMetadata.builder()
.withModel(prompt.getOptions().getModel())
.withUsage(BedrockUsage.from(chunk.amazonBedrockInvocationMetrics()))
.build();

return new ChatResponse(
List.of(new Generation(new AssistantMessage(chunk.outputText()), chatGenerationMetadata)));
List.of(new Generation(new AssistantMessage(chunk.outputText()), chatGenerationMetadata)),
chatResponseMetadata);
});
}

Expand Down