Skip to content

Commit abda18e

Browse files
elasticmachineelasticmachine
committed
Auto-generated API code
1 parent 4c98c2b commit abda18e

File tree

6 files changed

+32
-20
lines changed

6 files changed

+32
-20
lines changed

‎elasticsearch/_async/client/__init__.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,7 @@ async def bulk(
700700
<li>JavaScript: Check out <code>client.helpers.*</code></li>
701701
<li>.NET: Check out <code>BulkAllObservable</code></li>
702702
<li>PHP: Check out bulk indexing.</li>
703+
<li>Ruby: Check out <code>Elasticsearch::Helpers::BulkHelper</code></li>
703704
</ul>
704705
<p><strong>Submitting bulk requests with cURL</strong></p>
705706
<p>If you're providing text file input to <code>curl</code>, you must use the <code>--data-binary</code> flag instead of plain <code>-d</code>.
@@ -1416,7 +1417,7 @@ async def delete(
14161417
)
14171418

14181419
@_rewrite_parameters(
1419-
body_fields=("max_docs", "query", "slice"),
1420+
body_fields=("max_docs", "query", "slice", "sort"),
14201421
parameter_aliases={"from": "from_"},
14211422
)
14221423
async def delete_by_query(
@@ -1460,7 +1461,12 @@ async def delete_by_query(
14601461
] = None,
14611462
slice: t.Optional[t.Mapping[str, t.Any]] = None,
14621463
slices: t.Optional[t.Union[int, t.Union[str, t.Literal["auto"]]]] = None,
1463-
sort: t.Optional[t.Sequence[str]] = None,
1464+
sort: t.Optional[
1465+
t.Union[
1466+
t.Sequence[t.Union[str, t.Mapping[str, t.Any]]],
1467+
t.Union[str, t.Mapping[str, t.Any]],
1468+
]
1469+
] = None,
14641470
stats: t.Optional[t.Sequence[str]] = None,
14651471
terminate_after: t.Optional[int] = None,
14661472
timeout: t.Optional[t.Union[str, t.Literal[-1], t.Literal[0]]] = None,
@@ -1592,7 +1598,7 @@ async def delete_by_query(
15921598
:param slice: Slice the request manually using the provided slice ID and total
15931599
number of slices.
15941600
:param slices: The number of slices this task should be divided into.
1595-
:param sort: A comma-separated list of `<field>:<direction>` pairs.
1601+
:param sort: A sort object that specifies the order of deleted documents.
15961602
:param stats: The specific `tag` of the request for logging and statistical purposes.
15971603
:param terminate_after: The maximum number of documents to collect for each shard.
15981604
If a query reaches this limit, Elasticsearch terminates the query early.
@@ -1682,8 +1688,6 @@ async def delete_by_query(
16821688
__query["search_type"] = search_type
16831689
if slices is not None:
16841690
__query["slices"] = slices
1685-
if sort is not None:
1686-
__query["sort"] = sort
16871691
if stats is not None:
16881692
__query["stats"] = stats
16891693
if terminate_after is not None:
@@ -1703,6 +1707,8 @@ async def delete_by_query(
17031707
__body["query"] = query
17041708
if slice is not None:
17051709
__body["slice"] = slice
1710+
if sort is not None:
1711+
__body["sort"] = sort
17061712
__headers = {"accept": "application/json", "content-type": "application/json"}
17071713
return await self.perform_request( # type: ignore[return-value]
17081714
"POST",

‎elasticsearch/_async/client/esql.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class EsqlClient(NamespacedClient):
4444
async def async_query(
4545
self,
4646
*,
47-
query: t.Optional[str] = None,
47+
query: t.Optional[t.Union[str, "ESQLBase"]] = None,
4848
columnar: t.Optional[bool] = None,
4949
delimiter: t.Optional[str] = None,
5050
drop_null_columns: t.Optional[bool] = None,
@@ -153,7 +153,7 @@ async def async_query(
153153
__query["pretty"] = pretty
154154
if not __body:
155155
if query is not None:
156-
__body["query"] = query
156+
__body["query"] = str(query)
157157
if columnar is not None:
158158
__body["columnar"] = columnar
159159
if filter is not None:
@@ -391,7 +391,7 @@ async def async_query_stop(
391391
async def query(
392392
self,
393393
*,
394-
query: t.Optional[str] = None,
394+
query: t.Optional[t.Union[str, "ESQLBase"]] = None,
395395
columnar: t.Optional[bool] = None,
396396
delimiter: t.Optional[str] = None,
397397
drop_null_columns: t.Optional[bool] = None,
@@ -480,7 +480,7 @@ async def query(
480480
__query["pretty"] = pretty
481481
if not __body:
482482
if query is not None:
483-
__body["query"] = query
483+
__body["query"] = str(query)
484484
if columnar is not None:
485485
__body["columnar"] = columnar
486486
if filter is not None:

‎elasticsearch/_async/client/sql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ async def query(
283283
keep_alive: t.Optional[t.Union[str, t.Literal[-1], t.Literal[0]]] = None,
284284
keep_on_completion: t.Optional[bool] = None,
285285
page_timeout: t.Optional[t.Union[str, t.Literal[-1], t.Literal[0]]] = None,
286-
params: t.Optional[t.Mapping[str, t.Any]] = None,
286+
params: t.Optional[t.Sequence[t.Any]] = None,
287287
pretty: t.Optional[bool] = None,
288288
query: t.Optional[str] = None,
289289
request_timeout: t.Optional[t.Union[str, t.Literal[-1], t.Literal[0]]] = None,

‎elasticsearch/_sync/client/__init__.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@ def bulk(
698698
<li>JavaScript: Check out <code>client.helpers.*</code></li>
699699
<li>.NET: Check out <code>BulkAllObservable</code></li>
700700
<li>PHP: Check out bulk indexing.</li>
701+
<li>Ruby: Check out <code>Elasticsearch::Helpers::BulkHelper</code></li>
701702
</ul>
702703
<p><strong>Submitting bulk requests with cURL</strong></p>
703704
<p>If you're providing text file input to <code>curl</code>, you must use the <code>--data-binary</code> flag instead of plain <code>-d</code>.
@@ -1414,7 +1415,7 @@ def delete(
14141415
)
14151416

14161417
@_rewrite_parameters(
1417-
body_fields=("max_docs", "query", "slice"),
1418+
body_fields=("max_docs", "query", "slice", "sort"),
14181419
parameter_aliases={"from": "from_"},
14191420
)
14201421
def delete_by_query(
@@ -1458,7 +1459,12 @@ def delete_by_query(
14581459
] = None,
14591460
slice: t.Optional[t.Mapping[str, t.Any]] = None,
14601461
slices: t.Optional[t.Union[int, t.Union[str, t.Literal["auto"]]]] = None,
1461-
sort: t.Optional[t.Sequence[str]] = None,
1462+
sort: t.Optional[
1463+
t.Union[
1464+
t.Sequence[t.Union[str, t.Mapping[str, t.Any]]],
1465+
t.Union[str, t.Mapping[str, t.Any]],
1466+
]
1467+
] = None,
14621468
stats: t.Optional[t.Sequence[str]] = None,
14631469
terminate_after: t.Optional[int] = None,
14641470
timeout: t.Optional[t.Union[str, t.Literal[-1], t.Literal[0]]] = None,
@@ -1590,7 +1596,7 @@ def delete_by_query(
15901596
:param slice: Slice the request manually using the provided slice ID and total
15911597
number of slices.
15921598
:param slices: The number of slices this task should be divided into.
1593-
:param sort: A comma-separated list of `<field>:<direction>` pairs.
1599+
:param sort: A sort object that specifies the order of deleted documents.
15941600
:param stats: The specific `tag` of the request for logging and statistical purposes.
15951601
:param terminate_after: The maximum number of documents to collect for each shard.
15961602
If a query reaches this limit, Elasticsearch terminates the query early.
@@ -1680,8 +1686,6 @@ def delete_by_query(
16801686
__query["search_type"] = search_type
16811687
if slices is not None:
16821688
__query["slices"] = slices
1683-
if sort is not None:
1684-
__query["sort"] = sort
16851689
if stats is not None:
16861690
__query["stats"] = stats
16871691
if terminate_after is not None:
@@ -1701,6 +1705,8 @@ def delete_by_query(
17011705
__body["query"] = query
17021706
if slice is not None:
17031707
__body["slice"] = slice
1708+
if sort is not None:
1709+
__body["sort"] = sort
17041710
__headers = {"accept": "application/json", "content-type": "application/json"}
17051711
return self.perform_request( # type: ignore[return-value]
17061712
"POST",

‎elasticsearch/_sync/client/esql.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class EsqlClient(NamespacedClient):
4444
def async_query(
4545
self,
4646
*,
47-
query: t.Optional[str] = None,
47+
query: t.Optional[t.Union[str, "ESQLBase"]] = None,
4848
columnar: t.Optional[bool] = None,
4949
delimiter: t.Optional[str] = None,
5050
drop_null_columns: t.Optional[bool] = None,
@@ -153,7 +153,7 @@ def async_query(
153153
__query["pretty"] = pretty
154154
if not __body:
155155
if query is not None:
156-
__body["query"] = query
156+
__body["query"] = str(query)
157157
if columnar is not None:
158158
__body["columnar"] = columnar
159159
if filter is not None:
@@ -391,7 +391,7 @@ def async_query_stop(
391391
def query(
392392
self,
393393
*,
394-
query: t.Optional[str] = None,
394+
query: t.Optional[t.Union[str, "ESQLBase"]] = None,
395395
columnar: t.Optional[bool] = None,
396396
delimiter: t.Optional[str] = None,
397397
drop_null_columns: t.Optional[bool] = None,
@@ -480,7 +480,7 @@ def query(
480480
__query["pretty"] = pretty
481481
if not __body:
482482
if query is not None:
483-
__body["query"] = query
483+
__body["query"] = str(query)
484484
if columnar is not None:
485485
__body["columnar"] = columnar
486486
if filter is not None:

‎elasticsearch/_sync/client/sql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def query(
283283
keep_alive: t.Optional[t.Union[str, t.Literal[-1], t.Literal[0]]] = None,
284284
keep_on_completion: t.Optional[bool] = None,
285285
page_timeout: t.Optional[t.Union[str, t.Literal[-1], t.Literal[0]]] = None,
286-
params: t.Optional[t.Mapping[str, t.Any]] = None,
286+
params: t.Optional[t.Sequence[t.Any]] = None,
287287
pretty: t.Optional[bool] = None,
288288
query: t.Optional[str] = None,
289289
request_timeout: t.Optional[t.Union[str, t.Literal[-1], t.Literal[0]]] = None,

0 commit comments

Comments
 (0)