Skip to content

Commit b44e2be

Browse files
authored
Resolve Search Pylint Alias Rule Errors (Azure#23772)
* fix pylint issues * fix for Enum pylint error * aliasing fix * enum fixes * skip these file for pylint due to issue * enum changes in py3 * remove pylint skip * pylint fixes * remove whitespace
1 parent 6580b27 commit b44e2be

File tree

3 files changed

+37
-13
lines changed

3 files changed

+37
-13
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
# ------------------------------------
55

66
from enum import Enum
7+
from azure.core import CaseInsensitiveEnumMeta
78

8-
9-
class ApiVersion(str, Enum):
9+
class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta):
1010
#: this is the default version
1111
V2020_06_30 = "2020-06-30"
12-
V2021_04_30_preview = "2021-04-30-Preview"
12+
V2021_04_30_PREVIEW = "2021-04-30-Preview"
1313

1414

15-
DEFAULT_VERSION = ApiVersion.V2021_04_30_preview
15+
DEFAULT_VERSION = ApiVersion.V2021_04_30_PREVIEW

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

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@
3131
SimpleField,
3232
SearchIndex,
3333
)
34-
from . import _edm as SearchFieldDataType
34+
from . import _edm
3535
from ..._generated.models import SuggestOptions
3636
from .._generated.models import (
3737
SearchAlias,
3838
AzureMachineLearningSkill,
3939
AnalyzeResult,
4040
AnalyzedTokenInfo,
4141
AsciiFoldingTokenFilter,
42-
BM25Similarity as BM25SimilarityAlgorithm,
42+
BM25Similarity,
4343
CharFilter,
4444
CjkBigramTokenFilter,
45-
ClassicSimilarity as ClassicSimilarityAlgorithm,
45+
ClassicSimilarity,
4646
ClassicTokenizer,
4747
CommonGramTokenFilter,
4848
ConditionalSkill,
@@ -79,7 +79,7 @@
7979
KeyPhraseExtractionSkill,
8080
KeyPhraseExtractionSkillLanguage,
8181
KeywordMarkerTokenFilter,
82-
KeywordTokenizerV2 as KeywordTokenizer,
82+
KeywordTokenizerV2,
8383
LanguageDetectionSkill,
8484
LengthTokenFilter,
8585
LexicalAnalyzer,
@@ -102,7 +102,7 @@
102102
OcrSkill,
103103
OcrSkillLanguage,
104104
OutputFieldMappingEntry,
105-
PathHierarchyTokenizerV2 as PathHierarchyTokenizer,
105+
PathHierarchyTokenizerV2,
106106
PatternCaptureTokenFilter,
107107
PatternReplaceCharFilter,
108108
PatternReplaceTokenFilter,
@@ -137,7 +137,7 @@
137137
SentimentSkillLanguage,
138138
ShaperSkill,
139139
ShingleTokenFilter,
140-
Similarity as SimilarityAlgorithm,
140+
Similarity,
141141
SnowballTokenFilter,
142142
SnowballTokenFilterLanguage,
143143
SoftDeleteColumnDeletionDetectionPolicy,
@@ -150,7 +150,7 @@
150150
StopAnalyzer,
151151
StopwordsList,
152152
StopwordsTokenFilter,
153-
Suggester as SearchSuggester,
153+
Suggester,
154154
SynonymTokenFilter,
155155
TagScoringFunction,
156156
TagScoringParameters,
@@ -183,6 +183,28 @@
183183
SynonymMap,
184184
)
185185

186+
SearchFieldDataType = _edm
187+
188+
class BM25SimilarityAlgorithm(BM25Similarity):
189+
pass
190+
191+
class ClassicSimilarityAlgorithm(ClassicSimilarity):
192+
pass
193+
194+
class KeywordTokenizer(KeywordTokenizerV2):
195+
pass
196+
197+
class PathHierarchyTokenizer(PathHierarchyTokenizerV2):
198+
pass
199+
200+
class SimilarityAlgorithm(Similarity):
201+
pass
202+
203+
class SearchSuggester(Suggester):
204+
pass
205+
206+
207+
186208

187209
__all__ = (
188210
"SearchAlias",

sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
# Licensed under the MIT License. See License.txt in the project root for
44
# license information.
55
# --------------------------------------------------------------------------
6+
67
from enum import Enum
78
import msrest.serialization
9+
from azure.core import CaseInsensitiveEnumMeta
810
from .._generated.models import (
911
LexicalAnalyzer,
1012
LexicalTokenizer,
@@ -102,7 +104,7 @@ def _from_generated(cls, skillset):
102104
return cls(**kwargs)
103105

104106

105-
class EntityRecognitionSkillVersion(str, Enum):
107+
class EntityRecognitionSkillVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta):
106108
"""Specifies the Entity Recognition skill version to use."""
107109

108110
#: Use Entity Recognition skill V1.
@@ -244,7 +246,7 @@ def _from_generated(cls, skill):
244246
return None
245247

246248

247-
class SentimentSkillVersion(str, Enum):
249+
class SentimentSkillVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta):
248250
""" Specifies the Sentiment Skill version to use."""
249251

250252
#: Use Sentiment skill V1.

0 commit comments

Comments
 (0)