Add aliased parameters

Author: sethmlarson

elasticsearch/_async/client/__init__.py

@@ -3069,6 +3069,7 @@ async def search(
         *,
         index: Optional[Any] = None,
         aggregations: Optional[Dict[str, Any]] = None,
+        aggs: Optional[Dict[str, Any]] = None,
         allow_no_indices: Optional[bool] = None,
         allow_partial_search_results: Optional[bool] = None,
         analyze_wildcard: Optional[bool] = None,
@@ -3140,6 +3141,7 @@ async def search(
         :param index: A comma-separated list of index names to search; use `_all` or
             empty string to perform the operation on all indices
         :param aggregations:
+        :param aggs:
         :param allow_no_indices: Whether to ignore if a wildcard indices expression resolves
             into no concrete indices. (This includes `_all` string or when no indices
             have been specified)
@@ -3266,6 +3268,8 @@ async def search(
         __query: Dict[str, Any] = {}
         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:

elasticsearch/_async/client/async_search.py

@@ -162,6 +162,7 @@ async def submit(
         *,
         index: Optional[Any] = None,
         aggregations: Optional[Dict[str, Any]] = None,
+        aggs: Optional[Dict[str, Any]] = None,
         allow_no_indices: Optional[bool] = None,
         allow_partial_search_results: Optional[bool] = None,
         analyze_wildcard: Optional[bool] = None,
@@ -236,6 +237,7 @@ async def submit(
         :param index: A comma-separated list of index names to search; use `_all` or
             empty string to perform the operation on all indices
         :param aggregations:
+        :param aggs:
         :param allow_no_indices: Whether to ignore if a wildcard indices expression resolves
             into no concrete indices. (This includes `_all` string or when no indices
             have been specified)
@@ -359,6 +361,8 @@ async def submit(
         __query: Dict[str, Any] = {}
         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:

elasticsearch/_async/client/ml.py

@@ -2614,6 +2614,7 @@ async def put_datafeed(
         human: Optional[bool] = None,
         ignore_throttled: Optional[bool] = None,
         ignore_unavailable: Optional[bool] = None,
+        indexes: Optional[List[str]] = None,
         indices: Optional[List[str]] = None,
         indices_options: Optional[Any] = None,
         job_id: Optional[Any] = None,
@@ -2663,6 +2664,9 @@ async def put_datafeed(
         :param ignore_throttled: Ignore indices that are marked as throttled (default:
             true)
         :param ignore_unavailable: Ignore unavailable indexes (default: false)
+        :param indexes: An array of index names. Wildcards are supported. If any of the
+            indices are in remote clusters, the machine learning nodes must have the
+            `remote_cluster_client` role.
         :param indices: An array of index names. Wildcards are supported. If any of the
             indices are in remote clusters, the machine learning nodes must have the
             `remote_cluster_client` role.
@@ -2719,6 +2723,8 @@ async def put_datafeed(
             __query["ignore_throttled"] = ignore_throttled
         if ignore_unavailable is not None:
             __query["ignore_unavailable"] = ignore_unavailable
+        if indexes is not None:
+            __body["indexes"] = indexes
         if indices is not None:
             __body["indices"] = indices
         if indices_options is not None:

elasticsearch/_async/client/rollup.py

@@ -296,6 +296,7 @@ async def rollup_search(
         index: Any,
         type: Optional[Any] = None,
         aggregations: Optional[Dict[str, Any]] = None,
+        aggs: Optional[Dict[str, Any]] = None,
         error_trace: Optional[bool] = None,
         filter_path: Optional[Union[List[str], str]] = None,
         human: Optional[bool] = None,
@@ -314,6 +315,7 @@ async def rollup_search(
             that should be searched
         :param type: The doc type inside the index
         :param aggregations:
+        :param aggs:
         :param query:
         :param rest_total_hits_as_int: Indicates whether hits.total should be rendered
             as an integer or an object in the rest search response
@@ -333,6 +335,8 @@ async def rollup_search(
         __query: Dict[str, Any] = {}
         if aggregations is not None:
             __body["aggregations"] = aggregations
+        if aggs is not None:
+            __body["aggs"] = aggs
         if error_trace is not None:
             __query["error_trace"] = error_trace
         if filter_path is not None:

elasticsearch/_sync/client/__init__.py

@@ -3029,6 +3029,7 @@ def search(
         *,
         index: Optional[Any] = None,
         aggregations: Optional[Dict[str, Any]] = None,
+        aggs: Optional[Dict[str, Any]] = None,
         allow_no_indices: Optional[bool] = None,
         allow_partial_search_results: Optional[bool] = None,
         analyze_wildcard: Optional[bool] = None,
@@ -3100,6 +3101,7 @@ def search(
         :param index: A comma-separated list of index names to search; use `_all` or
             empty string to perform the operation on all indices
         :param aggregations:
+        :param aggs:
         :param allow_no_indices: Whether to ignore if a wildcard indices expression resolves
             into no concrete indices. (This includes `_all` string or when no indices
             have been specified)
@@ -3226,6 +3228,8 @@ def search(
         __query: Dict[str, Any] = {}
         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:

elasticsearch/_sync/client/async_search.py

@@ -162,6 +162,7 @@ def submit(
         *,
         index: Optional[Any] = None,
         aggregations: Optional[Dict[str, Any]] = None,
+        aggs: Optional[Dict[str, Any]] = None,
         allow_no_indices: Optional[bool] = None,
         allow_partial_search_results: Optional[bool] = None,
         analyze_wildcard: Optional[bool] = None,
@@ -236,6 +237,7 @@ def submit(
         :param index: A comma-separated list of index names to search; use `_all` or
             empty string to perform the operation on all indices
         :param aggregations:
+        :param aggs:
         :param allow_no_indices: Whether to ignore if a wildcard indices expression resolves
             into no concrete indices. (This includes `_all` string or when no indices
             have been specified)
@@ -359,6 +361,8 @@ def submit(
         __query: Dict[str, Any] = {}
         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:

elasticsearch/_sync/client/ml.py

@@ -2576,6 +2576,7 @@ def put_datafeed(
         human: Optional[bool] = None,
         ignore_throttled: Optional[bool] = None,
         ignore_unavailable: Optional[bool] = None,
+        indexes: Optional[List[str]] = None,
         indices: Optional[List[str]] = None,
         indices_options: Optional[Any] = None,
         job_id: Optional[Any] = None,
@@ -2625,6 +2626,9 @@ def put_datafeed(
         :param ignore_throttled: Ignore indices that are marked as throttled (default:
             true)
         :param ignore_unavailable: Ignore unavailable indexes (default: false)
+        :param indexes: An array of index names. Wildcards are supported. If any of the
+            indices are in remote clusters, the machine learning nodes must have the
+            `remote_cluster_client` role.
         :param indices: An array of index names. Wildcards are supported. If any of the
             indices are in remote clusters, the machine learning nodes must have the
             `remote_cluster_client` role.
@@ -2681,6 +2685,8 @@ def put_datafeed(
             __query["ignore_throttled"] = ignore_throttled
         if ignore_unavailable is not None:
             __query["ignore_unavailable"] = ignore_unavailable
+        if indexes is not None:
+            __body["indexes"] = indexes
         if indices is not None:
             __body["indices"] = indices
         if indices_options is not None:

elasticsearch/_sync/client/rollup.py

@@ -292,6 +292,7 @@ def rollup_search(
         index: Any,
         type: Optional[Any] = None,
         aggregations: Optional[Dict[str, Any]] = None,
+        aggs: Optional[Dict[str, Any]] = None,
         error_trace: Optional[bool] = None,
         filter_path: Optional[Union[List[str], str]] = None,
         human: Optional[bool] = None,
@@ -310,6 +311,7 @@ def rollup_search(
             that should be searched
         :param type: The doc type inside the index
         :param aggregations:
+        :param aggs:
         :param query:
         :param rest_total_hits_as_int: Indicates whether hits.total should be rendered
             as an integer or an object in the rest search response
@@ -329,6 +331,8 @@ def rollup_search(
         __query: Dict[str, Any] = {}
         if aggregations is not None:
             __body["aggregations"] = aggregations
+        if aggs is not None:
+            __body["aggs"] = aggs
         if error_trace is not None:
             __query["error_trace"] = error_trace
         if filter_path is not None:

elasticsearch/_sync/client/utils.py

@@ -237,7 +237,7 @@ def _quote(value: Any) -> str:
 
 
 def _quote_query(query: Dict[str, Any]) -> str:
-    return "&".join([f"{k}={percent_encode(_escape(v), ',*')}" for k, v in query.items()])
+    return "&".join([f"{k}={_quote(v)}" for k, v in query.items()])
 
 
 def _merge_kwargs_no_duplicates(kwargs: Dict[str, Any], values: Dict[str, Any]) -> None:

test_elasticsearch/test_async/test_server/test_rest_api_spec.py

@@ -21,6 +21,7 @@
 clients.
 """
 import inspect
+import json
 import warnings
 
 import pytest
@@ -30,6 +31,7 @@
 from ...test_server.test_rest_api_spec import (
     IMPLEMENTED_FEATURES,
     PARAMS_RENAMES,
+    API_PARAMS_RENAMES,
     RUN_ASYNC_REST_API_TESTS,
     YAML_TEST_SPECS,
     YamlRunner,
@@ -134,11 +136,20 @@ async def run_do(self, action):
             assert hasattr(api, m)
             api = getattr(api, m)
 
+        # Sometimes the 'body' parameter is encoded as a string instead of raw.
+        if "body" in args:
+            try:
+                args["body"] = json.loads(args["body"])
+            except (TypeError, ValueError):
+                pass
+
         # some parameters had to be renamed to not clash with python builtins,
         # compensate
-        for k in PARAMS_RENAMES:
+        renames = PARAMS_RENAMES.copy()
+        renames.update(API_PARAMS_RENAMES.get(method, {}))
+        for k in renames:
             if k in args:
-                args[PARAMS_RENAMES[k]] = args.pop(k)
+                args[renames[k]] = args.pop(k)
 
         # resolve vars
         for k in args:

test_elasticsearch/test_client/test_indices.py

@@ -42,5 +42,7 @@ def test_passing_empty_value_for_required_param_raises_exception(self):
             self.client.indices.exists(index="")
 
     def test_query_params(self):
-        self.client.indices.delete(index=["test1", "test*"], expand_wildcards=["open", "closed"])
+        self.client.indices.delete(
+            index=["test1", "test*"], expand_wildcards=["open", "closed"]
+        )
         self.assert_url_called("DELETE", "/test1,test*?expand_wildcards=open,closed")

test_elasticsearch/test_server/test_rest_api_spec.py

@@ -41,6 +41,16 @@
 # some params had to be changed in python, keep track of them so we can rename
 # those in the tests accordingly
 PARAMS_RENAMES = {"type": "doc_type", "from": "from_"}
+API_PARAMS_RENAMES = {
+    "snapshot.create_repository": {"repository": "name"},
+    "snapshot.delete_repository": {"repository": "name"},
+    "snapshot.get_repository": {"repository": "name"},
+    "snapshot.cleanup_repository": {"repository": "name"},
+    "snapshot.verify_repository": {"repository": "name"},
+    "ilm.delete_lifecycle": {"policy", "name"},
+    "ilm.get_lifecycle": {"policy": "name"},
+    "ilm.put_lifecycle": {"policy": "name"},
+}
 
 # mapping from catch values to http status codes
 CATCH_CODES = {"missing": 404, "conflict": 409, "unauthorized": 401}
@@ -228,11 +238,20 @@ def run_do(self, action):
             assert hasattr(api, m)
             api = getattr(api, m)
 
+        # Sometimes the 'body' parameter is encoded as a string instead of raw.
+        if "body" in args:
+            try:
+                args["body"] = json.loads(args["body"])
+            except (TypeError, ValueError):
+                pass
+
         # some parameters had to be renamed to not clash with python builtins,
         # compensate
-        for k in PARAMS_RENAMES:
+        renames = PARAMS_RENAMES.copy()
+        renames.update(API_PARAMS_RENAMES.get(method, {}))
+        for k in renames:
             if k in args:
-                args[PARAMS_RENAMES[k]] = args.pop(k)
+                args[renames[k]] = args.pop(k)
 
         # resolve vars
         for k in args:
@@ -269,8 +288,9 @@ def run_do(self, action):
             )
 
     def run_catch(self, catch, exception):
-        if catch == "param":
+        if catch == "param" or isinstance(exception, TypeError):
             assert isinstance(exception, TypeError)
+            self.last_response = None
             return
 
         assert isinstance(exception, ApiError)