Move notebook metadata detection to compiler artifact

Author: ileasile

jupyter-lib/shared-compiler/build.gradle.kts

@@ -1,4 +1,6 @@
 import build.CreateResourcesTask
+import build.util.defaultVersionCatalog
+import build.util.devKotlin
 
 plugins {
     id("ru.ileasile.kotlin.publisher")
@@ -45,7 +47,13 @@ buildSettings {
 }
 
 CreateResourcesTask.register(project, "buildProperties", tasks.processResources) {
-    addPropertiesFile("compiler.properties", mapOf("version" to rootSettings.pyPackageVersion))
+    addPropertiesFile(
+        "compiler.properties",
+        mapOf(
+            "version" to rootSettings.pyPackageVersion,
+            "kotlinVersion" to defaultVersionCatalog.versions.devKotlin,
+        )
+    )
 }
 
 kotlinPublications {

jupyter-lib/shared-compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/config/notebookMetadata.kt

@@ -0,0 +1,51 @@
+package org.jetbrains.kotlinx.jupyter.config
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+class LanguageInfo(
+    val name: String,
+    val version: String,
+    val mimetype: String,
+
+    @SerialName("file_extension")
+    val fileExtension: String,
+
+    @SerialName("pygments_lexer")
+    val pygmentsLexer: String,
+
+    @SerialName("codemirror_mode")
+    val codemirrorMode: String,
+
+    @SerialName("nbconvert_exporter")
+    val nbConvertExporter: String,
+)
+
+val notebookLanguageInfo: LanguageInfo by lazy {
+    LanguageInfo(
+        "kotlin",
+        currentKotlinVersion,
+        "text/x-kotlin",
+        ".kt",
+        "kotlin",
+        "kotlin",
+        ""
+    )
+}
+
+@Serializable
+class KotlinKernelSpec(
+    @SerialName("display_name")
+    val displayName: String,
+    val language: String,
+    val name: String,
+)
+
+val notebookKernelSpec: KotlinKernelSpec by lazy {
+    KotlinKernelSpec(
+        "Kotlin",
+        "kotlin",
+        "kotlin",
+    )
+}

jupyter-lib/shared-compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/config/runtimeProperties.kt

@@ -15,8 +15,16 @@ private val runtimeProperties by lazy {
     readResourceAsIniFile("compiler.properties", KernelStreams::class.java.classLoader)
 }
 
+fun getFromRuntimeProperties(property: String, propertyDescription: String): String {
+    return runtimeProperties[property] ?: error("Compiler artifact should contain $propertyDescription")
+}
+
 val currentKernelVersion by lazy {
     KotlinKernelVersion.from(
-        runtimeProperties["version"] ?: error("Compiler artifact should contain version")
+        getFromRuntimeProperties("version", "kernel version")
     )!!
 }
+
+val currentKotlinVersion by lazy {
+    getFromRuntimeProperties("kotlinVersion", "Kotlin version")
+}

src/main/kotlin/org/jetbrains/kotlinx/jupyter/message_types.kt

@@ -23,6 +23,7 @@ import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.serializer
+import org.jetbrains.kotlinx.jupyter.config.LanguageInfo
 import org.jetbrains.kotlinx.jupyter.exceptions.ReplException
 import kotlin.reflect.KClass
 import kotlin.reflect.full.createType
@@ -371,25 +372,6 @@ class HelpLink(
     val url: String,
 )
 
-@Serializable
-class LanguageInfo(
-    val name: String,
-    val version: String,
-    val mimetype: String,
-
-    @SerialName("file_extension")
-    val fileExtension: String,
-
-    @SerialName("pygments_lexer")
-    val pygmentsLexer: String,
-
-    @SerialName("codemirror_mode")
-    val codemirrorMode: String,
-
-    @SerialName("nbconvert_exporter")
-    val nbConvertExporter: String,
-)
-
 @Serializable
 class KernelInfoReply(
     @SerialName("protocol_version")

src/main/kotlin/org/jetbrains/kotlinx/jupyter/protocol.kt

@@ -8,7 +8,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.encodeToJsonElement
 import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlinx.jupyter.LoggingManagement.disableLogging
 import org.jetbrains.kotlinx.jupyter.LoggingManagement.mainLoggerLevel
 import org.jetbrains.kotlinx.jupyter.api.DisplayResult
@@ -21,6 +20,9 @@ import org.jetbrains.kotlinx.jupyter.api.textResult
 import org.jetbrains.kotlinx.jupyter.common.looksLikeReplCommand
 import org.jetbrains.kotlinx.jupyter.compiler.util.EvaluatedSnippetMetadata
 import org.jetbrains.kotlinx.jupyter.config.KernelStreams
+import org.jetbrains.kotlinx.jupyter.config.currentKernelVersion
+import org.jetbrains.kotlinx.jupyter.config.currentKotlinVersion
+import org.jetbrains.kotlinx.jupyter.config.notebookLanguageInfo
 import org.jetbrains.kotlinx.jupyter.exceptions.ReplCompilerException
 import org.jetbrains.kotlinx.jupyter.exceptions.ReplException
 import org.jetbrains.kotlinx.jupyter.repl.EvalResult
@@ -228,17 +230,9 @@ fun JupyterConnection.Socket.shellMessagesHandler(msg: Message, repl: ReplForJup
                     content = KernelInfoReply(
                         protocolVersion,
                         "Kotlin",
-                        repl.runtimeProperties.version.toMaybeUnspecifiedString(),
-                        "Kotlin kernel v. ${repl.runtimeProperties.version.toMaybeUnspecifiedString()}, Kotlin v. ${KotlinCompilerVersion.VERSION}",
-                        LanguageInfo(
-                            "kotlin",
-                            KotlinCompilerVersion.VERSION,
-                            "text/x-kotlin",
-                            ".kt",
-                            "kotlin",
-                            "kotlin",
-                            ""
-                        ),
+                        currentKernelVersion.toMaybeUnspecifiedString(),
+                        "Kotlin kernel v. ${currentKernelVersion.toMaybeUnspecifiedString()}, Kotlin v. $currentKotlinVersion",
+                        notebookLanguageInfo,
                         listOf()
                     ),
                 )