Merge pull request #14 from LIlGG/fix/proxy

fix: 修复代理无效的问题

Author: LIlGG

src/main/java/run/halo/live2d/openai/service/OpenAiService.java

@@ -1,5 +1,6 @@
 package run.halo.live2d.openai.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.theokanning.openai.completion.chat.ChatCompletionChunk;
 import com.theokanning.openai.completion.chat.ChatCompletionRequest;
 import com.theokanning.openai.completion.chat.ChatCompletionResult;
@@ -9,4 +10,6 @@ public interface OpenAiService {
     ChatCompletionResult createChatCompletion(ChatCompletionRequest request);
 
     Flowable<ChatCompletionChunk> streamChatCompletion(ChatCompletionRequest request);
+
+    JsonNode getOpenAiConfig();
 }

src/main/java/run/halo/live2d/openai/service/impl/OpenAIServiceImpl.java

@@ -30,6 +30,11 @@ public static OpenAiService getOpenAiService(JsonNode openAiConfig) {
         if (!openAiConfig.has("isOpenai") || !openAiConfig.get("isOpenai").asBoolean()) {
             return null;
         }
+
+        if (singleton != null && !openAiConfig.equals(singleton.getOpenAiConfig())) {
+            singleton = null;
+        }
+
         if (singleton == null) {
             synchronized (OpenAiService.class) {
                 if (singleton == null) {
@@ -75,22 +80,22 @@ OkHttpClient defaultClient() {
             throw new IllegalArgumentException("OpenAI token is required");
         }
 
-        OkHttpClient client
+        OkHttpClient.Builder builder
             = com.theokanning.openai.service.OpenAiService.defaultClient(
             openAiConfig.get("token").asText(),
             Duration.ofSeconds(openAiConfig.get("timeout").asInt())
-        );
+        ).newBuilder();
 
         if (openAiConfig.get("isProxy").asBoolean()) {
             Proxy proxy = new Proxy(Proxy.Type.HTTP,
                 new InetSocketAddress(openAiConfig.get("proxyHost").asText(),
                     openAiConfig.get("proxyPort").asInt()
                 )
             );
-            client.newBuilder().proxy(proxy).build();
+            builder.proxy(proxy).build();
         }
 
-        return client;
+        return builder.build();
     }
 
     ObjectMapper defaultObjectMapper() {
@@ -108,4 +113,8 @@ public Flowable<ChatCompletionChunk> streamChatCompletion(
         ChatCompletionRequest request) {
         return openAiService.streamChatCompletion(request);
     }
+
+    public JsonNode getOpenAiConfig() {
+        return openAiConfig;
+    }
 }

src/main/resources/extensions/settings.yaml

@@ -213,7 +213,7 @@ spec:
           help: 接口地址，国内如果访问不了，可考虑使用 openai-api-proxy
           name: baseUrl
           value: https://api.openai.com
-          validation: required|String
+          validation: required|url
         - $formkit: textarea
           if: "$get(isOpenai).value === true"
           label: 角色设定
@@ -271,12 +271,11 @@ spec:
           if: "$get(isOpenai).value === true && $get(isProxy).value === true"
           label: 代理地址
           name: proxyHost
-          validation: String
         - $formkit: text
           if: "$get(isOpenai).value === true && $get(isProxy).value === true"
           label: 代理端口
           name: proxyPort
-          validation: Number
+          validation: Number|between:0,65535
     - group: advanced
       label: 高级设置
       formSchema: