diff --git a/sdk/search/azure-search-documents/CHANGELOG.md b/sdk/search/azure-search-documents/CHANGELOG.md index abad78cf4b14..21ffd75e8d75 100644 --- a/sdk/search/azure-search-documents/CHANGELOG.md +++ b/sdk/search/azure-search-documents/CHANGELOG.md @@ -5,6 +5,7 @@ **Breaking Changes** - Reorganized `SearchServiceClient` into `SearchIndexClient` & `SearchIndexerClient` #11507 +- Split searchindex.json and searchservice.json models and operations into separate namespaces #11508 ## 1.0.0b3 (2020-05-04) diff --git a/sdk/search/azure-search-documents/azure/search/documents/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/__init__.py index 309814cf85f2..003405d0dcf0 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/__init__.py +++ b/sdk/search/azure-search-documents/azure/search/documents/__init__.py @@ -24,217 +24,18 @@ # # -------------------------------------------------------------------------- -from ._index import ( - AutocompleteQuery, - IndexAction, +from ._internal import ( IndexDocumentsBatch, - IndexingResult, SearchClient, SearchItemPaged, - SearchQuery, - SuggestQuery, - odata, ) -from ._service import ( - ComplexField, - SearchableField, - SimpleField, - SearchIndexClient, - SearchIndexerClient, - edm, -) -from ._service._generated.models import ( - AnalyzeRequest, - AnalyzeResult, - AnalyzedTokenInfo, - AsciiFoldingTokenFilter, - AzureActiveDirectoryApplicationCredentials, - CharFilter, - CjkBigramTokenFilter, - ClassicTokenizer, - CommonGramTokenFilter, - ConditionalSkill, - CorsOptions, - CustomAnalyzer, - DataSourceCredentials, - DictionaryDecompounderTokenFilter, - DistanceScoringFunction, - DistanceScoringParameters, - EdgeNGramTokenFilter, - EdgeNGramTokenizer, - ElisionTokenFilter, - EntityRecognitionSkill, - FreshnessScoringFunction, - FreshnessScoringParameters, - GetIndexStatisticsResult, - ImageAnalysisSkill, - IndexingSchedule, - IndexingParameters, - InputFieldMappingEntry, - KeepTokenFilter, - KeyPhraseExtractionSkill, - KeywordMarkerTokenFilter, - KeywordTokenizer, - LanguageDetectionSkill, - LengthTokenFilter, - LexicalAnalyzer, - LexicalTokenizer, - LimitTokenFilter, - LuceneStandardAnalyzer, - LuceneStandardTokenizer, - MagnitudeScoringFunction, - MagnitudeScoringParameters, - MappingCharFilter, - MergeSkill, - MicrosoftLanguageStemmingTokenizer, - MicrosoftLanguageTokenizer, - NGramTokenFilter, - NGramTokenizer, - OcrSkill, - OutputFieldMappingEntry, - PatternCaptureTokenFilter, - PatternReplaceCharFilter, - PatternReplaceTokenFilter, - PhoneticTokenFilter, - RegexFlags, - SearchField, - SearchIndex, - SearchIndexer, - SearchIndexerDataContainer, - SearchIndexerDataSource, - SearchIndexerSkillset, - SearchResourceEncryptionKey, - ScoringFunction, - ScoringProfile, - SentimentSkill, - ShaperSkill, - ShingleTokenFilter, - SnowballTokenFilter, - SplitSkill, - StemmerOverrideTokenFilter, - StemmerTokenFilter, - StopAnalyzer, - StopwordsTokenFilter, - Suggester, - SynonymMap, - SynonymTokenFilter, - TagScoringFunction, - TagScoringParameters, - TextTranslationSkill, - TextWeights, - TokenFilter, - TruncateTokenFilter, - UaxUrlEmailTokenizer, - UniqueTokenFilter, - WebApiSkill, - WordDelimiterTokenFilter, -) -from ._service._models import PatternAnalyzer, PatternTokenizer from ._version import VERSION __version__ = VERSION __all__ = ( - "AnalyzeRequest", - "AnalyzeResult", - "AnalyzedTokenInfo", - "AsciiFoldingTokenFilter", - "AutocompleteQuery", - "AzureActiveDirectoryApplicationCredentials", - "CharFilter", - "CjkBigramTokenFilter", - "ClassicTokenizer", - "CommonGramTokenFilter", - "ComplexField", - "ConditionalSkill", - "CorsOptions", - "CustomAnalyzer", - "DataSourceCredentials", - "DictionaryDecompounderTokenFilter", - "DistanceScoringFunction", - "DistanceScoringParameters", - "EdgeNGramTokenFilter", - "EdgeNGramTokenizer", - "ElisionTokenFilter", - "EntityRecognitionSkill", - "FreshnessScoringFunction", - "FreshnessScoringParameters", - "GetIndexStatisticsResult", - "ImageAnalysisSkill", - "IndexingSchedule", - "IndexingParameters", - "IndexAction", "IndexDocumentsBatch", - "IndexingResult", - "InputFieldMappingEntry", - "KeepTokenFilter", - "KeyPhraseExtractionSkill", - "KeywordMarkerTokenFilter", - "KeywordTokenizer", - "LanguageDetectionSkill", - "LengthTokenFilter", - "LexicalAnalyzer", - "LexicalTokenizer", - "LimitTokenFilter", - "LuceneStandardAnalyzer", - "LuceneStandardTokenizer", - "MagnitudeScoringFunction", - "MagnitudeScoringParameters", - "MappingCharFilter", - "MergeSkill", - "MicrosoftLanguageStemmingTokenizer", - "MicrosoftLanguageTokenizer", - "NGramTokenFilter", - "NGramTokenizer", - "OcrSkill", - "OutputFieldMappingEntry", - "PatternAnalyzer", - "PatternCaptureTokenFilter", - "PatternReplaceCharFilter", - "PatternReplaceTokenFilter", - "PatternTokenizer", - "PhoneticTokenFilter", - "RegexFlags", - "ScoringFunction", - "ScoringProfile", "SearchClient", - "SearchField", - "SearchIndex", - "SearchIndexer", - "SearchIndexerDataContainer", - "SearchIndexerDataSource", - "SearchIndexerSkillset", - "SearchIndexerClient", - "SearchIndexClient", "SearchItemPaged", - "SearchQuery", - "SearchResourceEncryptionKey", - "SearchableField", - "SentimentSkill", - "ShaperSkill", - "ShingleTokenFilter", - "SimpleField", - "SnowballTokenFilter", - "SplitSkill", - "StemmerOverrideTokenFilter", - "StemmerTokenFilter", - "StopAnalyzer", - "StopwordsTokenFilter", - "SuggestQuery", - "Suggester", - "SynonymMap", - "SynonymTokenFilter", - "TagScoringFunction", - "TagScoringParameters", - "TextTranslationSkill", - "TextWeights", - "TokenFilter", - "TruncateTokenFilter", - "UaxUrlEmailTokenizer", - "UniqueTokenFilter", - "WebApiSkill", - "WordDelimiterTokenFilter", - "edm", - "odata", ) diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/_configuration.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/_configuration.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/_configuration.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/_configuration.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/_search_index_client.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/_search_index_client.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/_search_index_client.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/_search_index_client.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/_configuration_async.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/_configuration_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/_configuration_async.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/_configuration_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/_search_index_client_async.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/_search_index_client_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/_search_index_client_async.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/_search_index_client_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/operations_async/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/operations_async/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/operations_async/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/operations_async/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/operations_async/_documents_operations_async.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/operations_async/_documents_operations_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/aio/operations_async/_documents_operations_async.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/aio/operations_async/_documents_operations_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/models/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/models/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/models/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/models/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/models/_models.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/models/_models.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/models/_models.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/models/_models_py3.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/models/_models_py3.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/models/_models_py3.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/models/_models_py3.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/models/_search_index_client_enums.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/models/_search_index_client_enums.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/models/_search_index_client_enums.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/models/_search_index_client_enums.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/operations/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/operations/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/operations/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/operations/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/operations/_documents_operations.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/operations/_documents_operations.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/operations/_documents_operations.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/operations/_documents_operations.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_generated/py.typed b/sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/py.typed similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_generated/py.typed rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_generated/py.typed diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_index_documents_batch.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_index_documents_batch.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_index_documents_batch.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_index_documents_batch.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_paging.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_paging.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_paging.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_paging.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_queries.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_queries.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_queries.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_queries.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/_search_client.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/_search_client.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/_search_client.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/_search_client.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/aio/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/aio/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/aio/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/aio/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/aio/_paging.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/aio/_paging.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/aio/_paging.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/aio/_paging.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_index/aio/_search_client_async.py b/sdk/search/azure-search-documents/azure/search/documents/_internal/aio/_search_client_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_index/aio/_search_client_async.py rename to sdk/search/azure-search-documents/azure/search/documents/_internal/aio/_search_client_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/aio.py b/sdk/search/azure-search-documents/azure/search/documents/aio.py index 19c037e557f0..333ee73eec4a 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/aio.py +++ b/sdk/search/azure-search-documents/azure/search/documents/aio.py @@ -24,15 +24,10 @@ # # -------------------------------------------------------------------------- -from ._index.aio import AsyncSearchItemPaged, SearchClient -from ._service.aio import ( - SearchIndexClient, - SearchIndexerClient, -) +from ._internal.aio import AsyncSearchItemPaged, SearchClient + __all__ = ( "AsyncSearchItemPaged", "SearchClient", - "SearchIndexClient", - "SearchIndexerClient", ) diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/__init__.py new file mode 100644 index 000000000000..2d1a744ba6c0 --- /dev/null +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/__init__.py @@ -0,0 +1,36 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- + +from ._internal import ( + SearchIndexClient, + SearchIndexerClient, +) + + +__all__ = ( + "SearchIndexerClient", + "SearchIndexClient", +) diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/_configuration.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/_configuration.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/_configuration.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/_configuration.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/_search_service_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/_search_service_client.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/_search_service_client.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/_search_service_client.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/_configuration_async.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/_configuration_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/_configuration_async.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/_configuration_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/_search_service_client_async.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/_search_service_client_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/_search_service_client_async.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/_search_service_client_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_data_sources_operations_async.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_data_sources_operations_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_data_sources_operations_async.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_data_sources_operations_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_indexers_operations_async.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_indexers_operations_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_indexers_operations_async.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_indexers_operations_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_indexes_operations_async.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_indexes_operations_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_indexes_operations_async.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_indexes_operations_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_search_service_client_operations_async.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_search_service_client_operations_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_search_service_client_operations_async.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_search_service_client_operations_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_skillsets_operations_async.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_skillsets_operations_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_skillsets_operations_async.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_skillsets_operations_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_synonym_maps_operations_async.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_synonym_maps_operations_async.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/aio/operations_async/_synonym_maps_operations_async.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/aio/operations_async/_synonym_maps_operations_async.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/models/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/models/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/models/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/models/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/models/_models.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/models/_models.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/models/_models.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/models/_models_py3.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/models/_models_py3.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/models/_models_py3.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/models/_models_py3.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/models/_search_service_client_enums.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/models/_search_service_client_enums.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/models/_search_service_client_enums.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/models/_search_service_client_enums.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_data_sources_operations.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_data_sources_operations.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_data_sources_operations.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_data_sources_operations.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_indexers_operations.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_indexers_operations.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_indexers_operations.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_indexers_operations.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_indexes_operations.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_indexes_operations.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_indexes_operations.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_indexes_operations.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_search_service_client_operations.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_search_service_client_operations.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_search_service_client_operations.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_search_service_client_operations.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_skillsets_operations.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_skillsets_operations.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_skillsets_operations.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_skillsets_operations.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_synonym_maps_operations.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_synonym_maps_operations.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/operations/_synonym_maps_operations.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/operations/_synonym_maps_operations.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_generated/py.typed b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/py.typed similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_generated/py.typed rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_generated/py.typed diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_index.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_index.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_index.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_index.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_models.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_models.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_models.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_search_index_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_search_index_client.py similarity index 99% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_search_index_client.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_search_index_client.py index 4317559fb208..a22c8ca062eb 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/_service/_search_index_client.py +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_search_index_client.py @@ -18,9 +18,9 @@ get_access_conditions, normalize_endpoint, ) -from .._headers_mixin import HeadersMixin -from .._version import SDK_MONIKER -from .. import SearchClient +from ..._headers_mixin import HeadersMixin +from ..._version import SDK_MONIKER +from ... import SearchClient if TYPE_CHECKING: # pylint:disable=unused-import,ungrouped-imports diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_search_indexer_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_search_indexer_client.py similarity index 99% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_search_indexer_client.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_search_indexer_client.py index e528a6d6413b..a7c1967dabbe 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/_service/_search_indexer_client.py +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_search_indexer_client.py @@ -12,8 +12,8 @@ from ._generated import SearchServiceClient as _SearchServiceClient from ._generated.models import SearchIndexerSkillset from ._utils import get_access_conditions, normalize_endpoint -from .._headers_mixin import HeadersMixin -from .._version import SDK_MONIKER +from ..._headers_mixin import HeadersMixin +from ..._version import SDK_MONIKER if TYPE_CHECKING: # pylint:disable=unused-import,ungrouped-imports diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_utils.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_utils.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/aio/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/__init__.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/aio/__init__.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/__init__.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/aio/_search_index_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/_search_index_client.py similarity index 99% rename from sdk/search/azure-search-documents/azure/search/documents/_service/aio/_search_index_client.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/_search_index_client.py index e44334f9c03c..0804a1ce087e 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/_service/aio/_search_index_client.py +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/_search_index_client.py @@ -10,7 +10,7 @@ from azure.core.async_paging import AsyncItemPaged from .._generated.aio import SearchServiceClient as _SearchServiceClient from .._generated.models import SynonymMap -from ...aio import SearchClient +from ....aio import SearchClient from .._utils import ( delistize_flags_for_index, listize_flags_for_index, @@ -18,8 +18,8 @@ get_access_conditions, normalize_endpoint, ) -from ..._headers_mixin import HeadersMixin -from ..._version import SDK_MONIKER +from ...._headers_mixin import HeadersMixin +from ...._version import SDK_MONIKER if TYPE_CHECKING: # pylint:disable=unused-import,ungrouped-imports diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/aio/_search_indexer_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/_search_indexer_client.py similarity index 99% rename from sdk/search/azure-search-documents/azure/search/documents/_service/aio/_search_indexer_client.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/_search_indexer_client.py index 4f844c27ba2c..e98add07919b 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/_service/aio/_search_indexer_client.py +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/_search_indexer_client.py @@ -12,8 +12,8 @@ from .._generated.aio import SearchServiceClient as _SearchServiceClient from .._generated.models import SearchIndexerSkillset from .._utils import get_access_conditions, normalize_endpoint -from ..._headers_mixin import HeadersMixin -from ..._version import SDK_MONIKER +from ...._headers_mixin import HeadersMixin +from ...._version import SDK_MONIKER if TYPE_CHECKING: # pylint:disable=unused-import,ungrouped-imports diff --git a/sdk/search/azure-search-documents/azure/search/documents/_service/edm.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/edm.py similarity index 100% rename from sdk/search/azure-search-documents/azure/search/documents/_service/edm.py rename to sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/edm.py diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/aio.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/aio.py new file mode 100644 index 000000000000..a88bb515f16f --- /dev/null +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/aio.py @@ -0,0 +1,35 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- + +from ._internal.aio import ( + SearchIndexClient, + SearchIndexerClient, +) + +__all__ = ( + "SearchIndexClient", + "SearchIndexerClient", +) diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py new file mode 100644 index 000000000000..f7f27f0e97c2 --- /dev/null +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py @@ -0,0 +1,213 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- + +from .._internal import ( + ComplexField, + SearchableField, + SimpleField, + edm, +) +from .._internal._generated.models import ( + AnalyzeRequest, + AnalyzeResult, + AnalyzedTokenInfo, + AsciiFoldingTokenFilter, + AzureActiveDirectoryApplicationCredentials, + CharFilter, + CjkBigramTokenFilter, + ClassicTokenizer, + CommonGramTokenFilter, + ConditionalSkill, + CorsOptions, + CustomAnalyzer, + DataSourceCredentials, + DictionaryDecompounderTokenFilter, + DistanceScoringFunction, + DistanceScoringParameters, + EdgeNGramTokenFilter, + EdgeNGramTokenizer, + ElisionTokenFilter, + EntityRecognitionSkill, + FreshnessScoringFunction, + FreshnessScoringParameters, + GetIndexStatisticsResult, + ImageAnalysisSkill, + IndexingSchedule, + IndexingParameters, + InputFieldMappingEntry, + KeepTokenFilter, + KeyPhraseExtractionSkill, + KeywordMarkerTokenFilter, + KeywordTokenizer, + LanguageDetectionSkill, + LengthTokenFilter, + LexicalAnalyzer, + LexicalTokenizer, + LimitTokenFilter, + LuceneStandardAnalyzer, + LuceneStandardTokenizer, + MagnitudeScoringFunction, + MagnitudeScoringParameters, + MappingCharFilter, + MergeSkill, + MicrosoftLanguageStemmingTokenizer, + MicrosoftLanguageTokenizer, + NGramTokenFilter, + NGramTokenizer, + OcrSkill, + OutputFieldMappingEntry, + PatternCaptureTokenFilter, + PatternReplaceCharFilter, + PatternReplaceTokenFilter, + PhoneticTokenFilter, + RegexFlags, + SearchField, + SearchIndex, + SearchIndexer, + SearchIndexerDataContainer, + SearchIndexerDataSource, + SearchIndexerSkillset, + SearchResourceEncryptionKey, + ScoringFunction, + ScoringProfile, + SentimentSkill, + ShaperSkill, + ShingleTokenFilter, + SnowballTokenFilter, + SplitSkill, + StemmerOverrideTokenFilter, + StemmerTokenFilter, + StopAnalyzer, + StopwordsTokenFilter, + Suggester, + SynonymMap, + SynonymTokenFilter, + TagScoringFunction, + TagScoringParameters, + TextTranslationSkill, + TextWeights, + TokenFilter, + TruncateTokenFilter, + UaxUrlEmailTokenizer, + UniqueTokenFilter, + WebApiSkill, + WordDelimiterTokenFilter, +) +from .._internal._models import PatternAnalyzer, PatternTokenizer + + +__all__ = ( + "AnalyzeRequest", + "AnalyzeResult", + "AnalyzedTokenInfo", + "AsciiFoldingTokenFilter", + "AzureActiveDirectoryApplicationCredentials", + "CharFilter", + "CjkBigramTokenFilter", + "ClassicTokenizer", + "CommonGramTokenFilter", + "ComplexField", + "ConditionalSkill", + "CorsOptions", + "CustomAnalyzer", + "DataSourceCredentials", + "DictionaryDecompounderTokenFilter", + "DistanceScoringFunction", + "DistanceScoringParameters", + "EdgeNGramTokenFilter", + "EdgeNGramTokenizer", + "ElisionTokenFilter", + "EntityRecognitionSkill", + "FreshnessScoringFunction", + "FreshnessScoringParameters", + "GetIndexStatisticsResult", + "ImageAnalysisSkill", + "IndexingSchedule", + "IndexingParameters", + "InputFieldMappingEntry", + "KeepTokenFilter", + "KeyPhraseExtractionSkill", + "KeywordMarkerTokenFilter", + "KeywordTokenizer", + "LanguageDetectionSkill", + "LengthTokenFilter", + "LexicalAnalyzer", + "LexicalTokenizer", + "LimitTokenFilter", + "LuceneStandardAnalyzer", + "LuceneStandardTokenizer", + "MagnitudeScoringFunction", + "MagnitudeScoringParameters", + "MappingCharFilter", + "MergeSkill", + "MicrosoftLanguageStemmingTokenizer", + "MicrosoftLanguageTokenizer", + "NGramTokenFilter", + "NGramTokenizer", + "OcrSkill", + "OutputFieldMappingEntry", + "PatternAnalyzer", + "PatternCaptureTokenFilter", + "PatternReplaceCharFilter", + "PatternReplaceTokenFilter", + "PatternTokenizer", + "PhoneticTokenFilter", + "RegexFlags", + "ScoringFunction", + "ScoringProfile", + "SearchField", + "SearchIndex", + "SearchIndexer", + "SearchIndexerDataContainer", + "SearchIndexerDataSource", + "SearchIndexerSkillset", + "SearchResourceEncryptionKey", + "SearchableField", + "SentimentSkill", + "ShaperSkill", + "ShingleTokenFilter", + "SimpleField", + "SnowballTokenFilter", + "SplitSkill", + "StemmerOverrideTokenFilter", + "StemmerTokenFilter", + "StopAnalyzer", + "StopwordsTokenFilter", + "Suggester", + "SynonymMap", + "SynonymTokenFilter", + "TagScoringFunction", + "TagScoringParameters", + "TextTranslationSkill", + "TextWeights", + "TokenFilter", + "TruncateTokenFilter", + "UaxUrlEmailTokenizer", + "UniqueTokenFilter", + "WebApiSkill", + "WordDelimiterTokenFilter", + "edm", +) diff --git a/sdk/search/azure-search-documents/azure/search/documents/models/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/models/__init__.py new file mode 100644 index 000000000000..4ed6626ec6cd --- /dev/null +++ b/sdk/search/azure-search-documents/azure/search/documents/models/__init__.py @@ -0,0 +1,44 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- + +from .._internal import ( + AutocompleteQuery, + IndexAction, + IndexingResult, + SearchQuery, + SuggestQuery, + odata, +) + + +__all__ = ( + "AutocompleteQuery", + "IndexAction", + "IndexingResult", + "SearchQuery", + "SuggestQuery", + "odata", +) diff --git a/sdk/search/azure-search-documents/tests/_test_utils.py b/sdk/search/azure-search-documents/tests/_test_utils.py index 844ff2a240b8..6b6401db0baa 100644 --- a/sdk/search/azure-search-documents/tests/_test_utils.py +++ b/sdk/search/azure-search-documents/tests/_test_utils.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # ------------------------------------ -from azure.search.documents import SynonymMap +from azure.search.documents.indexes.models import SynonymMap def build_synonym_map_from_dict(synonym_map): diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_index_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_index_live_async.py index 71e0f9e5bafa..a628ebc20c8a 100644 --- a/sdk/search/azure-search-documents/tests/async_tests/test_index_live_async.py +++ b/sdk/search/azure-search-documents/tests/async_tests/test_index_live_async.py @@ -24,7 +24,7 @@ from azure.core.exceptions import HttpResponseError from azure.core.credentials import AzureKeyCredential -from azure.search.documents import ( +from azure.search.documents.models import ( AutocompleteQuery, SearchQuery, SuggestQuery, diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_service_client_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_service_client_async.py index 10fd55b3bb20..726e2c481a34 100644 --- a/sdk/search/azure-search-documents/tests/async_tests/test_search_service_client_async.py +++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_service_client_async.py @@ -12,7 +12,8 @@ import mock from azure_devtools.scenario_tests.utilities import trim_kwargs_from_test_function from azure.core.credentials import AzureKeyCredential -from azure.search.documents.aio import SearchClient, SearchIndexClient, SearchIndexerClient +from azure.search.documents.aio import SearchClient +from azure.search.documents.indexes.aio import SearchIndexClient, SearchIndexerClient CREDENTIAL = AzureKeyCredential(key="test_api_key") diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_service_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_service_live_async.py index 91fc208abe08..f4542ced09b0 100644 --- a/sdk/search/azure-search-documents/tests/async_tests/test_service_live_async.py +++ b/sdk/search/azure-search-documents/tests/async_tests/test_service_live_async.py @@ -19,7 +19,7 @@ from azure_devtools.scenario_tests.utilities import trim_kwargs_from_test_function from azure.core.exceptions import HttpResponseError -from azure.search.documents import( +from azure.search.documents.indexes.models import( AnalyzeRequest, AnalyzeResult, CorsOptions, @@ -37,7 +37,7 @@ SimpleField, edm ) -from azure.search.documents.aio import SearchIndexClient, SearchIndexerClient +from azure.search.documents.indexes.aio import SearchIndexClient, SearchIndexerClient from _test_utils import build_synonym_map_from_dict CWD = dirname(realpath(__file__)) diff --git a/sdk/search/azure-search-documents/tests/search_service_preparer.py b/sdk/search/azure-search-documents/tests/search_service_preparer.py index b41ae7fd485a..5c0d7cba8951 100644 --- a/sdk/search/azure-search-documents/tests/search_service_preparer.py +++ b/sdk/search/azure-search-documents/tests/search_service_preparer.py @@ -132,7 +132,7 @@ def create_resource(self, name, **kwargs): if self.index_batch and self.schema: from azure.core.credentials import AzureKeyCredential from azure.search.documents import SearchClient - from azure.search.documents._index._generated.models import IndexBatch + from azure.search.documents._internal._generated.models import IndexBatch batch = IndexBatch.deserialize(self.index_batch) index_client = SearchClient( diff --git a/sdk/search/azure-search-documents/tests/test_index_documents_batch.py b/sdk/search/azure-search-documents/tests/test_index_documents_batch.py index 9387c04922ae..9fd058fe8425 100644 --- a/sdk/search/azure-search-documents/tests/test_index_documents_batch.py +++ b/sdk/search/azure-search-documents/tests/test_index_documents_batch.py @@ -5,7 +5,7 @@ import pytest -from azure.search.documents._index._generated.models import IndexAction +from azure.search.documents.models import IndexAction from azure.search.documents import IndexDocumentsBatch diff --git a/sdk/search/azure-search-documents/tests/test_index_field_helpers.py b/sdk/search/azure-search-documents/tests/test_index_field_helpers.py index 190cfc13f1d5..4758a09ee6be 100644 --- a/sdk/search/azure-search-documents/tests/test_index_field_helpers.py +++ b/sdk/search/azure-search-documents/tests/test_index_field_helpers.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # ------------------------------------ -from azure.search.documents import ComplexField, SearchableField, SimpleField, edm +from azure.search.documents.indexes.models import ComplexField, SearchableField, SimpleField, edm def test_edm_contents(): assert edm.String == "Edm.String" diff --git a/sdk/search/azure-search-documents/tests/test_index_live.py b/sdk/search/azure-search-documents/tests/test_index_live.py index 686277cc04f5..febb945f4710 100644 --- a/sdk/search/azure-search-documents/tests/test_index_live.py +++ b/sdk/search/azure-search-documents/tests/test_index_live.py @@ -20,9 +20,9 @@ from azure.core.exceptions import HttpResponseError from azure.core.credentials import AzureKeyCredential -from azure.search.documents import ( +from azure.search.documents import SearchClient +from azure.search.documents.models import ( AutocompleteQuery, - SearchClient, SearchQuery, SuggestQuery, ) diff --git a/sdk/search/azure-search-documents/tests/test_queries.py b/sdk/search/azure-search-documents/tests/test_queries.py index 814b117e84f8..111d52f2c4ce 100644 --- a/sdk/search/azure-search-documents/tests/test_queries.py +++ b/sdk/search/azure-search-documents/tests/test_queries.py @@ -10,13 +10,13 @@ except ImportError: import mock -from azure.search.documents._index._generated.models import ( +from azure.search.documents._internal._generated.models import ( AutocompleteRequest, SearchRequest, SuggestRequest, ) -from azure.search.documents import AutocompleteQuery, SearchQuery, SuggestQuery +from azure.search.documents.models import AutocompleteQuery, SearchQuery, SuggestQuery class TestAutocompleteQuery(object): @@ -25,7 +25,7 @@ def test_init(self): assert type(query.request) is AutocompleteRequest assert query.request.filter is None - @mock.patch("azure.search.documents.AutocompleteQuery._request_type") + @mock.patch("azure.search.documents.models.AutocompleteQuery._request_type") def test_kwargs_forwarded(self, mock_request): mock_request.return_value = None AutocompleteQuery(foo=10, bar=20) @@ -62,7 +62,7 @@ def test_init(self): assert query.request.order_by is None assert query.request.select is None - @mock.patch("azure.search.documents.SearchQuery._request_type") + @mock.patch("azure.search.documents.models.SearchQuery._request_type") def test_kwargs_forwarded(self, mock_request): mock_request.return_value = None SearchQuery(foo=10, bar=20) @@ -140,7 +140,7 @@ def test_init(self): assert type(query.request) is SuggestRequest assert query.request.filter is None - @mock.patch("azure.search.documents.SuggestQuery._request_type") + @mock.patch("azure.search.documents.models.SuggestQuery._request_type") def test_kwargs_forwarded(self, mock_request): mock_request.return_value = None SuggestQuery(foo=10, bar=20) diff --git a/sdk/search/azure-search-documents/tests/test_regex_flags.py b/sdk/search/azure-search-documents/tests/test_regex_flags.py index 26775607d3b7..52ed7f43a101 100644 --- a/sdk/search/azure-search-documents/tests/test_regex_flags.py +++ b/sdk/search/azure-search-documents/tests/test_regex_flags.py @@ -3,12 +3,12 @@ # Licensed under the MIT License. # ------------------------------------ -from azure.search.documents import SearchIndex, RegexFlags, PatternAnalyzer, PatternTokenizer -from azure.search.documents._service._generated.models import ( +from azure.search.documents.indexes.models import SearchIndex, RegexFlags, PatternAnalyzer, PatternTokenizer +from azure.search.documents.indexes._internal._generated.models import ( PatternAnalyzer as _PatternAnalyzer, PatternTokenizer as _PatternTokenizer, ) -from azure.search.documents._service._utils import delistize_flags_for_index, listize_flags_for_index +from azure.search.documents.indexes._internal._utils import delistize_flags_for_index, listize_flags_for_index def test_listize_flags_for_index(): pattern_analyzer = _PatternAnalyzer( diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client.py b/sdk/search/azure-search-documents/tests/test_search_index_client.py index 8817357ee6e1..4c011e6c1ef5 100644 --- a/sdk/search/azure-search-documents/tests/test_search_index_client.py +++ b/sdk/search/azure-search-documents/tests/test_search_index_client.py @@ -13,18 +13,20 @@ from azure.core.paging import ItemPaged from azure.core.credentials import AzureKeyCredential -from azure.search.documents._index._generated.models import ( +from azure.search.documents._internal._generated.models import ( IndexAction, IndexBatch, SearchDocumentsResult, SearchResult, ) -from azure.search.documents._index._search_client import SearchPageIterator +from azure.search.documents._internal._search_client import SearchPageIterator from azure.search.documents import ( - AutocompleteQuery, IndexDocumentsBatch, SearchClient, +) +from azure.search.documents.models import ( + AutocompleteQuery, SearchQuery, SuggestQuery, odata, @@ -106,7 +108,7 @@ def test_repr(self): ) @mock.patch( - "azure.search.documents._index._generated.operations._documents_operations.DocumentsOperations.count" + "azure.search.documents._internal._generated.operations._documents_operations.DocumentsOperations.count" ) def test_get_document_count(self, mock_count): client = SearchClient("endpoint", "index name", CREDENTIAL) @@ -118,7 +120,7 @@ def test_get_document_count(self, mock_count): @mock.patch( - "azure.search.documents._index._generated.operations._documents_operations.DocumentsOperations.get" + "azure.search.documents._internal._generated.operations._documents_operations.DocumentsOperations.get" ) def test_get_document(self, mock_get): client = SearchClient("endpoint", "index name", CREDENTIAL) @@ -144,7 +146,7 @@ def test_get_document(self, mock_get): "query", ["search text", SearchQuery(search_text="search text")], ids=repr ) @mock.patch( - "azure.search.documents._index._generated.operations._documents_operations.DocumentsOperations.search_post" + "azure.search.documents._internal._generated.operations._documents_operations.DocumentsOperations.search_post" ) def test_search_query_argument(self, mock_search_post, query): client = SearchClient("endpoint", "index name", CREDENTIAL) @@ -171,7 +173,7 @@ def test_search_bad_argument(self): ) @mock.patch( - "azure.search.documents._index._generated.operations._documents_operations.DocumentsOperations.suggest_post" + "azure.search.documents._internal._generated.operations._documents_operations.DocumentsOperations.suggest_post" ) def test_suggest_query_argument(self, mock_suggest_post): client = SearchClient("endpoint", "index name", CREDENTIAL) @@ -195,7 +197,7 @@ def test_suggest_bad_argument(self): ) @mock.patch( - "azure.search.documents._index._generated.operations._documents_operations.DocumentsOperations.autocomplete_post" + "azure.search.documents._internal._generated.operations._documents_operations.DocumentsOperations.autocomplete_post" ) def test_autocomplete_query_argument(self, mock_autocomplete_post): client = SearchClient("endpoint", "index name", CREDENTIAL) @@ -246,7 +248,7 @@ def test_add_method(self, arg, method_name): assert mock_index_documents.call_args[1]["extra"] == "foo" @mock.patch( - "azure.search.documents._index._generated.operations._documents_operations.DocumentsOperations.index" + "azure.search.documents._internal._generated.operations._documents_operations.DocumentsOperations.index" ) def test_index_documents(self, mock_index): client = SearchClient("endpoint", "index name", CREDENTIAL) diff --git a/sdk/search/azure-search-documents/tests/test_search_service_client.py b/sdk/search/azure-search-documents/tests/test_search_service_client.py index b32b0d98d754..f903d89e2dc8 100644 --- a/sdk/search/azure-search-documents/tests/test_search_service_client.py +++ b/sdk/search/azure-search-documents/tests/test_search_service_client.py @@ -11,7 +11,8 @@ import mock from azure.core.credentials import AzureKeyCredential -from azure.search.documents import SearchClient, SearchIndexClient, SearchIndexerClient +from azure.search.documents import SearchClient +from azure.search.documents.indexes import SearchIndexClient, SearchIndexerClient CREDENTIAL = AzureKeyCredential(key="test_api_key") @@ -44,7 +45,7 @@ def test_get_search_client(self): assert isinstance(search_client, SearchClient) @mock.patch( - "azure.search.documents._service._generated._search_service_client.SearchServiceClient.get_service_statistics" + "azure.search.documents.indexes._internal._generated._search_service_client.SearchServiceClient.get_service_statistics" ) def test_get_service_statistics(self, mock_get_stats): client = SearchIndexClient("endpoint", CREDENTIAL) diff --git a/sdk/search/azure-search-documents/tests/test_service_live.py b/sdk/search/azure-search-documents/tests/test_service_live.py index b1978514615c..755ac06c2b98 100644 --- a/sdk/search/azure-search-documents/tests/test_service_live.py +++ b/sdk/search/azure-search-documents/tests/test_service_live.py @@ -16,7 +16,7 @@ from azure.core import MatchConditions from azure.core.credentials import AzureKeyCredential from azure.core.exceptions import HttpResponseError -from azure.search.documents import( +from azure.search.documents.indexes.models import( AnalyzeRequest, AnalyzeResult, CorsOptions, @@ -24,8 +24,6 @@ SearchIndex, InputFieldMappingEntry, OutputFieldMappingEntry, - SearchIndexClient, - SearchIndexerClient, ScoringProfile, SearchIndexerSkillset, DataSourceCredentials, @@ -36,6 +34,7 @@ SimpleField, edm ) +from azure.search.documents.indexes import SearchIndexClient, SearchIndexerClient from _test_utils import build_synonym_map_from_dict CWD = dirname(realpath(__file__))