feat(examples): unify DataStore settings implementation across platforms

Author: siarhei-luskanau

examples/demo-compose-app/androidApp/build.gradle.kts

@@ -14,7 +14,7 @@ android {
 
     defaultConfig {
         applicationId = "com.jetbrains.example.koog.compose"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 36
         versionCode = 1
         versionName = "1.0"

examples/demo-compose-app/commonApp/build.gradle.kts

@@ -28,6 +28,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
+            implementation(libs.androidx.datastore.core.okio)
             implementation(libs.jetbrains.compose.animation)
             implementation(libs.jetbrains.compose.animation.graphics)
             implementation(libs.jetbrains.compose.components.resources)
@@ -57,21 +58,18 @@ kotlin {
         }
 
         androidMain.dependencies {
-            implementation(libs.androidx.datastore.preferences)
             implementation(libs.jetbrains.compose.ui.tooling)
             implementation(libs.kotlinx.coroutines.android)
             implementation(libs.ktor.client.okhttp)
         }
 
         jvmMain.dependencies {
             implementation(compose.desktop.currentOs)
-            implementation(libs.androidx.datastore.preferences)
             implementation(libs.kotlinx.coroutines.swing)
             implementation(libs.ktor.client.apache5)
         }
 
         iosMain.dependencies {
-            implementation(libs.androidx.datastore.preferences)
             implementation(libs.ktor.client.darwin)
         }
 

examples/demo-compose-app/commonApp/src/androidMain/kotlin/com/jetbrains/example/koog/compose/KoinAndroid.kt

@@ -1,23 +1,28 @@
 package com.jetbrains.example.koog.compose
 
 import android.content.Context
+import androidx.datastore.core.Storage
+import androidx.datastore.core.okio.OkioStorage
 import com.jetbrains.example.koog.compose.settings.AppSettings
+import com.jetbrains.example.koog.compose.settings.AppSettingsData
+import com.jetbrains.example.koog.compose.settings.AppSettingsSerializer
 import com.jetbrains.example.koog.compose.settings.DataStoreAppSettings
-import com.jetbrains.example.koog.compose.settings.PrefPathProvider
-import okio.Path
+import com.jetbrains.example.koog.compose.settings.StorageProvider
+import okio.FileSystem
 import okio.Path.Companion.toPath
 import org.koin.core.module.Module
 import org.koin.dsl.module
 
 actual val appPlatformModule: Module = module {
-    single<PrefPathProvider> {
+    single<StorageProvider> {
         val context: Context = get()
-        object : PrefPathProvider {
-            override fun get(): Path {
-                val file = context.filesDir.resolve("settings.preferences_pb")
-                return file.absolutePath.toPath()
-            }
+        object : StorageProvider {
+            override fun getStorage(): Storage<AppSettingsData> = OkioStorage(
+                fileSystem = FileSystem.SYSTEM,
+                serializer = AppSettingsSerializer,
+                producePath = { context.filesDir.resolve("app_settings.json").absolutePath.toPath() }
+            )
         }
     }
-    single<AppSettings> { DataStoreAppSettings(prefPathProvider = get()) }
+    single<AppSettings> { DataStoreAppSettings(storageProvider = get()) }
 }

examples/demo-compose-app/commonApp/src/androidMain/kotlin/com/jetbrains/example/koog/compose/settings/DataStoreAppSettings.kt

@@ -2,7 +2,7 @@ package com.jetbrains.example.koog.compose.agents.calculator
 
 import ai.koog.agents.core.agent.AIAgent
 import ai.koog.agents.core.agent.config.AIAgentConfig
-import ai.koog.agents.core.dsl.builder.forwardTo
+import ai.koog.agents.core.dsl.builder.node
 import ai.koog.agents.core.dsl.builder.strategy
 import ai.koog.agents.core.dsl.extension.nodeExecuteMultipleTools
 import ai.koog.agents.core.dsl.extension.nodeLLMCompressHistory
@@ -15,7 +15,7 @@ import ai.koog.agents.core.tools.ToolRegistry
 import ai.koog.agents.features.eventHandler.feature.handleEvents
 import ai.koog.prompt.dsl.prompt
 import ai.koog.prompt.executor.clients.LLMClient
-import ai.koog.prompt.executor.llms.SingleLLMPromptExecutor
+import ai.koog.prompt.executor.llms.MultiLLMPromptExecutor
 import ai.koog.prompt.llm.LLModel
 import com.jetbrains.example.koog.compose.agents.common.AgentProvider
 import com.jetbrains.example.koog.compose.agents.common.ExitTool
@@ -33,7 +33,7 @@ internal class CalculatorAgentProvider(private val provideLLMClient: suspend ()
         onAssistantMessage: suspend (String) -> String,
     ): AIAgent<String, String> {
         val (llmClient, model) = provideLLMClient.invoke()
-        val executor = SingleLLMPromptExecutor(llmClient = llmClient)
+        val executor = MultiLLMPromptExecutor(llmClient)
 
         // Create tool registry with calculator tools
         val toolRegistry = ToolRegistry {

examples/demo-compose-app/commonApp/src/androidMain/kotlin/com/jetbrains/example/koog/compose/settings/PrefPathProvider.kt

@@ -2,14 +2,15 @@ package com.jetbrains.example.koog.compose.agents.calculator
 
 import ai.koog.agents.core.tools.Tool
 import ai.koog.agents.core.tools.annotations.LLMDescription
+import ai.koog.serialization.typeToken
 import kotlinx.serialization.Serializable
 
 sealed class CalculatorTool(
     name: String,
     description: String,
 ) : Tool<CalculatorTool.Args, CalculatorTool.Result>(
-    argsSerializer = Args.serializer(),
-    resultSerializer = Result.serializer(),
+    argsType = typeToken<Args>(),
+    resultType = typeToken<Result>(),
     name = name,
     description = description
 ) {

examples/demo-compose-app/commonApp/src/commonMain/kotlin/com/jetbrains/example/koog/compose/agents/calculator/CalculatorAgentProvider.kt

@@ -2,10 +2,11 @@ package com.jetbrains.example.koog.compose.agents.common
 
 import ai.koog.agents.core.tools.SimpleTool
 import ai.koog.agents.core.tools.annotations.LLMDescription
+import ai.koog.serialization.typeToken
 import kotlinx.serialization.Serializable
 
 object ExitTool : SimpleTool<ExitTool.Args>(
-    argsSerializer = Args.serializer(),
+    argsType = typeToken<Args>(),
     name = "exit",
     description = "Exit the agent session with the specified result. Call this tool to finish the conversation with the user."
 ) {

examples/demo-compose-app/commonApp/src/commonMain/kotlin/com/jetbrains/example/koog/compose/agents/calculator/CalculatorTools.kt

@@ -2,7 +2,7 @@ package com.jetbrains.example.koog.compose.agents.weather
 
 import ai.koog.agents.core.agent.AIAgent
 import ai.koog.agents.core.agent.config.AIAgentConfig
-import ai.koog.agents.core.dsl.builder.forwardTo
+import ai.koog.agents.core.dsl.builder.node
 import ai.koog.agents.core.dsl.builder.strategy
 import ai.koog.agents.core.dsl.extension.nodeExecuteMultipleTools
 import ai.koog.agents.core.dsl.extension.nodeLLMCompressHistory
@@ -15,7 +15,7 @@ import ai.koog.agents.core.tools.ToolRegistry
 import ai.koog.agents.features.eventHandler.feature.handleEvents
 import ai.koog.prompt.dsl.prompt
 import ai.koog.prompt.executor.clients.LLMClient
-import ai.koog.prompt.executor.llms.SingleLLMPromptExecutor
+import ai.koog.prompt.executor.llms.MultiLLMPromptExecutor
 import ai.koog.prompt.llm.LLModel
 import com.jetbrains.example.koog.compose.agents.common.AgentProvider
 import com.jetbrains.example.koog.compose.agents.common.ExitTool
@@ -35,7 +35,7 @@ internal class WeatherAgentProvider(private val provideLLMClient: suspend () ->
         onAssistantMessage: suspend (String) -> String,
     ): AIAgent<String, String> {
         val (llmClient, model) = provideLLMClient.invoke()
-        val executor = SingleLLMPromptExecutor(llmClient)
+        val executor = MultiLLMPromptExecutor(llmClient)
 
         // Create tool registry with weather tools
         val toolRegistry = ToolRegistry {
@@ -139,7 +139,7 @@ internal class WeatherAgentProvider(private val provideLLMClient: suspend () ->
                     onErrorEvent("${ctx.throwable.message}")
                 }
 
-                onAgentCompleted { ctx ->
+                onAgentCompleted { _ ->
                     // Skip finish event handling
                 }
             }

examples/demo-compose-app/commonApp/src/commonMain/kotlin/com/jetbrains/example/koog/compose/agents/common/ExitTool.kt

@@ -2,6 +2,8 @@ package com.jetbrains.example.koog.compose.agents.weather
 
 import ai.koog.agents.core.tools.Tool
 import ai.koog.agents.core.tools.annotations.LLMDescription
+import ai.koog.serialization.JSONSerializer
+import ai.koog.serialization.typeToken
 import kotlinx.datetime.DateTimePeriod
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
@@ -44,8 +46,8 @@ sealed interface WeatherTools {
         val defaultTimeZone: TimeZone = UTC_ZONE,
         val clock: Clock = CLOCK,
     ) : Tool<CurrentDatetimeTool.Args, CurrentDatetimeTool.Result>(
-        argsSerializer = Args.serializer(),
-        resultSerializer = Result.serializer(),
+        argsType = typeToken<Args>(),
+        resultType = typeToken<Result>(),
         name = "current_datetime",
         description = "Get the current date and time in the specified timezone"
     ) {
@@ -87,7 +89,7 @@ sealed interface WeatherTools {
             )
         }
 
-        override fun encodeResultToString(result: Result): String {
+        override fun encodeResultToString(result: Result, serializer: JSONSerializer): String {
             return "Current datetime: ${result.datetime}, Date: ${result.date}, Time: ${result.time}, Timezone: ${result.timezone}"
         }
     }
@@ -99,8 +101,8 @@ sealed interface WeatherTools {
         val defaultTimeZone: TimeZone = UTC_ZONE,
         val clock: Clock = CLOCK,
     ) : Tool<AddDatetimeTool.Args, AddDatetimeTool.Result>(
-        argsSerializer = Args.serializer(),
-        resultSerializer = Result.serializer(),
+        argsType = typeToken<Args>(),
+        resultType = typeToken<Result>(),
         name = "add_datetime",
         description = "Add a duration to a date. Use this tool when you need to calculate offsets, such as tomorrow, in two days, etc."
     ) {
@@ -159,7 +161,7 @@ sealed interface WeatherTools {
             )
         }
 
-        override fun encodeResultToString(result: Result): String {
+        override fun encodeResultToString(result: Result, serializer: JSONSerializer): String {
             return buildString {
                 append("Date: ${result.date}")
                 if (result.originalDate.isBlank()) {
@@ -196,8 +198,8 @@ sealed interface WeatherTools {
         private val openMeteoClient: OpenMeteoClient = OpenMeteoClient(),
         val defaultTimeZone: TimeZone = UTC_ZONE
     ) : Tool<WeatherForecastTool.Args, WeatherForecastTool.Result>(
-        argsSerializer = Args.serializer(),
-        resultSerializer = Result.serializer(),
+        argsType = typeToken<Args>(),
+        resultType = typeToken<Result>(),
         name = "weather_forecast",
         description = "Get a weather forecast for a location with specified granularity (daily or hourly)"
     ) {
@@ -350,7 +352,7 @@ sealed interface WeatherTools {
             }
         }
 
-        override fun encodeResultToString(result: Result): String {
+        override fun encodeResultToString(result: Result, serializer: JSONSerializer): String {
             val granularityText = when (result.granularity) {
                 Granularity.DAILY -> "daily"
                 Granularity.HOURLY -> "hourly"