Merge pull request #173 from joreilly/junie

koog agent updates

Author: joreilly

.github/workflows/ios.yml

@@ -18,6 +18,11 @@ jobs:
           distribution: 'zulu'
           java-version: 21
 
+      - name: Set Xcode Version 16.4
+        shell: bash
+        run: |
+          xcodes select 16.4
+
       - name: Build iOS app
         run: xcodebuild -allowProvisioningUpdates -allowProvisioningUpdates -workspace iosApp/iosApp.xcodeproj/project.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 16'
 

.junie/guidelines.md

@@ -0,0 +1,12 @@
+# Project Guidelines
+
+## Project Structure
+This is a Kotlin Multiplatform project with Compose Multiplatform that includes:
+* `composeApp` - Shared Kotlin code with Compose UI
+* `iosApp` - iOS application
+
+## Building the Project
+When building this project, Junie should use the following Gradle task:
+```
+:composeApp:compileKotlinJvm
+```

agents/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 dependencies {
     implementation(libs.mcp.kotlin)
     implementation(libs.koin.core)
-    implementation("ai.koog:koog-agents:0.2.1")
+    implementation("ai.koog:koog-agents:0.3.0")
     //implementation("org.slf4j:slf4j-simple:2.0.17")
     implementation("com.google.adk:google-adk:0.2.0")
     implementation("com.google.adk:google-adk-dev:0.2.0")

agents/src/main/kotlin/koog/koog_agent.kt

@@ -1,56 +1,76 @@
 package koog
 
 import ai.koog.agents.core.agent.AIAgent
-import ai.koog.agents.core.tools.Tool
 import ai.koog.agents.core.tools.ToolRegistry
 import ai.koog.agents.core.tools.reflect.asTools
 import ai.koog.agents.features.eventHandler.feature.handleEvents
 import ai.koog.agents.mcp.McpToolRegistryProvider
 import ai.koog.prompt.executor.clients.google.GoogleModels
 import ai.koog.prompt.executor.clients.openai.OpenAIModels
 import ai.koog.prompt.executor.llms.all.simpleGoogleAIExecutor
+import ai.koog.prompt.executor.llms.all.simpleOllamaAIExecutor
 import ai.koog.prompt.executor.llms.all.simpleOpenAIExecutor
+import ai.koog.prompt.llm.LLMCapability
+import ai.koog.prompt.llm.LLMProvider
+import ai.koog.prompt.llm.LLModel
 import kotlinx.coroutines.runBlocking
-import kotlin.uuid.ExperimentalUuidApi
-import kotlin.uuid.Uuid
 
 val openAIApiKey = ""
 val apiKeyGoogle = ""
 
 
-@OptIn(ExperimentalUuidApi::class)
+
 fun main() = runBlocking {
+
+    val model = LLModel(
+        provider = LLMProvider.Ollama,
+        id = "gpt-oss",
+        //id = "llama3.1:8b",
+        capabilities = listOf(
+            LLMCapability.Temperature,
+            LLMCapability.Schema.JSON.Simple,
+            LLMCapability.Tools
+        ),
+    )
+
+
     val agent = AIAgent(
         //executor = simpleOpenAIExecutor(openAIApiKey),
-        executor = simpleGoogleAIExecutor(apiKeyGoogle),
+        //executor = simpleGoogleAIExecutor(apiKeyGoogle),
+        executor = simpleOllamaAIExecutor(),
         //llmModel = OpenAIModels.Chat.GPT4o,
-        llmModel = GoogleModels.Gemini1_5Pro,
+        //llmModel = GoogleModels.Gemini1_5Pro,
+        llmModel = model,
         toolRegistry = createToolSetRegistry()
     ) {
         handleEvents {
-            onToolCall { tool: Tool<*, *>, toolArgs: Tool.Args ->
-                println("Tool called: tool ${tool.name}, args $toolArgs")
+            onToolCall { eventContext ->
+                println("Tool called: ${eventContext.tool} with args ${eventContext.toolArgs}")
             }
-
-            onAgentRunError { strategyName: String, sessionUuid: Uuid?, throwable: Throwable ->
-                println("An error occurred: ${throwable.message}\n${throwable.stackTraceToString()}")
+            onAgentRunError { eventContext ->
+                println("An error occurred: ${eventContext.throwable.message}\n${eventContext.throwable.stackTraceToString()}")
             }
-
-            onAgentFinished { strategyName, result ->
-                println("Agent (strategy = $strategyName) finished with result: $result")
+            onAgentFinished { eventContext ->
+                println("Agent finished with result: ${eventContext.result}")
             }
         }
     }
 
-    agent.run(
+
+    val output = agent.run(
         """
         Get emission data for France and Germany for 2023 and 2024.
-        Use units of millions for the emissions data.
+        Also break down by sector.
+        Use 3 letter country codes.
+        Use units of millions for the emissions data.        
         """.trimIndent()
     )
+
+    println(output)
 }
 
 
+
 suspend fun createToolSetRegistry(): ToolRegistry {
     val processClimateTrace = ProcessBuilder("java", "-jar",
         "./mcp-server/build/libs/serverAll.jar", "--stdio"
@@ -61,6 +81,6 @@ suspend fun createToolSetRegistry(): ToolRegistry {
     val localToolSetRegistry = ToolRegistry { tools(ClimateTraceTool().asTools()) }
 
     // Can use either local toolset or one based on MCP server
-    //return toolRegistryClimateTrace
-    return localToolSetRegistry
+    return toolRegistryClimateTrace
+    //return localToolSetRegistry
 }

mcp-server/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 dependencies {
     implementation(libs.mcp.kotlin)
     implementation(libs.koin.core)
-    implementation("ch.qos.logback:logback-classic:1.5.8")
+    //implementation("ch.qos.logback:logback-classic:1.5.8")
     implementation(projects.composeApp)
 }