390 Added runs (#401)

* 390 Added runs * 390 Added runs --------- Co-authored-by: Theo Kanning <[email protected]>
TheoKanning · Nov 15, 2023 · 4ff2758 · 4ff2758
1 parent 99162e0
commit 4ff2758
Show file tree

Hide file tree

Showing 11 changed files with 295 additions and 17 deletions.
diff --git a/api/src/main/java/com/theokanning/openai/runs/MessageCreation.java b/api/src/main/java/com/theokanning/openai/runs/MessageCreation.java
@@ -0,0 +1,16 @@
+package com.theokanning.openai.runs;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class MessageCreation {
+    @JsonProperty("message_id")
+    String messageId;
+}
diff --git a/api/src/main/java/com/theokanning/openai/runs/Run.java b/api/src/main/java/com/theokanning/openai/runs/Run.java
@@ -0,0 +1,45 @@
+package com.theokanning.openai.runs;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class Run {
+
+    @JsonProperty("assistant_id")
+    String assistantId;
+    @JsonProperty("cancelled_at")
+    Long cancelledAt;
+    @JsonProperty("completed_at")
+    Long completedAt;
+    @JsonProperty("created_at")
+    Long createdAt;
+    @JsonProperty("expires_at")
+    Long expiresAt;
+    @JsonProperty("failed_at")
+    Long failedAt;
+    @JsonProperty("file_ids")
+    List<String> fileIds;
+    String id;
+    String instructions;
+    @JsonProperty("last_error")
+    String lastError;
+    Map<String, String> metadata;
+    String model;
+    String object;
+    @JsonProperty("started_at")
+    Long startedAt;
+    String status;
+    @JsonProperty("thread_id")
+    String threadId;
+    List<Tool> tools;
+}
diff --git a/api/src/main/java/com/theokanning/openai/runs/RunCreateRequest.java b/api/src/main/java/com/theokanning/openai/runs/RunCreateRequest.java
@@ -0,0 +1,23 @@
+package com.theokanning.openai.runs;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class RunCreateRequest {
+    String assistantId;
+
+    // Optional
+    String model;
+    String instructions;
+    List<Tool> tools;
+    Map<String, String> metadata;
+}
diff --git a/api/src/main/java/com/theokanning/openai/runs/RunStep.java b/api/src/main/java/com/theokanning/openai/runs/RunStep.java
@@ -0,0 +1,39 @@
+package com.theokanning.openai.runs;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class RunStep {
+
+    @JsonProperty("assistant_id")
+    String assistantId;
+    @JsonProperty("canelled_at")
+    Long cancelledAt;
+    @JsonProperty("completed_at")
+    Long completedAt;
+    @JsonProperty("created_at")
+    Long createdAt;
+    @JsonProperty("expired_at")
+    Long expiredAt;
+    @JsonProperty("failed_at")
+    Long failedAt;
+    String id;
+    @JsonProperty("last_error")
+    String lastError;
+    String object;
+    @JsonProperty("run_id")
+    String runId;
+    String status;
+    @JsonProperty("step_details")
+    StepDetails stepDetails;
+    @JsonProperty("thread_id")
+    String threadId;
+    String type;
+}
diff --git a/api/src/main/java/com/theokanning/openai/runs/RunSteps.java b/api/src/main/java/com/theokanning/openai/runs/RunSteps.java
@@ -0,0 +1,17 @@
+package com.theokanning.openai.runs;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public class RunSteps {
+
+    String object;
+    List<RunSteps> data;
+    @JsonProperty("first_id")
+    String firstId;
+    @JsonProperty("last_id")
+    String lastId;
+    @JsonProperty("has_more")
+    boolean hasMore;
+}
diff --git a/api/src/main/java/com/theokanning/openai/runs/Runs.java b/api/src/main/java/com/theokanning/openai/runs/Runs.java
@@ -0,0 +1,17 @@
+package com.theokanning.openai.runs;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public class Runs {
+
+    String object;
+    List<Runs> data;
+    @JsonProperty("first_id")
+    String firstId;
+    @JsonProperty("last_id")
+    String lastId;
+    @JsonProperty("has_more")
+    boolean hasMore;
+}
diff --git a/api/src/main/java/com/theokanning/openai/runs/StepDetails.java b/api/src/main/java/com/theokanning/openai/runs/StepDetails.java
@@ -0,0 +1,18 @@
+package com.theokanning.openai.runs;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class StepDetails {
+
+    @JsonProperty("message_creation")
+    MessageCreation messageCreation;
+    String type;
+}
diff --git a/api/src/main/java/com/theokanning/openai/runs/Tool.java b/api/src/main/java/com/theokanning/openai/runs/Tool.java
@@ -0,0 +1,15 @@
+package com.theokanning.openai.runs;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class Tool {
+
+    String type;
+}
diff --git a/client/src/main/java/com/theokanning/openai/client/OpenAiApi.java b/client/src/main/java/com/theokanning/openai/client/OpenAiApi.java
@@ -33,6 +33,8 @@
 import com.theokanning.openai.model.Model;
 import com.theokanning.openai.moderation.ModerationRequest;
 import com.theokanning.openai.moderation.ModerationResult;
+import com.theokanning.openai.runs.Run;
+import com.theokanning.openai.runs.RunCreateRequest;
 import com.theokanning.openai.threads.Thread;
 import com.theokanning.openai.threads.ThreadRequest;
 import io.reactivex.Single;
@@ -278,4 +280,12 @@ public interface OpenAiApi {
     @GET("/v1/threads/{thread_id}/messages/{message_id}/files")
     Single<OpenAiResponse<MessageFile>> listMessageFiles(@Path("thread_id") String threadId, @Path("message_id") String messageId, @QueryMap Map<String, Object> filterRequest);
 
+    @Headers("OpenAI-Beta: assistants=v1")
+    @POST("/v1/threads/{thread_id}/runs")
+    Single<Run> createRun(@Path("thread_id") String threadId, @Body RunCreateRequest runCreateRequest);
+
+    @Headers("OpenAI-Beta: assistants=v1")
+    @GET("/v1/threads/{thread_id}/runs/{run_id}")
+    Single<Run> retrieveRun(@Path("thread_id") String threadId, @Path("run_id") String runId);
+
 }
diff --git a/service/src/main/java/com/theokanning/openai/service/OpenAiService.java b/service/src/main/java/com/theokanning/openai/service/OpenAiService.java
@@ -8,11 +8,7 @@
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.theokanning.openai.*;
 import com.theokanning.openai.assistants.*;
-import com.theokanning.openai.audio.CreateSpeechRequest;
-import com.theokanning.openai.audio.CreateTranscriptionRequest;
-import com.theokanning.openai.audio.CreateTranslationRequest;
-import com.theokanning.openai.audio.TranscriptionResult;
-import com.theokanning.openai.audio.TranslationResult;
+import com.theokanning.openai.audio.*;
 import com.theokanning.openai.billing.BillingUsage;
 import com.theokanning.openai.billing.Subscription;
 import com.theokanning.openai.client.OpenAiApi;
@@ -42,6 +38,8 @@
 import com.theokanning.openai.model.Model;
 import com.theokanning.openai.moderation.ModerationRequest;
 import com.theokanning.openai.moderation.ModerationResult;
+import com.theokanning.openai.runs.Run;
+import com.theokanning.openai.runs.RunCreateRequest;
 import com.theokanning.openai.threads.Thread;
 import com.theokanning.openai.threads.ThreadRequest;
 import io.reactivex.BackpressureStrategy;
@@ -166,7 +164,7 @@ public List<File> listFiles() {
 
     public File uploadFile(String purpose, String filepath) {
         java.io.File file = new java.io.File(filepath);
-        RequestBody purposeBody = RequestBody.create(okhttp3.MultipartBody.FORM, purpose);
+        RequestBody purposeBody = RequestBody.create(MultipartBody.FORM, purpose);
         RequestBody fileBody = RequestBody.create(MediaType.parse("text"), file);
         MultipartBody.Part body = MultipartBody.Part.createFormData("file", filepath, fileBody);
 
@@ -364,7 +362,7 @@ public ModerationResult createModeration(ModerationRequest request) {
     public ResponseBody createSpeech(CreateSpeechRequest request) {
         return execute(api.createSpeech(request));
     }
-    
+
     public Assistant createAssistant(AssistantRequest request) {
         return execute(api.createAssistant(request));
     }
@@ -382,7 +380,8 @@ public DeleteResult deleteAssistant(String assistantId) {
     }
 
     public ListAssistant<Assistant> listAssistants(ListAssistantQueryRequest filterRequest) {
-        Map<String, Object> queryParameters = mapper.convertValue(filterRequest, new TypeReference<Map<String, Object>>() {});
+        Map<String, Object> queryParameters = mapper.convertValue(filterRequest, new TypeReference<Map<String, Object>>() {
+        });
         return execute(api.listAssistants(queryParameters));
     }
 
@@ -399,7 +398,8 @@ public DeleteResult deleteAssistantFile(String assistantId, String fileId) {
     }
 
     public ListAssistant<Assistant> listAssistantFiles(String assistantId, ListAssistantQueryRequest filterRequest) {
-        Map<String, Object> queryParameters = mapper.convertValue(filterRequest, new TypeReference<Map<String, Object>>() {});
+        Map<String, Object> queryParameters = mapper.convertValue(filterRequest, new TypeReference<Map<String, Object>>() {
+        });
         return execute(api.listAssistantFiles(assistantId, queryParameters));
     }
 
@@ -424,35 +424,44 @@ public Message createMessage(String threadId, MessageRequest request) {
     }
 
     public Message retrieveMessage(String threadId, String messageId) {
-        return execute(api.retrieveMessage(threadId,messageId));
+        return execute(api.retrieveMessage(threadId, messageId));
     }
 
     public Message modifyMessage(String threadId, String messageId, ModifyMessageRequest request) {
-        return execute(api.modifyMessage(threadId,messageId, request));
+        return execute(api.modifyMessage(threadId, messageId, request));
     }
 
     public OpenAiResponse<Message> listMessages(String threadId) {
         return execute(api.listMessages(threadId));
     }
 
     public OpenAiResponse<Message> listMessages(String threadId, ListSearchParameters params) {
-        Map<String, Object> queryParameters = mapper.convertValue(params, new TypeReference<Map<String, Object>>() {});
-        return execute(api.listMessages(threadId,queryParameters));
+        Map<String, Object> queryParameters = mapper.convertValue(params, new TypeReference<Map<String, Object>>() {
+        });
+        return execute(api.listMessages(threadId, queryParameters));
     }
 
     public MessageFile retrieveMessageFile(String threadId, String messageId, String fileId) {
-        return execute(api.retrieveMessageFile(threadId,messageId, fileId));
+        return execute(api.retrieveMessageFile(threadId, messageId, fileId));
     }
 
     public OpenAiResponse<MessageFile> listMessageFiles(String threadId, String messageId) {
-        return execute(api.listMessageFiles(threadId,messageId));
+        return execute(api.listMessageFiles(threadId, messageId));
     }
 
     public OpenAiResponse<MessageFile> listMessageFiles(String threadId, String messageId, ListSearchParameters params) {
-        Map<String, Object> queryParameters = mapper.convertValue(params, new TypeReference<Map<String, Object>>() {});
-        return execute(api.listMessageFiles(threadId,messageId, queryParameters));
+        Map<String, Object> queryParameters = mapper.convertValue(params, new TypeReference<Map<String, Object>>() {
+        });
+        return execute(api.listMessageFiles(threadId, messageId, queryParameters));
+    }
+
+    public Run createRun(String threadId, RunCreateRequest runCreateRequest) {
+        return execute(api.createRun(threadId, runCreateRequest));
     }
 
+    public Run retrieveRun(String threadId, String runId) {
+        return execute(api.retrieveRun(threadId, runId));
+    }
 
     /**
      * Calls the Open AI api, returns the response, and parses error messages if the request fails