Merge branch 'develop' into 1.0.15

# Conflicts:
#	src/main/java/com/unfbx/chatgpt/entity/chat/Functions.java

Author: guorutao

pom.xml

@@ -59,11 +59,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -106,6 +101,12 @@
             <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

src/main/java/com/unfbx/chatgpt/OpenAiClient.java

@@ -166,13 +166,12 @@ private OkHttpClient okHttpClient() {
         }
         this.authInterceptor.setApiKey(this.apiKey);
         this.authInterceptor.setKeyStrategy(this.keyStrategy);
-        OkHttpClient okHttpClient = new OkHttpClient
+        return new OkHttpClient
                 .Builder()
                 .addInterceptor(this.authInterceptor)
                 .connectTimeout(30, TimeUnit.SECONDS)
                 .writeTimeout(30, TimeUnit.SECONDS)
                 .readTimeout(30, TimeUnit.SECONDS).build();
-        return okHttpClient;
     }
 
     /**
@@ -182,8 +181,7 @@ private OkHttpClient okHttpClient() {
      */
     public List<Model> models() {
         Single<ModelResponse> models = this.openAiApi.models();
-        List<Model> modelList = models.blockingGet().getData();
-        return modelList;
+        return models.blockingGet().getData();
     }
 
     /**
@@ -727,7 +725,7 @@ public WhisperResponse speechToTextTranslations(java.io.File file, Translations
         RequestBody fileBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
         MultipartBody.Part multipartBody = MultipartBody.Part.createFormData("file", file.getName(), fileBody);
         //自定义参数
-        Map<String, RequestBody> requestBodyMap = new HashMap<>();
+        Map<String, RequestBody> requestBodyMap = new HashMap<>(5,1L);
 
         if (StrUtil.isNotBlank(translations.getModel())) {
             requestBodyMap.put(Translations.Fields.model, RequestBody.create(MediaType.parse("multipart/form-data"), translations.getModel()));
@@ -738,9 +736,7 @@ public WhisperResponse speechToTextTranslations(java.io.File file, Translations
         if (StrUtil.isNotBlank(translations.getResponseFormat())) {
             requestBodyMap.put(Translations.Fields.responseFormat, RequestBody.create(MediaType.parse("multipart/form-data"), translations.getResponseFormat()));
         }
-        if (Objects.nonNull(translations.getTemperature())) {
-            requestBodyMap.put(Translations.Fields.temperature, RequestBody.create(MediaType.parse("multipart/form-data"), String.valueOf(translations.getTemperature())));
-        }
+        requestBodyMap.put(Translations.Fields.temperature, RequestBody.create(MediaType.parse("multipart/form-data"), String.valueOf(translations.getTemperature())));
         Single<WhisperResponse> whisperResponse = this.openAiApi.speechToTextTranslations(multipartBody, requestBodyMap);
         return whisperResponse.blockingGet();
     }

src/main/java/com/unfbx/chatgpt/OpenAiStreamClient.java

@@ -142,14 +142,13 @@ private OkHttpClient okHttpClient() {
         }
         this.authInterceptor.setApiKey(this.apiKey);
         this.authInterceptor.setKeyStrategy(this.keyStrategy);
-        OkHttpClient okHttpClient = new OkHttpClient
+        return new OkHttpClient
                 .Builder()
                 .addInterceptor(this.authInterceptor)
                 .connectTimeout(10, TimeUnit.SECONDS)
                 .writeTimeout(50, TimeUnit.SECONDS)
                 .readTimeout(50, TimeUnit.SECONDS)
                 .build();
-        return okHttpClient;
     }
 
     /**
@@ -279,9 +278,8 @@ public CreditGrantsResponse creditGrants() {
                 log.error(openAiResponse.getError().getMessage());
                 throw new BaseException(openAiResponse.getError().getMessage());
             }
-            String errorMsg = bodyStr;
-            log.error("询余额请求异常：{}", errorMsg);
-            OpenAiResponse openAiResponse = JSONUtil.toBean(errorMsg, OpenAiResponse.class);
+            log.error("询余额请求异常：{}", bodyStr);
+            OpenAiResponse openAiResponse = JSONUtil.toBean(bodyStr, OpenAiResponse.class);
             if (Objects.nonNull(openAiResponse.getError())) {
                 log.error(openAiResponse.getError().getMessage());
                 throw new BaseException(openAiResponse.getError().getMessage());
@@ -290,8 +288,7 @@ public CreditGrantsResponse creditGrants() {
         }
         ObjectMapper mapper = new ObjectMapper();
         // 读取Json 返回值
-        CreditGrantsResponse completionResponse = mapper.readValue(bodyStr, CreditGrantsResponse.class);
-        return completionResponse;
+        return mapper.readValue(bodyStr, CreditGrantsResponse.class);
     }
 
     /**

src/main/java/com/unfbx/chatgpt/config/ChatGPTUrl.java

@@ -16,6 +16,6 @@ public enum ChatGPTUrl {
     COMPLETIONS("https://api.openai.com/v1/completions"),
     ;
 
-    private String url;
+    private final String url;
 
 }

src/main/java/com/unfbx/chatgpt/entity/billing/Subscription.java

@@ -1,6 +1,5 @@
 package com.unfbx.chatgpt.entity.billing;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 

src/main/java/com/unfbx/chatgpt/entity/chat/ChatCompletion.java

@@ -175,9 +175,7 @@ public enum Model {
          */
         GPT_4_32K_0613("gpt-4-32k-0613"),
         ;
-        private String name;
+        private final String name;
     }
 
 }
-
-

src/main/java/com/unfbx/chatgpt/entity/chat/FunctionCall.java

@@ -1,6 +1,5 @@
 package com.unfbx.chatgpt.entity.chat;
 
-import cn.hutool.json.JSONUtil;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -9,7 +8,7 @@
 /**
  * 描述：函数调用返回值
  *
- * @author https://www.unfbx.com
+ * @author <a href="https://www.unfbx.com">unfbx</a>
  * @since 2023-06-14
  */
 @Data

src/main/java/com/unfbx/chatgpt/entity/chat/Message.java

@@ -72,7 +72,7 @@ public enum Role {
         ASSISTANT("assistant"),
         FUNCTION("function"),
         ;
-        private String name;
+        private final String name;
     }
 
     public static final class Builder {

src/main/java/com/unfbx/chatgpt/entity/completions/Completion.java

@@ -3,8 +3,6 @@
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.unfbx.chatgpt.exception.BaseException;
-import com.unfbx.chatgpt.exception.CommonError;
 import com.unfbx.chatgpt.utils.TikTokensUtil;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
@@ -121,8 +119,6 @@ public enum Model {
         DAVINCI_002("text-davinci-002"),
         DAVINCI("davinci"),
         ;
-        private String name;
+        private final String name;
     }
 }
-
-

src/main/java/com/unfbx/chatgpt/entity/edits/Edit.java

@@ -66,11 +66,6 @@ public void setTemperature(double temperature) {
             this.temperature = 2;
             return;
         }
-        if (temperature < 0) {
-            log.error("temperature参数异常，temperature属于[0,2]");
-            this.temperature = 0;
-            return;
-        }
         this.temperature = temperature;
     }
 
@@ -96,9 +91,6 @@ public enum Model {
         TEXT_DAVINCI_EDIT_001("text-davinci-edit-001"),
         CODE_DAVINCI_EDIT_001("code-davinci-edit-001"),
         ;
-        private String name;
+        private final String name;
     }
 }
-
-
-