[Files] Support delete file

Author: qianmoQ

docs/docs/reference/openai/files.md

@@ -54,7 +54,7 @@ String file = this.getClass().getResource("/test.jsonl").getFile();
 FileEntity configure = FileEntity.builder()
     .file(new File(file))
     .build();
-this.client.files(configure);
+this.client.uploadFile(configure);
 ```
 
 Returns:
@@ -69,3 +69,24 @@ Returns:
   "purpose": "fine-tune"
 }
 ```
+
+### Delete file
+
+---
+
+Delete a file.
+
+```java
+String id = "file-XjGxS3KTG0uNmNOK362iJua3";
+this.client.deleteFile(entity.getId());
+```
+
+Returns:
+
+```json
+{
+  "id": "file-XjGxS3KTG0uNmNOK362iJua3",
+  "object": "file",
+  "deleted": true
+}
+```

docs/docs/reference/openai/files.zh.md

@@ -54,7 +54,7 @@ String file = this.getClass().getResource("/test.jsonl").getFile();
 FileEntity configure = FileEntity.builder()
     .file(new File(file))
     .build();
-this.client.files(configure);
+this.client.uploadFile(configure);
 ```
 
 返回:
@@ -69,3 +69,24 @@ this.client.files(configure);
   "purpose": "fine-tune"
 }
 ```
+
+### Delete file
+
+---
+
+删除文件
+
+```java
+String id = "file-XjGxS3KTG0uNmNOK362iJua3";
+this.client.deleteFile(entity.getId());
+```
+
+返回:
+
+```json
+{
+  "id": "file-XjGxS3KTG0uNmNOK362iJua3",
+  "object": "file",
+  "deleted": true
+}
+```

src/main/java/org/devlive/sdk/openai/DefaultApi.java

@@ -23,6 +23,7 @@
 import org.devlive.sdk.openai.response.ModerationResponse;
 import org.devlive.sdk.openai.response.UserKeyResponse;
 import retrofit2.http.Body;
+import retrofit2.http.DELETE;
 import retrofit2.http.GET;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
@@ -147,7 +148,14 @@ Single<EditResponse> fetchEdits(@Url String url,
      */
     @POST
     @Multipart
-    Single<FileEntity> fetchFiles(@Url String url,
+    Single<FileEntity> fetchUploadFile(@Url String url,
             @Part() MultipartBody.Part file,
             @PartMap Map<String, RequestBody> configure);
+
+    /**
+     * Delete a file.
+     * 删除文件。
+     */
+    @DELETE
+    Single<FileResponse> fetchDeleteFile(@Url String url);
 }

src/main/java/org/devlive/sdk/openai/DefaultClient.java

@@ -132,21 +132,28 @@ public EditResponse edit(EditEntity configure)
                 .blockingGet();
     }
 
-    public FileResponse files()
+    public FileResponse uploadFile()
     {
         return this.api.fetchFiles(ProviderUtils.getUrl(provider, UrlModel.FETCH_FILES))
                 .blockingGet();
     }
 
-    public FileEntity files(FileEntity configure)
+    public FileEntity uploadFile(FileEntity configure)
     {
         MultipartBody.Part fileBody = MultipartBodyUtils.getPart(configure.getFile(), "file");
-        return this.api.fetchFiles(ProviderUtils.getUrl(provider, UrlModel.FETCH_FILES),
+        return this.api.fetchUploadFile(ProviderUtils.getUrl(provider, UrlModel.FETCH_FILES),
                         fileBody,
                         configure.convertMap())
                 .blockingGet();
     }
 
+    public FileResponse deleteFile(String id)
+    {
+        String url = String.join("/", ProviderUtils.getUrl(provider, UrlModel.FETCH_FILES), id);
+        return this.api.fetchDeleteFile(url)
+                .blockingGet();
+    }
+
     public void close()
     {
         if (ObjectUtils.isNotEmpty(this.client)) {

src/main/java/org/devlive/sdk/openai/response/FileResponse.java

@@ -28,4 +28,10 @@ public class FileResponse
 
     @JsonProperty(value = "usage")
     private UsageEntity usage;
+
+    @JsonProperty(value = "id")
+    private String id;
+
+    @JsonProperty(value = "deleted")
+    private Boolean deleted;
 }

src/test/java/org/devlive/sdk/openai/BaseTest.java

@@ -11,7 +11,7 @@ public void before()
     {
         client = OpenAiClient.builder()
                 .apiKey(System.getProperty("openai.token"))
-                .apiKey("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")
+                .apiKey("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")
                 .build();
     }
 }

src/test/java/org/devlive/sdk/openai/FileClientTest.java

@@ -12,15 +12,29 @@ public class FileClientTest
     @Test
     public void testFiles()
     {
-        Assert.assertNotNull(this.client.files());
+        Assert.assertNotNull(this.client.uploadFile());
+    }
 
-        /**
-         * Test upload
-         * 测试上传
-         */
+    @Test
+    public void testUploadFile()
+    {
         String file = this.getClass().getResource("/test.jsonl").getFile();
-        Assert.assertNotNull(this.client.files(FileEntity.builder()
+        Assert.assertNotNull(this.client.uploadFile(FileEntity.builder()
                 .file(new File(file))
                 .build()));
     }
+
+    @Test
+    public void testDeleteFile()
+            throws InterruptedException
+    {
+        String file = this.getClass().getResource("/test.jsonl").getFile();
+        FileEntity entity = this.client.uploadFile(FileEntity.builder()
+                .file(new File(file))
+                .build());
+        Thread.sleep(3000);
+
+        Assert.assertTrue(this.client.deleteFile(entity.getId())
+                .getDeleted());
+    }
 }