refact: validate and update 'stream' value

aallam · Mar 9, 2021 · c309b59 · c309b59
1 parent 2aa216b
commit c309b59
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 31 deletions.
diff --git a/openai-client/src/commonMain/kotlin/com.aallam.openai.client/internal/OpenAIApi.kt b/openai-client/src/commonMain/kotlin/com.aallam.openai.client/internal/OpenAIApi.kt
@@ -42,14 +42,16 @@ internal class OpenAIApi(config: OpenAIConfig) : OpenAI {
     }
 
     override suspend fun completion(engineId: EngineId, request: CompletionRequest?): TextCompletion {
-        return httpClient.post(path = "/v1/engines/$engineId/completions", body = request ?: EmptyContent)
+        val body = if (request?.stream == true) request.copy(stream = false) else request
+        return httpClient.post(path = "/v1/engines/$engineId/completions", body = body ?: EmptyContent)
     }
 
     override fun completions(engineId: EngineId, request: CompletionRequest?): Flow<TextCompletion> {
+        val body = if (request?.stream != true) request?.copy(stream = true) else request
         return flow {
             httpClient.post<HttpStatement>(
                 path = "/v1/engines/$engineId/completions",
-                body = request ?: EmptyContent
+                body = body ?: EmptyContent
             ).execute {
                 val channel = it.receive<ByteReadChannel>()
                 while (!channel.isClosedForRead) {

diff --git a/openai-core/src/commonMain/kotlin/com.aallam.openai.api/completion/CompletionRequest.kt b/openai-core/src/commonMain/kotlin/com.aallam.openai.api/completion/CompletionRequest.kt
@@ -10,7 +10,7 @@ import kotlinx.serialization.Serializable
  * [documentation](https://beta.openai.com/docs/api-reference/create-completion)
  */
 @Serializable
-public class CompletionRequest(
+public data class CompletionRequest(
     /**
      * The prompt(s) to generate completions for, encoded as a string, a list of strings, or a list of token lists.
      *

diff --git a/sample/js/src/main/kotlin/main.kt b/sample/js/src/main/kotlin/main.kt
@@ -22,20 +22,12 @@ suspend fun main() {
     println(ada)
 
     println("\n>️ Creating completion...")
-    val completionRequest = CompletionRequest(
-        prompt = "Somebody once told me the world is gonna roll me",
-        echo = true
-    )
+    val completionRequest = CompletionRequest(prompt = "Somebody once told me the world is gonna roll me")
     openAI.completion(EngineId.Ada, completionRequest).choices.forEach(::println)
 
     println("\n>️ Creating completion stream...")
-    val completionRequestStream = CompletionRequest(
-        prompt = "Somebody once told me the world is gonna roll me",
-        stream = true,
-    )
-
     val scope = CoroutineScope(coroutineContext)
-    openAI.completions(EngineId.Ada, completionRequestStream)
+    openAI.completions(EngineId.Ada, completionRequest)
         .onEach { print(it.choices[0].text) }
         .onCompletion { println() }
         .launchIn(scope)

diff --git a/sample/jvm/src/main/kotlin/com/aallam/openai/sample/jvm/App.kt b/sample/jvm/src/main/kotlin/com/aallam/openai/sample/jvm/App.kt
@@ -23,18 +23,11 @@ fun main() = runBlocking {
     println(ada)
 
     println("\n>️ Creating completion...")
-    val completionRequest = CompletionRequest(
-        prompt = "Somebody once told me the world is gonna roll me",
-        echo = true
-    )
+    val completionRequest = CompletionRequest(prompt = "Somebody once told me the world is gonna roll me")
     openAI.completion(EngineId.Ada, completionRequest).choices.forEach(::println)
 
     println("\n>️ Creating completion stream...")
-    val completionRequestStream = CompletionRequest(
-        prompt = "Somebody once told me the world is gonna roll me",
-        stream = true,
-    )
-    openAI.completions(EngineId.Ada, completionRequestStream)
+    openAI.completions(EngineId.Ada, completionRequest)
         .onEach { print(it.choices[0].text) }
         .onCompletion { println() }
         .launchIn(this)

diff --git a/sample/native/src/nativeMain/kotlin/main.kt b/sample/native/src/nativeMain/kotlin/main.kt
@@ -28,18 +28,11 @@ fun main(): Unit = runBlocking {
     println(ada)
 
     println("\n>️ Creating completion...")
-    val completionRequest = CompletionRequest(
-        prompt = "Somebody once told me the world is gonna roll me",
-        echo = true
-    )
+    val completionRequest = CompletionRequest(prompt = "Somebody once told me the world is gonna roll me")
     openAI.completion(EngineId.Ada, completionRequest).choices.forEach(::println)
 
     println("\n>️ Creating completion stream...")
-    val completionRequestStream = CompletionRequest(
-        prompt = "Somebody once told me the world is gonna roll me",
-        stream = true,
-    )
-    openAI.completions(EngineId.Ada, completionRequestStream)
+    openAI.completions(EngineId.Ada, completionRequest)
         .onEach { print(it.choices[0].text) }
         .onCompletion { println() }
         .launchIn(this)