codeant-ai-for-open-source[bot] commented on code in PR #43176: URL: https://github.com/apache/superset/pull/43176#discussion_r4020504291
########## 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: You’re right—the dataset path is **not covered** by this helper as currently written. `_serialize_query()` only sees the post-factory `QueryObject`. For `query_dataset`, `_apply_granularity()` removes the `TEMPORAL_RANGE` filter when the temporal column is used as `granularity`, so both: ```python query.filter == [] query.time_range is None ``` may be true by the time `set_query_context_form_data()` runs. The fallback hoisting logic therefore has nothing to serialize, and `get_time_filter()` can still return `No filter`. The chart paths are safer when their original `form_data` includes a top-level `time_range`, but that does not fully solve column-specific `get_time_filter("column")` behavior. They should still rely on the serialized query’s filter payload where possible. The minimal fix is to preserve the request’s temporal filter for the Jinja payload before the query factory mutates the `QueryObject`, without adding `QueryObject.time_range` (which would affect cache-key behavior). For example, pass the original filters/time range through the query context’s form data or attach a chart-data-shaped filter payload, then let `_serialize_query()` use that preserved value when the final query has no temporal filter. So the concern is valid and should remain open until the dataset path has a regression test asserting `get_time_filter().time_range` after the real `QueryContextFactory` runs. -- 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]
