[examples] Fix demo app to work with newer version of Koog (#336)

Author: EugeneTheDev

examples/demo-android-app/README.md

@@ -5,8 +5,8 @@ This is a simple demo Android app built with Jetpack Compose that demonstrates t
 
 ## Setup
 1. Open the project in IntelliJ IDEA or Android Studio
-2. Configure your API keys in the app settings
-3. Build and run the application
+2. Build and run the application
+3. Configure your API keys in the app settings
 
 ## Usage Examples
 

examples/demo-android-app/app/src/main/java/com/jetbrains/example/kotlin_agents_demo_app/agents/calculator/CalculatorAgentProvider.kt

@@ -8,13 +8,15 @@ import ai.koog.agents.core.dsl.extension.*
 import ai.koog.agents.core.environment.ReceivedToolResult
 import ai.koog.agents.core.tools.Tool
 import ai.koog.agents.core.tools.ToolRegistry
-import ai.koog.agents.local.features.eventHandler.feature.handleEvents
+import ai.koog.agents.features.eventHandler.feature.handleEvents
 import ai.koog.prompt.dsl.prompt
 import ai.koog.prompt.executor.clients.openai.OpenAIModels
 import ai.koog.prompt.executor.llms.all.simpleOpenAIExecutor
 import com.jetbrains.example.kotlin_agents_demo_app.agents.common.AgentProvider
 import com.jetbrains.example.kotlin_agents_demo_app.agents.common.ExitTool
 import com.jetbrains.example.kotlin_agents_demo_app.settings.AppSettings
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Factory for creating calculator agents
@@ -122,11 +124,12 @@ object CalculatorAgentProvider : AgentProvider {
             toolRegistry = toolRegistry,
         ) {
             handleEvents {
-                onToolCall { tool: Tool<*, *>, toolArgs: ToolArgs ->
+                onToolCall { tool: Tool<*, *>, toolArgs: Tool.Args ->
                     onToolCallEvent("Tool ${tool.name}, args $toolArgs")
                 }
 
-                onAgentRunError { strategyName: String, throwable: Throwable ->
+                @OptIn(ExperimentalUuidApi::class)
+                onAgentRunError { strategyName: String, sessionUuid: Uuid?, throwable: Throwable ->
                     onErrorEvent("${throwable.message}")
                 }
 

examples/demo-android-app/app/src/main/java/com/jetbrains/example/kotlin_agents_demo_app/agents/calculator/CalculatorTools.kt

@@ -9,7 +9,7 @@ object CalculatorTools {
         description: String,
     ) : Tool<CalculatorTool.Args, CalculatorTool.Result>() {
         @Serializable
-        data class Args(val a: Float, val b: Float) : ToolArgs
+        data class Args(val a: Float, val b: Float) : Tool.Args
 
         @Serializable
         @JvmInline

examples/demo-android-app/app/src/main/java/com/jetbrains/example/kotlin_agents_demo_app/agents/common/ExitTool.kt

@@ -5,7 +5,7 @@ import kotlinx.serialization.Serializable
 
 object ExitTool : SimpleTool<ExitTool.Args>() {
     @Serializable
-    data class Args(val result: String = ""): ToolArgs
+    data class Args(val result: String = ""): Tool.Args
     override val argsSerializer = Args.serializer()
 
     override val descriptor = ToolDescriptor(

examples/demo-android-app/app/src/main/java/com/jetbrains/example/kotlin_agents_demo_app/agents/weather/WeatherAgentProvider.kt

@@ -8,13 +8,15 @@ import ai.koog.agents.core.dsl.extension.*
 import ai.koog.agents.core.environment.ReceivedToolResult
 import ai.koog.agents.core.tools.Tool
 import ai.koog.agents.core.tools.ToolRegistry
-import ai.koog.agents.local.features.eventHandler.feature.handleEvents
+import ai.koog.agents.features.eventHandler.feature.handleEvents
 import ai.koog.prompt.dsl.prompt
 import ai.koog.prompt.executor.clients.openai.OpenAIModels
 import ai.koog.prompt.executor.llms.all.simpleOpenAIExecutor
 import com.jetbrains.example.kotlin_agents_demo_app.agents.common.AgentProvider
 import com.jetbrains.example.kotlin_agents_demo_app.agents.common.ExitTool
 import com.jetbrains.example.kotlin_agents_demo_app.settings.AppSettings
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Factory for creating weather forecast agents
@@ -128,11 +130,12 @@ object WeatherAgentProvider : AgentProvider {
             toolRegistry = toolRegistry,
         ) {
             handleEvents {
-                onToolCall { tool: Tool<*, *>, toolArgs: ToolArgs ->
+                onToolCall { tool: Tool<*, *>, toolArgs: Tool.Args ->
                     onToolCallEvent("Tool ${tool.name}, args $toolArgs")
                 }
 
-                onAgentRunError { strategyName: String, throwable: Throwable ->
+                @OptIn(ExperimentalUuidApi::class)
+                onAgentRunError { strategyName: String, sessionUuid: Uuid?, throwable: Throwable ->
                     onErrorEvent("${throwable.message}")
                 }
 

examples/demo-android-app/app/src/main/java/com/jetbrains/example/kotlin_agents_demo_app/agents/weather/WeatherTools.kt

@@ -40,7 +40,7 @@ object WeatherTools {
         @Serializable
         data class Args(
             val timezone: String = "UTC"
-        ) : ToolArgs
+        ) : Tool.Args
 
         @Serializable
         data class Result(
@@ -96,7 +96,7 @@ object WeatherTools {
             val days: Int,
             val hours: Int,
             val minutes: Int
-        ) : ToolArgs
+        ) : Tool.Args
 
         @Serializable
         data class Result(