Merge pull request #205 from joreilly/koog_updates

joreilly · web-flow · commit dab1855ac507 · 2025-10-02T20:26:28.000+01:00
Koog 0.5.0 + related updates
diff --git a/composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.android.kt b/composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.android.kt
@@ -0,0 +1,12 @@
+package dev.johnoreilly.climatetrace.agent
+
+import ai.koog.prompt.executor.clients.google.GoogleModels
+import ai.koog.prompt.executor.llms.all.simpleGoogleAIExecutor
+import ai.koog.prompt.executor.model.PromptExecutor
+import ai.koog.prompt.llm.LLModel
+
+actual fun getLLModel() = GoogleModels.Gemini2_5Flash
+
+actual fun getPromptExecutor(apiKey: String): PromptExecutor {
+    return simpleGoogleAIExecutor(apiKey)
+}
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.kt
@@ -3,24 +3,21 @@ package dev.johnoreilly.climatetrace.agent
 import ai.koog.agents.core.agent.AIAgent
 import ai.koog.agents.core.tools.ToolRegistry
 import ai.koog.agents.features.eventHandler.feature.handleEvents
-import ai.koog.prompt.executor.clients.google.GoogleModels
-import ai.koog.prompt.executor.llms.all.simpleGoogleAIExecutor
+import ai.koog.prompt.executor.model.PromptExecutor
+import ai.koog.prompt.llm.LLModel
 import dev.johnoreilly.climatetrace.data.ClimateTraceRepository
 
 
 
+expect fun getLLModel(): LLModel
+expect fun getPromptExecutor(apiKey: String = ""): PromptExecutor
+
 class ClimateTraceAgent(private val climateTraceRepository: ClimateTraceRepository) {
     private val apiKeyGoogle = ""
-    private var agent: AIAgent<String, String>? = null
-
-    suspend fun createAgent() {
-        //val executor = simpleOpenAIExecutor(openAiApiKey)
-        val executor = simpleGoogleAIExecutor(apiKeyGoogle)
 
-        agent = AIAgent(
-            promptExecutor = executor,
-            llmModel = GoogleModels.Gemini2_5Flash,
-            //llmModel = OpenAIModels.Chat.GPT4o,
+    suspend fun createAgent() = AIAgent(
+            promptExecutor = getPromptExecutor(apiKeyGoogle),
+            llmModel = getLLModel(),
             toolRegistry = createToolSetRegistry(climateTraceRepository),
             systemPrompt  =
                 """                
@@ -46,7 +43,7 @@ class ClimateTraceAgent(private val climateTraceRepository: ClimateTraceReposito
                     ctx.responses.forEach { println("   $it") }
                 }
 
-                onToolExecutionStarting { eventContext ->
+                onToolCallStarting { eventContext ->
                     println("Tool called: ${eventContext.tool} with args ${eventContext.toolArgs}")
                 }
                 onAgentExecutionFailed { eventContext ->
@@ -62,18 +59,15 @@ class ClimateTraceAgent(private val climateTraceRepository: ClimateTraceReposito
                 }
             }
         }
-    }
 
 
-    suspend fun runAgent(prompt: String): String {
-        agent?.let { agent ->
-            println("Running agent")
-            val output = agent.run(prompt)
-            println("Result = $output")
-            return output
-        }
 
-        return ""
+    suspend fun runAgent(prompt: String): String {
+        val agent = createAgent()
+        println("Running agent")
+        val output = agent.run(prompt)
+        println("Result = $output")
+        return output
     }
 
     private suspend fun createToolSetRegistry(climateTraceRepository: ClimateTraceRepository): ToolRegistry {
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceTool.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceTool.kt
@@ -1,35 +1,27 @@
 package dev.johnoreilly.climatetrace.agent
 
 import ai.koog.agents.core.tools.SimpleTool
-import ai.koog.agents.core.tools.ToolArgs
 import ai.koog.agents.core.tools.ToolDescriptor
 import ai.koog.agents.core.tools.ToolParameterDescriptor
 import ai.koog.agents.core.tools.ToolParameterType
+import ai.koog.agents.core.tools.annotations.LLMDescription
 import dev.johnoreilly.climatetrace.data.ClimateTraceRepository
 import dev.johnoreilly.climatetrace.remote.Country
 import kotlinx.serialization.Serializable
 
 
 class GetCountryTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetCountryTool.Args>() {
     @Serializable
-    data class Args(val countryName: String) : ToolArgs
+    data class Args(
+        @property:LLMDescription("Country name")
+        val countryName: String
+    )
 
     override val argsSerializer = Args.serializer()
     override val description = "Look up country code using country name"
 
-
     private var countryList: List<Country>? = null
 
-    override val descriptor = ToolDescriptor(
-        name = "GetCountryTool",
-        description = "Look up country code using country name",
-        requiredParameters = listOf(
-            ToolParameterDescriptor(
-                name = "country", description = "country name", type = ToolParameterType.String
-            )
-        ),
-    )
-
     override suspend fun doExecute(args: Args): String {
         try {
             if (countryList == null) {
@@ -46,24 +38,16 @@ class GetCountryTool(val climateTraceRepository: ClimateTraceRepository) : Simpl
 
 class GetEmissionsTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetEmissionsTool.Args>() {
     @Serializable
-    data class Args(val countryCodeList: List<String>, val year: String) : ToolArgs
+    data class Args(
+        @property:LLMDescription("ISO country code list (e.g., 'USA', 'GBR', 'FRA')")
+        val countryCodeList: List<String>,
+        @property:LLMDescription("Year for which emissions occurred")
+        val year: String
+    )
 
     override val argsSerializer = Args.serializer()
     override val description = "Get the emission data for a country for a particular year."
 
-    override val descriptor = ToolDescriptor(
-        name = "GetEmissionsTool",
-        description = "Get the emission data for a country for a particular year.",
-        requiredParameters = listOf(
-            ToolParameterDescriptor(
-                name = "countryCodeList", description = "country code list", type = ToolParameterType.List(ToolParameterType.String)
-            ),
-            ToolParameterDescriptor(
-                name = "year", description = "year", type = ToolParameterType.String
-            )
-        ),
-    )
-
     override suspend fun doExecute(args: Args): String {
         try {
             return climateTraceRepository.fetchCountryEmissionsInfo(args.countryCodeList, args.year).joinToString {
@@ -79,7 +63,7 @@ class GetEmissionsTool(val climateTraceRepository: ClimateTraceRepository) : Sim
 
 class GetPopulationTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetPopulationTool.Args>() {
     @Serializable
-    data class Args(val countryCode: String) : ToolArgs
+    data class Args(val countryCode: String)
 
     override val argsSerializer = Args.serializer()
     override val description = "Get population data for a country by its country code"
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/ui/AgentsScreen.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/ui/AgentsScreen.kt
@@ -4,13 +4,11 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/viewmodel/AgentViewModel.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/viewmodel/AgentViewModel.kt
@@ -10,7 +10,6 @@ import app.cash.molecule.RecompositionMode
 import app.cash.molecule.launchMolecule
 import com.rickclephas.kmp.observableviewmodel.ViewModel
 import com.rickclephas.kmp.observableviewmodel.coroutineScope
-import com.rickclephas.kmp.observableviewmodel.launch
 import dev.johnoreilly.climatetrace.agent.ClimateTraceAgent
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -19,20 +18,9 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
 
-sealed class Message {
-    data class UserMessage(val text: String) : Message()
-    data class AgentMessage(val text: String) : Message()
-    data class SystemMessage(val text: String) : Message()
-    data class ErrorMessage(val text: String) : Message()
-    data class ToolCallMessage(val text: String) : Message()
-    data class ResultMessage(val text: String) : Message()
-}
-
-
 data class AgentUIState(
     val prompt: String = "",
     val result: String = "",
-    val messages: List<Message> = emptyList(),
     val isInputEnabled: Boolean = true,
     val isLoading: Boolean = false,
 
@@ -55,11 +43,6 @@ open class AgentViewModel : ViewModel(), KoinComponent {
         agentPresenter(events)
     }
 
-    init {
-        viewModelScope.launch {
-            climateTraceAgent.createAgent()
-        }
-    }
 
     fun updatePrompt(prompt: String) = events.tryEmit(AgentEvents.SetPrompt(prompt))
     fun runAgent() = events.tryEmit(AgentEvents.RunAgent)
diff --git a/composeApp/src/iosMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.ios.kt b/composeApp/src/iosMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.ios.kt
@@ -0,0 +1,12 @@
+package dev.johnoreilly.climatetrace.agent
+
+import ai.koog.prompt.executor.clients.google.GoogleModels
+import ai.koog.prompt.executor.llms.all.simpleGoogleAIExecutor
+import ai.koog.prompt.executor.model.PromptExecutor
+import ai.koog.prompt.llm.LLModel
+
+actual fun getLLModel() = GoogleModels.Gemini2_5Flash
+
+actual fun getPromptExecutor(apiKey: String): PromptExecutor {
+    return simpleGoogleAIExecutor(apiKey)
+}
diff --git a/composeApp/src/jvmMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.jvm.kt b/composeApp/src/jvmMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.jvm.kt
@@ -0,0 +1,24 @@
+package dev.johnoreilly.climatetrace.agent
+
+import ai.koog.prompt.executor.llms.all.simpleOllamaAIExecutor
+import ai.koog.prompt.executor.model.PromptExecutor
+import ai.koog.prompt.llm.LLMCapability
+import ai.koog.prompt.llm.LLMProvider
+import ai.koog.prompt.llm.LLModel
+
+actual fun getLLModel(): LLModel {
+    return LLModel(
+        provider = LLMProvider.Ollama,
+        id = "gpt-oss:20b",
+        capabilities = listOf(
+            LLMCapability.Temperature,
+            LLMCapability.Schema.JSON.Standard,
+            LLMCapability.Tools
+        ),
+        contextLength = 128_000,
+    )
+}
+
+actual fun getPromptExecutor(apiKey: String): PromptExecutor {
+    return simpleOllamaAIExecutor()
+}
diff --git a/composeApp/src/wasmJsMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.wasmJs.kt b/composeApp/src/wasmJsMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgent.wasmJs.kt
@@ -0,0 +1,11 @@
+package dev.johnoreilly.climatetrace.agent
+
+import ai.koog.prompt.executor.clients.google.GoogleModels
+import ai.koog.prompt.executor.llms.all.simpleGoogleAIExecutor
+import ai.koog.prompt.executor.model.PromptExecutor
+
+actual fun getLLModel() = GoogleModels.Gemini2_5Flash
+
+actual fun getPromptExecutor(apiKey: String): PromptExecutor {
+    return simpleGoogleAIExecutor(apiKey)
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -27,8 +27,8 @@ mcp = "0.7.2"
 shadowPlugin = "9.2.2"
 jib = "3.4.5"
 googleAdk = "0.3.0"
-koogAgents = "0.4.3-develop-20250927-0204"
-#koogAgents = "0.4.2"
+#koogAgents = "0.4.3-develop-20250927-0204"
+koogAgents = "0.5.0"
 markdownRenderer = "0.37.0"
 buildkonfig = "0.17.1"
 
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/iosApp.xcscheme b/iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/iosApp.xcscheme
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   version = "1.3">
-   <BuildAction>
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForRunning = "YES">
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "7555FF7A242A565900829871"
@@ -15,11 +21,25 @@
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
    <LaunchAction
-      useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "7555FF7A242A565900829871"
@@ -29,4 +49,18 @@
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
 </Scheme>
diff --git a/iosApp/iosApp/ContentView.swift b/iosApp/iosApp/ContentView.swift
@@ -17,7 +17,7 @@ struct ContentView: View {
                 }
             AgentsView()
                 .tabItem {
-                    Label("Agents", systemImage: "tree")
+                    Label("Agent", systemImage: "tree")
                 }
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,22 +9,12 @@ pluginManagement {
         }
         mavenCentral()
         gradlePluginPortal()
-        maven(url = "https://packages.jetbrains.team/maven/p/grazi/grazie-platform-public") {
-            mavenContent {
-                includeGroupAndSubgroups("ai.koog")
-            }
-        }
     }
 }
 dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven(url = "https://packages.jetbrains.team/maven/p/grazi/grazie-platform-public") {
-            mavenContent {
-                includeGroupAndSubgroups("ai.koog")
-            }
-        }
     }
 }
 
