Skip to content

Commit aaae96a

Browse files
authored
update APIs to main
1 parent a1963b9 commit aaae96a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1130
-590
lines changed

elasticsearch/_async/client/__init__.py

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ async def bulk(
622622
source_includes: t.Optional[
623623
t.Union[str, t.Union[t.List[str], t.Tuple[str, ...]]]
624624
] = None,
625-
timeout: t.Optional[t.Union[int, str]] = None,
625+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
626626
wait_for_active_shards: t.Optional[
627627
t.Union[int, t.Union["t.Literal['all', 'index-setting']", str]]
628628
] = None,
@@ -939,7 +939,7 @@ async def create(
939939
t.Union["t.Literal['false', 'true', 'wait_for']", bool, str]
940940
] = None,
941941
routing: t.Optional[str] = None,
942-
timeout: t.Optional[t.Union[int, str]] = None,
942+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
943943
version: t.Optional[int] = None,
944944
version_type: t.Optional[
945945
t.Union["t.Literal['external', 'external_gte', 'force', 'internal']", str]
@@ -1025,7 +1025,7 @@ async def delete(
10251025
t.Union["t.Literal['false', 'true', 'wait_for']", bool, str]
10261026
] = None,
10271027
routing: t.Optional[str] = None,
1028-
timeout: t.Optional[t.Union[int, str]] = None,
1028+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
10291029
version: t.Optional[int] = None,
10301030
version_type: t.Optional[
10311031
t.Union["t.Literal['external', 'external_gte', 'force', 'internal']", str]
@@ -1140,11 +1140,13 @@ async def delete_by_query(
11401140
query: t.Optional[t.Mapping[str, t.Any]] = None,
11411141
refresh: t.Optional[bool] = None,
11421142
request_cache: t.Optional[bool] = None,
1143-
requests_per_second: t.Optional[int] = None,
1143+
requests_per_second: t.Optional[float] = None,
11441144
routing: t.Optional[str] = None,
1145-
scroll: t.Optional[t.Union[int, str]] = None,
1145+
scroll: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
11461146
scroll_size: t.Optional[int] = None,
1147-
search_timeout: t.Optional[t.Union[int, str]] = None,
1147+
search_timeout: t.Optional[
1148+
t.Union["t.Literal[-1]", "t.Literal[0]", str]
1149+
] = None,
11481150
search_type: t.Optional[
11491151
t.Union["t.Literal['dfs_query_then_fetch', 'query_then_fetch']", str]
11501152
] = None,
@@ -1153,7 +1155,7 @@ async def delete_by_query(
11531155
sort: t.Optional[t.Union[t.List[str], t.Tuple[str, ...]]] = None,
11541156
stats: t.Optional[t.Union[t.List[str], t.Tuple[str, ...]]] = None,
11551157
terminate_after: t.Optional[int] = None,
1156-
timeout: t.Optional[t.Union[int, str]] = None,
1158+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
11571159
version: t.Optional[bool] = None,
11581160
wait_for_active_shards: t.Optional[
11591161
t.Union[int, t.Union["t.Literal['all', 'index-setting']", str]]
@@ -1322,7 +1324,7 @@ async def delete_by_query_rethrottle(
13221324
] = None,
13231325
human: t.Optional[bool] = None,
13241326
pretty: t.Optional[bool] = None,
1325-
requests_per_second: t.Optional[int] = None,
1327+
requests_per_second: t.Optional[float] = None,
13261328
) -> ObjectApiResponse[t.Any]:
13271329
"""
13281330
Changes the number of requests per second for a particular Delete By Query operation.
@@ -1362,9 +1364,11 @@ async def delete_script(
13621364
t.Union[str, t.Union[t.List[str], t.Tuple[str, ...]]]
13631365
] = None,
13641366
human: t.Optional[bool] = None,
1365-
master_timeout: t.Optional[t.Union[int, str]] = None,
1367+
master_timeout: t.Optional[
1368+
t.Union["t.Literal[-1]", "t.Literal[0]", str]
1369+
] = None,
13661370
pretty: t.Optional[bool] = None,
1367-
timeout: t.Optional[t.Union[int, str]] = None,
1371+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
13681372
) -> ObjectApiResponse[t.Any]:
13691373
"""
13701374
Deletes a script.
@@ -1955,7 +1959,9 @@ async def get_script(
19551959
t.Union[str, t.Union[t.List[str], t.Tuple[str, ...]]]
19561960
] = None,
19571961
human: t.Optional[bool] = None,
1958-
master_timeout: t.Optional[t.Union[int, str]] = None,
1962+
master_timeout: t.Optional[
1963+
t.Union["t.Literal[-1]", "t.Literal[0]", str]
1964+
] = None,
19591965
pretty: t.Optional[bool] = None,
19601966
) -> ObjectApiResponse[t.Any]:
19611967
"""
@@ -2160,7 +2166,7 @@ async def index(
21602166
] = None,
21612167
require_alias: t.Optional[bool] = None,
21622168
routing: t.Optional[str] = None,
2163-
timeout: t.Optional[t.Union[int, str]] = None,
2169+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
21642170
version: t.Optional[int] = None,
21652171
version_type: t.Optional[
21662172
t.Union["t.Literal['external', 'external_gte', 'force', 'internal']", str]
@@ -2818,7 +2824,7 @@ async def open_point_in_time(
28182824
self,
28192825
*,
28202826
index: t.Union[str, t.Union[t.List[str], t.Tuple[str, ...]]],
2821-
keep_alive: t.Union[int, str],
2827+
keep_alive: t.Union["t.Literal[-1]", "t.Literal[0]", str],
28222828
error_trace: t.Optional[bool] = None,
28232829
filter_path: t.Optional[
28242830
t.Union[str, t.Union[t.List[str], t.Tuple[str, ...]]]
@@ -2875,9 +2881,11 @@ async def put_script(
28752881
t.Union[str, t.Union[t.List[str], t.Tuple[str, ...]]]
28762882
] = None,
28772883
human: t.Optional[bool] = None,
2878-
master_timeout: t.Optional[t.Union[int, str]] = None,
2884+
master_timeout: t.Optional[
2885+
t.Union["t.Literal[-1]", "t.Literal[0]", str]
2886+
] = None,
28792887
pretty: t.Optional[bool] = None,
2880-
timeout: t.Optional[t.Union[int, str]] = None,
2888+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
28812889
) -> ObjectApiResponse[t.Any]:
28822890
"""
28832891
Creates or updates a script.
@@ -3036,13 +3044,13 @@ async def reindex(
30363044
max_docs: t.Optional[int] = None,
30373045
pretty: t.Optional[bool] = None,
30383046
refresh: t.Optional[bool] = None,
3039-
requests_per_second: t.Optional[int] = None,
3047+
requests_per_second: t.Optional[float] = None,
30403048
require_alias: t.Optional[bool] = None,
30413049
script: t.Optional[t.Mapping[str, t.Any]] = None,
3042-
scroll: t.Optional[t.Union[int, str]] = None,
3050+
scroll: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
30433051
size: t.Optional[int] = None,
30443052
slices: t.Optional[t.Union[int, t.Union["t.Literal['auto']", str]]] = None,
3045-
timeout: t.Optional[t.Union[int, str]] = None,
3053+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
30463054
wait_for_active_shards: t.Optional[
30473055
t.Union[int, t.Union["t.Literal['all', 'index-setting']", str]]
30483056
] = None,
@@ -3137,7 +3145,7 @@ async def reindex_rethrottle(
31373145
] = None,
31383146
human: t.Optional[bool] = None,
31393147
pretty: t.Optional[bool] = None,
3140-
requests_per_second: t.Optional[int] = None,
3148+
requests_per_second: t.Optional[float] = None,
31413149
) -> ObjectApiResponse[t.Any]:
31423150
"""
31433151
Changes the number of requests per second for a particular Reindex operation.
@@ -3289,7 +3297,7 @@ async def scroll(
32893297
human: t.Optional[bool] = None,
32903298
pretty: t.Optional[bool] = None,
32913299
rest_total_hits_as_int: t.Optional[bool] = None,
3292-
scroll: t.Optional[t.Union[int, str]] = None,
3300+
scroll: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
32933301
) -> ObjectApiResponse[t.Any]:
32943302
"""
32953303
Allows to retrieve a large numbers of results from a single search request.
@@ -3427,7 +3435,7 @@ async def search(
34273435
]
34283436
] = None,
34293437
script_fields: t.Optional[t.Mapping[str, t.Mapping[str, t.Any]]] = None,
3430-
scroll: t.Optional[t.Union[int, str]] = None,
3438+
scroll: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
34313439
search_after: t.Optional[
34323440
t.Union[
34333441
t.List[t.Union[None, float, int, str]],
@@ -4042,7 +4050,7 @@ async def search_template(
40424050
profile: t.Optional[bool] = None,
40434051
rest_total_hits_as_int: t.Optional[bool] = None,
40444052
routing: t.Optional[str] = None,
4045-
scroll: t.Optional[t.Union[int, str]] = None,
4053+
scroll: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
40464054
search_type: t.Optional[
40474055
t.Union["t.Literal['dfs_query_then_fetch', 'query_then_fetch']", str]
40484056
] = None,
@@ -4156,7 +4164,7 @@ async def terms_enum(
41564164
search_after: t.Optional[str] = None,
41574165
size: t.Optional[int] = None,
41584166
string: t.Optional[str] = None,
4159-
timeout: t.Optional[t.Union[int, str]] = None,
4167+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
41604168
) -> ObjectApiResponse[t.Any]:
41614169
"""
41624170
The terms enum API can be used to discover terms in the index that begin with
@@ -4375,7 +4383,7 @@ async def update(
43754383
source_includes: t.Optional[
43764384
t.Union[str, t.Union[t.List[str], t.Tuple[str, ...]]]
43774385
] = None,
4378-
timeout: t.Optional[t.Union[int, str]] = None,
4386+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
43794387
upsert: t.Optional[t.Mapping[str, t.Any]] = None,
43804388
wait_for_active_shards: t.Optional[
43814389
t.Union[int, t.Union["t.Literal['all', 'index-setting']", str]]
@@ -4525,12 +4533,14 @@ async def update_by_query(
45254533
query: t.Optional[t.Mapping[str, t.Any]] = None,
45264534
refresh: t.Optional[bool] = None,
45274535
request_cache: t.Optional[bool] = None,
4528-
requests_per_second: t.Optional[int] = None,
4536+
requests_per_second: t.Optional[float] = None,
45294537
routing: t.Optional[str] = None,
45304538
script: t.Optional[t.Mapping[str, t.Any]] = None,
4531-
scroll: t.Optional[t.Union[int, str]] = None,
4539+
scroll: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
45324540
scroll_size: t.Optional[int] = None,
4533-
search_timeout: t.Optional[t.Union[int, str]] = None,
4541+
search_timeout: t.Optional[
4542+
t.Union["t.Literal[-1]", "t.Literal[0]", str]
4543+
] = None,
45344544
search_type: t.Optional[
45354545
t.Union["t.Literal['dfs_query_then_fetch', 'query_then_fetch']", str]
45364546
] = None,
@@ -4539,7 +4549,7 @@ async def update_by_query(
45394549
sort: t.Optional[t.Union[t.List[str], t.Tuple[str, ...]]] = None,
45404550
stats: t.Optional[t.Union[t.List[str], t.Tuple[str, ...]]] = None,
45414551
terminate_after: t.Optional[int] = None,
4542-
timeout: t.Optional[t.Union[int, str]] = None,
4552+
timeout: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
45434553
version: t.Optional[bool] = None,
45444554
version_type: t.Optional[bool] = None,
45454555
wait_for_active_shards: t.Optional[
@@ -4722,7 +4732,7 @@ async def update_by_query_rethrottle(
47224732
] = None,
47234733
human: t.Optional[bool] = None,
47244734
pretty: t.Optional[bool] = None,
4725-
requests_per_second: t.Optional[int] = None,
4735+
requests_per_second: t.Optional[float] = None,
47264736
) -> ObjectApiResponse[t.Any]:
47274737
"""
47284738
Changes the number of requests per second for a particular Update By Query operation.

elasticsearch/_async/client/async_search.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@ async def get(
7171
t.Union[str, t.Union[t.List[str], t.Tuple[str, ...]]]
7272
] = None,
7373
human: t.Optional[bool] = None,
74-
keep_alive: t.Optional[t.Union[int, str]] = None,
74+
keep_alive: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
7575
pretty: t.Optional[bool] = None,
7676
typed_keys: t.Optional[bool] = None,
77-
wait_for_completion_timeout: t.Optional[t.Union[int, str]] = None,
77+
wait_for_completion_timeout: t.Optional[
78+
t.Union["t.Literal[-1]", "t.Literal[0]", str]
79+
] = None,
7880
) -> ObjectApiResponse[t.Any]:
7981
"""
8082
Retrieves the results of a previously submitted async search request given its
@@ -211,7 +213,7 @@ async def submit(
211213
indices_boost: t.Optional[
212214
t.Union[t.List[t.Mapping[str, float]], t.Tuple[t.Mapping[str, float], ...]]
213215
] = None,
214-
keep_alive: t.Optional[t.Union[int, str]] = None,
216+
keep_alive: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
215217
keep_on_completion: t.Optional[bool] = None,
216218
lenient: t.Optional[bool] = None,
217219
max_concurrent_shard_requests: t.Optional[int] = None,
@@ -249,7 +251,7 @@ async def submit(
249251
]
250252
] = None,
251253
script_fields: t.Optional[t.Mapping[str, t.Mapping[str, t.Any]]] = None,
252-
scroll: t.Optional[t.Union[int, str]] = None,
254+
scroll: t.Optional[t.Union["t.Literal[-1]", "t.Literal[0]", str]] = None,
253255
search_after: t.Optional[
254256
t.Union[
255257
t.List[t.Union[None, float, int, str]],
@@ -295,7 +297,9 @@ async def submit(
295297
track_total_hits: t.Optional[t.Union[bool, int]] = None,
296298
typed_keys: t.Optional[bool] = None,
297299
version: t.Optional[bool] = None,
298-
wait_for_completion_timeout: t.Optional[t.Union[int, str]] = None,
300+
wait_for_completion_timeout: t.Optional[
301+
t.Union["t.Literal[-1]", "t.Literal[0]", str]
302+
] = None,
299303
) -> ObjectApiResponse[t.Any]:
300304
"""
301305
Executes a search request asynchronously.

0 commit comments

Comments
 (0)