Skip to content

Commit 08b17d8

Browse files
authored
[Search] Regenerate Search SDK (#20977)
* Update README and setup.py for Python 2.7 and 3.10 changes. * Regenerate with latest Autorest. * Search-specific updates. * Expose generated changes. * Reflect latest swagger updates. * Expose kwargs via custom client. * Update changelog.
1 parent 0481e9d commit 08b17d8

33 files changed

+9302
-3921
lines changed

sdk/search/azure-search-documents/CHANGELOG.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Release History
22

3-
## 11.3.0b4 (Unreleased)
3+
## 11.3.0b4 (2021-10-05)
44

55
### Features Added
66

@@ -10,19 +10,18 @@
1010
### Breaking Changes
1111

1212
- Renamed `SearchClient.speller` to `SearchClient.query_speller`.
13+
- Renamed model `Speller` to `QuerySpellerType`.
14+
- Renamed model `Answers` to `QueryAnswerType`.
1315
- Removed keyword arguments from `SearchClient`: `answers` and `captions`.
1416
- `SentimentSkill`, `EntityRecognitionSkill`: added client-side validation to prevent sending unsupported parameters.
15-
16-
### Bugs Fixed
17-
18-
### Other Changes
17+
- Renamed property `ignore_reset_requirements` to `skip_indexer_reset_requirement_for_cache`.
1918

2019
## 11.3.0b3 (2021-09-08)
2120

2221
### Features Added
2322

2423
- Added new models:
25-
- `azure.search.documents.models.Captions`
24+
- `azure.search.documents.models.QueryCaptionType`
2625
- `azure.search.documents.models.CaptionResult`
2726
- `azure.search.documents.indexes.models.CustomEntityLookupSkillLanguage`
2827
- `azure.search.documents.indexes.models.EntityRecognitionSkillVersion`

sdk/search/azure-search-documents/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ Use the Azure.Search.Documents client library to:
4040
[Product documentation](https://docs.microsoft.com/azure/search/search-what-is-azure-search) |
4141
[Samples](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/search/azure-search-documents/samples)
4242

43+
## _Disclaimer_
44+
45+
_Azure SDK Python packages support for Python 2.7 is ending 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_
4346

4447
## Getting started
4548

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) AutoRest Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------
7+
8+
from azure.core.pipeline.transport import HttpRequest
9+
10+
def _convert_request(request, files=None):
11+
data = request.content if not files else None
12+
request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
13+
if files:
14+
request.set_formdata_body(files)
15+
return request
16+
17+
def _format_url_section(template, **kwargs):
18+
components = template.split("/")
19+
while components:
20+
try:
21+
return template.format(**kwargs)
22+
except KeyError as key:
23+
formatted_components = template.split("/")
24+
components = [
25+
c for c in formatted_components if "{}".format(key.args[0]) not in c
26+
]
27+
template = "/".join(components)

sdk/search/azure-search-documents/azure/search/documents/_generated/aio/operations/_documents_operations.py

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from azure.core.tracing.decorator_async import distributed_trace_async
1717

1818
from ... import models as _models
19+
from ..._vendor import _convert_request
1920
from ...operations._documents_operations import build_autocomplete_get_request, build_autocomplete_post_request, build_count_request, build_get_request, build_index_request, build_search_get_request, build_search_post_request, build_suggest_get_request, build_suggest_post_request
2021

2122
T = TypeVar('T')
@@ -71,7 +72,8 @@ async def count(
7172
request = build_count_request(
7273
x_ms_client_request_id=_x_ms_client_request_id,
7374
template_url=self.count.metadata['url'],
74-
)._to_pipeline_transport_request()
75+
)
76+
request = _convert_request(request)
7577
path_format_arguments = {
7678
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
7779
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -83,7 +85,7 @@ async def count(
8385

8486
if response.status_code not in [200]:
8587
map_error(status_code=response.status_code, response=response, error_map=error_map)
86-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
88+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
8789
raise HttpResponseError(response=response, model=error)
8890

8991
deserialized = self._deserialize('long', pipeline_response)
@@ -202,7 +204,8 @@ async def search_get(
202204
semantic_fields=_semantic_fields,
203205
x_ms_client_request_id=_x_ms_client_request_id,
204206
template_url=self.search_get.metadata['url'],
205-
)._to_pipeline_transport_request()
207+
)
208+
request = _convert_request(request)
206209
path_format_arguments = {
207210
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
208211
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -214,7 +217,7 @@ async def search_get(
214217

215218
if response.status_code not in [200]:
216219
map_error(status_code=response.status_code, response=response, error_map=error_map)
217-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
220+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
218221
raise HttpResponseError(response=response, model=error)
219222

220223
deserialized = self._deserialize('SearchDocumentsResult', pipeline_response)
@@ -263,7 +266,8 @@ async def search_post(
263266
x_ms_client_request_id=_x_ms_client_request_id,
264267
json=json,
265268
template_url=self.search_post.metadata['url'],
266-
)._to_pipeline_transport_request()
269+
)
270+
request = _convert_request(request)
267271
path_format_arguments = {
268272
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
269273
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -275,7 +279,7 @@ async def search_post(
275279

276280
if response.status_code not in [200]:
277281
map_error(status_code=response.status_code, response=response, error_map=error_map)
278-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
282+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
279283
raise HttpResponseError(response=response, model=error)
280284

281285
deserialized = self._deserialize('SearchDocumentsResult', pipeline_response)
@@ -325,7 +329,8 @@ async def get(
325329
selected_fields=selected_fields,
326330
x_ms_client_request_id=_x_ms_client_request_id,
327331
template_url=self.get.metadata['url'],
328-
)._to_pipeline_transport_request()
332+
)
333+
request = _convert_request(request)
329334
path_format_arguments = {
330335
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
331336
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -337,7 +342,7 @@ async def get(
337342

338343
if response.status_code not in [200]:
339344
map_error(status_code=response.status_code, response=response, error_map=error_map)
340-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
345+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
341346
raise HttpResponseError(response=response, model=error)
342347

343348
deserialized = self._deserialize('object', pipeline_response)
@@ -419,7 +424,8 @@ async def suggest_get(
419424
top=_top,
420425
x_ms_client_request_id=_x_ms_client_request_id,
421426
template_url=self.suggest_get.metadata['url'],
422-
)._to_pipeline_transport_request()
427+
)
428+
request = _convert_request(request)
423429
path_format_arguments = {
424430
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
425431
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -431,7 +437,7 @@ async def suggest_get(
431437

432438
if response.status_code not in [200]:
433439
map_error(status_code=response.status_code, response=response, error_map=error_map)
434-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
440+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
435441
raise HttpResponseError(response=response, model=error)
436442

437443
deserialized = self._deserialize('SuggestDocumentsResult', pipeline_response)
@@ -480,7 +486,8 @@ async def suggest_post(
480486
x_ms_client_request_id=_x_ms_client_request_id,
481487
json=json,
482488
template_url=self.suggest_post.metadata['url'],
483-
)._to_pipeline_transport_request()
489+
)
490+
request = _convert_request(request)
484491
path_format_arguments = {
485492
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
486493
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -492,7 +499,7 @@ async def suggest_post(
492499

493500
if response.status_code not in [200]:
494501
map_error(status_code=response.status_code, response=response, error_map=error_map)
495-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
502+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
496503
raise HttpResponseError(response=response, model=error)
497504

498505
deserialized = self._deserialize('SuggestDocumentsResult', pipeline_response)
@@ -542,7 +549,8 @@ async def index(
542549
x_ms_client_request_id=_x_ms_client_request_id,
543550
json=json,
544551
template_url=self.index.metadata['url'],
545-
)._to_pipeline_transport_request()
552+
)
553+
request = _convert_request(request)
546554
path_format_arguments = {
547555
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
548556
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -554,7 +562,7 @@ async def index(
554562

555563
if response.status_code not in [200, 207]:
556564
map_error(status_code=response.status_code, response=response, error_map=error_map)
557-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
565+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
558566
raise HttpResponseError(response=response, model=error)
559567

560568
if response.status_code == 200:
@@ -636,7 +644,8 @@ async def autocomplete_get(
636644
search_fields=_search_fields,
637645
top=_top,
638646
template_url=self.autocomplete_get.metadata['url'],
639-
)._to_pipeline_transport_request()
647+
)
648+
request = _convert_request(request)
640649
path_format_arguments = {
641650
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
642651
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -648,7 +657,7 @@ async def autocomplete_get(
648657

649658
if response.status_code not in [200]:
650659
map_error(status_code=response.status_code, response=response, error_map=error_map)
651-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
660+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
652661
raise HttpResponseError(response=response, model=error)
653662

654663
deserialized = self._deserialize('AutocompleteResult', pipeline_response)
@@ -697,7 +706,8 @@ async def autocomplete_post(
697706
x_ms_client_request_id=_x_ms_client_request_id,
698707
json=json,
699708
template_url=self.autocomplete_post.metadata['url'],
700-
)._to_pipeline_transport_request()
709+
)
710+
request = _convert_request(request)
701711
path_format_arguments = {
702712
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
703713
"indexName": self._serialize.url("self._config.index_name", self._config.index_name, 'str'),
@@ -709,7 +719,7 @@ async def autocomplete_post(
709719

710720
if response.status_code not in [200]:
711721
map_error(status_code=response.status_code, response=response, error_map=error_map)
712-
error = self._deserialize.failsafe_deserialize(_models.SearchError, response)
722+
error = self._deserialize.failsafe_deserialize(_models.SearchError, pipeline_response)
713723
raise HttpResponseError(response=response, model=error)
714724

715725
deserialized = self._deserialize('AutocompleteResult', pipeline_response)

sdk/search/azure-search-documents/azure/search/documents/_generated/models/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@
5656
AutocompleteMode,
5757
Captions,
5858
IndexActionType,
59+
QueryAnswerType,
60+
QueryCaptionType,
5961
QueryLanguage,
62+
QuerySpellerType,
6063
QueryType,
6164
ScoringStatistics,
6265
SearchMode,
@@ -89,7 +92,10 @@
8992
'AutocompleteMode',
9093
'Captions',
9194
'IndexActionType',
95+
'QueryAnswerType',
96+
'QueryCaptionType',
9297
'QueryLanguage',
98+
'QuerySpellerType',
9399
'QueryType',
94100
'ScoringStatistics',
95101
'SearchMode',

0 commit comments

Comments
 (0)