Merge pull request #155 from joreilly/adk_update

ADK Java 0.2.0 + add FunctionTool

Author: joreilly

agents/build.gradle.kts

@@ -7,11 +7,13 @@ dependencies {
     implementation(libs.koin.core)
     implementation("ai.koog:koog-agents:0.2.1")
     //implementation("org.slf4j:slf4j-simple:2.0.17")
-    implementation("com.google.adk:google-adk:0.1.0")
-    implementation("com.google.adk:google-adk-dev:0.1.0")
+    implementation("com.google.adk:google-adk:0.2.0")
+    implementation("com.google.adk:google-adk-dev:0.2.0")
+
+    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-rx3:1.10.2")
 
     // following needed for AdkWebServer (dev UI)
-    implementation("org.apache.httpcomponents.client5:httpclient5:5.4.3")
+    implementation("org.apache.httpcomponents.client5:httpclient5:5.5")
 
     implementation(projects.composeApp)
 }

agents/src/main/kotlin/adk/ClimateTraceTool.kt

@@ -0,0 +1,28 @@
+package adk
+
+import ai.koog.agents.core.tools.annotations.LLMDescription
+import dev.johnoreilly.climatetrace.data.ClimateTraceRepository
+import io.reactivex.rxjava3.core.Single
+import koin
+import kotlinx.coroutines.rx3.rxSingle
+
+class ClimateTraceTool {
+
+    companion object {
+        val climateTraceRepository = koin.get<ClimateTraceRepository>()
+
+        @JvmStatic
+        fun getCountries(): Single<Map<String, String>> {
+            return rxSingle {
+                mapOf("countries" to climateTraceRepository.fetchCountries().toString())
+            }
+        }
+
+        @JvmStatic
+        fun getEmissions(countryCode: String, year: String): Single<Map<String, String>> {
+            return rxSingle {
+                mapOf("emissions" to climateTraceRepository.fetchCountryEmissionsInfo(countryCode, year).toString())
+            }
+        }
+    }
+}

agents/src/main/kotlin/adk/adk_agent.kt

@@ -6,6 +6,7 @@ import com.google.adk.agents.LlmAgent
 import com.google.adk.events.Event
 import com.google.adk.models.Gemini
 import com.google.adk.runner.InMemoryRunner
+import com.google.adk.tools.LongRunningFunctionTool
 import com.google.adk.tools.mcp.McpToolset
 import com.google.genai.Client
 import com.google.genai.types.Content
@@ -25,12 +26,16 @@ class ClimateTraceAgent {
         fun initAgent(): BaseAgent {
             val apiKeyGoogle = ""
 
-            val mcpTools = McpToolset(
-                ServerParameters
-                    .builder("java")
-                    .args("-jar", "/Users/joreilly/dev/github/ClimateTraceKMP/mcp-server/build/libs/serverAll.jar", "--stdio")
-                    .build()
-            ).loadTools().join()
+//            val mcpTools = McpToolset(
+//                ServerParameters
+//                    .builder("java")
+//                    .args("-jar", "/Users/joreilly/dev/github/ClimateTraceKMP/mcp-server/build/libs/serverAll.jar", "--stdio")
+//                    .build()
+//            ).loadTools().join()
+
+            val getCountriesTool = LongRunningFunctionTool.create(ClimateTraceTool::class.java, "getCountries")
+            val getEmissionsTool = LongRunningFunctionTool.create(ClimateTraceTool::class.java, "getEmissions")
+            val mcpTools = listOf(getCountriesTool, getEmissionsTool)
 
             val model = Gemini(
                 "gemini-1.5-pro",
@@ -47,7 +52,6 @@ class ClimateTraceAgent {
                 .tools(mcpTools)
                 .build()
         }
-
     }
 }