feat: fix serialize bugs

Author: szl97

api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.bella</groupId>
         <artifactId>openai-java</artifactId>
-        <version>0.23.32</version>
+        <version>0.23.33</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>openai-api</artifactId>

api/src/main/java/com/theokanning/openai/assistants/assistant/Tool.java

@@ -45,7 +45,6 @@ public interface Tool {
      */
     @Data
     class Function implements Tool {
-        private String type = "function";
         private FunctionDefinition function;
         @JsonProperty("is_final")
         private Boolean isFinal = false;
@@ -61,7 +60,6 @@ public String getType() {
      */
     @Data
     class Retrieval implements Tool {
-        private String type = "retrieval";
         @JsonProperty("default_metadata")
         private DefaultMetadata defaultMetadata = new DefaultMetadata();
 
@@ -76,7 +74,6 @@ public String getType() {
      */
     @Data
     class Rag implements Tool {
-        private String type = "rag";
         @JsonProperty("default_metadata")
         private DefaultMetadata defaultMetadata = new DefaultMetadata();
 
@@ -91,7 +88,6 @@ public String getType() {
      */
     @Data
     class WebSearch implements Tool {
-        private String type = "web_search";
 
         @Override
         public String getType() {
@@ -104,7 +100,6 @@ public String getType() {
      */
     @Data
     class WebSearchTavily implements Tool {
-        private String type = "web_search_tavily";
 
         @Override
         public String getType() {
@@ -117,7 +112,6 @@ public String getType() {
      */
     @Data
     class WeatherSearch implements Tool {
-        private String type = "weather_search";
 
         @Override
         public String getType() {
@@ -130,7 +124,6 @@ public String getType() {
      */
     @Data
     class ImgVision implements Tool {
-        private String type = "img_vision";
 
         @Override
         public String getType() {
@@ -143,7 +136,6 @@ public String getType() {
      */
     @Data
     class ImgGenerate implements Tool {
-        private String type = "img_generate";
 
         @Override
         public String getType() {
@@ -156,7 +148,6 @@ public String getType() {
      */
     @Data
     class Bar implements Tool {
-        private String type = "generate_bar";
 
         @Override
         public String getType() {
@@ -169,7 +160,6 @@ public String getType() {
      */
     @Data
     class Line implements Tool {
-        private String type = "generate_line";
 
         @Override
         public String getType() {
@@ -182,7 +172,6 @@ public String getType() {
      */
     @Data
     class Pie implements Tool {
-        private String type = "generate_pie";
 
         @Override
         public String getType() {
@@ -195,7 +184,6 @@ public String getType() {
      */
     @Data
     class WikiSearch implements Tool {
-        private String type = "wiki_search";
 
         @Override
         public String getType() {
@@ -208,7 +196,6 @@ public String getType() {
      */
     @Data
     class MyWeekReport implements Tool {
-        private String type = "my_week_report";
 
         @Override
         public String getType() {
@@ -221,7 +208,6 @@ public String getType() {
      */
     @Data
     class WeekReportToMe implements Tool {
-        private String type = "week_report_to_me";
 
         @Override
         public String getType() {
@@ -234,7 +220,6 @@ public String getType() {
      */
     @Data
     class ReadFiles implements Tool {
-        private String type = "read_files";
 
         @Override
         public String getType() {
@@ -247,7 +232,6 @@ public String getType() {
      */
     @Data
     class WebCrawler implements Tool {
-        private String type = "web_crawler";
 
         @Override
         public String getType() {

api/src/main/java/com/theokanning/openai/assistants/message/MessageContent.java

@@ -41,4 +41,15 @@ public class MessageContent {
     @JsonProperty("image_url")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     ImageUrl imageUrl;
+
+    public boolean empty() {
+        switch (type) {
+        case "image_file":
+            return imageFile == null;
+        case "image_url":
+            return imageUrl == null;
+        default:
+            return text == null || text.getValue() == null || text.getValue().trim().isEmpty();
+        }
+    }
 }

api/src/main/java/com/theokanning/openai/assistants/run/SubmitToolOutputsRequest.java

@@ -1,6 +1,7 @@
 package com.theokanning.openai.assistants.run;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.theokanning.openai.assistants.IUssrRequest;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,7 +21,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SubmitToolOutputsRequest {
+public class SubmitToolOutputsRequest implements IUssrRequest {
 
     Boolean stream;
 
@@ -30,6 +31,8 @@ public class SubmitToolOutputsRequest {
     @JsonProperty("tool_outputs")
     private List<SubmitToolOutputRequestItem> toolOutputs;
 
+    String user;
+
 
     /**
      * 单个函数调用的请求对象构造

client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.bella</groupId>
         <artifactId>openai-java</artifactId>
-        <version>0.23.32</version>
+        <version>0.23.33</version>
     </parent>
     <packaging>jar</packaging>
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>top.bella</groupId>
     <artifactId>openai-java</artifactId>
-    <version>0.23.32</version>
+    <version>0.23.33</version>
     <packaging>pom</packaging>
     <description>openai java 版本</description>
     <name>openai-java</name>

service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>top.bella</groupId>
         <artifactId>openai-java</artifactId>
-        <version>0.23.32</version>
+        <version>0.23.33</version>
     </parent>
     <packaging>jar</packaging>