feat(BE-190): As a user, i want able to use ollama-client

- support llama3 - streamEventsFrom - refactor
tddworks · Apr 19, 2024 · 2fc98d7 · 2fc98d7
1 parent 257867f
commit 2fc98d7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/common/src/commonMain/kotlin/com/tddworks/common/network/api/ktor/api/Stream.kt b/common/src/commonMain/kotlin/com/tddworks/common/network/api/ktor/api/Stream.kt
@@ -15,23 +15,30 @@ private const val STREAM_END_TOKEN = "$STREAM_PREFIX [DONE]"
  */
 suspend inline fun <reified T> FlowCollector<T>.streamEventsFrom(response: HttpResponse) {
     val channel: ByteReadChannel = response.body()
+
+    // Continue to read until the channel is closed.
     while (!channel.isClosedForRead) {
         channel.readUTF8Line()?.let { streamResponse ->
             if (notEndStreamResponse(streamResponse)) {
-                emit(json().decodeFromString(streamResponse.removePrefix(STREAM_PREFIX)))
-            } else {
-                // for like ollama api it's returning json string without prefix "data:"
-                emit(json().decodeFromString(streamResponse))
+                // If the response indicates streaming data, decode and emit it.
+                emit(json().decodeFromString<T>(streamResponse.removePrefix(STREAM_PREFIX)))
+            } else if (isJson(streamResponse)) {
+                emit(json().decodeFromString<T>(streamResponse))
             }
-        } ?: break
+        } ?: break // If `readUTF8Line()` returns null, exit the loop (end of input).
     }
+
+
 }
 
+
 fun json(): Json {
     return getInstance()
 }
 
 
 private fun isStreamResponse(line: String) = line.startsWith(STREAM_PREFIX)
 
-fun notEndStreamResponse(line: String) = line != STREAM_END_TOKEN && isStreamResponse(line)
+fun notEndStreamResponse(line: String) = line != STREAM_END_TOKEN && isStreamResponse(line)
+
+fun isJson(line: String) = line.startsWith("{") && line.endsWith("}")
diff --git a/...ma-client/ollama-client-core/src/commonMain/kotlin/com/tddworks/ollama/api/OllamaModel.kt b/...ma-client/ollama-client-core/src/commonMain/kotlin/com/tddworks/ollama/api/OllamaModel.kt
@@ -11,6 +11,6 @@ value class OllamaModel(val value: String) {
         val LLAMA3 = OllamaModel("llama3")
         val CODE_LLAMA = OllamaModel("codellama")
         val MISTRAL = OllamaModel("mistral")
-        val availableModels = listOf(LLAMA2, CODE_LLAMA, MISTRAL)
+        val availableModels = listOf(LLAMA2, LLAMA3, CODE_LLAMA, MISTRAL)
     }
 }
diff --git a/...way-core/src/commonMain/kotlin/com/tddworks/openai/gateway/api/AnthropicOpenAIProvider.kt b/...way-core/src/commonMain/kotlin/com/tddworks/openai/gateway/api/AnthropicOpenAIProvider.kt
@@ -30,9 +30,7 @@ class AnthropicOpenAIProvider(private val client: Anthropic) : OpenAIProvider {
      */
     override suspend fun completions(request: ChatCompletionRequest): OpenAIChatCompletion {
         val anthropicRequest = request.toAnthropicRequest()
-        return client.create(anthropicRequest).let {
-            it.toOpenAIChatCompletion()
-        }
+        return client.create(anthropicRequest).toOpenAIChatCompletion()
     }
 
     /**

diff --git a/...-gateway/openai-gateway-core/src/commonMain/kotlin/com/tddworks/openai/gateway/di/Koin.kt b/...-gateway/openai-gateway-core/src/commonMain/kotlin/com/tddworks/openai/gateway/di/Koin.kt
@@ -28,8 +28,8 @@ fun initOpenAIGateway(
         commonModule(false) +
                 anthropicModules(anthropicConfig) +
                 openAIModules(openAIConfig) +
-                openAIGatewayModules() +
-                ollamaModules(ollamaConfig)
+                ollamaModules(ollamaConfig) +
+                openAIGatewayModules()
     )
 }.koin.get<OpenAIGateway>()