You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2026/03/20 19:43:07 UTC

(superset) 06/32: feat(mcp): add extra_form_data param to get_chart_data for dashboard filters (#38531)

This is an automated email from the ASF dual-hosted git repository.

michaelsmolina pushed a commit to branch 6.1
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 5adf07aef31457e9888cb0a1cc00d614d5789c39
Author: Amin Ghadersohi <am...@gmail.com>
AuthorDate: Fri Mar 13 12:13:47 2026 +0100

    feat(mcp): add extra_form_data param to get_chart_data for dashboard filters (#38531)
    
    Co-authored-by: Claude Opus 4.6 <no...@anthropic.com>
---
 superset/mcp_service/chart/schemas.py             |  8 +++
 superset/mcp_service/chart/tool/get_chart_data.py | 63 ++++++++++++++++-------
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/superset/mcp_service/chart/schemas.py b/superset/mcp_service/chart/schemas.py
index 31b0d4daf0f..7109b34b580 100644
--- a/superset/mcp_service/chart/schemas.py
+++ b/superset/mcp_service/chart/schemas.py
@@ -1076,6 +1076,14 @@ class GetChartDataRequest(QueryCacheControl):
             "chart's configured row limit."
         ),
     )
+    extra_form_data: dict[str, Any] | None = Field(
+        default=None,
+        description=(
+            "Extra form data to merge into the chart query, typically from "
+            "dashboard native filters. Format: "
+            '{"filters": [{"col": "country", "op": "IN", "val": ["US"]}]}'
+        ),
+    )
     format: Literal["json", "csv", "excel"] = Field(
         default="json", description="Data export format"
     )
diff --git a/superset/mcp_service/chart/tool/get_chart_data.py b/superset/mcp_service/chart/tool/get_chart_data.py
index 907057d859e..c6f9123c5cc 100644
--- a/superset/mcp_service/chart/tool/get_chart_data.py
+++ b/superset/mcp_service/chart/tool/get_chart_data.py
@@ -44,10 +44,21 @@ from superset.mcp_service.chart.schemas import (
 )
 from superset.mcp_service.utils.cache_utils import get_cache_status_from_result
 from superset.mcp_service.utils.schema_utils import parse_request
+from superset.utils.core import merge_extra_filters
 
 logger = logging.getLogger(__name__)
 
 
+def _apply_extra_form_data(
+    form_data: dict[str, Any], extra_form_data: dict[str, Any] | None
+) -> None:
+    """Merge dashboard native filters into chart form_data in-place."""
+    if not extra_form_data:
+        return
+    form_data["extra_form_data"] = extra_form_data
+    merge_extra_filters(form_data)
+
+
 def _get_cached_form_data(form_data_key: str) -> str | None:
     """Retrieve form_data from cache using form_data_key.
 
@@ -286,20 +297,26 @@ async def get_chart_data(  # noqa: C901
                     cached_metrics = cached_form_data_dict.get("metrics", [])
                     cached_groupby = cached_form_data_dict.get("groupby", [])
 
+                _apply_extra_form_data(cached_form_data_dict, request.extra_form_data)
+
+                cached_query: dict[str, Any] = {
+                    "filters": cached_form_data_dict.get("filters", []),
+                    "columns": cached_groupby,
+                    "metrics": cached_metrics,
+                    "row_limit": row_limit,
+                    "order_desc": cached_form_data_dict.get("order_desc", True),
+                }
+                # Include adhoc_filters so dashboard native filters are applied
+                cached_adhoc = cached_form_data_dict.get("adhoc_filters")
+                if cached_adhoc:
+                    cached_query["adhoc_filters"] = cached_adhoc
+
                 query_context = factory.create(
                     datasource={
                         "id": datasource_id,
                         "type": datasource_type,
                     },
-                    queries=[
-                        {
-                            "filters": cached_form_data_dict.get("filters", []),
-                            "columns": cached_groupby,
-                            "metrics": cached_metrics,
-                            "row_limit": row_limit,
-                            "order_desc": cached_form_data_dict.get("order_desc", True),
-                        }
-                    ],
+                    queries=[cached_query],
                     form_data=cached_form_data_dict,
                     force=request.force_refresh,
                 )
@@ -454,20 +471,26 @@ async def get_chart_data(  # noqa: C901
                         error_type="MissingQueryContext",
                     )
 
+                _apply_extra_form_data(form_data, request.extra_form_data)
+
+                fallback_query: dict[str, Any] = {
+                    "filters": form_data.get("filters", []),
+                    "columns": query_columns,
+                    "metrics": metrics,
+                    "row_limit": row_limit,
+                    "order_desc": True,
+                }
+                # Include adhoc_filters so dashboard native filters are applied
+                fallback_adhoc = form_data.get("adhoc_filters")
+                if fallback_adhoc:
+                    fallback_query["adhoc_filters"] = fallback_adhoc
+
                 query_context = factory.create(
                     datasource={
                         "id": chart.datasource_id,
                         "type": chart.datasource_type,
                     },
-                    queries=[
-                        {
-                            "filters": form_data.get("filters", []),
-                            "columns": query_columns,
-                            "metrics": metrics,
-                            "row_limit": row_limit,
-                            "order_desc": True,
-                        }
-                    ],
+                    queries=[fallback_query],
                     form_data=form_data,
                     force=request.force_refresh,
                 )
@@ -480,6 +503,10 @@ async def get_chart_data(  # noqa: C901
                     for query in query_context_json.get("queries", []):
                         query["row_limit"] = request.limit
 
+                # Merge dashboard native filters into query_context's form_data
+                qc_form_data = query_context_json.setdefault("form_data", {})
+                _apply_extra_form_data(qc_form_data, request.extra_form_data)
+
                 # Create QueryContext from the saved context using the schema
                 # This is exactly how the API does it
                 query_context = ChartDataQueryContextSchema().load(query_context_json)