Add variable serializer to repl state; fixed some tests

Author: nikolay-egorov

jupyter-lib/shared-compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/compiler/util/serializedCompiledScript.kt

@@ -36,7 +36,7 @@ class EvaluatedSnippetMetadata(
     val newClasspath: Classpath = emptyList(),
     val compiledData: SerializedCompiledScriptsData = SerializedCompiledScriptsData.EMPTY,
     val newImports: List<String> = emptyList(),
-    val evaluatedVariablesState: SerializedVariablesState = SerializedVariablesState()
+    val evaluatedVariablesState: Map<String, SerializedVariablesState> = emptyMap()
 ) {
     companion object {
         val EMPTY = EvaluatedSnippetMetadata()

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

@@ -5,7 +5,6 @@ import jupyter.kotlin.DependsOn
 import jupyter.kotlin.KotlinContext
 import jupyter.kotlin.KotlinKernelHostProvider
 import jupyter.kotlin.Repository
-import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlinx.jupyter.api.Code
 import org.jetbrains.kotlinx.jupyter.api.ExecutionCallback
@@ -27,7 +26,6 @@ import org.jetbrains.kotlinx.jupyter.compiler.ScriptImportsCollector
 import org.jetbrains.kotlinx.jupyter.compiler.util.Classpath
 import org.jetbrains.kotlinx.jupyter.compiler.util.EvaluatedSnippetMetadata
 import org.jetbrains.kotlinx.jupyter.compiler.util.SerializedCompiledScriptsData
-import org.jetbrains.kotlinx.jupyter.compiler.util.SerializedVariablesState
 import org.jetbrains.kotlinx.jupyter.config.catchAll
 import org.jetbrains.kotlinx.jupyter.config.getCompilationConfiguration
 import org.jetbrains.kotlinx.jupyter.dependencies.JupyterScriptDependenciesResolverImpl
@@ -49,7 +47,6 @@ import org.jetbrains.kotlinx.jupyter.repl.CellExecutor
 import org.jetbrains.kotlinx.jupyter.repl.CompletionResult
 import org.jetbrains.kotlinx.jupyter.repl.ContextUpdater
 import org.jetbrains.kotlinx.jupyter.repl.EvalResult
-import org.jetbrains.kotlinx.jupyter.repl.EvalResultEx
 import org.jetbrains.kotlinx.jupyter.repl.InternalEvaluator
 import org.jetbrains.kotlinx.jupyter.repl.KotlinCompleter
 import org.jetbrains.kotlinx.jupyter.repl.ListErrorsResult
@@ -134,6 +131,8 @@ interface ReplForJupyter {
 
     val notebook: NotebookImpl
 
+    val variablesSerializer: VariablesSerializer
+
     val fileExtension: String
 
     val isEmbedded: Boolean
@@ -185,7 +184,9 @@ class ReplForJupyterImpl(
 
     override val notebook = NotebookImpl(runtimeProperties)
 
-    val librariesScanner = LibrariesScanner(notebook)
+    override val variablesSerializer = VariablesSerializer()
+
+    private val librariesScanner = LibrariesScanner(notebook)
     private val resourcesProcessor = LibraryResourcesProcessorImpl()
 
     override var outputConfig
@@ -341,7 +342,7 @@ class ReplForJupyterImpl(
     )
 
     private var evalContextEnabled = false
-    private fun <T> withEvalContext(action: () -> T): T {
+    private fun withEvalContext(action: () -> EvalResult): EvalResult {
         return synchronized(this) {
             evalContextEnabled = true
             try {
@@ -359,14 +360,14 @@ class ReplForJupyterImpl(
         else context.compilationConfiguration.asSuccess()
     }
 
-    @TestOnly
-    @Suppress("unused")
+    /**
+     * Used for debug purposes.
+     * @see ReplCommand
+     */
     private fun printVariables(isHtmlFormat: Boolean = false) = log.debug(
         if (isHtmlFormat) notebook.variablesReportAsHTML() else notebook.variablesReport()
     )
 
-    @TestOnly
-    @Suppress("unused")
     private fun printUsagesInfo(cellId: Int, usedVariables: Set<String>?) {
         log.debug(buildString {
             if (usedVariables == null || usedVariables.isEmpty()) {
@@ -380,7 +381,7 @@ class ReplForJupyterImpl(
         })
     }
 
-    fun evalEx(code: Code, displayHandler: DisplayHandler?, jupyterId: Int): EvalResultEx {
+    fun evalEx(code: Code, displayHandler: DisplayHandler?, jupyterId: Int): EvalResult {
         return withEvalContext {
             rethrowAsLibraryException(LibraryProblemPart.BEFORE_CELL_CALLBACKS) {
                 beforeCellExecution.forEach { executor.execute(it) }
@@ -418,15 +419,13 @@ class ReplForJupyterImpl(
             notebook.updateVariablesState(internalEvaluator)
             // printVars()
             // printUsagesInfo(jupyterId, cellVariables[jupyterId - 1])
+            val entry = notebook.variablesState.entries.lastOrNull()
+            val serializedVarsState =  variablesSerializer.serializeVariableState(jupyterId - 1, entry?.key, entry?.value)
+            val serializedData = variablesSerializer.serializeVariables(jupyterId - 1, notebook.variablesState)
 
-
-            val variablesStateUpdate = notebook.variablesState.mapValues { it.value.stringValue }
-            EvalResultEx(
+            EvalResult(
                 result.result.value,
-                rendered,
-                result.scriptInstance,
-                result.result.name,
-                EvaluatedSnippetMetadata(newClasspath, compiledData, newImports, SerializedVariablesState()),
+                EvaluatedSnippetMetadata(newClasspath, compiledData, newImports, serializedData),
             )
         }
     }