Skip to content

fix: bedrock titan embeddings should return usage #3460

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

fix: bedrock titan embeddings should return usage #3460

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
22 changes: 16 additions & 6 deletions ...edrock/src/main/java/org/springframework/ai/bedrock/titan/BedrockTitanEmbeddingModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicInteger;

import io.micrometer.observation.Observation;
Expand All @@ -28,12 +29,9 @@
import org.springframework.ai.bedrock.titan.api.TitanEmbeddingBedrockApi;
import org.springframework.ai.bedrock.titan.api.TitanEmbeddingBedrockApi.TitanEmbeddingRequest;
import org.springframework.ai.bedrock.titan.api.TitanEmbeddingBedrockApi.TitanEmbeddingResponse;
import org.springframework.ai.chat.metadata.DefaultUsage;
import org.springframework.ai.document.Document;
import org.springframework.ai.embedding.AbstractEmbeddingModel;
import org.springframework.ai.embedding.Embedding;
import org.springframework.ai.embedding.EmbeddingOptions;
import org.springframework.ai.embedding.EmbeddingRequest;
import org.springframework.ai.embedding.EmbeddingResponse;
import org.springframework.ai.embedding.*;
import org.springframework.util.Assert;

/**
Expand Down Expand Up @@ -89,6 +87,7 @@ public EmbeddingResponse call(EmbeddingRequest request) {

List<Embedding> embeddings = new ArrayList<>();
var indexCounter = new AtomicInteger(0);
int tokenUsage = 0;

for (String inputContent : request.getInstructions()) {
var apiRequest = createTitanEmbeddingRequest(inputContent, request.getOptions());
Expand All @@ -111,6 +110,10 @@ public EmbeddingResponse call(EmbeddingRequest request) {
}

embeddings.add(new Embedding(response.embedding(), indexCounter.getAndIncrement()));

if (response.inputTextTokenCount() != null) {
tokenUsage += response.inputTextTokenCount();
}
}
catch (Exception ex) {
logger.error("Titan API embedding failed for input at index {}: {}", indexCounter.get(),
Expand All @@ -120,7 +123,10 @@ public EmbeddingResponse call(EmbeddingRequest request) {
}
}

return new EmbeddingResponse(embeddings);
EmbeddingResponseMetadata embeddingResponseMetadata = new EmbeddingResponseMetadata("",
getDefaultUsage(tokenUsage));

return new EmbeddingResponse(embeddings, embeddingResponseMetadata);
}

private TitanEmbeddingRequest createTitanEmbeddingRequest(String inputContent, EmbeddingOptions requestOptions) {
Expand Down Expand Up @@ -155,6 +161,10 @@ private String summarizeInput(String input) {
return input.length() > 100 ? input.substring(0, 100) + "..." : input;
}

private DefaultUsage getDefaultUsage(int tokens) {
return new DefaultUsage(tokens, 0);
}

public enum InputType {

TEXT, IMAGE
Expand Down