update openai client to 3.4.1 (#388)

Co-authored-by: José Carlos Montañez <[email protected]>

Author: raulraja

gradle/libs.versions.toml

@@ -33,7 +33,7 @@ pdfbox = "3.0.0"
 mysql = "8.0.33"
 semverGradle = "0.5.0-rc.5"
 scala = "3.3.0"
-openai-client-version = "3.3.2"
+openai-client-version = "3.4.1"
 gpt4all-java = "1.1.5"
 ai-djl = "0.23.0"
 jackson = "2.15.2"
@@ -144,4 +144,4 @@ semver-gradle = { id="com.javiersc.semver", version.ref="semverGradle" }
 suspend-transform-plugin = { id="love.forte.plugin.suspend-transform", version.ref="suspend-transform" }
 resources = { id="com.goncalossilva.resources", version.ref="resources-kmp" }
 detekt = { id="io.gitlab.arturbosch.detekt", version.ref="detekt"}
-node-gradle = { id = "com.github.node-gradle.node", version.ref = "node-gradle" }
+node-gradle = { id = "com.github.node-gradle.node", version.ref = "node-gradle" }

openai/src/commonMain/kotlin/com/xebia/functional/xef/conversation/llm/openai/OpenAIClient.kt

@@ -1,6 +1,7 @@
 package com.xebia.functional.xef.conversation.llm.openai
 
 import com.aallam.openai.api.BetaOpenAI
+import com.aallam.openai.api.LegacyOpenAI
 import com.aallam.openai.api.chat.*
 import com.aallam.openai.api.chat.ChatChunk as OpenAIChatChunk
 import com.aallam.openai.api.chat.ChatCompletionChunk as OpenAIChatCompletionChunk
@@ -58,9 +59,10 @@ class OpenAIModel(
       headers = mapOf("Authorization" to " Bearer $openAI.token")
     )
 
+  @OptIn(LegacyOpenAI::class)
   override suspend fun createCompletion(request: CompletionRequest): CompletionResult {
     fun completionChoice(it: OpenAIChoice): CompletionChoice =
-      CompletionChoice(it.text, it.index, null, it.finishReason)
+      CompletionChoice(it.text, it.index, null, it.finishReason.value)
 
     val response = client.completion(toCompletionRequest(request))
     return CompletionResult(
@@ -73,7 +75,6 @@ class OpenAIModel(
     )
   }
 
-  @OptIn(BetaOpenAI::class)
   override suspend fun createChatCompletion(
     request: ChatCompletionRequest
   ): ChatCompletionResponse {
@@ -86,8 +87,8 @@ class OpenAIModel(
 
     fun toChoice(choice: ChatChoice): Choice =
       Choice(
-        message = choice.message?.let { chatMessage(it) },
-        finishReason = choice.finishReason,
+        message = chatMessage(choice.message),
+        finishReason = choice.finishReason.value,
         index = choice.index,
       )
 
@@ -102,7 +103,6 @@ class OpenAIModel(
     )
   }
 
-  @OptIn(BetaOpenAI::class)
   override suspend fun createChatCompletions(
     request: ChatCompletionRequest
   ): Flow<ChatCompletionChunk> {
@@ -114,7 +114,7 @@ class OpenAIModel(
       )
 
     fun chatChunk(chunk: OpenAIChatChunk): ChatChunk =
-      ChatChunk(chunk.index, chunk.delta?.let { chatDelta(it) }, chunk.finishReason)
+      ChatChunk(chunk.index, chatDelta(chunk.delta), chunk.finishReason?.value)
 
     fun chatCompletionChunk(response: OpenAIChatCompletionChunk): ChatCompletionChunk =
       ChatCompletionChunk(
@@ -128,7 +128,6 @@ class OpenAIModel(
     return client.chatCompletions(toChatCompletionRequest(request)).map { chatCompletionChunk(it) }
   }
 
-  @OptIn(BetaOpenAI::class)
   override suspend fun createChatCompletionWithFunctions(
     request: ChatCompletionRequest
   ): ChatCompletionResponseWithFunctions {
@@ -169,8 +168,8 @@ class OpenAIModel(
 
     fun choiceWithFunctions(choice: ChatChoice): ChoiceWithFunctions =
       ChoiceWithFunctions(
-        message = choice.message?.let { fromOpenAI(it) },
-        finishReason = choice.finishReason,
+        message = fromOpenAI(choice.message),
+        finishReason = choice.finishReason.value,
         index = choice.index,
       )
 
@@ -243,7 +242,6 @@ class OpenAIModel(
       totalTokens = usage?.totalTokens,
     )
 
-  @OptIn(BetaOpenAI::class)
   private fun toRole(it: ChatRole?) =
     when (it) {
       ChatRole.User -> Role.USER
@@ -253,15 +251,13 @@ class OpenAIModel(
       else -> Role.ASSISTANT
     }
 
-  @OptIn(BetaOpenAI::class)
   private fun fromRole(it: Role) =
     when (it) {
       Role.USER -> ChatRole.User
       Role.ASSISTANT -> ChatRole.Assistant
       Role.SYSTEM -> ChatRole.System
     }
 
-  @OptIn(BetaOpenAI::class)
   private fun toChatCompletionRequest(request: ChatCompletionRequest): OpenAIChatCompletionRequest =
     chatCompletionRequest {
       model = ModelId(request.model)