Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(runs): beta-v2 hotfix - Runs need v2 version to use gpt-4o #357

Merged
merged 3 commits into from
Jun 18, 2024
Merged

fix(runs): beta-v2 hotfix - Runs need v2 version to use gpt-4o #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e7ddeb
Runs beta-v2 hotfix
kdman98 Jun 18, 2024
3c3b134
optimize import
kdman98 Jun 18, 2024
dc74f5e
Merge branch 'main' into main
aallam Jun 18, 2024
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
18 changes: 9 additions & 9 deletions openai-client/src/commonMain/kotlin/com.aallam.openai.client/internal/api/RunsApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
url(path = "${ApiPath.Threads}/${threadId.id}/runs")
setBody(request)
contentType(ContentType.Application.Json)
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand All @@ -31,7 +31,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
return requester.perform {
it.get {
url(path = "${ApiPath.Threads}/${threadId.id}/runs/${runId.id}")
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand All @@ -50,7 +50,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
setBody(mapOf("metadata" to meta))
contentType(ContentType.Application.Json)
}
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand All @@ -72,7 +72,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
after?.let { parameter("after", it.id) }
before?.let { parameter("before", it.id) }
}
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand All @@ -89,7 +89,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
url(path = "${ApiPath.Threads}/${threadId.id}/runs/${runId.id}/submit_tool_outputs")
setBody(mapOf("tool_outputs" to output))
contentType(ContentType.Application.Json)
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand All @@ -99,7 +99,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
return requester.perform {
it.post {
url(path = "${ApiPath.Threads}/${threadId.id}/runs/${runId.id}/cancel")
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand All @@ -111,7 +111,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
url(path = "${ApiPath.Threads}/runs")
setBody(request)
contentType(ContentType.Application.Json)
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand All @@ -126,7 +126,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
return requester.perform {
it.get {
url(path = "${ApiPath.Threads}/${threadId.id}/runs/${runId.id}/steps/${stepId.id}")
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand All @@ -149,7 +149,7 @@ internal class RunsApi(val requester: HttpRequester) : Runs {
after?.let { parameter("after", it.id) }
before?.let { parameter("before", it.id) }
}
beta("assistants", 1)
beta("assistants", 2)
requestOptions(requestOptions)
}.body()
}
Expand Down
31 changes: 26 additions & 5 deletions openai-client/src/commonTest/kotlin/com/aallam/openai/client/TestRuns.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ package com.aallam.openai.client
import com.aallam.openai.api.assistant.AssistantTool
import com.aallam.openai.api.assistant.assistantRequest
import com.aallam.openai.api.core.PaginatedList
import com.aallam.openai.api.core.Role
import com.aallam.openai.api.message.MessageRequest
import com.aallam.openai.api.model.ModelId
import com.aallam.openai.api.run.RunRequest
import com.aallam.openai.api.run.RunStep
import com.aallam.openai.api.run.ThreadRunRequest
import com.aallam.openai.api.thread.ThreadMessage
import com.aallam.openai.api.thread.ThreadRequest
import com.aallam.openai.client.internal.JsonLenient
import kotlin.test.Test
import kotlin.test.assertEquals
Expand All @@ -19,11 +23,20 @@ class TestRuns : TestOpenAI() {
request = assistantRequest {
name = "Math Tutor"
tools = listOf(AssistantTool.CodeInterpreter)
model = ModelId("gpt-4")
model = ModelId("gpt-4o")
}
)
val thread = openAI.thread()
val request = RunRequest(assistantId = assistant.id)
openAI.message(
threadId = thread.id,
request = MessageRequest(
role = Role.User,
content = "solve me 1 + 1",
metadata = mapOf(),
),
requestOptions = null,
)
val run = openAI.createRun(threadId = thread.id, request = request)
assertEquals(thread.id, run.threadId)

Expand All @@ -32,8 +45,6 @@ class TestRuns : TestOpenAI() {

val runs = openAI.runs(threadId = thread.id)
assertEquals(1, runs.size)

openAI.cancel(threadId = thread.id, runId = run.id)
}

@Test
Expand All @@ -42,10 +53,20 @@ class TestRuns : TestOpenAI() {
request = assistantRequest {
name = "Math Tutor"
tools = listOf(AssistantTool.CodeInterpreter)
model = ModelId("gpt-4")
model = ModelId("gpt-4o")
}
)
val request = ThreadRunRequest(assistantId = assistant.id)
val request = ThreadRunRequest(
thread = ThreadRequest(
listOf(
ThreadMessage(
role = Role.User,
content = "solve 1 + 2",
)
)
),
assistantId = assistant.id,
)
val run = openAI.createThreadRun(request)
assertEquals(assistant.id, run.assistantId)

Expand Down
Loading