Ollama support (#316)

* using toml for dependency * Adding buttons * Adding story * Creating the sketch of the connection * Adding loading support * modules for Ollama connection * Call working * Streaming ollama response * Loading available models * adding ai answer drawer * Moving files * Adding error support * Update OllamaApi.kt * ktlint * Adding model selection * Printing models --------- Co-authored-by: CI Bot <[email protected]>
leandroBorgesFerreira · Jan 28, 2025 · b796a21 · b796a21
1 parent 4d0429f
commit b796a21
Show file tree

Hide file tree

Showing 62 changed files with 936 additions and 219 deletions.
diff --git a/application/common_flows/wide_screen_common/build.gradle.kts b/application/common_flows/wide_screen_common/build.gradle.kts
@@ -43,6 +43,8 @@ kotlin {
                 implementation(project(":application:core:models"))
                 implementation(project(":application:core:folders"))
                 implementation(project(":application:core:common_ui"))
+                implementation(project(":application:core:ollama"))
+                implementation(project(":application:core:connection"))
                 implementation(project(":application:features:editor"))
                 implementation(project(":application:features:note_menu"))
                 implementation(project(":application:features:global_shell"))
@@ -51,6 +53,7 @@ kotlin {
 
                 implementation(libs.ktor.client.logging)
                 implementation(libs.ktor.client.core)
+                implementation(libs.ktor.serialization.json)
 
                 implementation(compose.runtime)
                 implementation(compose.foundation)

diff --git a/...ows/wide_screen_common/src/commonMain/kotlin/io/writeopia/notes/desktop/components/App.kt b/...ows/wide_screen_common/src/commonMain/kotlin/io/writeopia/notes/desktop/components/App.kt
@@ -29,6 +29,8 @@ import io.writeopia.account.ui.SettingsDialog
 import io.writeopia.auth.core.di.KmpAuthCoreInjection
 import io.writeopia.auth.core.token.MockTokenHandler
 import io.writeopia.common.utils.Destinations
+import io.writeopia.di.AppConnectionInjection
+import io.writeopia.di.OllamaInjection
 import io.writeopia.editor.di.EditorKmpInjector
 import io.writeopia.features.search.di.KmpSearchInjection
 import io.writeopia.features.search.ui.SearchDialog
@@ -88,6 +90,8 @@ fun DesktopApp(
                 disableWebsocket = disableWebsocket
             )
         }
+    val appConnectionInjection = remember { AppConnectionInjection() }
+    val ollamaInjection = remember { OllamaInjection(appConnectionInjection) }
     val editorInjector = remember {
         EditorKmpInjector.desktop(
             authCoreInjection = authCoreInjection,
@@ -96,7 +100,8 @@ fun DesktopApp(
             selectionState = selectionState,
             keyboardEventFlow = keyboardEventFlow,
             uiConfigurationInjector.provideUiConfigurationRepository(),
-            folderInjector = notesInjector
+            folderInjector = notesInjector,
+            ollamaInjection = ollamaInjection
         )
     }
     val accountInjector = remember { AccountMenuKmpInjector(authCoreInjection) }
@@ -116,7 +121,8 @@ fun DesktopApp(
             authCoreInjection,
             repositoryInjection,
             uiConfigurationInjector,
-            selectionState
+            selectionState,
+            ollamaInjection = ollamaInjection
         )
     }
 
@@ -226,9 +232,14 @@ fun DesktopApp(
                             SettingsDialog(
                                 workplacePathState = globalShellViewModel.workspaceLocalPath,
                                 selectedThemePosition = MutableStateFlow(2),
+                                ollamaUrlState = MutableStateFlow(""),
+                                ollamaAvailableModels = globalShellViewModel.getModels(),
+                                ollamaSelectedModel = MutableStateFlow(""),
                                 onDismissRequest = globalShellViewModel::hideSettings,
                                 selectColorTheme = selectColorTheme,
-                                selectWorkplacePath = globalShellViewModel::changeWorkspaceLocalPath
+                                selectWorkplacePath = globalShellViewModel::changeWorkspaceLocalPath,
+                                ollamaUrlChange = { },
+                                ollamaModelChange = { }
                             )
                         }
 

diff --git a/application/composeApp/build.gradle.kts b/application/composeApp/build.gradle.kts
@@ -99,7 +99,7 @@ kotlin {
 
                 implementation(libs.androidx.ktx)
                 implementation(libs.appCompat)
-                implementation("androidx.activity:activity-compose")
+                implementation(libs.activity.compose)
 
                 implementation(project(":application:core:resources"))
                 implementation(project(":application:features:auth"))

diff --git a/application/core/common_ui/src/commonMain/kotlin/io/writeopia/commonui/IconsPicker.kt b/application/core/common_ui/src/commonMain/kotlin/io/writeopia/commonui/IconsPicker.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import io.writeopia.common.utils.ColorUtils
+import io.writeopia.common.utils.colors.ColorUtils
 import io.writeopia.common.utils.icons.WrIcons
 
 @Composable

diff --git a/...cation/core/common_ui/src/commonMain/kotlin/io/writeopia/commonui/folders/DocumentList.kt b/...cation/core/common_ui/src/commonMain/kotlin/io/writeopia/commonui/folders/DocumentList.kt
@@ -33,7 +33,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import io.writeopia.common.utils.IconChange
+import io.writeopia.common.utils.icons.IconChange
 import io.writeopia.common.utils.icons.WrIcons
 import io.writeopia.commonui.IconsPicker
 import io.writeopia.commonui.dtos.MenuItemUi

diff --git a/application/core/connection/.gitignore b/application/core/connection/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/application/core/connection/build.gradle.kts b/application/core/connection/build.gradle.kts
@@ -0,0 +1,39 @@
+plugins {
+    kotlin("multiplatform")
+}
+
+kotlin {
+    jvm {}
+
+    js(IR) {
+        browser()
+        binaries.library()
+    }
+
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "WriteopiaCoreConnection"
+            isStatic = true
+        }
+    }
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.datetime)
+                implementation(libs.ktor.client.core)
+                implementation(libs.ktor.client.logging)
+
+                implementation(libs.ktor.client.logging)
+                implementation(libs.ktor.client.core)
+                implementation(libs.ktor.client.content.negotiation)
+                implementation(libs.ktor.serialization.json)
+            }
+        }
+    }
+}
diff --git a/application/core/connection/consumer-rules.pro b/application/core/connection/consumer-rules.pro
diff --git a/application/core/connection/proguard-rules.pro b/application/core/connection/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/application/core/connection/src/commonMain/kotlin/io/writeopia/di/AppConnectionInjection.kt b/application/core/connection/src/commonMain/kotlin/io/writeopia/di/AppConnectionInjection.kt
@@ -0,0 +1,48 @@
+package io.writeopia.di
+
+import io.ktor.client.HttpClient
+import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.logging.DEFAULT
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logger
+import io.ktor.client.plugins.logging.Logging
+import io.ktor.http.HttpHeaders
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.modules.SerializersModule
+
+class AppConnectionInjection(
+    private val json: Json = Json {
+        serializersModule = SerializersModule {
+            ignoreUnknownKeys = true
+        }
+    },
+    private val apiLogger: Logger = Logger.Companion.DEFAULT
+) {
+    fun provideJson() = json
+
+    fun provideHttpClient(): HttpClient = ApiInjectorDefaults.httpClient(json, apiLogger)
+}
+
+object ApiInjectorDefaults {
+    fun httpClient(
+        json: Json,
+        apiLogger: Logger,
+    ) = HttpClient {
+        install(HttpTimeout) {
+            requestTimeoutMillis = 30000
+            socketTimeoutMillis = 30000
+        }
+
+        install(ContentNegotiation) {
+            json(json = json)
+        }
+
+        install(Logging) {
+            logger = apiLogger
+            level = LogLevel.ALL
+            sanitizeHeader { header -> header == HttpHeaders.Authorization }
+        }
+    }
+}
diff --git a/application/core/ollama/.gitignore b/application/core/ollama/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/application/core/ollama/build.gradle.kts b/application/core/ollama/build.gradle.kts
@@ -0,0 +1,39 @@
+plugins {
+    kotlin("multiplatform")
+    alias(libs.plugins.kotlinSerialization)
+    alias(libs.plugins.ktlint)
+}
+
+kotlin {
+    jvm {}
+
+    js(IR) {
+        browser()
+        binaries.library()
+    }
+
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "WriteopiaCoreOllama"
+            isStatic = true
+        }
+    }
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.datetime)
+                implementation(libs.ktor.client.core)
+                implementation(project(":common:endpoints"))
+                implementation(project(":application:core:connection"))
+                implementation(project(":application:core:utils"))
+                implementation(libs.kotlinx.serialization.json)
+            }
+        }
+    }
+}
diff --git a/application/core/ollama/consumer-rules.pro b/application/core/ollama/consumer-rules.pro
diff --git a/application/core/ollama/proguard-rules.pro b/application/core/ollama/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/application/core/ollama/src/commonMain/kotlin/io/writeopia/OllamaRepository.kt b/application/core/ollama/src/commonMain/kotlin/io/writeopia/OllamaRepository.kt
@@ -0,0 +1,18 @@
+package io.writeopia
+
+import io.writeopia.api.OllamaApi
+import io.writeopia.common.utils.ResultData
+import io.writeopia.requests.ModelsResponse
+import kotlinx.coroutines.flow.Flow
+
+class OllamaRepository(private val ollamaApi: OllamaApi) {
+
+    suspend fun generateReply(model: String, prompt: String): String {
+        return ollamaApi.generateReply(model, prompt).response
+    }
+
+    fun streamReply(model: String, prompt: String): Flow<ResultData<String>> =
+        ollamaApi.streamReply(model, prompt)
+
+    fun getModels(): Flow<ResultData<ModelsResponse>> = ollamaApi.getModels()
+}
diff --git a/application/core/ollama/src/commonMain/kotlin/io/writeopia/api/OllamaApi.kt b/application/core/ollama/src/commonMain/kotlin/io/writeopia/api/OllamaApi.kt
@@ -0,0 +1,92 @@
+package io.writeopia.api
+
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import io.ktor.client.request.preparePost
+import io.ktor.client.request.setBody
+import io.ktor.client.request.url
+import io.ktor.http.ContentType
+import io.ktor.http.contentType
+import io.ktor.utils.io.ByteReadChannel
+import io.ktor.utils.io.readUTF8Line
+import io.writeopia.app.endpoints.EndPoints
+import io.writeopia.common.utils.ResultData
+import io.writeopia.requests.ModelsResponse
+import io.writeopia.requests.OllamaGenerateRequest
+import io.writeopia.responses.OllamaResponse
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.isActive
+import kotlinx.serialization.json.Json
+
+/**
+ * API for calling Ollama
+ */
+class OllamaApi(
+    private val client: HttpClient,
+    private val baseUrl: String = "http://localhost:11434/api",
+    private val json: Json
+) {
+
+    suspend fun generateReply(
+        model: String,
+        prompt: String,
+    ): OllamaResponse =
+        client.post("$baseUrl/${EndPoints.ollamaGenerate()}") {
+            contentType(ContentType.Application.Json)
+            setBody(OllamaGenerateRequest(model, prompt, false))
+        }.body<OllamaResponse>()
+
+    fun streamReply(
+        model: String,
+        prompt: String,
+    ): Flow<ResultData<String>> =
+        flow {
+            try {
+                client.preparePost {
+                    url("$baseUrl/${EndPoints.ollamaGenerate()}")
+                    contentType(ContentType.Application.Json)
+                    setBody(OllamaGenerateRequest(model, prompt, true))
+                }.execute { response ->
+                    try {
+                        val stringBuilder = StringBuilder()
+                        val channel = response.body<ByteReadChannel>()
+
+                        while (currentCoroutineContext().isActive && !channel.isClosedForRead) {
+                            val line =
+                                channel.readUTF8Line()?.takeUnless { it.isEmpty() } ?: continue
+
+                            val value: OllamaResponse = json.decodeFromString(line)
+
+                            stringBuilder.append(" ${value.response}")
+
+                            emit(ResultData.Complete(stringBuilder.toString()))
+                        }
+                    } catch (e: Exception) {
+                        emit(ResultData.Error(e))
+                    }
+                }
+            } catch (e: Exception) {
+                emit(ResultData.Error(e))
+            }
+        }
+
+    fun getModels(): Flow<ResultData<ModelsResponse>> {
+        return flow {
+            try {
+                emit(ResultData.Loading())
+
+                val request = client.get("$baseUrl/${EndPoints.ollamaModels()}") {
+                    contentType(ContentType.Application.Json)
+                }
+
+                emit(ResultData.Complete(request.body()))
+            } catch (e: Exception) {
+                emit(ResultData.Error(e))
+            }
+        }
+    }
+}