Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

Assistant fixed #414

Merged
merged 4 commits into from
Nov 21, 2023
Merged

Assistant fixed #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0ca8b3
fix(assistant-run): run ans run-step
vacuityv Nov 16, 2023
a5069ec
fix(run and run-step): fix the list method
vacuityv Nov 20, 2023
123f0da
Merge branch 'main' into assistant-fixed
vacuityv Nov 20, 2023
352475f
Merge branch 'main' into assistant-fixed
TheoKanning Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions client/src/main/java/com/theokanning/openai/client/OpenAiApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,8 @@ public interface OpenAiApi {

@Headers("OpenAI-Beta: assistants=v1")
@GET("/v1/threads/{thread_id}/runs")
Single<OpenAiResponse<Run>> listRuns(@Path("thread_id") String threadId, @Body ListSearchParameters listSearchParameters);
Single<OpenAiResponse<Run>> listRuns(@Path("thread_id") String threadId, @QueryMap Map<String, String> listSearchParameters);


@Headers("OpenAI-Beta: assistants=v1")
@POST("/v1/threads/{thread_id}/runs/{run_id}/submit_tool_outputs")
Expand All @@ -319,5 +320,5 @@ public interface OpenAiApi {

@Headers("OpenAI-Beta: assistants=v1")
@GET("/v1/threads/{thread_id}/runs/{run_id}/steps")
Single<OpenAiResponse<RunStep>> listRunSteps(@Path("thread_id") String threadId, @Path("run_id") String runId, @Body ListSearchParameters listSearchParameters);
Single<OpenAiResponse<RunStep>> listRunSteps(@Path("thread_id") String threadId, @Path("run_id") String runId, @QueryMap Map<String, String> listSearchParameters);
}
15 changes: 13 additions & 2 deletions service/src/main/java/com/theokanning/openai/service/OpenAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import java.io.IOException;
import java.time.Duration;
import java.time.LocalDate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -471,7 +472,12 @@ public Run modifyRun(String threadId, String runId, Map<String, String> metadata
}

public OpenAiResponse<Run> listRuns(String threadId, ListSearchParameters listSearchParameters) {
return execute(api.listRuns(threadId, listSearchParameters));
Map<String, String> search = new HashMap<>();
if (listSearchParameters != null) {
ObjectMapper mapper = defaultObjectMapper();
search = mapper.convertValue(listSearchParameters, Map.class);
}
return execute(api.listRuns(threadId, search));
}

public Run submitToolOutputs(String threadId, String runId, SubmitToolOutputsRequest submitToolOutputsRequest) {
Expand All @@ -491,7 +497,12 @@ public RunStep retrieveRunStep(String threadId, String runId, String stepId) {
}

public OpenAiResponse<RunStep> listRunSteps(String threadId, String runId, ListSearchParameters listSearchParameters) {
return execute(api.listRunSteps(threadId, runId, listSearchParameters));
Map<String, String> search = new HashMap<>();
if (listSearchParameters != null) {
ObjectMapper mapper = defaultObjectMapper();
search = mapper.convertValue(listSearchParameters, Map.class);
}
return execute(api.listRunSteps(threadId, runId, search));
}

/**
Expand Down