Merge pull request #149 from joreilly/query_update

update query to support list of countries

Author: joreilly

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

@@ -61,8 +61,9 @@ fun main() {
 
     val prompt =
         """
-            Get emission data for France and Germany for 2023 and 2024.
+            Get emission data for EU countries in 2024.
             Use units of millions for the emissions data.
+            Show result in a grid or decreasing order of emissions.
             """.trimIndent()
 
     val userMsg = Content.fromParts(Part.fromText(prompt))

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

@@ -10,16 +10,16 @@ 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.simpleOpenAIExecutor
+import kotlinx.coroutines.runBlocking
 import kotlin.uuid.ExperimentalUuidApi
 import kotlin.uuid.Uuid
 
 val openAIApiKey = ""
 val apiKeyGoogle = ""
 
 
-
 @OptIn(ExperimentalUuidApi::class)
-suspend fun main() {
+fun main() = runBlocking {
     val agent = AIAgent(
         //executor = simpleOpenAIExecutor(openAIApiKey),
         executor = simpleGoogleAIExecutor(apiKeyGoogle),

composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/data/ClimateTraceRepository.kt

@@ -15,6 +15,7 @@ class ClimateTraceRepository(
         return countries
     }
 
-    suspend fun fetchCountryEmissionsInfo(countryCode: String, year: String) = api.fetchCountryEmissionsInfo(countryCode, year)
+    suspend fun fetchCountryEmissionsInfo(countryCodeList: List<String>, year: String) = api.fetchCountryEmissionsInfo(countryCodeList, year)
+    suspend fun fetchCountryEmissionsInfo(countryCode: String, year: String) = api.fetchCountryEmissionsInfo(listOf(countryCode), year)
     suspend fun fetchCountryAssetEmissionsInfo(countryCode: String) = api.fetchCountryAssetEmissionsInfo(countryCode)
 }

composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/remote/ClimateTraceApi.kt

@@ -74,7 +74,18 @@ class ClimateTraceApi(
     suspend fun fetchAssets() = client.get("$baseUrl/assets").body<AssetsResult>()
 
     suspend fun fetchCountryAssets(countryCode: String) = client.get("$baseUrl/assets?countries=$countryCode").body<AssetsResult>()
-    suspend fun fetchCountryEmissionsInfo(countryCode: String, year: String) = client.get("$baseUrl/country/emissions?since=$year&to=$year&countries=$countryCode").body<List<CountryEmissionsInfo>>()
+    //suspend fun fetchCountryEmissionsInfo(countryCode: String, year: String) = client.get("$baseUrl/country/emissions?since=$year&to=$year&countries=$countryCode").body<List<CountryEmissionsInfo>>()
+
+    suspend fun fetchCountryEmissionsInfo(countryCodeList: List<String>, year: String): List<CountryEmissionsInfo> {
+        return client.get("$baseUrl/country/emissions") {
+            url {
+                parameters.append("countries", countryCodeList.joinToString(","))
+                parameters.append("since", year)
+                parameters.append("to", year)
+            }
+        }.body<List<CountryEmissionsInfo>>()
+    }
+
 
     suspend fun fetchCountryAssetEmissionsInfo(countryCode: String) = client.get("$baseUrl/assets/emissions?countries=$countryCode").body<Map<String, List<CountryAssetEmissionsInfo>>>()[countryCode] ?: emptyList()
 }

iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/iosApp.xcscheme

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+   version = "1.3">
+   <BuildAction>
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
+            buildForRunning = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "7555FF7A242A565900829871"
@@ -21,38 +15,11 @@
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1AB84D8E2CA0ABED002A845D"
-               BuildableName = "ClimateTraceKMPUITests.xctest"
-               BlueprintName = "ClimateTraceKMPUITests"
-               ReferencedContainer = "container:iosApp.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
+      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <BuildableProductRunnable>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "7555FF7A242A565900829871"
@@ -62,18 +29,4 @@
          </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>

mcp-server/src/main/kotlin/server.kt

@@ -12,6 +12,7 @@ import kotlinx.io.buffered
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.putJsonObject
 
@@ -50,23 +51,30 @@ fun configureServer(): Server {
         description = "List emission info for a particular country",
         inputSchema = Tool.Input(
             properties = buildJsonObject {
-                putJsonObject("countryCode") { put("type", JsonPrimitive("string")) }
+                putJsonObject("countryCodeList") {
+                    put("type", JsonPrimitive("array"))
+                    putJsonObject("items") {
+                        put("type", JsonPrimitive("string"))
+                    }
+                }
                 putJsonObject("year") { put("type", JsonPrimitive("string")) }
             },
-            required = listOf("countryCode", "year")
+            required = listOf("countryCodeList", "year")
         )
 
     ) { request ->
-        val countryCode = request.arguments["countryCode"]
+        val countryCodeList = request.arguments["countryCodeList"]
         val year = request.arguments["year"]
-        if (countryCode == null || year == null) {
+        if (countryCodeList == null || year == null) {
             return@addTool CallToolResult(
-                content = listOf(TextContent("The 'countryCode' and `year` parameters are required."))
+                content = listOf(TextContent("The 'countryCodeList' and `year` parameters are required."))
             )
         }
 
         val countryEmissionInfo = climateTraceRepository.fetchCountryEmissionsInfo(
-            countryCode = countryCode.jsonPrimitive.content,
+            countryCodeList = countryCodeList
+                .jsonArray
+                .map { it.jsonPrimitive.content },
             year = year.jsonPrimitive.content
         )
         CallToolResult(