feature 1.0.14 支持最新的3.5-0613、4.0-0613模型，支持最新的chat接口function call功能，bu修复

guorutao · guorutao · commit 6da6d8cf9e69 · 2023-06-25T20:31:25.000+08:00
diff --git a/src/main/java/com/unfbx/chatgpt/entity/billing/BillingUsage.java b/src/main/java/com/unfbx/chatgpt/entity/billing/BillingUsage.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.billing;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -13,6 +14,7 @@
  * @since 2023-04-08
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class BillingUsage {
 
     @JsonProperty("object")
diff --git a/src/main/java/com/unfbx/chatgpt/entity/billing/CreditGrantsResponse.java b/src/main/java/com/unfbx/chatgpt/entity/billing/CreditGrantsResponse.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.billing;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -13,6 +14,7 @@
  * @since 2023-03-18
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CreditGrantsResponse implements Serializable {
     private String object;
     /**
diff --git a/src/main/java/com/unfbx/chatgpt/entity/billing/DailyCost.java b/src/main/java/com/unfbx/chatgpt/entity/billing/DailyCost.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.billing;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@
  * @since 2023-04-08
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class DailyCost {
     /**
      * 时间戳
diff --git a/src/main/java/com/unfbx/chatgpt/entity/billing/Datum.java b/src/main/java/com/unfbx/chatgpt/entity/billing/Datum.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.billing;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@
  * @since 2023-03-18
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Datum {
     private String object;
     private String id;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/billing/Grants.java b/src/main/java/com/unfbx/chatgpt/entity/billing/Grants.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.billing;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@
  * @since 2023-03-18
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Grants {
     private String object;
     @JsonProperty("data")
diff --git a/src/main/java/com/unfbx/chatgpt/entity/billing/LineItem.java b/src/main/java/com/unfbx/chatgpt/entity/billing/LineItem.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.billing;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -11,6 +12,7 @@
  * @since 2023-04-08
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class LineItem {
     /**
      * 模型名称
diff --git a/src/main/java/com/unfbx/chatgpt/entity/billing/Plan.java b/src/main/java/com/unfbx/chatgpt/entity/billing/Plan.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.billing;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 /**
@@ -9,6 +10,7 @@
  * @since  2023-04-08
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Plan {
     private String title;
     private String id;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/billing/Subscription.java b/src/main/java/com/unfbx/chatgpt/entity/billing/Subscription.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.billing;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -10,6 +11,7 @@
  * @since  2023-04-08
  */
 @Data
+//@JsonIgnoreProperties(ignoreUnknown = true)
 public class Subscription {
     @JsonProperty("object")
     private String object;
@@ -49,4 +51,6 @@ public class Subscription {
     private Object billingAddress;
     @JsonProperty("business_address")
     private Object businessAddress;
+    @JsonProperty("primary")
+    private Boolean primary;
 }
diff --git a/src/main/java/com/unfbx/chatgpt/entity/chat/ChatChoice.java b/src/main/java/com/unfbx/chatgpt/entity/chat/ChatChoice.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.chat;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@
  * @since 2023-03-02
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ChatChoice implements Serializable {
     private long index;
     /**
diff --git a/src/main/java/com/unfbx/chatgpt/entity/chat/ChatCompletionResponse.java b/src/main/java/com/unfbx/chatgpt/entity/chat/ChatCompletionResponse.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.chat;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.unfbx.chatgpt.entity.common.Usage;
 import lombok.Data;
 
@@ -13,6 +14,7 @@
  * 2023-03-02
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ChatCompletionResponse implements Serializable {
     private String id;
     private String object;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/chat/FunctionCall.java b/src/main/java/com/unfbx/chatgpt/entity/chat/FunctionCall.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.chat;
 
+import cn.hutool.json.JSONUtil;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/chat/Message.java b/src/main/java/com/unfbx/chatgpt/entity/chat/Message.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.chat;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
@@ -17,6 +18,7 @@
  */
 @Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Message implements Serializable {
 
     /**
diff --git a/src/main/java/com/unfbx/chatgpt/entity/common/Choice.java b/src/main/java/com/unfbx/chatgpt/entity/common/Choice.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.common;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Choice implements Serializable {
     private String text;
     private long index;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/common/DeleteResponse.java b/src/main/java/com/unfbx/chatgpt/entity/common/DeleteResponse.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.common;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,6 +12,7 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class DeleteResponse implements Serializable {
     private String id;
     private String object;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/common/OpenAiResponse.java b/src/main/java/com/unfbx/chatgpt/entity/common/OpenAiResponse.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.common;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,13 +12,15 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class OpenAiResponse<T> implements Serializable {
     private String object;
     private List<T> data;
     private Error error;
 
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public class Error {
         private String message;
         private String type;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/common/Usage.java b/src/main/java/com/unfbx/chatgpt/entity/common/Usage.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.common;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Usage implements Serializable {
     @JsonProperty("prompt_tokens")
     private long promptTokens;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/completions/CompletionResponse.java b/src/main/java/com/unfbx/chatgpt/entity/completions/CompletionResponse.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.completions;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.unfbx.chatgpt.entity.common.OpenAiResponse;
 import com.unfbx.chatgpt.entity.common.Choice;
 import com.unfbx.chatgpt.entity.common.Usage;
@@ -14,6 +15,7 @@
  *  2023-02-11
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CompletionResponse extends OpenAiResponse implements Serializable {
     private String id;
     private String object;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/edits/EditResponse.java b/src/main/java/com/unfbx/chatgpt/entity/edits/EditResponse.java
@@ -1,6 +1,7 @@
 package com.unfbx.chatgpt.entity.edits;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.unfbx.chatgpt.entity.common.Choice;
 import com.unfbx.chatgpt.entity.common.Usage;
 import lombok.Data;
@@ -14,6 +15,7 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class EditResponse implements Serializable {
     private String id;
     private String object;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/embeddings/EmbeddingResponse.java b/src/main/java/com/unfbx/chatgpt/entity/embeddings/EmbeddingResponse.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.embeddings;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.unfbx.chatgpt.entity.common.Usage;
 import lombok.Data;
 
@@ -14,6 +15,7 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class EmbeddingResponse implements Serializable {
 
     private String object;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/embeddings/Item.java b/src/main/java/com/unfbx/chatgpt/entity/embeddings/Item.java
@@ -1,12 +1,14 @@
 package com.unfbx.chatgpt.entity.embeddings;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Item implements Serializable {
     private String object;
     private List<BigDecimal> embedding;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/engines/Engine.java b/src/main/java/com/unfbx/chatgpt/entity/engines/Engine.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.engines;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,6 +12,7 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Engine implements Serializable {
 
     private String id;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/files/File.java b/src/main/java/com/unfbx/chatgpt/entity/files/File.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.files;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class File implements Serializable {
 
     private String id;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/files/UploadFileResponse.java b/src/main/java/com/unfbx/chatgpt/entity/files/UploadFileResponse.java
@@ -1,5 +1,6 @@
 package com.unfbx.chatgpt.entity.files;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,5 +12,6 @@
  *  2023-02-15
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UploadFileResponse extends File implements Serializable {
 }
diff --git a/src/main/java/com/unfbx/chatgpt/entity/fineTune/Event.java b/src/main/java/com/unfbx/chatgpt/entity/fineTune/Event.java
@@ -1,11 +1,13 @@
 package com.unfbx.chatgpt.entity.fineTune;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Event implements Serializable {
     private String object;
     @JsonProperty("created_at")
diff --git a/src/main/java/com/unfbx/chatgpt/entity/fineTune/FineTuneDeleteResponse.java b/src/main/java/com/unfbx/chatgpt/entity/fineTune/FineTuneDeleteResponse.java
@@ -1,10 +1,12 @@
 package com.unfbx.chatgpt.entity.fineTune;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class FineTuneDeleteResponse implements Serializable {
 
     private String id;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/fineTune/FineTuneResponse.java b/src/main/java/com/unfbx/chatgpt/entity/fineTune/FineTuneResponse.java
@@ -1,12 +1,14 @@
 package com.unfbx.chatgpt.entity.fineTune;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class FineTuneResponse implements Serializable {
 
     private String id;
diff --git a/src/main/java/com/unfbx/chatgpt/entity/fineTune/HyperParam.java b/src/main/java/com/unfbx/chatgpt/entity/fineTune/HyperParam.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/fineTune/TrainingFile.java b/src/main/java/com/unfbx/chatgpt/entity/fineTune/TrainingFile.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/images/ImageResponse.java b/src/main/java/com/unfbx/chatgpt/entity/images/ImageResponse.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/images/Item.java b/src/main/java/com/unfbx/chatgpt/entity/images/Item.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/models/Model.java b/src/main/java/com/unfbx/chatgpt/entity/models/Model.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/models/ModelResponse.java b/src/main/java/com/unfbx/chatgpt/entity/models/ModelResponse.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/models/Permission.java b/src/main/java/com/unfbx/chatgpt/entity/models/Permission.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/moderations/Categories.java b/src/main/java/com/unfbx/chatgpt/entity/moderations/Categories.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/moderations/CategoryScores.java b/src/main/java/com/unfbx/chatgpt/entity/moderations/CategoryScores.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/moderations/ModerationResponse.java b/src/main/java/com/unfbx/chatgpt/entity/moderations/ModerationResponse.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/moderations/Result.java b/src/main/java/com/unfbx/chatgpt/entity/moderations/Result.java
diff --git a/src/main/java/com/unfbx/chatgpt/entity/whisper/WhisperResponse.java b/src/main/java/com/unfbx/chatgpt/entity/whisper/WhisperResponse.java
diff --git a/src/main/java/com/unfbx/chatgpt/utils/TikTokensUtil.java b/src/main/java/com/unfbx/chatgpt/utils/TikTokensUtil.java
