Auto-generate aggregation classes (#1918) (#1926)

* auto-generate aggregation classes * feedback (cherry picked from commit ec8da55) Co-authored-by: Miguel Grinberg <miguel.grinberg@gmail.com>
elastic · Oct 7, 2024 · bb2c9b0 · bb2c9b0
1 parent b116175
commit bb2c9b0
Show file tree

Hide file tree

Showing 13 changed files with 5,813 additions and 1,081 deletions.
diff --git a/elasticsearch_dsl/aggs.py b/elasticsearch_dsl/aggs.py
diff --git a/elasticsearch_dsl/query.py b/elasticsearch_dsl/query.py
@@ -624,7 +624,9 @@ def __init__(
             Literal["multiply", "replace", "sum", "avg", "max", "min"], "DefaultType"
         ] = DEFAULT,
         functions: Union[
-            Sequence["types.FunctionScoreContainer"], Dict[str, Any], "DefaultType"
+            Sequence["types.FunctionScoreContainer"],
+            Sequence[Dict[str, Any]],
+            "DefaultType",
         ] = DEFAULT,
         max_boost: Union[float, "DefaultType"] = DEFAULT,
         min_score: Union[float, "DefaultType"] = DEFAULT,
@@ -1688,7 +1690,7 @@ def __init__(
         organic: Union[Query, "DefaultType"] = DEFAULT,
         ids: Union[Sequence[str], "DefaultType"] = DEFAULT,
         docs: Union[
-            Sequence["types.PinnedDoc"], Dict[str, Any], "DefaultType"
+            Sequence["types.PinnedDoc"], Sequence[Dict[str, Any]], "DefaultType"
         ] = DEFAULT,
         boost: Union[float, "DefaultType"] = DEFAULT,
         _name: Union[str, "DefaultType"] = DEFAULT,
@@ -2372,7 +2374,7 @@ def __init__(
         self,
         *,
         clauses: Union[
-            Sequence["types.SpanQuery"], Dict[str, Any], "DefaultType"
+            Sequence["types.SpanQuery"], Sequence[Dict[str, Any]], "DefaultType"
         ] = DEFAULT,
         in_order: Union[bool, "DefaultType"] = DEFAULT,
         slop: Union[int, "DefaultType"] = DEFAULT,
@@ -2459,7 +2461,7 @@ def __init__(
         self,
         *,
         clauses: Union[
-            Sequence["types.SpanQuery"], Dict[str, Any], "DefaultType"
+            Sequence["types.SpanQuery"], Sequence[Dict[str, Any]], "DefaultType"
         ] = DEFAULT,
         boost: Union[float, "DefaultType"] = DEFAULT,
         _name: Union[str, "DefaultType"] = DEFAULT,

diff --git a/elasticsearch_dsl/search_base.py b/elasticsearch_dsl/search_base.py
@@ -949,7 +949,7 @@ def to_dict(self, count: bool = False, **kwargs: Any) -> Dict[str, Any]:
         d = {}
 
         if self.query:
-            d["query"] = self.query.to_dict()
+            d["query"] = recursive_to_dict(self.query)
 
         if self._knn:
             if len(self._knn) == 1:
@@ -963,10 +963,10 @@ def to_dict(self, count: bool = False, **kwargs: Any) -> Dict[str, Any]:
         # count request doesn't care for sorting and other things
         if not count:
             if self.post_filter:
-                d["post_filter"] = self.post_filter.to_dict()
+                d["post_filter"] = recursive_to_dict(self.post_filter.to_dict())
 
             if self.aggs.aggs:
-                d.update(self.aggs.to_dict())
+                d.update(recursive_to_dict(self.aggs.to_dict()))
 
             if self._sort:
                 d["sort"] = self._sort