Accept body in _rewrite_parameters

Author: pquentin

elasticsearch/_async/helpers.py

@@ -445,7 +445,7 @@ def normalize_from_keyword(kw: MutableMapping[str, Any]) -> None:
         search_kwargs = kwargs.copy()
         search_kwargs["scroll"] = scroll
         search_kwargs["size"] = size
-        resp = await client.search(body=query, **search_kwargs)  # type: ignore[call-arg]
+        resp = await client.search(body=query, **search_kwargs)
 
     scroll_id: Optional[str] = resp.get("_scroll_id")
     scroll_transport_kwargs = pop_transport_kwargs(scroll_kwargs)

elasticsearch/_sync/client/utils.py

@@ -294,9 +294,23 @@ def _merge_kwargs_no_duplicates(kwargs: Dict[str, Any], values: Dict[str, Any])
         kwargs[key] = val
 
 
+def _merge_body_fields_no_duplicates(
+    body: Dict[str, Any], kwargs: Dict[str, Any], body_fields: Tuple[str, ...]
+) -> None:
+    for key in list(kwargs.keys()):
+        if key in body:
+            raise ValueError(
+                f"Received multiple values for '{key}', specify parameters "
+                "directly instead of using 'body' or 'params'"
+            )
+        if key in body_fields:
+            # deprecate this
+            body[key] = kwargs.pop(key)
+
+
 def _rewrite_parameters(
     body_name: Optional[str] = None,
-    body_fields: bool = False,
+    body_fields: Optional[Tuple[str, ...]] = None,
     parameter_aliases: Optional[Dict[str, str]] = None,
     ignore_deprecated_options: Optional[Set[str]] = None,
 ) -> Callable[[F], F]:
@@ -390,7 +404,8 @@ def wrapped(*args: Any, **kwargs: Any) -> Any:
                                 "Couldn't merge 'body' with other parameters as it wasn't a mapping. "
                                 "Instead of using 'body' use individual API parameters"
                             )
-                        _merge_kwargs_no_duplicates(kwargs, body)
+                        _merge_body_fields_no_duplicates(body, kwargs, body_fields)
+                        kwargs["body"] = body
 
             if parameter_aliases:
                 for alias, rename_to in parameter_aliases.items():

elasticsearch/helpers/actions.py

@@ -714,7 +714,7 @@ def normalize_from_keyword(kw: MutableMapping[str, Any]) -> None:
         search_kwargs = kwargs.copy()
         search_kwargs["scroll"] = scroll
         search_kwargs["size"] = size
-        resp = client.search(body=query, **search_kwargs)  # type: ignore[call-arg]
+        resp = client.search(body=query, **search_kwargs)
 
     scroll_id = resp.get("_scroll_id")
     scroll_transport_kwargs = pop_transport_kwargs(scroll_kwargs)