Skip to content

Commit f8e1b23

Browse files
authored
fix search fields (Azure#18014)
1 parent 1f28dd5 commit f8e1b23

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

sdk/search/azure-search-documents/azure/search/documents/_search_client.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ def search(self, search_text, **kwargs):
242242
scoring_parameters = kwargs.pop("scoring_parameters", None)
243243
scoring_profile = kwargs.pop("scoring_profile", None)
244244
search_fields = kwargs.pop("search_fields", None)
245+
search_fields_str = ",".join(search_fields) if search_fields else None
245246
search_mode = kwargs.pop("search_mode", None)
246247
query_language = kwargs.pop("query_language", None)
247248
speller = kwargs.pop("speller", None)
@@ -262,7 +263,7 @@ def search(self, search_text, **kwargs):
262263
query_type=query_type,
263264
scoring_parameters=scoring_parameters,
264265
scoring_profile=scoring_profile,
265-
search_fields=search_fields,
266+
search_fields=search_fields_str,
266267
search_mode=search_mode,
267268
query_language=query_language,
268269
speller=speller,
@@ -333,6 +334,7 @@ def suggest(self, search_text, suggester_name, **kwargs):
333334
minimum_coverage = kwargs.pop("minimum_coverage", None)
334335
order_by = kwargs.pop("order_by", None)
335336
search_fields = kwargs.pop("search_fields", None)
337+
search_fields_str = ",".join(search_fields) if search_fields else None
336338
select = kwargs.pop("select", None)
337339
top = kwargs.pop("top", None)
338340
query = SuggestQuery(
@@ -344,7 +346,7 @@ def suggest(self, search_text, suggester_name, **kwargs):
344346
highlight_pre_tag=highlight_pre_tag,
345347
minimum_coverage=minimum_coverage,
346348
order_by=order_by,
347-
search_fields=search_fields,
349+
search_fields=search_fields_str,
348350
select=select if isinstance(select, six.string_types) else None,
349351
top=top
350352
)
@@ -406,6 +408,7 @@ def autocomplete(self, search_text, suggester_name, **kwargs):
406408
highlight_pre_tag = kwargs.pop("highlight_pre_tag", None)
407409
minimum_coverage = kwargs.pop("minimum_coverage", None)
408410
search_fields = kwargs.pop("search_fields", None)
411+
search_fields_str = ",".join(search_fields) if search_fields else None
409412
top = kwargs.pop("top", None)
410413
query = AutocompleteQuery(
411414
search_text=search_text,
@@ -416,7 +419,7 @@ def autocomplete(self, search_text, suggester_name, **kwargs):
416419
highlight_post_tag=highlight_post_tag,
417420
highlight_pre_tag=highlight_pre_tag,
418421
minimum_coverage=minimum_coverage,
419-
search_fields=search_fields,
422+
search_fields=search_fields_str,
420423
top=top
421424
)
422425

sdk/search/azure-search-documents/azure/search/documents/aio/_search_client_async.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ async def search(self, search_text, **kwargs):
216216
scoring_parameters = kwargs.pop("scoring_parameters", None)
217217
scoring_profile = kwargs.pop("scoring_profile", None)
218218
search_fields = kwargs.pop("search_fields", None)
219+
search_fields_str = ",".join(search_fields) if search_fields else None
219220
search_mode = kwargs.pop("search_mode", None)
220221
query_language = kwargs.pop("query_language", None)
221222
speller = kwargs.pop("speller", None)
@@ -236,7 +237,7 @@ async def search(self, search_text, **kwargs):
236237
query_type=query_type,
237238
scoring_parameters=scoring_parameters,
238239
scoring_profile=scoring_profile,
239-
search_fields=search_fields,
240+
search_fields=search_fields_str,
240241
search_mode=search_mode,
241242
query_language=query_language,
242243
speller=speller,
@@ -306,6 +307,7 @@ async def suggest(self, search_text, suggester_name, **kwargs):
306307
minimum_coverage = kwargs.pop("minimum_coverage", None)
307308
order_by = kwargs.pop("order_by", None)
308309
search_fields = kwargs.pop("search_fields", None)
310+
search_fields_str = ",".join(search_fields) if search_fields else None
309311
select = kwargs.pop("select", None)
310312
top = kwargs.pop("top", None)
311313
query = SuggestQuery(
@@ -317,7 +319,7 @@ async def suggest(self, search_text, suggester_name, **kwargs):
317319
highlight_pre_tag=highlight_pre_tag,
318320
minimum_coverage=minimum_coverage,
319321
order_by=order_by,
320-
search_fields=search_fields,
322+
search_fields=search_fields_str,
321323
select=select if isinstance(select, six.string_types) else None,
322324
top=top
323325
)
@@ -379,6 +381,7 @@ async def autocomplete(self, search_text, suggester_name, **kwargs):
379381
highlight_pre_tag = kwargs.pop("highlight_pre_tag", None)
380382
minimum_coverage = kwargs.pop("minimum_coverage", None)
381383
search_fields = kwargs.pop("search_fields", None)
384+
search_fields_str = ",".join(search_fields) if search_fields else None
382385
top = kwargs.pop("top", None)
383386
query = AutocompleteQuery(
384387
search_text=search_text,
@@ -389,7 +392,7 @@ async def autocomplete(self, search_text, suggester_name, **kwargs):
389392
highlight_post_tag=highlight_post_tag,
390393
highlight_pre_tag=highlight_pre_tag,
391394
minimum_coverage=minimum_coverage,
392-
search_fields=search_fields,
395+
search_fields=search_fields_str,
393396
top=top
394397
)
395398

0 commit comments

Comments
 (0)