The Unified and Autonomous Development Platform
fix: Trusted certs do not work for custom LLM provider (OD-2727)
Robin Shen0952b494e08f
diff --git a/pom.xml b/pom.xmlindex e9f8125ede..85926dd05a 100644--- a/pom.xml+++ b/pom.xml@@ -657,6 +657,11 @@<artifactId>langchain4j-open-ai</artifactId><version>${langchain4j.version}</version></dependency>+ <dependency>+ <groupId>dev.langchain4j</groupId>+ <artifactId>langchain4j-http-client-jdk</artifactId>+ <version>${langchain4j.version}</version>+ </dependency></dependencies></dependencyManagement><repositories>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 12e4529561..69202d3f6b 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -425,6 +425,10 @@<groupId>dev.langchain4j</groupId><artifactId>langchain4j-open-ai</artifactId></dependency>+ <dependency>+ <groupId>dev.langchain4j</groupId>+ <artifactId>langchain4j-http-client-jdk</artifactId>+ </dependency><dependency><groupId>dev.langchain4j</groupId><artifactId>langchain4j</artifactId>diff --git a/server-core/src/main/java/io/onedev/server/model/support/AiModelSetting.java b/server-core/src/main/java/io/onedev/server/model/support/AiModelSetting.javaindex 7ba923bf47..139b18d99b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/AiModelSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/AiModelSetting.java@@ -19,14 +19,17 @@ import org.slf4j.LoggerFactory;import com.google.gson.JsonParser;+import dev.langchain4j.http.client.jdk.JdkHttpClientBuilder;import dev.langchain4j.model.chat.ChatModel;import dev.langchain4j.model.chat.StreamingChatModel;import dev.langchain4j.model.openai.OpenAiChatModel;import dev.langchain4j.model.openai.OpenAiStreamingChatModel;+import io.onedev.server.OneDev;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Password;import io.onedev.server.util.EditContext;+import nl.altindag.ssl.SSLFactory;@Editable(order=100)public class AiModelSetting implements Serializable {@@ -91,6 +94,12 @@ public class AiModelSetting implements Serializable {this.timeoutSeconds = timeoutSeconds;}+ private static HttpClient.Builder newHttpClientBuilder() {+ var builder = HttpClient.newBuilder();+ builder.sslContext(OneDev.getInstance(SSLFactory.class).getSslContext());+ return builder;+ }+@SuppressWarnings("unused")private static List<String> getModels() {var baseUrl = (String) EditContext.get().getInputValue("baseUrl");@@ -102,7 +111,7 @@ public class AiModelSetting implements Serializable {try {var modelsUrl = baseUrl.endsWith("/") ? baseUrl + "models" : baseUrl + "/models";- HttpClient client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build();+ HttpClient client = newHttpClientBuilder().followRedirects(HttpClient.Redirect.NORMAL).build();var requestBuilder = HttpRequest.newBuilder().uri(URI.create(modelsUrl))@@ -138,8 +147,13 @@ public class AiModelSetting implements Serializable {}}+ private static JdkHttpClientBuilder newLangChainHttpClientBuilder() {+ return new JdkHttpClientBuilder().httpClientBuilder(newHttpClientBuilder());+ }+public ChatModel getChatModel() {return OpenAiChatModel.builder()+ .httpClientBuilder(newLangChainHttpClientBuilder()).apiKey(apiKey).baseUrl(baseUrl).modelName(name)@@ -149,6 +163,7 @@ public class AiModelSetting implements Serializable {public StreamingChatModel getStreamingChatModel() {return OpenAiStreamingChatModel.builder()+ .httpClientBuilder(newLangChainHttpClientBuilder()).apiKey(apiKey).baseUrl(baseUrl).modelName(name)