Skip to content

code refactoring 4 #11800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiangyan99 merged 18 commits into from
Jun 5, 2020
Merged

code refactoring 4 #11800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0e8db7f
search method only takes search_text
xiangyan99 Jun 3, 2020
2cb3750
update
xiangyan99 Jun 4, 2020
da6d4f5
Add AzureCliCredential and VSCodeCredential to public API (#11790) (#…
xiangyan99 Jun 4, 2020
902db93
Merge branch 'master' into search_search_method
xiangyan99 Jun 4, 2020
119e4e8
get master (#11823)
xiangyan99 Jun 4, 2020
bf94e32
Merge branch 'master' into search_search_method
xiangyan99 Jun 4, 2020
88f8895
rename AnalyzeText to AnalyzeTextRequest
xiangyan99 Jun 4, 2020
25a0755
fixes
xiangyan99 Jun 4, 2020
d4cf252
update
xiangyan99 Jun 4, 2020
6212964
update changelog
xiangyan99 Jun 4, 2020
af02a00
update
xiangyan99 Jun 4, 2020
0c3f697
add types
xiangyan99 Jun 4, 2020
6376587
update
xiangyan99 Jun 4, 2020
a3f66a8
rename batch methods
xiangyan99 Jun 4, 2020
42e60ec
update
xiangyan99 Jun 5, 2020
13d56f4
update
xiangyan99 Jun 5, 2020
a544404
update
xiangyan99 Jun 5, 2020
a6d0fa7
updates
xiangyan99 Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions sdk/search/azure-search-documents/azure/search/documents/_internal/_search_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def search(self, search_text, **kwargs):
"""
include_total_result_count = kwargs.pop("include_total_result_count", None)
facets = kwargs.pop("facets", None)
filter = kwargs.pop("filter", None)
filter_arg = kwargs.pop("filter", None)
highlight_fields = kwargs.pop("highlight_fields", None)
highlight_post_tag = kwargs.pop("highlight_post_tag", None)
highlight_pre_tag = kwargs.pop("highlight_pre_tag", None)
Expand All @@ -187,7 +187,7 @@ def search(self, search_text, **kwargs):
search_text=search_text,
include_total_result_count=include_total_result_count,
facets=facets,
filter=filter,
filter=filter_arg,
highlight_fields=highlight_fields,
highlight_post_tag=highlight_post_tag,
highlight_pre_tag=highlight_pre_tag,
Expand Down Expand Up @@ -228,7 +228,7 @@ def suggest(self, search_text, suggester_name, **kwargs):
:dedent: 4
:caption: Get search suggestions.
"""
filter = kwargs.pop("filter", None)
filter_arg = kwargs.pop("filter", None)
use_fuzzy_matching = kwargs.pop("use_fuzzy_matching", None)
highlight_post_tag = kwargs.pop("highlight_post_tag", None)
highlight_pre_tag = kwargs.pop("highlight_pre_tag", None)
Expand All @@ -240,7 +240,7 @@ def suggest(self, search_text, suggester_name, **kwargs):
query = SuggestQuery(
search_text=search_text,
suggester_name=suggester_name,
filter=filter,
filter=filter_arg,
use_fuzzy_matching=use_fuzzy_matching,
highlight_post_tag=highlight_post_tag,
highlight_pre_tag=highlight_pre_tag,
Expand Down Expand Up @@ -278,7 +278,7 @@ def autocomplete(self, search_text, suggester_name, **kwargs):
:caption: Get a auto-completions.
"""
autocomplete_mode = kwargs.pop("autocomplete_mode", None)
filter = kwargs.pop("filter", None)
filter_arg = kwargs.pop("filter", None)
use_fuzzy_matching = kwargs.pop("use_fuzzy_matching", None)
highlight_post_tag = kwargs.pop("highlight_post_tag", None)
highlight_pre_tag = kwargs.pop("highlight_pre_tag", None)
Expand All @@ -289,7 +289,7 @@ def autocomplete(self, search_text, suggester_name, **kwargs):
search_text=search_text,
suggester_name=suggester_name,
autocomplete_mode=autocomplete_mode,
filter=filter,
filter=filter_arg,
use_fuzzy_matching=use_fuzzy_matching,
highlight_post_tag=highlight_post_tag,
highlight_pre_tag=highlight_pre_tag,
Expand Down
12 changes: 6 additions & 6 deletions ...earch/azure-search-documents/azure/search/documents/_internal/aio/_search_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ async def search(self, search_text, **kwargs):
"""
include_total_result_count = kwargs.pop("include_total_result_count", None)
facets = kwargs.pop("facets", None)
filter = kwargs.pop("filter", None)
filter_arg = kwargs.pop("filter", None)
highlight_fields = kwargs.pop("highlight_fields", None)
highlight_post_tag = kwargs.pop("highlight_post_tag", None)
highlight_pre_tag = kwargs.pop("highlight_pre_tag", None)
Expand All @@ -157,7 +157,7 @@ async def search(self, search_text, **kwargs):
search_text=search_text,
include_total_result_count=include_total_result_count,
facets=facets,
filter=filter,
filter=filter_arg,
highlight_fields=highlight_fields,
highlight_post_tag=highlight_post_tag,
highlight_pre_tag=highlight_pre_tag,
Expand Down Expand Up @@ -198,7 +198,7 @@ async def suggest(self, search_text, suggester_name, **kwargs):
:dedent: 4
:caption: Get search suggestions.
"""
filter = kwargs.pop("filter", None)
filter_arg = kwargs.pop("filter", None)
use_fuzzy_matching = kwargs.pop("use_fuzzy_matching", None)
highlight_post_tag = kwargs.pop("highlight_post_tag", None)
highlight_pre_tag = kwargs.pop("highlight_pre_tag", None)
Expand All @@ -210,7 +210,7 @@ async def suggest(self, search_text, suggester_name, **kwargs):
query = SuggestQuery(
search_text=search_text,
suggester_name=suggester_name,
filter=filter,
filter=filter_arg,
use_fuzzy_matching=use_fuzzy_matching,
highlight_post_tag=highlight_post_tag,
highlight_pre_tag=highlight_pre_tag,
Expand Down Expand Up @@ -248,7 +248,7 @@ async def autocomplete(self, search_text, suggester_name, **kwargs):
:caption: Get a auto-completions.
"""
autocomplete_mode = kwargs.pop("autocomplete_mode", None)
filter = kwargs.pop("filter", None)
filter_arg = kwargs.pop("filter", None)
use_fuzzy_matching = kwargs.pop("use_fuzzy_matching", None)
highlight_post_tag = kwargs.pop("highlight_post_tag", None)
highlight_pre_tag = kwargs.pop("highlight_pre_tag", None)
Expand All @@ -259,7 +259,7 @@ async def autocomplete(self, search_text, suggester_name, **kwargs):
search_text=search_text,
suggester_name=suggester_name,
autocomplete_mode=autocomplete_mode,
filter=filter,
filter=filter_arg,
use_fuzzy_matching=use_fuzzy_matching,
highlight_post_tag=highlight_post_tag,
highlight_pre_tag=highlight_pre_tag,
Expand Down
2 changes: 1 addition & 1 deletion ...h/azure-search-documents/azure/search/documents/indexes/_internal/_search_index_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def create_or_update_index(

@distributed_trace
def analyze_text(self, index_name, analyze_request, **kwargs):
# type: (str, AnalyzeRequest, **Any) -> AnalyzeResult
# type: (str, AnalyzeTextRequest, **Any) -> AnalyzeResult
Copy link
Member

@heaths heaths Jun 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be AnalyzeTextOptions now, or was that going to come in a separate PR? See #11830.

Copy link
Member Author

@xiangyan99 xiangyan99 Jun 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already fixed. :)

"""Shows how an analyzer breaks text into tokens.

:param index_name: The name of the index for which to test an analyzer.
Expand Down
6 changes: 3 additions & 3 deletions ...ure-search-documents/azure/search/documents/indexes/_internal/aio/_search_index_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

if TYPE_CHECKING:
# pylint:disable=unused-import,ungrouped-imports
from .._generated.models import AnalyzeRequest, AnalyzeResult, SearchIndex
from .._generated.models import AnalyzeRequest as AnalyzeTextRequest, AnalyzeResult, SearchIndex
from typing import Any, Dict, List, Union
from azure.core.credentials import AzureKeyCredential

Expand Down Expand Up @@ -239,13 +239,13 @@ async def create_or_update_index(

@distributed_trace_async
async def analyze_text(self, index_name, analyze_request, **kwargs):
# type: (str, AnalyzeRequest, **Any) -> AnalyzeResult
# type: (str, AnalyzeTextRequest, **Any) -> AnalyzeResult
"""Shows how an analyzer breaks text into tokens.

:param index_name: The name of the index for which to test an analyzer.
:type index_name: str
:param analyze_request: The text and analyzer or analysis components to test.
:type analyze_request: :class:`~azure.search.documents.indexes.models.AnalyzeRequest
:type analyze_request: :class:`~azure.search.documents.indexes.models.AnalyzeTextRequest
:return: AnalyzeResult
:rtype: :class:`~azure.search.documents.indexes.models.AnalyzeRequest
:raises: ~azure.core.exceptions.HttpResponseError
Expand Down
4 changes: 2 additions & 2 deletions sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
SearchFieldDataType,
)
from .._internal._generated.models import (
AnalyzeRequest,
AnalyzeRequest as AnalyzeTextRequest,
AnalyzeResult,
AnalyzedTokenInfo,
AsciiFoldingTokenFilter,
Expand Down Expand Up @@ -124,7 +124,7 @@


__all__ = (
"AnalyzeRequest",
"AnalyzeTextRequest",
"AnalyzeResult",
"AnalyzedTokenInfo",
"AsciiFoldingTokenFilter",
Expand Down