Merge branch 'master' into statistics-fixes

Author: Jolanrensen

core/build.gradle.kts

@@ -87,6 +87,7 @@ dependencies {
     }
     testImplementation(libs.kotlin.scriptingJvm)
     testImplementation(libs.jsoup)
+    testImplementation(libs.sl4jsimple)
 }
 
 val samplesImplementation by configurations.getting {

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt

@@ -5,6 +5,8 @@ import org.jetbrains.kotlinx.dataframe.ColumnsSelector
 import org.jetbrains.kotlinx.dataframe.DataColumn
 import org.jetbrains.kotlinx.dataframe.DataFrame
 import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
+import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
+import org.jetbrains.kotlinx.dataframe.annotations.Refine
 import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
 import org.jetbrains.kotlinx.dataframe.impl.nameGenerator
 import kotlin.reflect.KProperty
@@ -50,6 +52,8 @@ public fun <T> DataColumn<T>.valueCounts(
 
 // region DataFrame
 
+@Refine
+@Interpretable("ValueCounts")
 public fun <T> DataFrame<T>.valueCounts(
     sort: Boolean = true,
     ascending: Boolean = false,

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/ColumnAccessorImpl.kt

@@ -43,4 +43,6 @@ internal class ColumnAccessorImpl<T>(val path: ColumnPath) : ColumnAccessor<T> {
     override fun getValue(row: AnyRow) = path.getValue(row) as T
 
     override fun getValueOrNull(row: AnyRow) = path.getValueOrNull(row) as T
+
+    override fun toString(): String = path().toString()
 }

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/Integration.kt

@@ -57,7 +57,6 @@ import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 import org.jetbrains.kotlinx.jupyter.api.libraries.resources
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty
-import kotlin.reflect.KType
 import kotlin.reflect.full.isSubtypeOf
 
 /** Users will get an error if their Kotlin Jupyter kernel is older than this version. */
@@ -70,29 +69,6 @@ internal class Integration(private val notebook: Notebook, private val options:
 
     val version = options["v"]
 
-    private fun KotlinKernelHost.execute(codeWithConverter: CodeWithConverter, argument: String): VariableName? {
-        val code = codeWithConverter.with(argument)
-        return if (code.isNotBlank()) {
-            val result = execute(code)
-            if (codeWithConverter.hasConverter) {
-                result.name
-            } else {
-                null
-            }
-        } else {
-            null
-        }
-    }
-
-    private fun KotlinKernelHost.execute(
-        codeWithConverter: CodeWithConverter,
-        property: KProperty<*>,
-        type: KType,
-    ): VariableName? {
-        val variableName = "(${property.name}${if (property.returnType.isMarkedNullable) "!!" else ""} as $type)"
-        return execute(codeWithConverter, variableName)
-    }
-
     private fun KotlinKernelHost.updateImportDataSchemaVariable(
         importDataSchema: ImportDataSchema,
         property: KProperty<*>,

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/execute.kt

@@ -0,0 +1,30 @@
+package org.jetbrains.kotlinx.dataframe.jupyter
+
+import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
+import org.jetbrains.kotlinx.jupyter.api.KotlinKernelHost
+import org.jetbrains.kotlinx.jupyter.api.VariableName
+import kotlin.reflect.KProperty
+import kotlin.reflect.KType
+
+internal fun KotlinKernelHost.execute(codeWithConverter: CodeWithConverter, argument: String): VariableName? {
+    val code = codeWithConverter.with(argument)
+    return if (code.isNotBlank()) {
+        val result = execute(code)
+        if (codeWithConverter.hasConverter) {
+            result.name
+        } else {
+            null
+        }
+    } else {
+        null
+    }
+}
+
+internal fun KotlinKernelHost.execute(
+    codeWithConverter: CodeWithConverter,
+    property: KProperty<*>,
+    type: KType,
+): VariableName? {
+    val variableName = "(${property.name}${if (property.returnType.isMarkedNullable) "!!" else ""} as $type)"
+    return execute(codeWithConverter, variableName)
+}

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/get.kt

@@ -49,6 +49,9 @@ class GetTests {
         shouldThrow<IllegalArgumentException> { row.getValue(c) }
         shouldThrow<IllegalArgumentException> { row.getValue(A::c) }
 
+        val throwable = shouldThrow<IllegalArgumentException> { df[column<Int>("c")] }
+        throwable.message shouldContain "Column not found: '[c]'"
+
         val added = df.add(A::c) { "3" }[0]
 
         shouldThrow<ClassCastException> { added.getValue(c) + 1 }

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/FastDoubleParserTests.kt

@@ -9,22 +9,21 @@ import org.junit.Test
 import java.text.NumberFormat
 import java.util.Locale
 
-private const val LOG_LEVEL = "org.slf4j.simpleLogger.defaultLogLevel"
-
 class FastDoubleParserTests {
 
+    private val logLevel = "org.slf4j.simpleLogger.log.${FastDoubleParser::class.qualifiedName}"
     private var loggerBefore: String? = null
 
     @Before
     fun setLogger() {
-        loggerBefore = System.getProperty(LOG_LEVEL)
-        System.setProperty(LOG_LEVEL, "debug")
+        loggerBefore = System.getProperty(logLevel)
+        System.setProperty(logLevel, "debug")
     }
 
     @After
     fun restoreLogger() {
         if (loggerBefore != null) {
-            System.setProperty(LOG_LEVEL, loggerBefore)
+            System.setProperty(logLevel, loggerBefore)
         }
     }
 

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Modify.kt

@@ -1464,4 +1464,63 @@ class Modify : TestBase() {
         }
         // SampleEnd
     }
+
+    @Test
+    @TransformDataFrameExpressions
+    fun rename_properties() {
+        // SampleStart
+        df.rename { name }.into("fullName")
+        // SampleEnd
+    }
+
+    @Test
+    @TransformDataFrameExpressions
+    fun rename_accessors() {
+        // SampleStart
+        val name by columnGroup()
+        df.rename(name).into("fullName")
+        // SampleEnd
+    }
+
+    @Test
+    @TransformDataFrameExpressions
+    fun rename_strings() {
+        // SampleStart
+        df.rename("name").into("fullName")
+        // SampleEnd
+    }
+
+    @Test
+    @TransformDataFrameExpressions
+    fun renameExpression_properties() {
+        // SampleStart
+        df.rename { age }.into {
+            val mean = it.data.mean()
+            "age [mean = $mean]"
+        }
+        // SampleEnd
+    }
+
+    @Test
+    @TransformDataFrameExpressions
+    fun renameExpression_accessors() {
+        // SampleStart
+        val age by column<Int>()
+        df.rename(age).into {
+            val mean = it.data.mean()
+            "age [mean = $mean]"
+        }
+        // SampleEnd
+    }
+
+    @Test
+    @TransformDataFrameExpressions
+    fun renameExpression_strings() {
+        // SampleStart
+        df.rename("age").into {
+            val mean = it.data.cast<Int>().mean()
+            "age [mean = $mean]"
+        }
+        // SampleEnd
+    }
 }

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt

@@ -5,6 +5,8 @@ import org.jetbrains.kotlinx.dataframe.ColumnsSelector
 import org.jetbrains.kotlinx.dataframe.DataColumn
 import org.jetbrains.kotlinx.dataframe.DataFrame
 import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
+import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
+import org.jetbrains.kotlinx.dataframe.annotations.Refine
 import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
 import org.jetbrains.kotlinx.dataframe.impl.nameGenerator
 import kotlin.reflect.KProperty
@@ -50,6 +52,8 @@ public fun <T> DataColumn<T>.valueCounts(
 
 // region DataFrame
 
+@Refine
+@Interpretable("ValueCounts")
 public fun <T> DataFrame<T>.valueCounts(
     sort: Boolean = true,
     ascending: Boolean = false,

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/ColumnAccessorImpl.kt

@@ -43,4 +43,6 @@ internal class ColumnAccessorImpl<T>(val path: ColumnPath) : ColumnAccessor<T> {
     override fun getValue(row: AnyRow) = path.getValue(row) as T
 
     override fun getValueOrNull(row: AnyRow) = path.getValueOrNull(row) as T
+
+    override fun toString(): String = path().toString()
 }