aminghadersohi commented on code in PR #42822: URL: https://github.com/apache/superset/pull/42822#discussion_r3785376168
########## superset/charts/data/form_data.py: ########## @@ -0,0 +1,57 @@ +# 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) -> dict[str, Any]: + """Serialize query fields consumed by the Jinja form-data fallback.""" + query_data = dict(query.to_dict()) Review Comment: Addressed in 9446d35f45 (included in head b1daf8b77b). now maps the real field to the key consumed by the Jinja fallback, preserves , and hoists from . Both regression tests now construct real instances rather than mocking , so they exercise the production serialization contract. ########## superset/charts/data/form_data.py: ########## @@ -0,0 +1,57 @@ +# 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) -> dict[str, Any]: + """Serialize query fields consumed by the Jinja form-data fallback.""" + query_data = dict(query.to_dict()) + if query.time_range is not None: + query_data["time_range"] = query.time_range + return query_data + + +def set_query_context_form_data( + query_context: QueryContext, + datasource_id: int, + datasource_type: str, +) -> None: + """Expose a programmatically-created query like a chart data API request.""" + set_form_data( + { + "datasource": {"id": datasource_id, "type": datasource_type}, + "queries": [ + _serialize_query(query) + for query in getattr(query_context, "queries", ()) Review Comment: Addressed in 9446d35f45. I removed the production guard and changed the OAuth test factory to return , keeping the helper contract aligned with a real . ########## superset/mcp_service/dataset/tool/query_dataset.py: ########## @@ -310,6 +310,10 @@ async def query_dataset( # noqa: C901 custom_cache_timeout=request.cache_timeout, ) + from superset.charts.data.form_data import set_query_context_form_data + + set_query_context_form_data(query_context, dataset.id, "table") Review Comment: Good point. I kept this PR scoped to the two MCP data-execution paths that motivated the fix; broadening it to every compile/preview/semantic-layer caller would require separate behavior and regression coverage. The helper is shared so those paths can adopt it consistently in a follow-up. The blocking serializer issues and tests are addressed on this head. -- 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]
