Skip to content
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.

Sign up for GitHub

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

Supported operations for Explorer lists #136

Merged
merged 4 commits into from
Jan 19, 2024
Merged

Supported operations for Explorer lists #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f90f24b
Supported operations for lists
cristineguadelupe Jan 19, 2024
be4bdea
Format main.js
cristineguadelupe Jan 19, 2024
7766895
Applying suggestions
cristineguadelupe Jan 19, 2024
6e73979
Remove old test
cristineguadelupe Jan 19, 2024
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
13 changes: 9 additions & 4 deletions lib/assets/data_transform_cell/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ export async function init(ctx, payload) {
operation_type="sorting"
label="Sort by"
v-model="operation.sort_by"
:options="dataFrameColumns(operation.data_options)"
:options="dataFrameColumnsByTypes(sortTypes, operation.data_options)"
:index="index"
:disabled="noDataFrame"
/>
Expand Down Expand Up @@ -720,6 +720,7 @@ export async function init(ctx, payload) {
dataFrames: payload.data_frame_variables,
dataFrameAlias: payload.data_frame_alias.slice(7),
pivotWiderTypes: payload.operation_types.pivot_wider,
sortTypes: payload.operation_types.sort,
summariseTypes: payload.operation_types.summarise,
queriedFilterTypes: payload.operation_types.queried_filter,
fillMissingOptions: payload.operation_options.fill_missing,
Expand Down Expand Up @@ -752,9 +753,13 @@ export async function init(ctx, payload) {
return data_options ? Object.keys(data_options) : [];
},
dataFrameColumnsWithTypes(data_options) {
const dataFrameColumns = data_options
? Object.entries(data_options)
: {};
const notAllowedTypes = ["list"];
const dataOptions = Object.fromEntries(
Object.entries(data_options).filter(
([col, type]) => !notAllowedTypes.includes(type)
)
);
const dataFrameColumns = dataOptions ? Object.entries(dataOptions) : {};
const columns = Array.from(dataFrameColumns, ([name, type]) => {
return { label: `${name} (${type})`, value: name };
});
Expand Down
21 changes: 13 additions & 8 deletions lib/kino_explorer/data_transform_cell.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ defmodule KinoExplorer.DataTransformCell do
"string",
"time"
]
@composite_column_types ["list"]
@filter_options %{
"binary" => ["equal", "contains", "not contains", "not equal"],
"boolean" => ["equal", "not equal"],
Expand All @@ -32,7 +33,8 @@ defmodule KinoExplorer.DataTransformCell do
"float" => ["less", "less equal", "equal", "not equal", "greater equal", "greater"],
"integer" => ["less", "less equal", "equal", "not equal", "greater equal", "greater"],
"string" => ["equal", "contains", "not contains", "not equal"],
"time" => ["less", "less equal", "equal", "not equal", "greater equal", "greater"]
"time" => ["less", "less equal", "equal", "not equal", "greater equal", "greater"],
"list" => []
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add "member?" (we can probably call it "contains") and not member? More info: https://hexdocs.pm/explorer/Explorer.Series.html#member?/2

}
@fill_missing_options %{
"binary" => ["forward", "backward", "max", "min", "scalar"],
Expand All @@ -45,10 +47,11 @@ defmodule KinoExplorer.DataTransformCell do
"float" => ["forward", "backward", "max", "min", "mean", "scalar", "nan"],
"integer" => ["forward", "backward", "max", "min", "mean", "scalar"],
"string" => ["forward", "backward", "max", "min", "scalar"],
"time" => ["forward", "backward", "max", "min", "mean", "scalar"]
"time" => ["forward", "backward", "max", "min", "mean", "scalar"],
"list" => ["forward", "backward"]
}
@summarise_options %{
count: @column_types,
count: @column_types ++ @composite_column_types,
max: [
"date",
"datetime[ms]",
Expand All @@ -69,16 +72,17 @@ defmodule KinoExplorer.DataTransformCell do
"integer",
"time"
],
n_distinct: @column_types,
nil_count: @column_types,
n_distinct: @column_types ++ @composite_column_types,
nil_count: @column_types ++ @composite_column_types,
standard_deviation: ["float", "integer"],
sum: ["boolean", "float", "integer"],
variance: ["float", "integer"]
}
@pivot_wider_types %{
names_from: @column_types,
values_from: @column_types
values_from: @column_types ++ @composite_column_types
}
@sort_types @column_types
@queried_filter_options [
"mean",
"median",
Expand Down Expand Up @@ -139,7 +143,8 @@ defmodule KinoExplorer.DataTransformCell do
},
operation_types: %{
pivot_wider: @pivot_wider_types,
queried_filter: @queried_filter_types
queried_filter: @queried_filter_types,
sort: @sort_types
},
missing_require: nil
)
Expand Down Expand Up @@ -980,6 +985,6 @@ defmodule KinoExplorer.DataTransformCell do
end

defp build_data_options(df) do
df |> DataFrame.dtypes() |> normalize_dtypes() |> Map.reject(fn {_k, v} -> v == "list" end)
df |> DataFrame.dtypes() |> normalize_dtypes()
end
end
45 changes: 0 additions & 45 deletions test/kino_explorer/data_transform_cell_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,51 +150,6 @@ defmodule KinoExplorer.DataTransformCellTest do
})
end

test "removes list-type columns from data options" do
{kino, _source} = start_smart_cell!(DataTransformCell, %{})

df =
Explorer.DataFrame.new(
[
a: ["a", "b"],
b: [1, 2],
c: ["https://elixir-lang.org", "https://www.erlang.org"],
d: [<<110, 120>>, <<200, 210>>],
e: [[1, 2], [3, 4]]
],
dtypes: [d: :binary]
)

env = Code.env_for_eval([])
DataTransformCell.scan_binding(kino.pid, binding(), env)

data_frame_variables = %{"df" => true}

assert_broadcast_event(kino, "set_available_data", %{
"data_frame_variables" => ^data_frame_variables,
"fields" => %{
operations: [
%{
"active" => true,
"column" => nil,
"data_options" => %{
"a" => "string",
"b" => "integer",
"c" => "string",
"d" => "binary"
},
"datalist" => [],
"filter" => nil,
"operation_type" => "filters",
"type" => "string",
"value" => nil
}
],
root_fields: %{"assign_to" => nil, "data_frame" => "df"}
}
})
end

describe "code generation" do
test "source for a data frame without operations" do
attrs = build_attrs(%{})
Expand Down