aminghadersohi commented on code in PR #43268: URL: https://github.com/apache/superset/pull/43268#discussion_r3825453020
########## superset/mcp_service/app.py: ########## @@ -417,17 +421,17 @@ def get_default_instructions( Chart Types in Existing Charts (viewable via list_charts/get_chart_info): Each chart returned by list_charts / get_chart_info includes a chart_type_display_name field with a human-readable name when available. -This field is populated only for the 10 chart types supported by generate_chart +This field is populated for the chart types supported by generate_chart (xy, pie, table, pivot_table, big_number, mixed_timeseries, handlebars, -histogram, box_plot, waterfall). +histogram, box_plot, waterfall, and host-gated interactive_pivot when enabled). For all other viz_types (Funnel, Gauge, Heatmap, etc.) it will be null — use the raw viz_type field instead when referring to those chart types. Review Comment: Addressed in 447cc3653b. The display-name lookup is intentionally unfiltered so MCP can name existing charts even when creation is disabled; `test_registry_filters.py` explicitly covers that contract. Availability still gates actionable discovery and generation. I updated the instructions to distinguish metadata lookup from creation/schema availability. ########## superset/mcp_service/chart/plugins/interactive_pivot.py: ########## @@ -0,0 +1,226 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +"""Preset AG Grid interactive pivot chart plugin.""" + +from __future__ import annotations + +from collections.abc import Mapping +from typing import Any, ClassVar + +from superset.extensions import feature_flag_manager +from superset.mcp_service.chart.chart_utils import ( + _add_adhoc_filters, + _summarize_filters, + add_currency_format, + create_metric_object, +) +from superset.mcp_service.chart.plugin import BaseChartPlugin +from superset.mcp_service.chart.schemas import ColumnRef, InteractivePivotChartConfig +from superset.mcp_service.chart.validation.dataset_validator import DatasetValidator +from superset.mcp_service.common.error_schemas import ChartGenerationError + +AG_GRID_PIVOT_FEATURE_FLAG = "AG_GRID_PIVOT_TABLE_ENABLED" +_AG_GRID_AGGREGATION = { + "AVG": "avg", + "MIN": "min", + "MAX": "max", +} + + +def _metric_label(metric: dict[str, Any] | str) -> str: + """Return the label AG Grid uses as a metric column identifier.""" + return metric if isinstance(metric, str) else str(metric["label"]) + + +def _grid_aggregation(metric: ColumnRef) -> str: + """Map a Superset metric aggregate to AG Grid's group rollup function.""" + return _AG_GRID_AGGREGATION.get((metric.aggregate or "SUM").upper(), "sum") + + +def map_interactive_pivot_config( + config: InteractivePivotChartConfig, +) -> dict[str, Any]: + """Map the MCP config to Preset's ``ag-grid-pivot-table`` form data.""" + metrics = [create_metric_object(metric) for metric in config.metrics] + rows = [column.name for column in config.rows] + columns = [column.name for column in config.columns] + + form_data: dict[str, Any] = { + "viz_type": "ag-grid-pivot-table", + # The Preset control panel stores every dimension in groupby. AG Grid's + # persisted state assigns each one to the Rows or Column Labels bucket. + "groupby": [*rows, *columns], + "metrics": metrics, + "row_limit": config.row_limit, + "order_desc": config.sort_descending, + "rowGroupCounts": config.show_row_group_counts, + "rowTotals": config.show_row_totals, + "colTotals": config.show_column_totals, + "colSubTotals": config.show_column_subtotals, + "valueFormat": config.value_format, + "allow_render_html": config.allow_render_html, + "expand_pivot_groups": config.expand_pivot_groups, + "pivot_table_state": { + "rowGroup": {"groupColIds": rows}, + "pivot": {"pivotMode": True, "pivotColIds": columns}, + "aggregation": { + "aggregationModel": [ + { + "colId": _metric_label(mapped_metric), + "aggFunc": _grid_aggregation(metric), + } + for metric, mapped_metric in zip( + config.metrics, metrics, strict=True + ) + ] + }, + }, + } + + if config.time_grain: + form_data["time_grain_sqla"] = config.time_grain.value Review Comment: Validated against the current Preset control panel and `buildQuery.ts`; no query fix is needed. The control panel registers `temporal_columns_lookup` as a hidden control initialized from dataset datetime columns, and `buildQuery` applies `time_grain_sqla` to each physical groupby dimension found in that lookup (or matching `granularity_sqla`). Since a pivot can contain multiple temporal dimensions, forcing one `granularity_sqla` would be incomplete. Commit 447cc3653b adds an explanatory comment so this coupling is explicit. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
