Skip to content

Commit 2772c7e

Browse files
committed
Polish OpenAiChatAutoConfiguration and OpenAiEmbeddingAutoConfiguration
1. Remove `embeddingsPath` setting from `OpenAiChatAutoConfiguration` since it is not used by chat model. 2. Remove `completionsPath` setting from `OpenAiEmbeddingAutoConfiguration` since it is not used by embedding model. 3. Reorder method parameters for consistency. See GH-4789 Signed-off-by: Yanming Zhou <[email protected]>
1 parent e4926e5 commit 2772c7e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiChatAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
* @author Stefan Vassilev
5353
* @author Thomas Vitale
5454
* @author Ilayaperumal Gopinathan
55+
* @author Yanming Zhou
5556
* @author Issam El-atif
5657
*/
5758
@AutoConfiguration(after = { RestClientAutoConfiguration.class, WebClientAutoConfiguration.class,
@@ -76,7 +77,6 @@ public OpenAiApi openAiApi(OpenAiConnectionProperties commonProperties, OpenAiCh
7677
.apiKey(new SimpleApiKey(resolved.apiKey()))
7778
.headers(resolved.headers())
7879
.completionsPath(chatProperties.getCompletionsPath())
79-
.embeddingsPath(OpenAiEmbeddingProperties.DEFAULT_EMBEDDINGS_PATH)
8080
.restClientBuilder(restClientBuilderProvider.getIfAvailable(RestClient::builder))
8181
.webClientBuilder(webClientBuilderProvider.getIfAvailable(WebClient::builder))
8282
.responseErrorHandler(responseErrorHandler)

auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiEmbeddingAutoConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
* @author Thomas Vitale
5050
* @author Ilayaperumal Gopinathan
5151
* @author Issam El-atif
52+
* @author Yanming Zhou
5253
*/
5354
@AutoConfiguration(after = { RestClientAutoConfiguration.class, WebClientAutoConfiguration.class,
5455
SpringAiRetryAutoConfiguration.class })
@@ -66,7 +67,7 @@ public OpenAiEmbeddingModel openAiEmbeddingModel(OpenAiConnectionProperties comm
6667
ResponseErrorHandler responseErrorHandler, ObjectProvider<ObservationRegistry> observationRegistry,
6768
ObjectProvider<EmbeddingModelObservationConvention> observationConvention) {
6869

69-
var openAiApi = openAiApi(embeddingProperties, commonProperties,
70+
var openAiApi = openAiApi(commonProperties, embeddingProperties,
7071
restClientBuilderProvider.getIfAvailable(RestClient::builder),
7172
webClientBuilderProvider.getIfAvailable(WebClient::builder), responseErrorHandler, "embedding");
7273

@@ -79,8 +80,8 @@ public OpenAiEmbeddingModel openAiEmbeddingModel(OpenAiConnectionProperties comm
7980
return embeddingModel;
8081
}
8182

82-
private OpenAiApi openAiApi(OpenAiEmbeddingProperties embeddingProperties,
83-
OpenAiConnectionProperties commonProperties, RestClient.Builder restClientBuilder,
83+
private OpenAiApi openAiApi(OpenAiConnectionProperties commonProperties,
84+
OpenAiEmbeddingProperties embeddingProperties, RestClient.Builder restClientBuilder,
8485
WebClient.Builder webClientBuilder, ResponseErrorHandler responseErrorHandler, String modelType) {
8586

8687
OpenAIAutoConfigurationUtil.ResolvedConnectionProperties resolved = resolveConnectionProperties(
@@ -90,7 +91,6 @@ private OpenAiApi openAiApi(OpenAiEmbeddingProperties embeddingProperties,
9091
.baseUrl(resolved.baseUrl())
9192
.apiKey(new SimpleApiKey(resolved.apiKey()))
9293
.headers(resolved.headers())
93-
.completionsPath(OpenAiChatProperties.DEFAULT_COMPLETIONS_PATH)
9494
.embeddingsPath(embeddingProperties.getEmbeddingsPath())
9595
.restClientBuilder(restClientBuilder)
9696
.webClientBuilder(webClientBuilder)

0 commit comments

Comments
 (0)