Skip to content

Commit 4932159

Browse files
JolanrensenJolanrensen
committed
Merge branch 'master' into better-static-tables
2 parents d0167f1 + b3f3331 commit 4932159

File tree

20 files changed

+1895
-121
lines changed

20 files changed

+1895
-121
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ import kotlin.reflect.KProperty
1717

1818
// region DataFrame
1919

20+
/**
21+
*
22+
* @param cols key columns; Column for grouping can be created inplace
23+
*
24+
* `df.groupBy { expr("columnName") { "someColumn"<Int>() + 15 } }`
25+
*
26+
* is equivalent to
27+
*
28+
* `df.add("columnName") { "someColumn"<Int>() + 15 }.groupBy("columnName")`
29+
*/
2030
public fun <T> DataFrame<T>.groupBy(moveToTop: Boolean = true, cols: ColumnsSelector<T, *>): GroupBy<T, T> =
2131
groupByImpl(moveToTop, cols)
2232

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,17 +374,15 @@ public fun <T> DataFrame<T>.html(): String = toStandaloneHTML().toString()
374374
public fun <T> DataFrame<T>.toStandaloneHTML(
375375
configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT,
376376
cellRenderer: CellRenderer = DefaultCellRenderer,
377-
includeStatic: Boolean = true,
378377
getFooter: (DataFrame<T>) -> String? = { "DataFrame [${it.size}]" },
379-
): DataFrameHtmlData = toHTML(configuration, cellRenderer, includeStatic, getFooter).withTableDefinitions()
378+
): DataFrameHtmlData = toHTML(configuration, cellRenderer, getFooter).withTableDefinitions()
380379

381380
/**
382381
* @return DataFrameHtmlData without additional definitions. Can be rendered in Jupyter kernel environments
383382
*/
384383
public fun <T> DataFrame<T>.toHTML(
385384
configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT,
386385
cellRenderer: CellRenderer = DefaultCellRenderer,
387-
includeStatic: Boolean = true,
388386
getFooter: (DataFrame<T>) -> String? = { "DataFrame [${it.size}]" },
389387
): DataFrameHtmlData {
390388
val limit = configuration.rowsLimit ?: Int.MAX_VALUE
@@ -405,7 +403,7 @@ public fun <T> DataFrame<T>.toHTML(
405403

406404
var tableHtml = toHtmlData(configuration, cellRenderer)
407405

408-
if (includeStatic) {
406+
if (configuration.enableFallbackStaticTables) {
409407
tableHtml += toStaticHtml(configuration, DefaultCellRenderer)
410408
}
411409

@@ -505,6 +503,8 @@ public data class DataFrameHtmlData(
505503
/**
506504
* @param rowsLimit null to disable rows limit
507505
* @param cellContentLimit -1 to disable content trimming
506+
* @param enableFallbackStaticTables true to add additional pure HTML table that will be visible only if JS is disabled;
507+
* For example hosting *.ipynb files with outputs on GitHub
508508
*/
509509
public data class DisplayConfiguration(
510510
var rowsLimit: Int? = 20,
@@ -515,6 +515,7 @@ public data class DisplayConfiguration(
515515
var isolatedOutputs: Boolean = flagFromEnv("LETS_PLOT_HTML_ISOLATED_FRAME"),
516516
internal val localTesting: Boolean = flagFromEnv("KOTLIN_DATAFRAME_LOCAL_TESTING"),
517517
var useDarkColorScheme: Boolean = false,
518+
var enableFallbackStaticTables: Boolean = true,
518519
) {
519520
public companion object {
520521
public val DEFAULT: DisplayConfiguration = DisplayConfiguration()

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import org.jetbrains.kotlinx.dataframe.api.SplitWithTransform
2424
import org.jetbrains.kotlinx.dataframe.api.Update
2525
import org.jetbrains.kotlinx.dataframe.api.at
2626
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
27-
import org.jetbrains.kotlinx.dataframe.api.filter
2827
import org.jetbrains.kotlinx.dataframe.api.frames
2928
import org.jetbrains.kotlinx.dataframe.api.into
3029
import org.jetbrains.kotlinx.dataframe.api.sortBy
@@ -60,7 +59,7 @@ public object KotlinNotebookPluginUtils {
6059
* It's used for example for dynamic pagination in Kotlin Notebook Plugin.
6160
*/
6261
public fun getRowsSubsetForRendering(df: AnyFrame, startIdx: Int, endIdx: Int): DisableRowsLimitWrapper =
63-
DisableRowsLimitWrapper(df.filter { it.index() in startIdx until endIdx })
62+
DisableRowsLimitWrapper(df[startIdx ..< endIdx])
6463

6564
/**
6665
* Sorts a dataframe-like object by multiple columns.

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/PluginCallbackProxy.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import org.jetbrains.kotlinx.dataframe.api.where
2727
import org.jetbrains.kotlinx.dataframe.api.with
2828
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
2929
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
30-
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
3130
import org.jetbrains.kotlinx.dataframe.io.sessionId
3231
import org.jetbrains.kotlinx.dataframe.io.tableInSessionId
3332
import org.jetbrains.kotlinx.dataframe.io.toHTML
@@ -244,8 +243,8 @@ object PluginCallbackProxy : PluginCallback {
244243
}
245244

246245
private fun convertToHTML(dataframeLike: Any): DataFrameHtmlData {
247-
fun DataFrame<*>.toHTML() = toHTML(DisplayConfiguration(), getFooter = { "" })
248-
fun FormattedFrame<*>.toHTML1() = toHTML(DisplayConfiguration())
246+
fun DataFrame<*>.toHTML() = toHTML(SamplesDisplayConfiguration, getFooter = { "" })
247+
fun FormattedFrame<*>.toHTML1() = toHTML(SamplesDisplayConfiguration)
249248

250249
return when (dataframeLike) {
251250
is Pivot<*> -> dataframeLike.frames().toDataFrame().toHTML()

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/SamplesDisplayConfiguration.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.jetbrains.kotlinx.dataframe.explainer
2+
3+
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
4+
5+
val SamplesDisplayConfiguration = DisplayConfiguration(enableFallbackStaticTables = false)

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

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,6 @@ class Analyze : TestBase() {
577577
df.groupBy { name }
578578
df.groupBy { city and name.lastName }
579579
df.groupBy { age / 10 named "ageDecade" }
580-
df.groupBy { expr { name.firstName.length + name.lastName.length } named "nameLength" }
581580
// SampleEnd
582581
}
583582

@@ -601,7 +600,6 @@ class Analyze : TestBase() {
601600

602601
df.groupBy { age / 10 named "ageDecade" }
603602

604-
df.groupBy { expr { firstName().length + lastName().length } named "nameLength" }
605603
// SampleEnd
606604
}
607605

@@ -612,10 +610,53 @@ class Analyze : TestBase() {
612610
df.groupBy("name")
613611
df.groupBy { "city" and "name"["lastName"] }
614612
df.groupBy { "age"<Int>() / 10 named "ageDecade" }
613+
// SampleEnd
614+
}
615+
616+
@Test
617+
@TransformDataFrameExpressions
618+
fun groupByExpr_properties() {
619+
// SampleStart
620+
df.groupBy { expr { name.firstName.length + name.lastName.length } named "nameLength" }
621+
// SampleEnd
622+
}
623+
624+
@Test
625+
@TransformDataFrameExpressions
626+
fun groupByExpr_accessors() {
627+
// SampleStart
628+
val name by columnGroup()
629+
val lastName by name.column<String>()
630+
val firstName by name.column<String>()
631+
632+
df.groupBy { expr { firstName().length + lastName().length } named "nameLength" }
633+
// SampleEnd
634+
}
635+
636+
@Test
637+
@TransformDataFrameExpressions
638+
fun groupByExpr_strings() {
639+
// SampleStart
615640
df.groupBy { expr { "name"["firstName"]<String>().length + "name"["lastName"]<String>().length } named "nameLength" }
616641
// SampleEnd
617642
}
618643

644+
@Test
645+
@TransformDataFrameExpressions
646+
fun groupByMoveToTop() {
647+
// SampleStart
648+
df.groupBy(moveToTop = true) { name.lastName }
649+
// SampleEnd
650+
}
651+
652+
@Test
653+
@TransformDataFrameExpressions
654+
fun groupByMoveToTopFalse() {
655+
// SampleStart
656+
df.groupBy(moveToTop = false) { name.lastName }
657+
// SampleEnd
658+
}
659+
619660
@Test
620661
@TransformDataFrameExpressions
621662
fun dataFrameToGroupBy() {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import org.jetbrains.kotlinx.dataframe.api.rightJoin
2929
import org.jetbrains.kotlinx.dataframe.api.rightJoinWith
3030
import org.jetbrains.kotlinx.dataframe.api.with
3131
import org.jetbrains.kotlinx.dataframe.explainer.PluginCallbackProxy
32+
import org.jetbrains.kotlinx.dataframe.explainer.SamplesDisplayConfiguration
3233
import org.jetbrains.kotlinx.dataframe.explainer.TransformDataFrameExpressions
3334
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
3435
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
@@ -131,7 +132,7 @@ class JoinWith : TestBase() {
131132
private fun AnyFrame.toColoredHTML() = toHTML(
132133
getFooter = { null },
133134
cellRenderer = renderer,
134-
configuration = DisplayConfiguration.DEFAULT.copy(
135+
configuration = SamplesDisplayConfiguration.copy(
135136
cellFormatter = { row, col ->
136137
val value = row[col]
137138
if (value is ColoredValue<*>) {

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ import kotlin.reflect.KProperty
1717

1818
// region DataFrame
1919

20+
/**
21+
*
22+
* @param cols key columns; Column for grouping can be created inplace
23+
*
24+
* `df.groupBy { expr("columnName") { "someColumn"<Int>() + 15 } }`
25+
*
26+
* is equivalent to
27+
*
28+
* `df.add("columnName") { "someColumn"<Int>() + 15 }.groupBy("columnName")`
29+
*/
2030
public fun <T> DataFrame<T>.groupBy(moveToTop: Boolean = true, cols: ColumnsSelector<T, *>): GroupBy<T, T> =
2131
groupByImpl(moveToTop, cols)
2232

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,17 +374,15 @@ public fun <T> DataFrame<T>.html(): String = toStandaloneHTML().toString()
374374
public fun <T> DataFrame<T>.toStandaloneHTML(
375375
configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT,
376376
cellRenderer: CellRenderer = DefaultCellRenderer,
377-
includeStatic: Boolean = true,
378377
getFooter: (DataFrame<T>) -> String? = { "DataFrame [${it.size}]" },
379-
): DataFrameHtmlData = toHTML(configuration, cellRenderer, includeStatic, getFooter).withTableDefinitions()
378+
): DataFrameHtmlData = toHTML(configuration, cellRenderer, getFooter).withTableDefinitions()
380379

381380
/**
382381
* @return DataFrameHtmlData without additional definitions. Can be rendered in Jupyter kernel environments
383382
*/
384383
public fun <T> DataFrame<T>.toHTML(
385384
configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT,
386385
cellRenderer: CellRenderer = DefaultCellRenderer,
387-
includeStatic: Boolean = true,
388386
getFooter: (DataFrame<T>) -> String? = { "DataFrame [${it.size}]" },
389387
): DataFrameHtmlData {
390388
val limit = configuration.rowsLimit ?: Int.MAX_VALUE
@@ -405,7 +403,7 @@ public fun <T> DataFrame<T>.toHTML(
405403

406404
var tableHtml = toHtmlData(configuration, cellRenderer)
407405

408-
if (includeStatic) {
406+
if (configuration.enableFallbackStaticTables) {
409407
tableHtml += toStaticHtml(configuration, DefaultCellRenderer)
410408
}
411409

@@ -505,6 +503,8 @@ public data class DataFrameHtmlData(
505503
/**
506504
* @param rowsLimit null to disable rows limit
507505
* @param cellContentLimit -1 to disable content trimming
506+
* @param enableFallbackStaticTables true to add additional pure HTML table that will be visible only if JS is disabled;
507+
* For example hosting *.ipynb files with outputs on GitHub
508508
*/
509509
public data class DisplayConfiguration(
510510
var rowsLimit: Int? = 20,
@@ -515,6 +515,7 @@ public data class DisplayConfiguration(
515515
var isolatedOutputs: Boolean = flagFromEnv("LETS_PLOT_HTML_ISOLATED_FRAME"),
516516
internal val localTesting: Boolean = flagFromEnv("KOTLIN_DATAFRAME_LOCAL_TESTING"),
517517
var useDarkColorScheme: Boolean = false,
518+
var enableFallbackStaticTables: Boolean = true,
518519
) {
519520
public companion object {
520521
public val DEFAULT: DisplayConfiguration = DisplayConfiguration()

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/JupyterHtmlRenderer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ internal inline fun <reified T : Any> JupyterHtmlRenderer.render(
5050
includeCss = true,
5151
).plus(
5252
df.toHTML(
53-
configuration = reifiedDisplayConfiguration,
53+
// is added later to make sure it's put outside of potential iFrames
54+
configuration = reifiedDisplayConfiguration.copy(enableFallbackStaticTables = false),
5455
cellRenderer = contextRenderer,
55-
includeStatic = false, // is added later to make sure it's put outside of potential iFrames
5656
) { footer }
5757
).toJupyterHtmlData()
5858

0 commit comments

Comments
 (0)