rusackas commented on code in PR #43176:
URL: https://github.com/apache/superset/pull/43176#discussion_r4018374136
##########
superset/mcp_service/chart/tool/get_chart_sql.py:
##########
@@ -185,6 +187,11 @@ def _sql_from_saved_query_context(
query_context = ChartDataQueryContextSchema().load(qc_json)
query_context.result_type = ChartDataResultType.QUERY
+ set_query_context_form_data(
+ query_context,
+ chart.datasource_id,
+ chart.datasource_type,
+ )
Review Comment:
Oops, that last reply was meant for the other thread, ignore it here. On
this one: `_datasource_id_and_type_from_query_context` already prefers
`query_context.datasource.id`/`.type`, `chart.datasource_id` only kicks in as a
last resort when that's not an int/str (MagicMock test doubles etc). That's the
order it's been in since before this thread, just split into its own helper
later to satisfy ruff's complexity check. Resolving.
##########
superset/charts/data/form_data.py:
##########
@@ -0,0 +1,63 @@
+# 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.
+
+from __future__ import annotations
+
+from typing import Any, TYPE_CHECKING
+
+from flask import g
+
+if TYPE_CHECKING:
+ from superset.common.query_context import QueryContext
+ from superset.common.query_object import QueryObject
+
+
+def set_form_data(form_data: dict[str, Any]) -> None:
+ """Expose chart data request fields to Jinja template macros."""
+ g.form_data = form_data
+
+
+def _serialize_query(
+ query: QueryObject,
+ form_data: dict[str, Any],
+) -> dict[str, Any]:
+ """Serialize query fields consumed by the Jinja form-data fallback."""
+ query_data = dict(query.to_dict())
+ query_data["filters"] = query.filter
+ if query.time_range is not None:
+ query_data["time_range"] = query.time_range
+ if url_params := form_data.get("url_params"):
+ query_data["url_params"] = url_params
+ return query_data
+
+
+def set_query_context_form_data(
+ query_context: QueryContext,
+ datasource_id: int | str,
+ datasource_type: str,
+) -> None:
+ """Expose a programmatically-created query like a chart data API
request."""
+ form_data = query_context.form_data or {}
+ set_form_data(
+ {
+ "datasource": {"id": datasource_id, "type": datasource_type},
+ "queries": [
+ _serialize_query(query, form_data) for query in
query_context.queries
+ ],
+ "form_data": form_data,
+ }
Review Comment:
I think this is covered too, just less directly. `_serialize_query` still
carries `query.filter` up as `filters`, and `get_time_filter()` runs
`convert_legacy_filters_into_adhoc()` first, converting any `TEMPORAL_RANGE`
entries into `adhoc_filters` before matching on column. No test covers the
column-specific case though, so flagging before closing this out.
--
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]
