From 10fed6c748976cea95e1d5961ea4c651b859112e Mon Sep 17 00:00:00 2001 From: Miguel Grinberg Date: Thu, 10 Apr 2025 12:52:30 +0100 Subject: [PATCH] use internal aggregation range class for date aggregation ranges (#2897) (cherry picked from commit 0d23e6b5dd44b322b65938e504ebb27ca54bcf89) --- utils/dsl-generator.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/dsl-generator.py b/utils/dsl-generator.py index 2aa12c53d..f18991dfc 100644 --- a/utils/dsl-generator.py +++ b/utils/dsl-generator.py @@ -345,12 +345,12 @@ def get_python_type(self, schema_type, for_response=False): ]["name"].endswith("Analyzer"): # not expanding analyzers at this time, maybe in the future return "str, Dict[str, Any]", None - elif ( - schema_type["name"]["namespace"] == "_types.aggregations" - and schema_type["name"]["name"].endswith("AggregationRange") - and schema_type["name"]["name"] != "IpRangeAggregationRange" - ): - return '"wrappers.AggregationRange"', None + elif schema_type["name"]["namespace"] == "_types.aggregations": + if ( + schema_type["name"]["name"].endswith("AggregationRange") + or schema_type["name"]["name"] == "DateRangeExpression" + ) and schema_type["name"]["name"] != "IpRangeAggregationRange": + return '"wrappers.AggregationRange"', None # to handle other interfaces we generate a type of the same name # and add the interface to the interfaces.py module