Update weather-stdio-server

Author: kpavlov

samples/weather-stdio-server/README.md

@@ -30,13 +30,13 @@ The project provides:
 Use the Gradle wrapper to build the application. In a terminal run:
 
 ```shell
-./gradlew clean build -x test
+./gradlew clean build
 ```
 
 To run the server:
 
 ```shell
-java -jar build/libs/<your-jar-name>.jar
+java -jar build/libs/weather-stdio-server-0.1.0-all.jar
 ```
 
 > [!NOTE]

samples/weather-stdio-server/build.gradle.kts

@@ -19,6 +19,8 @@ dependencies {
     implementation(libs.ktor.server.cio)
     implementation(libs.ktor.client.cio)
     implementation(libs.slf4j.simple)
+    runtimeOnly(libs.kotlin.logging)
+    runtimeOnly(libs.kotlinx.collections.immutable)
 
     testImplementation(kotlin("test"))
 

samples/weather-stdio-server/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.configuration-cache=true
 org.gradle.parallel=true
 org.gradle.caching=true
-

samples/weather-stdio-server/gradle/libs.versions.toml

@@ -1,20 +1,24 @@
 [versions]
+collections-immutable = "0.4.0"
+coroutines = "1.10.2"
 kotlin = "2.2.20"
 ktor = "3.3.0"
+logging = "7.0.13"
 mcp-kotlin = "0.7.3"
-slf4j = "2.0.17"
 shadow = "9.2.2"
-coroutines = "1.10.2"
+slf4j = "2.0.17"
 
 [libraries]
+kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging-jvm", version.ref = "logging" }
+kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable-jvm", version.ref = "collections-immutable" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json-jvm", version.ref = "ktor" }
 ktor-server-cio = { group = "io.ktor", name = "ktor-server-cio", version.ref = "ktor" }
 mcp-kotlin-client = { group = "io.modelcontextprotocol", name = "kotlin-sdk-client", version.ref = "mcp-kotlin" }
 mcp-kotlin-server = { group = "io.modelcontextprotocol", name = "kotlin-sdk-server", version.ref = "mcp-kotlin" }
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

samples/weather-stdio-server/src/main/kotlin/io/modelcontextprotocol/sample/server/McpWeatherServer.kt

@@ -1,23 +1,38 @@
 package io.modelcontextprotocol.sample.server
 
-import io.ktor.client.*
-import io.ktor.client.plugins.*
-import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.http.*
-import io.ktor.serialization.kotlinx.json.*
-import io.ktor.utils.io.streams.*
-import io.modelcontextprotocol.kotlin.sdk.*
+import io.ktor.client.HttpClient
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.defaultRequest
+import io.ktor.http.ContentType
+import io.ktor.http.contentType
+import io.ktor.http.headers
+import io.ktor.serialization.kotlinx.json.json
+import io.ktor.utils.io.core.Input
+import io.ktor.utils.io.streams.asInput
+import io.modelcontextprotocol.kotlin.sdk.CallToolResult
+import io.modelcontextprotocol.kotlin.sdk.Implementation
+import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
+import io.modelcontextprotocol.kotlin.sdk.TextContent
+import io.modelcontextprotocol.kotlin.sdk.Tool
 import io.modelcontextprotocol.kotlin.sdk.server.Server
 import io.modelcontextprotocol.kotlin.sdk.server.ServerOptions
 import io.modelcontextprotocol.kotlin.sdk.server.StdioServerTransport
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.runBlocking
+import kotlinx.io.Sink
 import kotlinx.io.asSink
 import kotlinx.io.buffered
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.doubleOrNull
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.put
+import kotlinx.serialization.json.putJsonObject
 
-// Main function to run the MCP server
-fun `run mcp server`() {
+/**
+ * Starts an MCP server that provides weather-related tools for fetching active weather alerts by state and weather forecasts by latitude/longitude.
+ */
+fun runMcpServer() {
     // Base URL for the Weather API
     val baseUrl = "https://api.weather.gov"
 

samples/weather-stdio-server/src/main/kotlin/io/modelcontextprotocol/sample/server/main.kt

@@ -1,3 +1,3 @@
 package io.modelcontextprotocol.sample.server
 
-fun main() = `run mcp server`()
+fun main() = runMcpServer()

samples/weather-stdio-server/src/test/kotlin/io/modelcontextprotocol/sample/client/ClientStdio.kt

@@ -11,15 +11,15 @@ import kotlinx.io.asSource
 import kotlinx.io.buffered
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
-
+import kotlinx.serialization.json.buildJsonObject
 
 fun main(): Unit = runBlocking {
-    val process = ProcessBuilder("java", "-jar", "build/libs/weather-stdio-server-0.1.0-all.jar")
+    val process = ProcessBuilder("java", "-jar", "./build/libs/weather-stdio-server-0.1.0-all.jar")
         .start()
 
     val transport = StdioClientTransport(
         input = process.inputStream.asSource().buffered(),
-        output = process.outputStream.asSink().buffered()
+        output = process.outputStream.asSink().buffered(),
     )
 
     // Initialize the MCP client with client information
@@ -29,15 +29,17 @@ fun main(): Unit = runBlocking {
 
     client.connect(transport)
 
-
-    val toolsList = client.listTools()?.tools?.map { it.name }
+    val toolsList = client.listTools().tools.map { it.name }
     println("Available Tools = $toolsList")
 
     val weatherForecastResult = client.callTool(
         CallToolRequest(
             name = "get_forecast",
-            arguments = JsonObject(mapOf("latitude" to JsonPrimitive(38.5816), "longitude" to JsonPrimitive(-121.4944)))
-        )
+            arguments = buildJsonObject {
+                put("latitude", JsonPrimitive(38.5816))
+                put("longitude", JsonPrimitive(-121.4944))
+            },
+        ),
     )?.content?.map { if (it is TextContent) it.text else it.toString() }
 
     println("Weather Forcast: ${weatherForecastResult?.joinToString(separator = "\n", prefix = "\n", postfix = "\n")}")
@@ -46,11 +48,11 @@ fun main(): Unit = runBlocking {
         client.callTool(
             CallToolRequest(
                 name = "get_alerts",
-                arguments = JsonObject(mapOf("state" to JsonPrimitive("TX")))
-            )
+                arguments = JsonObject(mapOf("state" to JsonPrimitive("TX"))),
+            ),
         )?.content?.map { if (it is TextContent) it.text else it.toString() }
 
     println("Alert Response = $alertResult")
 
     client.close()
-}
+}

samples/weather-stdio-server/src/test/kotlin/io/modelcontextprotocol/sample/client/FakeTest.kt

@@ -0,0 +1,11 @@
+package io.modelcontextprotocol.sample.client
+
+import kotlin.test.Test
+
+class FakeTest {
+
+    @Test
+    fun testSomething() {
+        assert(true) { "Bingo!" }
+    }
+}