Skip to content

Commit 1ca20d1

Browse files
Ensure matching enum id to value for multilingual cohere embedding model
1 parent 6cfe5e7 commit 1ca20d1

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/cohere/api/CohereEmbeddingBedrockApi.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818

1919
// @formatter:off
2020

21-
import java.time.Duration;
22-
import java.util.List;
23-
2421
import com.fasterxml.jackson.annotation.JsonInclude;
2522
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2623
import com.fasterxml.jackson.annotation.JsonProperty;
2724
import com.fasterxml.jackson.databind.ObjectMapper;
28-
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
29-
import software.amazon.awssdk.regions.Region;
30-
3125
import org.springframework.ai.bedrock.api.AbstractBedrockApi;
3226
import org.springframework.ai.bedrock.cohere.api.CohereEmbeddingBedrockApi.CohereEmbeddingRequest;
3327
import org.springframework.ai.bedrock.cohere.api.CohereEmbeddingBedrockApi.CohereEmbeddingResponse;
28+
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
29+
import software.amazon.awssdk.regions.Region;
30+
31+
import java.time.Duration;
32+
import java.util.List;
3433

3534
/**
3635
* Cohere Embedding API.
@@ -123,7 +122,7 @@ public enum CohereEmbeddingModel {
123122
/**
124123
* cohere.embed-multilingual-v3
125124
*/
126-
COHERE_EMBED_MULTILINGUAL_V1("cohere.embed-multilingual-v3"),
125+
COHERE_EMBED_MULTILINGUAL_V3("cohere.embed-multilingual-v3"),
127126
/**
128127
* cohere.embed-english-v3
129128
*/

models/spring-ai-bedrock/src/test/java/org/springframework/ai/bedrock/cohere/BedrockCohereEmbeddingModelIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public static class TestConfiguration {
170170

171171
@Bean
172172
public CohereEmbeddingBedrockApi cohereEmbeddingApi() {
173-
return new CohereEmbeddingBedrockApi(CohereEmbeddingModel.COHERE_EMBED_MULTILINGUAL_V1.id(),
173+
return new CohereEmbeddingBedrockApi(CohereEmbeddingModel.COHERE_EMBED_MULTILINGUAL_V3.id(),
174174
EnvironmentVariableCredentialsProvider.create(), Region.US_EAST_1.id(), new ObjectMapper(),
175175
Duration.ofMinutes(2));
176176
}

models/spring-ai-bedrock/src/test/java/org/springframework/ai/bedrock/cohere/api/CohereEmbeddingBedrockApiIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
public class CohereEmbeddingBedrockApiIT {
4141

4242
CohereEmbeddingBedrockApi api = new CohereEmbeddingBedrockApi(
43-
CohereEmbeddingModel.COHERE_EMBED_MULTILINGUAL_V1.id(), EnvironmentVariableCredentialsProvider.create(),
43+
CohereEmbeddingModel.COHERE_EMBED_MULTILINGUAL_V3.id(), EnvironmentVariableCredentialsProvider.create(),
4444
Region.US_EAST_1.id(), new ObjectMapper(), Duration.ofMinutes(2));
4545

4646
@Test

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/bedrock/cohere/BedrockCohereEmbeddingProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class BedrockCohereEmbeddingProperties {
4343
* Bedrock Cohere Embedding generative name. Defaults to
4444
* 'cohere.embed-multilingual-v3'.
4545
*/
46-
private String model = CohereEmbeddingModel.COHERE_EMBED_MULTILINGUAL_V1.id();
46+
private String model = CohereEmbeddingModel.COHERE_EMBED_MULTILINGUAL_V3.id();
4747

4848
@NestedConfigurationProperty
4949
private BedrockCohereEmbeddingOptions options = BedrockCohereEmbeddingOptions.builder()

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/bedrock/cohere/BedrockCohereEmbeddingAutoConfigurationIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class BedrockCohereEmbeddingAutoConfigurationIT {
4444

4545
private final ApplicationContextRunner contextRunner = BedrockTestUtils.getContextRunner()
4646
.withPropertyValues("spring.ai.bedrock.cohere.embedding.enabled=true",
47-
"spring.ai.bedrock.cohere.embedding.model=" + CohereEmbeddingModel.COHERE_EMBED_MULTILINGUAL_V1.id(),
47+
"spring.ai.bedrock.cohere.embedding.model=" + CohereEmbeddingModel.COHERE_EMBED_MULTILINGUAL_V3.id(),
4848
"spring.ai.bedrock.cohere.embedding.options.inputType=SEARCH_DOCUMENT",
4949
"spring.ai.bedrock.cohere.embedding.options.truncate=NONE")
5050
.withConfiguration(AutoConfigurations.of(BedrockCohereEmbeddingAutoConfiguration.class));

0 commit comments

Comments
 (0)