feat: file search tool

Author: szl97

api/pom.xml

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

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

@@ -88,6 +88,10 @@ class Retrieval implements Tool {
         @JsonInclude(JsonInclude.Include.NON_NULL)
         private Boolean inherit;
 
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        @JsonProperty("file_ids")
+        private List<String> fileIds;
+
         public Retrieval() {
 
         }
@@ -105,7 +109,9 @@ public String getType() {
         @Override
         public ToolDefinition definition() {
             com.theokanning.openai.response.tool.definition.FileSearchTool fileSearchTool = new com.theokanning.openai.response.tool.definition.FileSearchTool();
-            fileSearchTool.setDefaultMetadata(defaultMetadata);
+            fileSearchTool.setVectorStoreIds(fileIds);
+            fileSearchTool.setRankingOptions(new com.theokanning.openai.response.tool.definition.FileSearchTool.RankingOptions(null, defaultMetadata.getScore()));
+            fileSearchTool.setMaxNumResults(defaultMetadata.getTopK());
             return fileSearchTool;
         }
 

api/src/main/java/com/theokanning/openai/response/tool/definition/FileSearchTool.java

@@ -25,9 +25,6 @@ public class FileSearchTool implements ToolDefinition {
      */
     private String type = "file_search";
 
-    @JsonProperty("default_metadata")
-    private Tool.DefaultMetadata defaultMetadata = new Tool.DefaultMetadata();
-
     /**
      * Vector store IDs to search.
      */
@@ -54,7 +51,15 @@ public class FileSearchTool implements ToolDefinition {
     @Override
     public Tool getRealTool() {
         Tool.Retrieval retrieval = new Tool.Retrieval();
-        retrieval.setDefaultMetadata(defaultMetadata);
+        Tool.DefaultMetadata metadata = new Tool.DefaultMetadata();
+        if(maxNumResults != null) {
+            metadata.setTopK(maxNumResults);
+        }
+        if(rankingOptions != null && rankingOptions.scoreThreshold != null) {
+            metadata.setScore(rankingOptions.scoreThreshold);
+        }
+        retrieval.setFileIds(vectorStoreIds);
+        retrieval.setDefaultMetadata(metadata);
         return retrieval;
     }
 

client/pom.xml

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

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>top.bella</groupId>
     <artifactId>openai-java</artifactId>
-    <version>0.23.57</version>
+    <version>0.23.58</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.57</version>
+        <version>0.23.58</version>
     </parent>
     <packaging>jar</packaging>