Skip to content

Fix EmbeddingOptions #1978

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 EmbeddingOptions #1978

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...rock/src/main/java/org/springframework/ai/bedrock/cohere/BedrockCohereEmbeddingModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ BedrockCohereEmbeddingOptions mergeOptions(EmbeddingOptions requestOptions) {
.truncate(CohereEmbeddingRequest.Truncate.NONE)
.build();

if (requestOptions != null && !EmbeddingOptions.EMPTY.equals(requestOptions)) {
if (requestOptions != null) {
options = ModelOptionsUtils.merge(requestOptions, options, BedrockCohereEmbeddingOptions.class);
}

Expand Down
2 changes: 1 addition & 1 deletion ...-postgresml/src/main/java/org/springframework/ai/postgresml/PostgresMlEmbeddingModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ PostgresMlEmbeddingOptions mergeOptions(EmbeddingOptions requestOptions) {
PostgresMlEmbeddingOptions options = (this.defaultOptions != null) ? this.defaultOptions
: PostgresMlEmbeddingOptions.builder().build();

if (requestOptions != null && !EmbeddingOptions.EMPTY.equals(requestOptions)) {
if (requestOptions != null) {
options = ModelOptionsUtils.merge(requestOptions, options, PostgresMlEmbeddingOptions.class);
}

Expand Down
5 changes: 3 additions & 2 deletions ...ostgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingModelIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

import org.springframework.ai.document.Document;
import org.springframework.ai.document.MetadataMode;
import org.springframework.ai.embedding.EmbeddingOptions;
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
import org.springframework.ai.embedding.EmbeddingRequest;
import org.springframework.ai.embedding.EmbeddingResponse;
import org.springframework.ai.embedding.EmbeddingResponseMetadata;
Expand Down Expand Up @@ -179,7 +179,8 @@ void embedCallWithRequestOptionsOverride() {
true);
embeddingModel.afterPropertiesSet();

var request1 = new EmbeddingRequest(List.of("Hello World!", "Spring AI!", "LLM!"), EmbeddingOptions.EMPTY);
var request1 = new EmbeddingRequest(List.of("Hello World!", "Spring AI!", "LLM!"),
EmbeddingOptionsBuilder.builder().build());

EmbeddingResponse embeddingResponse = embeddingModel.call(request1);

Expand Down
4 changes: 2 additions & 2 deletions ...esml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingOptionsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import org.springframework.ai.embedding.EmbeddingOptions;
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
import org.springframework.jdbc.core.JdbcTemplate;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -62,7 +62,7 @@ public void mergeOptions() {
var jdbcTemplate = Mockito.mock(JdbcTemplate.class);
PostgresMlEmbeddingModel embeddingModel = new PostgresMlEmbeddingModel(jdbcTemplate);

PostgresMlEmbeddingOptions options = embeddingModel.mergeOptions(EmbeddingOptions.EMPTY);
PostgresMlEmbeddingOptions options = embeddingModel.mergeOptions(EmbeddingOptionsBuilder.builder().build());

// Default options
assertThat(options.getTransformer()).isEqualTo(PostgresMlEmbeddingModel.DEFAULT_TRANSFORMER_MODEL);
Expand Down
3 changes: 1 addition & 2 deletions ...rg/springframework/ai/vertexai/embedding/multimodal/VertexAiMultimodalEmbeddingModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.springframework.ai.embedding.DocumentEmbeddingModel;
import org.springframework.ai.embedding.DocumentEmbeddingRequest;
import org.springframework.ai.embedding.Embedding;
import org.springframework.ai.embedding.EmbeddingOptions;
import org.springframework.ai.embedding.EmbeddingResponse;
import org.springframework.ai.embedding.EmbeddingResponseMetadata;
import org.springframework.ai.embedding.EmbeddingResultMetadata;
Expand Down Expand Up @@ -101,7 +100,7 @@ public EmbeddingResponse call(DocumentEmbeddingRequest request) {
// merge the runtime and default vertex ai options.
VertexAiMultimodalEmbeddingOptions mergedOptions = this.defaultOptions;

if (request.getOptions() != null && request.getOptions() != EmbeddingOptions.EMPTY) {
if (request.getOptions() != null) {
var defaultOptionsCopy = VertexAiMultimodalEmbeddingOptions.builder().from(this.defaultOptions).build();
mergedOptions = ModelOptionsUtils.merge(request.getOptions(), defaultOptionsCopy,
VertexAiMultimodalEmbeddingOptions.class);
Expand Down
3 changes: 1 addition & 2 deletions .../main/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
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.EmbeddingResponseMetadata;
Expand Down Expand Up @@ -167,7 +166,7 @@ private VertexAiTextEmbeddingOptions mergedOptions(EmbeddingRequest request) {

VertexAiTextEmbeddingOptions mergedOptions = this.defaultOptions;

if (request.getOptions() != null && request.getOptions() != EmbeddingOptions.EMPTY) {
if (request.getOptions() != null) {
var defaultOptionsCopy = VertexAiTextEmbeddingOptions.builder().from(this.defaultOptions).build();
mergedOptions = ModelOptionsUtils.merge(request.getOptions(), defaultOptionsCopy,
VertexAiTextEmbeddingOptions.class);
Expand Down
3 changes: 2 additions & 1 deletion ...-watsonx-ai/src/test/java/org/springframework/ai/watsonx/WatsonxAiEmbeddingModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.junit.jupiter.api.Test;

import org.springframework.ai.embedding.EmbeddingOptions;
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
import org.springframework.ai.embedding.EmbeddingResponse;
import org.springframework.ai.watsonx.api.WatsonxAiApi;
import org.springframework.ai.watsonx.api.WatsonxAiEmbeddingRequest;
Expand Down Expand Up @@ -73,7 +74,7 @@ void createRequestWithOptionsAndInvalidModel() {
void createRequestWithNoOptions() {
List<String> inputs = List.of("test");
WatsonxAiEmbeddingRequest request = this.embeddingModel.watsonxAiEmbeddingRequest(inputs,
EmbeddingOptions.EMPTY);
EmbeddingOptionsBuilder.builder().build());

assertThat(request.getModel()).isEqualTo(WatsonxAiEmbeddingOptions.DEFAULT_MODEL);
assertThat(request.getInputs().size()).isEqualTo(inputs.size());
Expand Down
4 changes: 2 additions & 2 deletions ...rk/ai/autoconfigure/vertexai/embedding/VertexAiTextEmbeddingModelAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import org.springframework.ai.document.Document;
import org.springframework.ai.embedding.DocumentEmbeddingRequest;
import org.springframework.ai.embedding.EmbeddingOptions;
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
import org.springframework.ai.embedding.EmbeddingResponse;
import org.springframework.ai.embedding.EmbeddingResultMetadata;
import org.springframework.ai.vertexai.embedding.multimodal.VertexAiMultimodalEmbeddingModel;
Expand Down Expand Up @@ -105,7 +105,7 @@ public void multimodalEmbedding() {
var document = new Document("Hello World");

DocumentEmbeddingRequest embeddingRequest = new DocumentEmbeddingRequest(List.of(document),
EmbeddingOptions.EMPTY);
EmbeddingOptionsBuilder.builder().build());

EmbeddingResponse embeddingResponse = multiModelEmbeddingModel.call(embeddingRequest);
assertThat(embeddingResponse.getResults()).hasSize(1);
Expand Down
Loading