Skip to content

Commit 41116fa

Browse files
authored
code refactoring (Azure#11638)
SearchIndexerDataSource -> SearchIndexerDataSourceConnection SearchField.SynonymMaps -> SearchField.SynonymMapNames SearchField.Analyzer -> SearchField.AnalyzerName SearchField.IndexAnalyzer -> SearchField.IndexAnalyzerName SearchField.SearchAnalyzer -> SearchField.SearchAnalyzerName SearchableField.SynonymMaps -> SearchableField.SynonymMapNames SearchableField.Analyzer -> SearchableField.AnalyzerName SearchableField.IndexAnalyzer -> SearchableField.IndexAnalyzerName SearchableField.SearchAnalyzer -> SearchableField.SearchAnalyzerName Similarity -> SimilarityAlgorithm Suggester -> SearchSuggester PathHierarchyTokenizerV2 -> PathHierarchyTokenizer
1 parent af4f29f commit 41116fa

File tree

9 files changed

+545
-113
lines changed

9 files changed

+545
-113
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@
88
- Split searchindex.json and searchservice.json models and operations into separate namespaces #11508
99
- Renamed `edm` to `SearchFieldDataType` #11511
1010
- Now Search Synonym Map creation/update returns a model #11514
11+
- Renaming #11565
12+
SearchIndexerDataSource -> SearchIndexerDataSourceConnection
13+
SearchField.SynonymMaps -> SearchField.SynonymMapNames
14+
SearchField.Analyzer -> SearchField.AnalyzerName
15+
SearchField.IndexAnalyzer -> SearchField.IndexAnalyzerName
16+
SearchField.SearchAnalyzer -> SearchField.SearchAnalyzerName
17+
SearchableField.SynonymMaps -> SearchableField.SynonymMapNames
18+
SearchableField.Analyzer -> SearchableField.AnalyzerName
19+
SearchableField.IndexAnalyzer -> SearchableField.IndexAnalyzerName
20+
SearchableField.SearchAnalyzer -> SearchableField.SearchAnalyzerName
21+
Similarity -> SimilarityAlgorithm
22+
Suggester -> SearchSuggester
23+
PathHierarchyTokenizerV2 -> PathHierarchyTokenizer
24+
25+
1126

1227
## 1.0.0b3 (2020-05-04)
1328

sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# ------------------------------------
55
from ._index import ( # pylint: disable=unused-import
66
ComplexField,
7+
SearchField,
78
SearchableField,
89
SimpleField,
910
)

sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_index.py

Lines changed: 295 additions & 29 deletions
Large diffs are not rendered by default.

sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_search_index_client.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
from ._generated import SearchServiceClient as _SearchServiceClient
1313
from ._generated.models import SynonymMap as _SynonymMap
1414
from ._utils import (
15-
delistize_flags_for_index,
16-
listize_flags_for_index,
17-
listize_synonyms,
15+
unpack_search_index,
16+
pack_search_index,
17+
unpack_synonyms,
1818
pack_search_resource_encryption_key,
1919
get_access_conditions,
2020
normalize_endpoint,
@@ -83,7 +83,7 @@ def list_indexes(self, **kwargs):
8383
"""
8484
kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
8585

86-
return self._client.indexes.list(cls=lambda objs: [listize_flags_for_index(x) for x in objs], **kwargs)
86+
return self._client.indexes.list(cls=lambda objs: [unpack_search_index(x) for x in objs], **kwargs)
8787

8888
@distributed_trace
8989
def get_index(self, index_name, **kwargs):
@@ -107,7 +107,7 @@ def get_index(self, index_name, **kwargs):
107107
"""
108108
kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
109109
result = self._client.indexes.get(index_name, **kwargs)
110-
return listize_flags_for_index(result)
110+
return unpack_search_index(result)
111111

112112
@distributed_trace
113113
def get_index_statistics(self, index_name, **kwargs):
@@ -181,9 +181,9 @@ def create_index(self, index, **kwargs):
181181
:caption: Creating a new index.
182182
"""
183183
kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
184-
patched_index = delistize_flags_for_index(index)
184+
patched_index = pack_search_index(index)
185185
result = self._client.indexes.create(patched_index, **kwargs)
186-
return result
186+
return unpack_search_index(result)
187187

188188
@distributed_trace
189189
def create_or_update_index(
@@ -226,15 +226,15 @@ def create_or_update_index(
226226
index, kwargs.pop("match_condition", MatchConditions.Unconditionally)
227227
)
228228
kwargs.update(access_condition)
229-
patched_index = delistize_flags_for_index(index)
229+
patched_index = pack_search_index(index)
230230
result = self._client.indexes.create_or_update(
231231
index_name=index_name,
232232
index=patched_index,
233233
allow_index_downtime=allow_index_downtime,
234234
error_map=error_map,
235235
**kwargs
236236
)
237-
return result
237+
return unpack_search_index(result)
238238

239239
@distributed_trace
240240
def analyze_text(self, index_name, analyze_request, **kwargs):
@@ -285,7 +285,7 @@ def get_synonym_maps(self, **kwargs):
285285
"""
286286
kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
287287
result = self._client.synonym_maps.list(**kwargs)
288-
return [listize_synonyms(x) for x in result.synonym_maps]
288+
return [unpack_synonyms(x) for x in result.synonym_maps]
289289

290290
@distributed_trace
291291
def get_synonym_map(self, name, **kwargs):
@@ -310,7 +310,7 @@ def get_synonym_map(self, name, **kwargs):
310310
"""
311311
kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
312312
result = self._client.synonym_maps.get(name, **kwargs)
313-
return listize_synonyms(result)
313+
return unpack_synonyms(result)
314314

315315
@distributed_trace
316316
def delete_synonym_map(self, synonym_map, **kwargs):
@@ -375,7 +375,7 @@ def create_synonym_map(self, name, synonyms, **kwargs):
375375
solr_format_synonyms = "\n".join(synonyms)
376376
synonym_map = _SynonymMap(name=name, synonyms=solr_format_synonyms)
377377
result = self._client.synonym_maps.create(synonym_map, **kwargs)
378-
return listize_synonyms(result)
378+
return unpack_synonyms(result)
379379

380380
@distributed_trace
381381
def create_or_update_synonym_map(self, synonym_map, synonyms=None, **kwargs):
@@ -413,7 +413,7 @@ def create_or_update_synonym_map(self, synonym_map, synonyms=None, **kwargs):
413413
error_map=error_map,
414414
**kwargs
415415
)
416-
return listize_synonyms(result)
416+
return unpack_synonyms(result)
417417

418418
@distributed_trace
419419
def get_service_statistics(self, **kwargs):

0 commit comments

Comments
 (0)