From 7252ba19f9cf2b9e2f7589874f4eb7a8b04c9753 Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Tue, 30 Apr 2024 15:44:16 +0300 Subject: [PATCH] Udate azure open ai client ot 1.0.0-beta8. - In ITs rename property spring.ai.azure.openai.chat.options.model to spring.ai.azure.openai.chat.options.deployment-name. - Resolve compilation issues after the client library update. --- .../ai/azure/openai/AzureOpenAiEmbeddingClient.java | 5 +++-- pom.xml | 2 +- .../azure/tool/FunctionCallWithFunctionBeanIT.java | 2 +- .../azure/tool/FunctionCallWithFunctionWrapperIT.java | 2 +- .../azure/tool/FunctionCallWithPromptFunctionIT.java | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClient.java b/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClient.java index cb2e895c5..66add3a9e 100644 --- a/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClient.java +++ b/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClient.java @@ -112,9 +112,10 @@ public class AzureOpenAiEmbeddingClient extends AbstractEmbeddingClient { private List generateEmbeddingList(List nativeData) { List data = new ArrayList<>(); for (EmbeddingItem nativeDatum : nativeData) { - List nativeDatumEmbedding = nativeDatum.getEmbedding(); + List nativeDatumEmbedding = nativeDatum.getEmbedding(); int nativeIndex = nativeDatum.getPromptIndex(); - Embedding embedding = new Embedding(nativeDatumEmbedding, nativeIndex); + Embedding embedding = new Embedding(nativeDatumEmbedding.stream().map(f -> f.doubleValue()).toList(), + nativeIndex); data.add(embedding); } return data; diff --git a/pom.xml b/pom.xml index 1aa983322..0f21647f8 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ 3.2.4 6.1.4 4.0.2 - 1.0.0-beta.7 + 1.0.0-beta.8 1.0.0 4.31.1 2.25.3 diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithFunctionBeanIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithFunctionBeanIT.java index 4fd729fb8..e8a7e2126 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithFunctionBeanIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithFunctionBeanIT.java @@ -54,7 +54,7 @@ class FunctionCallWithFunctionBeanIT { @Test void functionCallTest() { - contextRunner.withPropertyValues("spring.ai.azure.openai.chat.options.model=gpt-4-0125-preview") + contextRunner.withPropertyValues("spring.ai.azure.openai.chat.options..deployment-name=gpt-4-0125-preview") .run(context -> { ChatClient chatClient = context.getBean(AzureOpenAiChatClient.class); diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithFunctionWrapperIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithFunctionWrapperIT.java index ff070a957..934b84cf1 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithFunctionWrapperIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithFunctionWrapperIT.java @@ -53,7 +53,7 @@ public class FunctionCallWithFunctionWrapperIT { @Test void functionCallTest() { - contextRunner.withPropertyValues("spring.ai.azure.openai.chat.options.model=gpt-4-0125-preview") + contextRunner.withPropertyValues("spring.ai.azure.openai.chat.options.deployment-name=gpt-4-0125-preview") .run(context -> { AzureOpenAiChatClient chatClient = context.getBean(AzureOpenAiChatClient.class); diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithPromptFunctionIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithPromptFunctionIT.java index 898eefe80..9bef922d2 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithPromptFunctionIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/tool/FunctionCallWithPromptFunctionIT.java @@ -49,7 +49,7 @@ public class FunctionCallWithPromptFunctionIT { @Test void functionCallTest() { - contextRunner.withPropertyValues("spring.ai.azure.openai.chat.options.model=gpt-4-0125-preview") + contextRunner.withPropertyValues("spring.ai.azure.openai.chat.options.deployment-name=gpt-4-0125-preview") .run(context -> { AzureOpenAiChatClient chatClient = context.getBean(AzureOpenAiChatClient.class);