Skip to content

Add the missing renderers for the bunch of intermediate objects #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,27 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
import org.jetbrains.kotlinx.dataframe.DataRow
import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
import org.jetbrains.kotlinx.dataframe.api.Convert
import org.jetbrains.kotlinx.dataframe.api.FormatClause
import org.jetbrains.kotlinx.dataframe.api.FormattedFrame
import org.jetbrains.kotlinx.dataframe.api.Gather
import org.jetbrains.kotlinx.dataframe.api.GroupBy
import org.jetbrains.kotlinx.dataframe.api.GroupClause
import org.jetbrains.kotlinx.dataframe.api.InsertClause
import org.jetbrains.kotlinx.dataframe.api.Merge
import org.jetbrains.kotlinx.dataframe.api.MoveClause
import org.jetbrains.kotlinx.dataframe.api.Pivot
import org.jetbrains.kotlinx.dataframe.api.PivotGroupBy
import org.jetbrains.kotlinx.dataframe.api.ReducedGroupBy
import org.jetbrains.kotlinx.dataframe.api.ReducedPivot
import org.jetbrains.kotlinx.dataframe.api.ReducedPivotGroupBy
import org.jetbrains.kotlinx.dataframe.api.RenameClause
import org.jetbrains.kotlinx.dataframe.api.ReplaceClause
import org.jetbrains.kotlinx.dataframe.api.Split
import org.jetbrains.kotlinx.dataframe.api.SplitWithTransform
import org.jetbrains.kotlinx.dataframe.api.Update
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
import org.jetbrains.kotlinx.dataframe.api.asDataFrame
import org.jetbrains.kotlinx.dataframe.api.at
import org.jetbrains.kotlinx.dataframe.api.columnsCount
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
import org.jetbrains.kotlinx.dataframe.api.frames
Expand Down Expand Up @@ -215,6 +222,13 @@ internal class Integration(
applyRowsLimit = false
)

render<GroupClause<*, *>>({ "Group" })
render<MoveClause<*, *>>({ "Move" })
render<RenameClause<*, *>>({ "Rename" })
render<ReplaceClause<*, *>>({ "Replace" })
render<InsertClause<*>>({ "Insert" })
render<FormatClause<*, *>>({ "Format" })

render<DataFrameHtmlData> {
// Our integration declares script and css definition. But in Kotlin Notebook outputs are isolated in IFrames
// That's why we include them directly in the output
Expand Down Expand Up @@ -350,5 +364,11 @@ internal fun convertToDataFrame(dataframeLike: Any): AnyFrame =
is GroupBy<*, *> -> dataframeLike.toDataFrame()
is AnyFrame -> dataframeLike
is DisableRowsLimitWrapper -> dataframeLike.value
is MoveClause<*, *> -> dataframeLike.df
is RenameClause<*, *> -> dataframeLike.df
is ReplaceClause<*, *> -> dataframeLike.df
is GroupClause<*, *> -> dataframeLike.into("untitled")
is InsertClause<*> -> dataframeLike.at(0)
is FormatClause<*, *> -> dataframeLike.df
else -> throw IllegalArgumentException("Unsupported type: ${dataframeLike::class}")
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,27 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
import org.jetbrains.kotlinx.dataframe.DataRow
import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
import org.jetbrains.kotlinx.dataframe.api.Convert
import org.jetbrains.kotlinx.dataframe.api.FormatClause
import org.jetbrains.kotlinx.dataframe.api.FormattedFrame
import org.jetbrains.kotlinx.dataframe.api.Gather
import org.jetbrains.kotlinx.dataframe.api.GroupBy
import org.jetbrains.kotlinx.dataframe.api.GroupClause
import org.jetbrains.kotlinx.dataframe.api.InsertClause
import org.jetbrains.kotlinx.dataframe.api.Merge
import org.jetbrains.kotlinx.dataframe.api.MoveClause
import org.jetbrains.kotlinx.dataframe.api.Pivot
import org.jetbrains.kotlinx.dataframe.api.PivotGroupBy
import org.jetbrains.kotlinx.dataframe.api.ReducedGroupBy
import org.jetbrains.kotlinx.dataframe.api.ReducedPivot
import org.jetbrains.kotlinx.dataframe.api.ReducedPivotGroupBy
import org.jetbrains.kotlinx.dataframe.api.RenameClause
import org.jetbrains.kotlinx.dataframe.api.ReplaceClause
import org.jetbrains.kotlinx.dataframe.api.Split
import org.jetbrains.kotlinx.dataframe.api.SplitWithTransform
import org.jetbrains.kotlinx.dataframe.api.Update
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
import org.jetbrains.kotlinx.dataframe.api.asDataFrame
import org.jetbrains.kotlinx.dataframe.api.at
import org.jetbrains.kotlinx.dataframe.api.columnsCount
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
import org.jetbrains.kotlinx.dataframe.api.frames
Expand Down Expand Up @@ -215,6 +222,13 @@ internal class Integration(
applyRowsLimit = false
)

render<GroupClause<*, *>>({ "Group" })
render<MoveClause<*, *>>({ "Move" })
render<RenameClause<*, *>>({ "Rename" })
render<ReplaceClause<*, *>>({ "Replace" })
render<InsertClause<*>>({ "Insert" })
render<FormatClause<*, *>>({ "Format" })

render<DataFrameHtmlData> {
// Our integration declares script and css definition. But in Kotlin Notebook outputs are isolated in IFrames
// That's why we include them directly in the output
Expand Down Expand Up @@ -350,5 +364,11 @@ internal fun convertToDataFrame(dataframeLike: Any): AnyFrame =
is GroupBy<*, *> -> dataframeLike.toDataFrame()
is AnyFrame -> dataframeLike
is DisableRowsLimitWrapper -> dataframeLike.value
is MoveClause<*, *> -> dataframeLike.df
is RenameClause<*, *> -> dataframeLike.df
is ReplaceClause<*, *> -> dataframeLike.df
is GroupClause<*, *> -> dataframeLike.into("untitled")
is InsertClause<*> -> dataframeLike.at(0)
is FormatClause<*, *> -> dataframeLike.df
else -> throw IllegalArgumentException("Unsupported type: ${dataframeLike::class}")
}