From ed5eef4b0b3cba43fba3aa2594d09ec843e97a95 Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Tue, 12 Mar 2024 10:45:14 -0400 Subject: [PATCH] fix failing test due to property name change of model->deployment-name in azure --- .../java/org/springframework/ai/openai/OpenAiImageClient.java | 2 +- .../autoconfigure/azure/AzureOpenAiAutoConfigurationIT.java | 4 ++-- .../azure/AzureOpenAiAutoConfigurationPropertyTests.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiImageClient.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiImageClient.java index 1bc78d4c2..69863ef9f 100644 --- a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiImageClient.java +++ b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiImageClient.java @@ -119,7 +119,7 @@ public class OpenAiImageClient implements ImageClient { /** * Convert the {@link ImageOptions} into {@link OpenAiImageOptions}. - * @param defaultOptions the image options to use. + * @param runtimeImageOptions the image options to use. * @return the converted {@link OpenAiImageOptions}. */ private OpenAiImageOptions toOpenAiImageOptions(ImageOptions runtimeImageOptions) { diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationIT.java index 0ecb7357e..ce7075250 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationIT.java @@ -56,11 +56,11 @@ public class AzureOpenAiAutoConfigurationIT { "spring.ai.azure.openai.api-key=" + System.getenv("AZURE_OPENAI_API_KEY"), "spring.ai.azure.openai.endpoint=" + System.getenv("AZURE_OPENAI_ENDPOINT"), - "spring.ai.azure.openai.chat.options.model=" + CHAT_MODEL_NAME, + "spring.ai.azure.openai.chat.options.deployment-name=" + CHAT_MODEL_NAME, "spring.ai.azure.openai.chat.options.temperature=0.8", "spring.ai.azure.openai.chat.options.maxTokens=123", - "spring.ai.azure.openai.embedding.options.model=" + EMBEDDING_MODEL_NAME + "spring.ai.azure.openai.embedding.options.deployment-name=" + EMBEDDING_MODEL_NAME // @formatter:on ).withConfiguration(AutoConfigurations.of(AzureOpenAiAutoConfiguration.class)); diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationPropertyTests.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationPropertyTests.java index 7f7e5f704..48d1e9f34 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationPropertyTests.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationPropertyTests.java @@ -38,7 +38,7 @@ public class AzureOpenAiAutoConfigurationPropertyTests { new ApplicationContextRunner() .withPropertyValues("spring.ai.azure.openai.api-key=TEST_API_KEY", "spring.ai.azure.openai.endpoint=TEST_ENDPOINT", - "spring.ai.azure.openai.embedding.options.model=MODEL_XYZ") + "spring.ai.azure.openai.embedding.options.deployment-name=MODEL_XYZ") .withConfiguration(AutoConfigurations.of(AzureOpenAiAutoConfiguration.class)) .run(context -> { var chatProperties = context.getBean(AzureOpenAiEmbeddingProperties.class); @@ -59,7 +59,7 @@ public class AzureOpenAiAutoConfigurationPropertyTests { "spring.ai.azure.openai.api-key=API_KEY", "spring.ai.azure.openai.endpoint=ENDPOINT", - "spring.ai.azure.openai.chat.options.model=MODEL_XYZ", + "spring.ai.azure.openai.chat.options.deployment-name=MODEL_XYZ", "spring.ai.azure.openai.chat.options.frequencyPenalty=-1.5", "spring.ai.azure.openai.chat.options.logitBias.myTokenId=-5", "spring.ai.azure.openai.chat.options.maxTokens=123",