Separate setting __query and __body

Author: pquentin

elasticsearch/_async/client/__init__.py

@@ -396,8 +396,8 @@ async def submit(
             __path = f"/{_quote(index)}/_async_search"
         else:
             __path = "/_async_search"
-        __body: t.Dict[str, t.Any] = {}
         __query: t.Dict[str, t.Any] = {}
+        __body: t.Dict[str, t.Any] = {}
         # The 'sort' parameter with a colon can't be encoded to the body.
         if sort is not None and (
             (isinstance(sort, str) and ":" in sort)
@@ -409,10 +409,6 @@ async def submit(
         ):
             __query["sort"] = sort
             sort = None
-        if aggregations is not None:
-            __body["aggregations"] = aggregations
-        if aggs is not None:
-            __body["aggs"] = aggs
         if allow_no_indices is not None:
             __query["allow_no_indices"] = allow_no_indices
         if allow_partial_search_results is not None:
@@ -425,86 +421,106 @@ async def submit(
             __query["batched_reduce_size"] = batched_reduce_size
         if ccs_minimize_roundtrips is not None:
             __query["ccs_minimize_roundtrips"] = ccs_minimize_roundtrips
-        if collapse is not None:
-            __body["collapse"] = collapse
         if default_operator is not None:
             __query["default_operator"] = default_operator
         if df is not None:
             __query["df"] = df
-        if docvalue_fields is not None:
-            __body["docvalue_fields"] = docvalue_fields
         if error_trace is not None:
             __query["error_trace"] = error_trace
         if expand_wildcards is not None:
             __query["expand_wildcards"] = expand_wildcards
-        if explain is not None:
-            __body["explain"] = explain
-        if ext is not None:
-            __body["ext"] = ext
-        if fields is not None:
-            __body["fields"] = fields
         if filter_path is not None:
             __query["filter_path"] = filter_path
-        if from_ is not None:
-            __body["from"] = from_
-        if highlight is not None:
-            __body["highlight"] = highlight
         if human is not None:
             __query["human"] = human
         if ignore_throttled is not None:
             __query["ignore_throttled"] = ignore_throttled
         if ignore_unavailable is not None:
             __query["ignore_unavailable"] = ignore_unavailable
-        if indices_boost is not None:
-            __body["indices_boost"] = indices_boost
         if keep_alive is not None:
             __query["keep_alive"] = keep_alive
         if keep_on_completion is not None:
             __query["keep_on_completion"] = keep_on_completion
-        if knn is not None:
-            __body["knn"] = knn
         if lenient is not None:
             __query["lenient"] = lenient
         if max_concurrent_shard_requests is not None:
             __query["max_concurrent_shard_requests"] = max_concurrent_shard_requests
         if min_compatible_shard_node is not None:
             __query["min_compatible_shard_node"] = min_compatible_shard_node
-        if min_score is not None:
-            __body["min_score"] = min_score
-        if pit is not None:
-            __body["pit"] = pit
-        if post_filter is not None:
-            __body["post_filter"] = post_filter
         if pre_filter_shard_size is not None:
             __query["pre_filter_shard_size"] = pre_filter_shard_size
         if preference is not None:
             __query["preference"] = preference
         if pretty is not None:
             __query["pretty"] = pretty
-        if profile is not None:
-            __body["profile"] = profile
         if q is not None:
             __query["q"] = q
-        if query is not None:
-            __body["query"] = query
         if request_cache is not None:
             __query["request_cache"] = request_cache
-        if rescore is not None:
-            __body["rescore"] = rescore
         if rest_total_hits_as_int is not None:
             __query["rest_total_hits_as_int"] = rest_total_hits_as_int
         if routing is not None:
             __query["routing"] = routing
+        if scroll is not None:
+            __query["scroll"] = scroll
+        if search_type is not None:
+            __query["search_type"] = search_type
+        if source_excludes is not None:
+            __query["_source_excludes"] = source_excludes
+        if source_includes is not None:
+            __query["_source_includes"] = source_includes
+        if suggest_field is not None:
+            __query["suggest_field"] = suggest_field
+        if suggest_mode is not None:
+            __query["suggest_mode"] = suggest_mode
+        if suggest_size is not None:
+            __query["suggest_size"] = suggest_size
+        if suggest_text is not None:
+            __query["suggest_text"] = suggest_text
+        if typed_keys is not None:
+            __query["typed_keys"] = typed_keys
+        if wait_for_completion_timeout is not None:
+            __query["wait_for_completion_timeout"] = wait_for_completion_timeout
+        if aggregations is not None:
+            __body["aggregations"] = aggregations
+        if aggs is not None:
+            __body["aggs"] = aggs
+        if collapse is not None:
+            __body["collapse"] = collapse
+        if docvalue_fields is not None:
+            __body["docvalue_fields"] = docvalue_fields
+        if explain is not None:
+            __body["explain"] = explain
+        if ext is not None:
+            __body["ext"] = ext
+        if fields is not None:
+            __body["fields"] = fields
+        if from_ is not None:
+            __body["from"] = from_
+        if highlight is not None:
+            __body["highlight"] = highlight
+        if indices_boost is not None:
+            __body["indices_boost"] = indices_boost
+        if knn is not None:
+            __body["knn"] = knn
+        if min_score is not None:
+            __body["min_score"] = min_score
+        if pit is not None:
+            __body["pit"] = pit
+        if post_filter is not None:
+            __body["post_filter"] = post_filter
+        if profile is not None:
+            __body["profile"] = profile
+        if query is not None:
+            __body["query"] = query
+        if rescore is not None:
+            __body["rescore"] = rescore
         if runtime_mappings is not None:
             __body["runtime_mappings"] = runtime_mappings
         if script_fields is not None:
             __body["script_fields"] = script_fields
-        if scroll is not None:
-            __query["scroll"] = scroll
         if search_after is not None:
             __body["search_after"] = search_after
-        if search_type is not None:
-            __query["search_type"] = search_type
         if seq_no_primary_term is not None:
             __body["seq_no_primary_term"] = seq_no_primary_term
         if size is not None:
@@ -515,24 +531,12 @@ async def submit(
             __body["sort"] = sort
         if source is not None:
             __body["_source"] = source
-        if source_excludes is not None:
-            __query["_source_excludes"] = source_excludes
-        if source_includes is not None:
-            __query["_source_includes"] = source_includes
         if stats is not None:
             __body["stats"] = stats
         if stored_fields is not None:
             __body["stored_fields"] = stored_fields
         if suggest is not None:
             __body["suggest"] = suggest
-        if suggest_field is not None:
-            __query["suggest_field"] = suggest_field
-        if suggest_mode is not None:
-            __query["suggest_mode"] = suggest_mode
-        if suggest_size is not None:
-            __query["suggest_size"] = suggest_size
-        if suggest_text is not None:
-            __query["suggest_text"] = suggest_text
         if terminate_after is not None:
             __body["terminate_after"] = terminate_after
         if timeout is not None:
@@ -541,12 +545,8 @@ async def submit(
             __body["track_scores"] = track_scores
         if track_total_hits is not None:
             __body["track_total_hits"] = track_total_hits
-        if typed_keys is not None:
-            __query["typed_keys"] = typed_keys
         if version is not None:
             __body["version"] = version
-        if wait_for_completion_timeout is not None:
-            __query["wait_for_completion_timeout"] = wait_for_completion_timeout
         if not __body:
             __body = None  # type: ignore[assignment]
         __headers = {"accept": "application/json"}

elasticsearch/_async/client/async_search.py

@@ -123,6 +123,10 @@ async def follow(
             __query["filter_path"] = filter_path
         if human is not None:
             __query["human"] = human
+        if pretty is not None:
+            __query["pretty"] = pretty
+        if wait_for_active_shards is not None:
+            __query["wait_for_active_shards"] = wait_for_active_shards
         if leader_index is not None:
             __body["leader_index"] = leader_index
         if max_outstanding_read_requests is not None:
@@ -147,14 +151,10 @@ async def follow(
             ] = max_write_request_operation_count
         if max_write_request_size is not None:
             __body["max_write_request_size"] = max_write_request_size
-        if pretty is not None:
-            __query["pretty"] = pretty
         if read_poll_timeout is not None:
             __body["read_poll_timeout"] = read_poll_timeout
         if remote_cluster is not None:
             __body["remote_cluster"] = remote_cluster
-        if wait_for_active_shards is not None:
-            __query["wait_for_active_shards"] = wait_for_active_shards
         __headers = {"accept": "application/json", "content-type": "application/json"}
         return await self.perform_request(  # type: ignore[return-value]
             "PUT", __path, params=__query, headers=__headers, body=__body
@@ -269,18 +269,18 @@ async def forget_follower(
             __query["error_trace"] = error_trace
         if filter_path is not None:
             __query["filter_path"] = filter_path
+        if human is not None:
+            __query["human"] = human
+        if pretty is not None:
+            __query["pretty"] = pretty
         if follower_cluster is not None:
             __body["follower_cluster"] = follower_cluster
         if follower_index is not None:
             __body["follower_index"] = follower_index
         if follower_index_uuid is not None:
             __body["follower_index_uuid"] = follower_index_uuid
-        if human is not None:
-            __query["human"] = human
         if leader_remote_cluster is not None:
             __body["leader_remote_cluster"] = leader_remote_cluster
-        if pretty is not None:
-            __query["pretty"] = pretty
         __headers = {"accept": "application/json", "content-type": "application/json"}
         return await self.perform_request(  # type: ignore[return-value]
             "POST", __path, params=__query, headers=__headers, body=__body
@@ -480,18 +480,20 @@ async def put_auto_follow_pattern(
         if remote_cluster is None:
             raise ValueError("Empty value passed for parameter 'remote_cluster'")
         __path = f"/_ccr/auto_follow/{_quote(name)}"
-        __body: t.Dict[str, t.Any] = {}
         __query: t.Dict[str, t.Any] = {}
-        if remote_cluster is not None:
-            __body["remote_cluster"] = remote_cluster
+        __body: t.Dict[str, t.Any] = {}
         if error_trace is not None:
             __query["error_trace"] = error_trace
         if filter_path is not None:
             __query["filter_path"] = filter_path
-        if follow_index_pattern is not None:
-            __body["follow_index_pattern"] = follow_index_pattern
         if human is not None:
             __query["human"] = human
+        if pretty is not None:
+            __query["pretty"] = pretty
+        if remote_cluster is not None:
+            __body["remote_cluster"] = remote_cluster
+        if follow_index_pattern is not None:
+            __body["follow_index_pattern"] = follow_index_pattern
         if leader_index_exclusion_patterns is not None:
             __body["leader_index_exclusion_patterns"] = leader_index_exclusion_patterns
         if leader_index_patterns is not None:
@@ -518,8 +520,6 @@ async def put_auto_follow_pattern(
             ] = max_write_request_operation_count
         if max_write_request_size is not None:
             __body["max_write_request_size"] = max_write_request_size
-        if pretty is not None:
-            __query["pretty"] = pretty
         if read_poll_timeout is not None:
             __body["read_poll_timeout"] = read_poll_timeout
         if settings is not None:
@@ -618,6 +618,8 @@ async def resume_follow(
             __query["filter_path"] = filter_path
         if human is not None:
             __query["human"] = human
+        if pretty is not None:
+            __query["pretty"] = pretty
         if max_outstanding_read_requests is not None:
             __body["max_outstanding_read_requests"] = max_outstanding_read_requests
         if max_outstanding_write_requests is not None:
@@ -640,8 +642,6 @@ async def resume_follow(
             ] = max_write_request_operation_count
         if max_write_request_size is not None:
             __body["max_write_request_size"] = max_write_request_size
-        if pretty is not None:
-            __query["pretty"] = pretty
         if read_poll_timeout is not None:
             __body["read_poll_timeout"] = read_poll_timeout
         if not __body:

elasticsearch/_async/client/ccr.py

@@ -59,10 +59,8 @@ async def allocation_explain(
             for.
         """
         __path = "/_cluster/allocation/explain"
-        __body: t.Dict[str, t.Any] = {}
         __query: t.Dict[str, t.Any] = {}
-        if current_node is not None:
-            __body["current_node"] = current_node
+        __body: t.Dict[str, t.Any] = {}
         if error_trace is not None:
             __query["error_trace"] = error_trace
         if filter_path is not None:
@@ -73,10 +71,12 @@ async def allocation_explain(
             __query["include_disk_info"] = include_disk_info
         if include_yes_decisions is not None:
             __query["include_yes_decisions"] = include_yes_decisions
-        if index is not None:
-            __body["index"] = index
         if pretty is not None:
             __query["pretty"] = pretty
+        if current_node is not None:
+            __body["current_node"] = current_node
+        if index is not None:
+            __body["index"] = index
         if primary is not None:
             __body["primary"] = primary
         if shard is not None:
@@ -652,12 +652,8 @@ async def put_component_template(
         if template is None:
             raise ValueError("Empty value passed for parameter 'template'")
         __path = f"/_component_template/{_quote(name)}"
-        __body: t.Dict[str, t.Any] = {}
         __query: t.Dict[str, t.Any] = {}
-        if template is not None:
-            __body["template"] = template
-        if allow_auto_create is not None:
-            __body["allow_auto_create"] = allow_auto_create
+        __body: t.Dict[str, t.Any] = {}
         if create is not None:
             __query["create"] = create
         if error_trace is not None:
@@ -668,10 +664,14 @@ async def put_component_template(
             __query["human"] = human
         if master_timeout is not None:
             __query["master_timeout"] = master_timeout
-        if meta is not None:
-            __body["_meta"] = meta
         if pretty is not None:
             __query["pretty"] = pretty
+        if template is not None:
+            __body["template"] = template
+        if allow_auto_create is not None:
+            __body["allow_auto_create"] = allow_auto_create
+        if meta is not None:
+            __body["_meta"] = meta
         if version is not None:
             __body["version"] = version
         __headers = {"accept": "application/json", "content-type": "application/json"}
@@ -721,12 +721,12 @@ async def put_settings(
             __query["human"] = human
         if master_timeout is not None:
             __query["master_timeout"] = master_timeout
-        if persistent is not None:
-            __body["persistent"] = persistent
         if pretty is not None:
             __query["pretty"] = pretty
         if timeout is not None:
             __query["timeout"] = timeout
+        if persistent is not None:
+            __body["persistent"] = persistent
         if transient is not None:
             __body["transient"] = transient
         __headers = {"accept": "application/json", "content-type": "application/json"}
@@ -803,10 +803,8 @@ async def reroute(
             the timeout expires, the request fails and returns an error.
         """
         __path = "/_cluster/reroute"
-        __body: t.Dict[str, t.Any] = {}
         __query: t.Dict[str, t.Any] = {}
-        if commands is not None:
-            __body["commands"] = commands
+        __body: t.Dict[str, t.Any] = {}
         if dry_run is not None:
             __query["dry_run"] = dry_run
         if error_trace is not None:
@@ -827,6 +825,8 @@ async def reroute(
             __query["retry_failed"] = retry_failed
         if timeout is not None:
             __query["timeout"] = timeout
+        if commands is not None:
+            __body["commands"] = commands
         if not __body:
             __body = None  # type: ignore[assignment]
         __headers = {"accept": "application/json"}