UT config for openai

Signed-off-by: lambochen <[email protected]>

Author: lambochen

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/OpenAiTestConfiguration.java

@@ -32,22 +32,48 @@ public class OpenAiTestConfiguration {
 
 	@Bean
 	public OpenAiApi openAiApi() {
-		return OpenAiApi.builder().apiKey(getApiKey()).build();
+		var builder = OpenAiApi.builder().apiKey(getApiKey());
+
+		String baseUrl = getBaseUrl();
+		if (StringUtils.hasText(baseUrl)) {
+			builder.baseUrl(baseUrl);
+		}
+		String completionsPath = getCompletionsPath();
+		if (StringUtils.hasText(completionsPath)) {
+			builder.completionsPath(completionsPath);
+		}
+
+		return builder.build();
 	}
 
 	@Bean
 	public OpenAiImageApi openAiImageApi() {
-		return OpenAiImageApi.builder().apiKey(getApiKey()).build();
+		var builder = OpenAiImageApi.builder().apiKey(getApiKey());
+		String baseUrl = getBaseUrl();
+		if (StringUtils.hasText(baseUrl)) {
+			builder.baseUrl(baseUrl);
+		}
+		return builder.build();
 	}
 
 	@Bean
 	public OpenAiAudioApi openAiAudioApi() {
-		return OpenAiAudioApi.builder().apiKey(getApiKey()).build();
+		var builder = OpenAiAudioApi.builder().apiKey(getApiKey());
+		String baseUrl = getBaseUrl();
+		if (StringUtils.hasText(baseUrl)) {
+			builder.baseUrl(baseUrl);
+		}
+		return builder.build();
 	}
 
 	@Bean
 	public OpenAiModerationApi openAiModerationApi() {
-		return OpenAiModerationApi.builder().apiKey(getApiKey()).build();
+		var builder = OpenAiModerationApi.builder().apiKey(getApiKey());
+		String baseUrl = getBaseUrl();
+		if (StringUtils.hasText(baseUrl)) {
+			builder.baseUrl(baseUrl);
+		}
+		return builder.build();
 	}
 
 	private ApiKey getApiKey() {
@@ -59,6 +85,22 @@ private ApiKey getApiKey() {
 		return new SimpleApiKey(apiKey);
 	}
 
+	private String getBaseUrl() {
+		String baseUrl = System.getenv("OPENAI_BASE_URL");
+		if (StringUtils.hasText(baseUrl)) {
+			return baseUrl;
+		}
+		return null;
+	}
+
+	private String getCompletionsPath() {
+		String path = System.getenv("OPENAI_COMPLETIONS_PATH");
+		if (StringUtils.hasText(path)) {
+			return path;
+		}
+		return null;
+	}
+
 	@Bean
 	public OpenAiChatModel openAiChatModel(OpenAiApi api) {
 		return OpenAiChatModel.builder()

spring-ai-model/src/main/java/org/springframework/ai/model/tool/ToolExecutionEligibilityPredicate.java

@@ -44,7 +44,8 @@ default boolean isToolExecutionRequired(ChatOptions promptOptions, ChatResponse
 	}
 
 	/**
-	 * Determines if tool execution should be performed based on the prompt options and chat response and the number of attempts.
+	 * Determines if tool execution should be performed based on the prompt options and
+	 * chat response and the number of attempts.
 	 * @param promptOptions The options from the prompt
 	 * @param chatResponse The response from the chat model
 	 * @param attempts The number of attempts

spring-ai-model/src/test/java/org/springframework/ai/model/tool/ToolExecutionEligibilityCheckerTest.java

@@ -49,5 +49,7 @@ class TestToolExecutionEligibilityChecker implements ToolExecutionEligibilityChe
 		public Boolean apply(ChatResponse chatResponse) {
 			return true;
 		}
+
 	}
+
 }