OpenAI: migrate to HttpClient (#113)

## Issue
Closes langchain4j/langchain4j#2468

## Change

This PR is a part of
langchain4j/langchain4j#2529


## General checklist
- [ ] There are no breaking changes
- [x] I have added unit and/or integration tests for my change
- [ ] The tests cover both positive and negative cases
- [x] I have manually run all the unit and integration tests in the
module I have added/changed, and they are all green
- [x] I have added/updated the
[documentation](https://github.com/langchain4j/langchain4j/tree/main/docs/docs)
- [x] I have added an example in the [examples
repo](https://github.com/langchain4j/langchain4j-examples) (only for
"big" features)

Author: dliubarskyi

langchain4j-http-client-spring-restclient/src/main/java/dev/langchain4j/http/client/spring/restclient/SpringRestClient.java

@@ -57,6 +57,10 @@ private static AsyncTaskExecutor createDefaultStreamingRequestExecutor() {
         return taskExecutor;
     }
 
+    public static SpringRestClientBuilder builder() {
+        return new SpringRestClientBuilder();
+    }
+
     @Override
     public SuccessfulHttpResponse execute(HttpRequest request) throws HttpException {
         try {

langchain4j-http-client-spring-restclient/src/main/java/dev/langchain4j/http/client/spring/restclient/SpringRestClientBuilderFactory.java

@@ -6,6 +6,6 @@ public class SpringRestClientBuilderFactory implements HttpClientBuilderFactory
 
     @Override
     public SpringRestClientBuilder create() {
-        return new SpringRestClientBuilder();
+        return SpringRestClient.builder();
     }
 }

langchain4j-http-client-spring-restclient/src/test/java/dev/langchain4j/http/client/spring/restclient/SpringRestClientIT.java

@@ -15,16 +15,16 @@ class SpringRestClientIT extends HttpClientIT {
     @Override
     protected List<HttpClient> clients() {
         return List.of(
-                new SpringRestClientBuilder()
+                SpringRestClient.builder()
                         .restClientBuilder(RestClient.builder().requestFactory(new JdkClientHttpRequestFactory()))
                         .build(),
-                new SpringRestClientBuilder()
+                SpringRestClient.builder()
                         .restClientBuilder(RestClient.builder().requestFactory(new HttpComponentsClientHttpRequestFactory()))
                         .build(),
-                new SpringRestClientBuilder()
+                SpringRestClient.builder()
                         .restClientBuilder(RestClient.builder().requestFactory(new ReactorNettyClientRequestFactory()))
                         .build(),
-                new SpringRestClientBuilder()
+                SpringRestClient.builder()
                         .restClientBuilder(RestClient.builder().requestFactory(new SimpleClientHttpRequestFactory()))
                         .build()
         );

langchain4j-http-client-spring-restclient/src/test/java/dev/langchain4j/http/client/spring/restclient/SpringRestClientTimeoutIT.java

@@ -18,19 +18,19 @@ class SpringRestClientTimeoutIT extends HttpClientTimeoutIT {
     @Override
     protected List<HttpClient> clients(Duration readTimeout) {
         return List.of(
-                new SpringRestClientBuilder()
+                SpringRestClient.builder()
                         .restClientBuilder(RestClient.builder().requestFactory(new JdkClientHttpRequestFactory()))
                         .readTimeout(readTimeout)
                         .build(),
-                new SpringRestClientBuilder()
+                SpringRestClient.builder()
                         .restClientBuilder(RestClient.builder().requestFactory(new HttpComponentsClientHttpRequestFactory()))
                         .readTimeout(readTimeout)
                         .build(),
-                new SpringRestClientBuilder()
+                SpringRestClient.builder()
                         .restClientBuilder(RestClient.builder().requestFactory(new ReactorNettyClientRequestFactory()))
                         .readTimeout(readTimeout)
                         .build(),
-                new SpringRestClientBuilder()
+                SpringRestClient.builder()
                         .restClientBuilder(RestClient.builder().requestFactory(new SimpleClientHttpRequestFactory()))
                         .readTimeout(readTimeout)
                         .build()

langchain4j-ollama-spring-boot-starter/src/main/java/dev/langchain4j/ollama/spring/AutoConfig.java

@@ -1,7 +1,7 @@
 package dev.langchain4j.ollama.spring;
 
 import dev.langchain4j.http.client.HttpClientBuilder;
-import dev.langchain4j.http.client.spring.restclient.SpringRestClientBuilder;
+import dev.langchain4j.http.client.spring.restclient.SpringRestClient;
 import dev.langchain4j.model.chat.listener.ChatModelListener;
 import dev.langchain4j.model.ollama.*;
 import org.springframework.beans.factory.ObjectProvider;
@@ -27,22 +27,22 @@ public class AutoConfig {
 
     private static final String TASK_EXECUTOR_THREAD_NAME_PREFIX = "LangChain4j-Ollama-";
 
-    private static final String OLLAMA_CHAT_MODEL_HTTP_CLIENT_BUILDER = "ollamaChatModelHttpClientBuilder";
+    private static final String CHAT_MODEL_HTTP_CLIENT_BUILDER = "ollamaChatModelHttpClientBuilder";
 
-    private static final String OLLAMA_STREAMING_CHAT_MODEL_HTTP_CLIENT_BUILDER = "ollamaStreamingChatModelHttpClientBuilder";
-    private static final String OLLAMA_STREAMING_CHAT_MODEL_TASK_EXECUTOR = "ollamaStreamingChatModelTaskExecutor";
+    private static final String STREAMING_CHAT_MODEL_HTTP_CLIENT_BUILDER = "ollamaStreamingChatModelHttpClientBuilder";
+    private static final String STREAMING_CHAT_MODEL_TASK_EXECUTOR = "ollamaStreamingChatModelTaskExecutor";
 
-    private static final String OLLAMA_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER = "ollamaLanguageModelHttpClientBuilder";
+    private static final String LANGUAGE_MODEL_HTTP_CLIENT_BUILDER = "ollamaLanguageModelHttpClientBuilder";
 
-    private static final String OLLAMA_STREAMING_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER = "ollamaStreamingLanguageModelHttpClientBuilder";
-    private static final String OLLAMA_STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR = "ollamaStreamingLanguageModelTaskExecutor";
+    private static final String STREAMING_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER = "ollamaStreamingLanguageModelHttpClientBuilder";
+    private static final String STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR = "ollamaStreamingLanguageModelTaskExecutor";
 
-    private static final String OLLAMA_EMBEDDING_MODEL_HTTP_CLIENT_BUILDER = "ollamaEmbeddingModelHttpClientBuilder";
+    private static final String EMBEDDING_MODEL_HTTP_CLIENT_BUILDER = "ollamaEmbeddingModelHttpClientBuilder";
 
     @Bean
     @ConditionalOnProperty(PREFIX + ".chat-model.base-url")
     OllamaChatModel ollamaChatModel(
-            @Qualifier(OLLAMA_CHAT_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
+            @Qualifier(CHAT_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
             Properties properties,
             ObjectProvider<ChatModelListener> listeners
     ) {
@@ -69,11 +69,11 @@ OllamaChatModel ollamaChatModel(
                 .build();
     }
 
-    @Bean(OLLAMA_CHAT_MODEL_HTTP_CLIENT_BUILDER)
+    @Bean(CHAT_MODEL_HTTP_CLIENT_BUILDER)
     @ConditionalOnProperty(PREFIX + ".chat-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_CHAT_MODEL_HTTP_CLIENT_BUILDER)
+    @ConditionalOnMissingBean(name = CHAT_MODEL_HTTP_CLIENT_BUILDER)
     HttpClientBuilder ollamaChatModelHttpClientBuilder(ObjectProvider<RestClient.Builder> restClientBuilder) {
-        return new SpringRestClientBuilder()
+        return SpringRestClient.builder()
                 .restClientBuilder(restClientBuilder.getIfAvailable(RestClient::builder))
                 // executor is not needed for no-streaming OllamaChatModel
                 .createDefaultStreamingRequestExecutor(false);
@@ -82,7 +82,7 @@ HttpClientBuilder ollamaChatModelHttpClientBuilder(ObjectProvider<RestClient.Bui
     @Bean
     @ConditionalOnProperty(PREFIX + ".streaming-chat-model.base-url")
     OllamaStreamingChatModel ollamaStreamingChatModel(
-            @Qualifier(OLLAMA_STREAMING_CHAT_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
+            @Qualifier(STREAMING_CHAT_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
             Properties properties,
             ObjectProvider<ChatModelListener> listeners
     ) {
@@ -108,20 +108,20 @@ OllamaStreamingChatModel ollamaStreamingChatModel(
                 .build();
     }
 
-    @Bean(OLLAMA_STREAMING_CHAT_MODEL_HTTP_CLIENT_BUILDER)
+    @Bean(STREAMING_CHAT_MODEL_HTTP_CLIENT_BUILDER)
     @ConditionalOnProperty(PREFIX + ".streaming-chat-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_STREAMING_CHAT_MODEL_HTTP_CLIENT_BUILDER)
+    @ConditionalOnMissingBean(name = STREAMING_CHAT_MODEL_HTTP_CLIENT_BUILDER)
     HttpClientBuilder ollamaStreamingChatModelHttpClientBuilder(
             ObjectProvider<RestClient.Builder> restClientBuilder,
-            @Qualifier(OLLAMA_STREAMING_CHAT_MODEL_TASK_EXECUTOR) AsyncTaskExecutor executor) {
-        return new SpringRestClientBuilder()
+            @Qualifier(STREAMING_CHAT_MODEL_TASK_EXECUTOR) AsyncTaskExecutor executor) {
+        return SpringRestClient.builder()
                 .restClientBuilder(restClientBuilder.getIfAvailable(RestClient::builder))
                 .streamingRequestExecutor(executor);
     }
 
-    @Bean(OLLAMA_STREAMING_CHAT_MODEL_TASK_EXECUTOR)
+    @Bean(STREAMING_CHAT_MODEL_TASK_EXECUTOR)
     @ConditionalOnProperty(PREFIX + ".streaming-chat-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_STREAMING_CHAT_MODEL_TASK_EXECUTOR)
+    @ConditionalOnMissingBean(name = STREAMING_CHAT_MODEL_TASK_EXECUTOR)
     @ConditionalOnClass(name = "io.micrometer.context.ContextSnapshotFactory")
     AsyncTaskExecutor ollamaStreamingChatModelTaskExecutorWithContextPropagation() {
         ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
@@ -130,9 +130,9 @@ AsyncTaskExecutor ollamaStreamingChatModelTaskExecutorWithContextPropagation() {
         return taskExecutor;
     }
 
-    @Bean(OLLAMA_STREAMING_CHAT_MODEL_TASK_EXECUTOR)
+    @Bean(STREAMING_CHAT_MODEL_TASK_EXECUTOR)
     @ConditionalOnProperty(PREFIX + ".streaming-chat-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_STREAMING_CHAT_MODEL_TASK_EXECUTOR)
+    @ConditionalOnMissingBean(name = STREAMING_CHAT_MODEL_TASK_EXECUTOR)
     @ConditionalOnMissingClass("io.micrometer.context.ContextSnapshotFactory")
     AsyncTaskExecutor ollamaStreamingChatModelTaskExecutor() {
         ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
@@ -143,7 +143,7 @@ AsyncTaskExecutor ollamaStreamingChatModelTaskExecutor() {
     @Bean
     @ConditionalOnProperty(PREFIX + ".language-model.base-url")
     OllamaLanguageModel ollamaLanguageModel(
-            @Qualifier(OLLAMA_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
+            @Qualifier(LANGUAGE_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
             Properties properties
     ) {
         LanguageModelProperties languageModelProperties = properties.getLanguageModel();
@@ -167,11 +167,11 @@ OllamaLanguageModel ollamaLanguageModel(
                 .build();
     }
 
-    @Bean(OLLAMA_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER)
+    @Bean(LANGUAGE_MODEL_HTTP_CLIENT_BUILDER)
     @ConditionalOnProperty(PREFIX + ".language-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER)
+    @ConditionalOnMissingBean(name = LANGUAGE_MODEL_HTTP_CLIENT_BUILDER)
     HttpClientBuilder ollamaLanguageModelHttpClientBuilder(ObjectProvider<RestClient.Builder> restClientBuilder) {
-        return new SpringRestClientBuilder()
+        return SpringRestClient.builder()
                 .restClientBuilder(restClientBuilder.getIfAvailable(RestClient::builder))
                 // executor is not needed for no-streaming OllamaLanguageModel
                 .createDefaultStreamingRequestExecutor(false);
@@ -180,7 +180,7 @@ HttpClientBuilder ollamaLanguageModelHttpClientBuilder(ObjectProvider<RestClient
     @Bean
     @ConditionalOnProperty(PREFIX + ".streaming-language-model.base-url")
     OllamaStreamingLanguageModel ollamaStreamingLanguageModel(
-            @Qualifier(OLLAMA_STREAMING_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
+            @Qualifier(STREAMING_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
             Properties properties
     ) {
         LanguageModelProperties languageModelProperties = properties.getStreamingLanguageModel();
@@ -203,21 +203,21 @@ OllamaStreamingLanguageModel ollamaStreamingLanguageModel(
                 .build();
     }
 
-    @Bean(OLLAMA_STREAMING_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER)
+    @Bean(STREAMING_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER)
     @ConditionalOnProperty(PREFIX + ".streaming-language-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_STREAMING_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER)
+    @ConditionalOnMissingBean(name = STREAMING_LANGUAGE_MODEL_HTTP_CLIENT_BUILDER)
     HttpClientBuilder ollamaStreamingLanguageModelHttpClientBuilder(
-            @Qualifier(OLLAMA_STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR) AsyncTaskExecutor executor,
+            @Qualifier(STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR) AsyncTaskExecutor executor,
             ObjectProvider<RestClient.Builder> restClientBuilder
     ) {
-        return new SpringRestClientBuilder()
+        return SpringRestClient.builder()
                 .restClientBuilder(restClientBuilder.getIfAvailable(RestClient::builder))
                 .streamingRequestExecutor(executor);
     }
 
-    @Bean(OLLAMA_STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR)
+    @Bean(STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR)
     @ConditionalOnProperty(PREFIX + ".streaming-language-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR)
+    @ConditionalOnMissingBean(name = STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR)
     @ConditionalOnClass(name = "io.micrometer.context.ContextSnapshotFactory")
     AsyncTaskExecutor ollamaStreamingLanguageModelTaskExecutorWithContextPropagation() {
         ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
@@ -226,9 +226,9 @@ AsyncTaskExecutor ollamaStreamingLanguageModelTaskExecutorWithContextPropagation
         return taskExecutor;
     }
 
-    @Bean(OLLAMA_STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR)
+    @Bean(STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR)
     @ConditionalOnProperty(PREFIX + ".streaming-language-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR)
+    @ConditionalOnMissingBean(name = STREAMING_LANGUAGE_MODEL_TASK_EXECUTOR)
     @ConditionalOnMissingClass("io.micrometer.context.ContextSnapshotFactory")
     AsyncTaskExecutor ollamaStreamingLanguageModelTaskExecutor() {
         ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
@@ -239,7 +239,7 @@ AsyncTaskExecutor ollamaStreamingLanguageModelTaskExecutor() {
     @Bean
     @ConditionalOnProperty(PREFIX + ".embedding-model.base-url")
     OllamaEmbeddingModel ollamaEmbeddingModel(
-            @Qualifier(OLLAMA_EMBEDDING_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
+            @Qualifier(EMBEDDING_MODEL_HTTP_CLIENT_BUILDER) HttpClientBuilder httpClientBuilder,
             Properties properties
     ) {
         EmbeddingModelProperties embeddingModelProperties = properties.getEmbeddingModel();
@@ -255,11 +255,11 @@ OllamaEmbeddingModel ollamaEmbeddingModel(
                 .build();
     }
 
-    @Bean(OLLAMA_EMBEDDING_MODEL_HTTP_CLIENT_BUILDER)
+    @Bean(EMBEDDING_MODEL_HTTP_CLIENT_BUILDER)
     @ConditionalOnProperty(PREFIX + ".embedding-model.base-url")
-    @ConditionalOnMissingBean(name = OLLAMA_EMBEDDING_MODEL_HTTP_CLIENT_BUILDER)
+    @ConditionalOnMissingBean(name = EMBEDDING_MODEL_HTTP_CLIENT_BUILDER)
     HttpClientBuilder ollamaEmbeddingModelHttpClientBuilder(ObjectProvider<RestClient.Builder> restClientBuilder) {
-        return new SpringRestClientBuilder()
+        return SpringRestClient.builder()
                 .restClientBuilder(restClientBuilder.getIfAvailable(RestClient::builder))
                 // executor is not needed for no-streaming OllamaEmbeddingModel
                 .createDefaultStreamingRequestExecutor(false);

langchain4j-open-ai-spring-boot-starter/pom.xml

@@ -19,6 +19,18 @@
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-open-ai</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>dev.langchain4j</groupId>
+                    <artifactId>langchain4j-http-client-jdk</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-http-client-spring-restclient</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>