A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
feat: explicit aggregation column selection in dataframe Group By (#7261)
Holden X0540232f5cdf
diff --git a/frontend/src/plugins/impl/data-frames/forms/__tests__/__snapshots__/form.test.tsx.snap b/frontend/src/plugins/impl/data-frames/forms/__tests__/__snapshots__/form.test.tsx.snapindex 9706f17d24..b6e57ccdfb 100644--- a/frontend/src/plugins/impl/data-frames/forms/__tests__/__snapshots__/form.test.tsx.snap+++ b/frontend/src/plugins/impl/data-frames/forms/__tests__/__snapshots__/form.test.tsx.snap@@ -18,18 +18,18 @@ exports[`renderZodSchema > should render a form aggregate 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r24»-form-item"+ for="«r26»-form-item">- Columns+ Group by columns</label><div- aria-describedby="«r24»-form-item-description"+ aria-describedby="«r26»-form-item-description"aria-invalid="false"class="relative"- id="«r24»-form-item"+ id="«r26»-form-item"><div- aria-controls="radix-«r25»"+ aria-controls="radix-«r27»"aria-expanded="false"aria-haspopup="dialog"class="flex h-6 w-fit mb-1 shadow-xs-solid items-center justify-between rounded-sm border border-input bg-transparent px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground hover:shadow-sm-solid focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-primary focus:shadow-md-solid disabled:cursor-not-allowed disabled:opacity-50 min-w-[180px]"@@ -39,7 +39,7 @@ exports[`renderZodSchema > should render a form aggregate 1`] = `<spanclass="truncate flex-1 min-w-0">- Select columns+ Select group by columns</span><svgaria-hidden="true"@@ -73,18 +73,18 @@ exports[`renderZodSchema > should render a form aggregate 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 whitespace-pre"- for="«r26»-form-item"+ for="«r28»-form-item">Aggregations</label><div- aria-describedby="«r26»-form-item-description"+ aria-describedby="«r28»-form-item-description"aria-invalid="false"class="relative"- id="«r26»-form-item"+ id="«r28»-form-item"><div- aria-controls="radix-«r27»"+ aria-controls="radix-«r29»"aria-expanded="false"aria-haspopup="dialog"class="flex h-6 w-fit mb-1 shadow-xs-solid items-center justify-between rounded-sm border border-input bg-transparent px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground hover:shadow-sm-solid focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-primary focus:shadow-md-solid disabled:cursor-not-allowed disabled:opacity-50 min-w-[180px]"@@ -324,7 +324,7 @@ exports[`renderZodSchema > should render a form expand_dict 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r2o»-form-item"+ for="«r2q»-form-item">Column</label>@@ -333,7 +333,7 @@ exports[`renderZodSchema > should render a form expand_dict 1`] = `><buttonaria-autocomplete="none"- aria-controls="radix-«r2p»"+ aria-controls="radix-«r2r»"aria-expanded="false"class="flex h-6 w-fit items-center justify-between rounded-sm bg-background px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 cursor-pointer shadow-xs-solid border border-input hover:shadow-sm-solid focus:border-primary focus:shadow-md-solid disabled:hover:shadow-xs-solid mb-0 min-w-[180px]"data-placeholder=""@@ -390,18 +390,18 @@ exports[`renderZodSchema > should render a form explode_columns 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r2m»-form-item"+ for="«r2o»-form-item">- Columns+ Group by columns</label><div- aria-describedby="«r2m»-form-item-description"+ aria-describedby="«r2o»-form-item-description"aria-invalid="false"class="relative"- id="«r2m»-form-item"+ id="«r2o»-form-item"><div- aria-controls="radix-«r2n»"+ aria-controls="radix-«r2p»"aria-expanded="false"aria-haspopup="dialog"class="flex h-6 w-fit mb-1 shadow-xs-solid items-center justify-between rounded-sm border border-input bg-transparent px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground hover:shadow-sm-solid focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-primary focus:shadow-md-solid disabled:cursor-not-allowed disabled:opacity-50 min-w-[180px]"@@ -411,7 +411,7 @@ exports[`renderZodSchema > should render a form explode_columns 1`] = `<spanclass="truncate flex-1 min-w-0">- Select columns+ Select group by columns</span><svgaria-hidden="true"@@ -589,7 +589,7 @@ exports[`renderZodSchema > should render a form group_by 1`] = `class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"for="«r1o»-form-item">- Columns+ Group by columns</label><divaria-describedby="«r1o»-form-item-description"@@ -608,7 +608,7 @@ exports[`renderZodSchema > should render a form group_by 1`] = `<spanclass="truncate flex-1 min-w-0">- Select columns+ Select group by columns</span><svgaria-hidden="true"@@ -641,14 +641,69 @@ exports[`renderZodSchema > should render a form group_by 1`] = `class="flex flex-col gap-1"><label- class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 whitespace-pre"+ class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"for="«r1q»-form-item"+ >+ Aggregate on columns+ </label>+ <div+ aria-describedby="«r1q»-form-item-description"+ aria-invalid="false"+ class="relative"+ id="«r1q»-form-item"+ >+ <div+ aria-controls="radix-«r1r»"+ aria-expanded="false"+ aria-haspopup="dialog"+ class="flex h-6 w-fit mb-1 shadow-xs-solid items-center justify-between rounded-sm border border-input bg-transparent px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground hover:shadow-sm-solid focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-primary focus:shadow-md-solid disabled:cursor-not-allowed disabled:opacity-50 min-w-[180px]"+ data-state="closed"+ type="button"+ >+ <span+ class="truncate flex-1 min-w-0"+ >+ Select aggregate on columns+ </span>+ <svg+ aria-hidden="true"+ class="lucide lucide-chevron-down ml-3 w-4 h-4 opacity-50 shrink-0"+ fill="none"+ height="24"+ stroke="currentColor"+ stroke-linecap="round"+ stroke-linejoin="round"+ stroke-width="2"+ viewBox="0 0 24 24"+ width="24"+ xmlns="http://www.w3.org/2000/svg"+ >+ <path+ d="m6 9 6 6 6-6"+ />+ </svg>+ </div>+ <div+ class="flex flex-col gap-1 items-start"+ />+ </div>+ </div>+ </div>+ <div+ class="flex flex-row align-start"+ >+ <div+ class="flex flex-col gap-1"+ >+ <label+ class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 whitespace-pre"+ for="«r1s»-form-item">Aggregation</label><buttonaria-autocomplete="none"- aria-controls="radix-«r1r»"+ aria-controls="radix-«r1t»"aria-expanded="false"class="flex h-6 w-fit items-center justify-between rounded-sm bg-background px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 cursor-pointer shadow-xs-solid border border-input hover:shadow-sm-solid focus:border-primary focus:shadow-md-solid disabled:hover:shadow-xs-solid mb-0 min-w-[180px]"data-placeholder=""@@ -693,18 +748,18 @@ exports[`renderZodSchema > should render a form group_by 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r1s»-form-item"+ for="«r1u»-form-item">Drop N/A</label><buttonaria-checked="false"- aria-describedby="«r1s»-form-item-description"+ aria-describedby="«r1u»-form-item-description"aria-invalid="false"class="flex items-center justify-center peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground"data-state="unchecked"data-testid="marimo-plugin-data-frames-boolean-checkbox"- id="«r1s»-form-item"+ id="«r1u»-form-item"role="checkbox"type="button"value="on"@@ -819,7 +874,7 @@ exports[`renderZodSchema > should render a form sample_rows 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r28»-form-item"+ for="«r2a»-form-item">Number of rows</label>@@ -831,13 +886,13 @@ exports[`renderZodSchema > should render a form sample_rows 1`] = `class="shadow-xs-solid hover:shadow-sm-solid hover:focus-within:shadow-md-solid flex overflow-hidden rounded-sm border border-input bg-background text-sm font-code ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 disabled:shadow-xs-solid focus-within:shadow-md-solid focus-within:outline-hidden focus-within:ring-1 focus-within:ring-ring focus-within:border-primary h-6 w-full my-0"><input- aria-describedby="«r28»-form-item-description"+ aria-describedby="«r2a»-form-item-description"aria-roledescription="Number field"autocomplete="off"autocorrect="off"class="flex-1 w-full placeholder:text-muted-foreground outline-hidden disabled:cursor-not-allowed disabled:opacity-50 px-1.5"data-rac=""- id="«r28»-form-item"+ id="«r2a»-form-item"inputmode="numeric"spellcheck="false"tabindex="0"@@ -849,12 +904,12 @@ exports[`renderZodSchema > should render a form sample_rows 1`] = `class="flex flex-col border-s-2"><button- aria-controls="«r28»-form-item"+ aria-controls="«r2a»-form-item"aria-label="Increase"class="cursor-default text-muted-foreground pressed:bg-muted-foreground group-disabled:text-disabled-foreground outline-hidden focus-visible:text-primary disabled:cursor-not-allowed disabled:opacity-50 hover:text-primary hover:bg-muted px-0.5"data-rac=""data-react-aria-pressable="true"- id="react-aria-«r2f»"+ id="react-aria-«r2h»"slot="increment"tabindex="-1"type="button"@@ -881,12 +936,12 @@ exports[`renderZodSchema > should render a form sample_rows 1`] = `class="h-px shrink-0 divider bg-border z-10"/><button- aria-controls="«r28»-form-item"+ aria-controls="«r2a»-form-item"aria-label="Decrease"class="cursor-default text-muted-foreground pressed:bg-muted-foreground group-disabled:text-disabled-foreground outline-hidden focus-visible:text-primary disabled:cursor-not-allowed disabled:opacity-50 hover:text-primary hover:bg-muted px-0.5"data-rac=""data-react-aria-pressable="true"- id="react-aria-«r2g»"+ id="react-aria-«r2i»"slot="decrement"tabindex="-1"type="button"@@ -966,18 +1021,18 @@ exports[`renderZodSchema > should render a form sample_rows 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r2l»-form-item"+ for="«r2n»-form-item">Sample with replacement</label><buttonaria-checked="false"- aria-describedby="«r2l»-form-item-description"+ aria-describedby="«r2n»-form-item-description"aria-invalid="false"class="flex items-center justify-center peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground"data-state="unchecked"data-testid="marimo-plugin-data-frames-boolean-checkbox"- id="«r2l»-form-item"+ id="«r2n»-form-item"role="checkbox"type="button"value="on"@@ -1009,7 +1064,7 @@ exports[`renderZodSchema > should render a form select_columns 1`] = `class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"for="«r3»-form-item">- Columns+ Group by columns</label><divaria-describedby="«r3»-form-item-description"@@ -1028,7 +1083,7 @@ exports[`renderZodSchema > should render a form select_columns 1`] = `<spanclass="truncate flex-1 min-w-0">- Select columns+ Select group by columns</span><svgaria-hidden="true"@@ -1290,18 +1345,18 @@ exports[`renderZodSchema > should render a form unique 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r2v»-form-item"+ for="«r31»-form-item">- Columns+ Group by columns</label><div- aria-describedby="«r2v»-form-item-description"+ aria-describedby="«r31»-form-item-description"aria-invalid="false"class="relative"- id="«r2v»-form-item"+ id="«r31»-form-item"><div- aria-controls="radix-«r30»"+ aria-controls="radix-«r32»"aria-expanded="false"aria-haspopup="dialog"class="flex h-6 w-fit mb-1 shadow-xs-solid items-center justify-between rounded-sm border border-input bg-transparent px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground hover:shadow-sm-solid focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-primary focus:shadow-md-solid disabled:cursor-not-allowed disabled:opacity-50 min-w-[180px]"@@ -1311,7 +1366,7 @@ exports[`renderZodSchema > should render a form unique 1`] = `<spanclass="truncate flex-1 min-w-0">- Select columns+ Select group by columns</span><svgaria-hidden="true"@@ -1345,13 +1400,13 @@ exports[`renderZodSchema > should render a form unique 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 whitespace-pre"- for="«r31»-form-item"+ for="«r33»-form-item">Keep</label><buttonaria-autocomplete="none"- aria-controls="radix-«r32»"+ aria-controls="radix-«r34»"aria-expanded="false"class="flex h-6 w-fit items-center justify-between rounded-sm bg-background px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 cursor-pointer shadow-xs-solid border border-input hover:shadow-sm-solid focus:border-primary focus:shadow-md-solid disabled:hover:shadow-xs-solid mb-0 min-w-[180px]"data-placeholder=""@@ -1396,7 +1451,7 @@ exports[`renders custom forms column_id 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r38»-form-item"+ for="«r3a»-form-item">Column</label>@@ -1405,7 +1460,7 @@ exports[`renders custom forms column_id 1`] = `><buttonaria-autocomplete="none"- aria-controls="radix-«r39»"+ aria-controls="radix-«r3b»"aria-expanded="false"class="flex h-6 w-fit items-center justify-between rounded-sm bg-background px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 cursor-pointer shadow-xs-solid border border-input hover:shadow-sm-solid focus:border-primary focus:shadow-md-solid disabled:hover:shadow-xs-solid mb-0 min-w-[180px]"data-placeholder=""@@ -1449,18 +1504,18 @@ exports[`renders custom forms column_id_array 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r3f»-form-item"+ for="«r3h»-form-item">- Columns+ Group by columns</label><div- aria-describedby="«r3f»-form-item-description"+ aria-describedby="«r3h»-form-item-description"aria-invalid="false"class="relative"- id="«r3f»-form-item"+ id="«r3h»-form-item"><div- aria-controls="radix-«r3g»"+ aria-controls="radix-«r3i»"aria-expanded="false"aria-haspopup="dialog"class="flex h-6 w-fit mb-1 shadow-xs-solid items-center justify-between rounded-sm border border-input bg-transparent px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground hover:shadow-sm-solid focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-primary focus:shadow-md-solid disabled:cursor-not-allowed disabled:opacity-50 min-w-[180px]"@@ -1470,7 +1525,7 @@ exports[`renders custom forms column_id_array 1`] = `<spanclass="truncate flex-1 min-w-0">- Select columns+ Select group by columns</span><svgaria-hidden="true"@@ -1504,13 +1559,13 @@ exports[`renders custom forms column_id_dot_array 1`] = `class="flex flex-col gap-1"><div- aria-describedby="«r3h»-form-item-description"+ aria-describedby="«r3j»-form-item-description"aria-invalid="false"class="relative"- id="«r3h»-form-item"+ id="«r3j»-form-item"><div- aria-controls="radix-«r3i»"+ aria-controls="radix-«r3k»"aria-expanded="false"aria-haspopup="dialog"class="flex h-6 w-fit mb-1 shadow-xs-solid items-center justify-between rounded-sm border border-input bg-transparent px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground hover:shadow-sm-solid focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-primary focus:shadow-md-solid disabled:cursor-not-allowed disabled:opacity-50 min-w-[180px]"@@ -1555,7 +1610,7 @@ exports[`renders custom forms column_id_optional 1`] = `><labelclass="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="«r3j»-form-item"+ for="«r3l»-form-item">Column</label>@@ -1564,7 +1619,7 @@ exports[`renders custom forms column_id_optional 1`] = `><buttonaria-autocomplete="none"- aria-controls="radix-«r3k»"+ aria-controls="radix-«r3m»"aria-expanded="false"class="flex h-6 w-fit items-center justify-between rounded-sm bg-background px-2 text-sm font-prose ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 cursor-pointer shadow-xs-solid border border-input hover:shadow-sm-solid focus:border-primary focus:shadow-md-solid disabled:hover:shadow-xs-solid mb-0 min-w-[180px]"data-placeholder=""diff --git a/frontend/src/plugins/impl/data-frames/schema.ts b/frontend/src/plugins/impl/data-frames/schema.tsindex 3bec14c4a0..2129433129 100644--- a/frontend/src/plugins/impl/data-frames/schema.ts+++ b/frontend/src/plugins/impl/data-frames/schema.ts@@ -29,7 +29,7 @@ export const column_id_array = z.array(column_id.describe(FieldOptions.of({ special: "column_id" }))).min(1, "At least one column is required").default([])- .describe(FieldOptions.of({ label: "Columns", minLength: 1 }));+ .describe(FieldOptions.of({ label: "Group by columns", minLength: 1 }));const ColumnConversionTransformSchema = z.object({@@ -108,6 +108,10 @@ const GroupByTransformSchema = z.object({type: z.literal("group_by"),column_ids: column_id_array,+ aggregation_column_ids: z+ .array(column_id.describe(FieldOptions.of({ special: "column_id" })))+ .default([])+ .describe(FieldOptions.of({ label: "Aggregate on columns" })),aggregation: z.enum(AGGREGATION_FNS).default("count")diff --git a/frontend/src/plugins/impl/data-frames/utils/__tests__/getUpdatedColumnTypes.test.ts b/frontend/src/plugins/impl/data-frames/utils/__tests__/getUpdatedColumnTypes.test.tsindex e95a612b9d..2b936f784c 100644--- a/frontend/src/plugins/impl/data-frames/utils/__tests__/getUpdatedColumnTypes.test.ts+++ b/frontend/src/plugins/impl/data-frames/utils/__tests__/getUpdatedColumnTypes.test.ts@@ -27,12 +27,14 @@ const Transforms = {column_ids: ["col1", "col3"] as ColumnId[],aggregation: "max",drop_na: true,+ aggregation_column_ids: [],} satisfies TransformType,GROUP_BY_CHAINED: {type: "group_by",column_ids: ["newCol2"] as ColumnId[],aggregation: "max",drop_na: true,+ aggregation_column_ids: [],} satisfies TransformType,AGGREGATE: {type: "aggregate",@@ -99,7 +101,9 @@ describe("getUpdatedColumnTypes", () => {);expect(result).toMatchInlineSnapshot(`Map {- 2 => "bool",+ "col1" => "str",+ "2_max" => "bool",+ "col3" => "int",}`);});@@ -182,10 +186,7 @@ describe("getUpdatedColumnTypes", () => {INITIAL_COLUMN_TYPES,);expect(result).toMatchInlineSnapshot(`- Map {- "col1" => "bool",- "col3" => "int",- }+ Map {}`);});});diff --git a/frontend/src/plugins/impl/data-frames/utils/getUpdatedColumnTypes.ts b/frontend/src/plugins/impl/data-frames/utils/getUpdatedColumnTypes.tsindex fdde7198f8..5d771cce22 100644--- a/frontend/src/plugins/impl/data-frames/utils/getUpdatedColumnTypes.ts+++ b/frontend/src/plugins/impl/data-frames/utils/getUpdatedColumnTypes.ts@@ -2,7 +2,7 @@import { logNever } from "@/utils/assertNever";import { Maps } from "@/utils/maps";import type { TransformType } from "../schema";-import type { ColumnDataTypes } from "../types";+import type { ColumnDataTypes, ColumnId } from "../types";/*** Given a list of transforms, return the updated column names/types.@@ -46,8 +46,29 @@ function handleTransform(}return next;}- case "group_by":- return Maps.filterMap(next, (_v, k) => !transform.column_ids.includes(k));+ case "group_by": {+ const groupColumns = new Set(transform.column_ids ?? []);+ const aggregationColumns =+ transform.aggregation_column_ids &&+ transform.aggregation_column_ids.length > 0+ ? new Set(transform.aggregation_column_ids)+ : null;++ const updated = new Map<ColumnId, string>();++ for (const [columnId, type] of next.entries()) {+ if (groupColumns.has(columnId)) {+ updated.set(columnId, type);+ continue;+ }++ if (aggregationColumns === null || aggregationColumns.has(columnId)) {+ updated.set(`${columnId}_${transform.aggregation}` as ColumnId, type);+ }+ }++ return updated;+ }case "aggregate":return Maps.filterMap(next, (_v, k) => transform.column_ids.includes(k));case "select_columns":diff --git a/marimo/_plugins/ui/_impl/dataframes/transforms/handlers.py b/marimo/_plugins/ui/_impl/dataframes/transforms/handlers.pyindex 385a619225..debfd56231 100644--- a/marimo/_plugins/ui/_impl/dataframes/transforms/handlers.py+++ b/marimo/_plugins/ui/_impl/dataframes/transforms/handlers.py@@ -225,9 +225,12 @@ class NarwhalsTransformHandler(TransformHandler[DataFrame]):) -> DataFrame:aggs: list[Expr] = []group_by_column_id_set = set(transform.column_ids)+ columns = (+ transform.aggregation_column_ids or df.collect_schema().names()+ )agg_columns = [column_id- for column_id in df.collect_schema().names()+ for column_id in columnsif column_id not in group_by_column_id_set]diff --git a/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py b/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.pyindex acffacc461..4301a3dec2 100644--- a/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py+++ b/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py@@ -29,8 +29,6 @@ def python_print_transforms(def python_print_pandas(df_name: str, all_columns: list[str], transform: Transform) -> str:- del all_columns-def generate_where_clause(df_name: str, where: Condition) -> str:column_id, operator, value = (where.column_id,@@ -144,6 +142,10 @@ def python_print_pandas(transform.aggregation,transform.drop_na,)+ # Use explicit aggregation columns if provided, otherwise all except group-by columns+ aggregation_columns = transform.aggregation_column_ids or [+ col for col in all_columns if col not in column_ids+ ]args = _args_list(_list_of_strings(column_ids), f"dropna={drop_na}")group_by = f"{df_name}.groupby({args})"# Narwhals adds suffixes to aggregated columns like 'column_count'@@ -162,7 +164,16 @@ def python_print_pandas(agg_func = "max"else:assert_never(aggregation)- # Use pandas pipe to add suffixes++ # If specific aggregation columns are provided, only aggregate those and rename explicitly.+ if aggregation_columns:+ agg_dict = ", ".join(+ f"{_as_literal(f'{col}_{aggregation}')} : ({_as_literal(col)}, {_as_literal(agg_func)})"+ for col in aggregation_columns+ )+ return f"{group_by}.agg(**{{{agg_dict}}}).reset_index()"++ # Otherwise, follow pandas default across all applicable columns and suffix the resultif aggregation in ["mean", "median"]:agg_call = f"{group_by}.{agg_func}(numeric_only=True)"else:@@ -302,36 +313,37 @@ def python_print_polars(elif transform.type == TransformType.GROUP_BY:column_ids, aggregation = transform.column_ids, transform.aggregation+ columns = transform.aggregation_column_ids or all_columns+ aggregation_columns = [col for col in columns if col not in column_ids]aggs: list[str] = []# Use _as_literal to properly escape column names- for column_id in all_columns:- if column_id not in column_ids:- col_ref = _as_literal(column_id)- agg_alias = f"{column_id}_{aggregation}"- if aggregation == "count":- aggs.append(- f"pl.col({col_ref}).count().alias({_as_literal(agg_alias)})"- )- elif aggregation == "sum":- aggs.append(- f"pl.col({col_ref}).sum().alias({_as_literal(agg_alias)})"- )- elif aggregation == "mean":- aggs.append(- f"pl.col({col_ref}).mean().alias({_as_literal(agg_alias)})"- )- elif aggregation == "median":- aggs.append(- f"pl.col({col_ref}).median().alias({_as_literal(agg_alias)})"- )- elif aggregation == "min":- aggs.append(- f"pl.col({col_ref}).min().alias({_as_literal(agg_alias)})"- )- elif aggregation == "max":- aggs.append(- f"pl.col({col_ref}).max().alias({_as_literal(agg_alias)})"- )+ for column_id in aggregation_columns:+ col_ref = _as_literal(column_id)+ agg_alias = f"{column_id}_{aggregation}"+ if aggregation == "count":+ aggs.append(+ f"pl.col({col_ref}).count().alias({_as_literal(agg_alias)})"+ )+ elif aggregation == "sum":+ aggs.append(+ f"pl.col({col_ref}).sum().alias({_as_literal(agg_alias)})"+ )+ elif aggregation == "mean":+ aggs.append(+ f"pl.col({col_ref}).mean().alias({_as_literal(agg_alias)})"+ )+ elif aggregation == "median":+ aggs.append(+ f"pl.col({col_ref}).median().alias({_as_literal(agg_alias)})"+ )+ elif aggregation == "min":+ aggs.append(+ f"pl.col({col_ref}).min().alias({_as_literal(agg_alias)})"+ )+ elif aggregation == "max":+ aggs.append(+ f"pl.col({col_ref}).max().alias({_as_literal(agg_alias)})"+ )group_cols = [f"pl.col({_as_literal(col)})" for col in column_ids]return f"{df_name}.group_by([{', '.join(group_cols)}], maintain_order=True).agg([{', '.join(aggs)}])" # noqa: E501@@ -460,13 +472,14 @@ def python_print_ibis(elif transform.type == TransformType.GROUP_BY:column_ids, aggregation = transform.column_ids, transform.aggregation+ columns = transform.aggregation_column_ids or all_columns+ aggregation_columns = [col for col in columns if col not in column_ids]aggs: list[str] = []- for column_id in all_columns:- if column_id not in column_ids:- agg_alias = f"{column_id}_{aggregation}"- aggs.append(- f'"{agg_alias}" : {df_name}["{column_id}"].{aggregation}()'- )+ for column_id in aggregation_columns:+ agg_alias = f"{column_id}_{aggregation}"+ aggs.append(+ f'"{agg_alias}" : {df_name}["{column_id}"].{aggregation}()'+ )return f"{df_name}.group_by({_list_of_strings(column_ids)}).aggregate(**{{{','.join(aggs)}}})" # noqa: E501elif transform.type == TransformType.SELECT_COLUMNS:diff --git a/marimo/_plugins/ui/_impl/dataframes/transforms/types.py b/marimo/_plugins/ui/_impl/dataframes/transforms/types.pyindex eba1214655..9e21b2ea7d 100644--- a/marimo/_plugins/ui/_impl/dataframes/transforms/types.py+++ b/marimo/_plugins/ui/_impl/dataframes/transforms/types.py@@ -126,6 +126,7 @@ class GroupByTransform:column_ids: ColumnIdsdrop_na: boolaggregation: Aggregation+ aggregation_column_ids: ColumnIds@dataclassdiff --git a/tests/_plugins/ui/_impl/dataframes/test_dataframe.py b/tests/_plugins/ui/_impl/dataframes/test_dataframe.pyindex c8b31b650c..34aea85cb7 100644--- a/tests/_plugins/ui/_impl/dataframes/test_dataframe.py+++ b/tests/_plugins/ui/_impl/dataframes/test_dataframe.py@@ -448,6 +448,7 @@ class TestDataframes:column_ids=["group"],drop_na=True,aggregation="max",+ aggregation_column_ids=["age"],)transformations = Transformations([transform])transformed_df = transform_container.apply(transformations)@@ -524,6 +525,7 @@ class TestDataframes:column_ids=["group"],drop_na=True,aggregation="max",+ aggregation_column_ids=["age"],)# Create and apply the sort transformationdiff --git a/tests/_plugins/ui/_impl/dataframes/test_handlers.py b/tests/_plugins/ui/_impl/dataframes/test_handlers.pyindex eff7b7d77d..852abf047b 100644--- a/tests/_plugins/ui/_impl/dataframes/test_handlers.py+++ b/tests/_plugins/ui/_impl/dataframes/test_handlers.py@@ -782,6 +782,7 @@ class TestTransformHandler:column_ids=["A"],drop_na=False,aggregation="sum",+ aggregation_column_ids=[],)result = apply(df, transform)if not isinstance(result, pd.DataFrame):diff --git a/tests/_plugins/ui/_impl/dataframes/test_print_code.py b/tests/_plugins/ui/_impl/dataframes/test_print_code.pyindex feaae53c49..de14f46575 100644--- a/tests/_plugins/ui/_impl/dataframes/test_print_code.py+++ b/tests/_plugins/ui/_impl/dataframes/test_print_code.py@@ -76,6 +76,10 @@ def create_transform_strategy(df_size: int = 3,) -> st.SearchStrategy[Transform]:column_ids = st.lists(column_id, min_size=1)+ aggregation_column_ids = st.one_of(+ st.just([]),+ st.lists(column_id, min_size=1),+ )if string_column_id is None:string_column_id = column_id@@ -174,6 +178,7 @@ def create_transform_strategy(column_ids=column_ids,drop_na=st.booleans(),aggregation=aggregation,+ aggregation_column_ids=aggregation_column_ids,)aggregate_transform_strategy = st.builds(@@ -749,6 +754,7 @@ class TestCombinedTransforms:column_ids=["a"],drop_na=False,aggregation="sum",+ aggregation_column_ids=["b"],),])@@ -775,6 +781,7 @@ class TestCombinedTransforms:column_ids=["x"],drop_na=False,aggregation="mean",+ aggregation_column_ids=["b"],),])