Skip to content

d2183715d380084ff04313a73c8803d042fe91b9 #20009

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 1 commit into from
Jul 30, 2021
Merged

d2183715d380084ff04313a73c8803d042fe91b9 #20009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ...ents/azure/search/documents/indexes/_generated/aio/operations/_data_sources_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ async def create_or_update(
data_source: "_models.SearchIndexerDataSource",
if_match: Optional[str] = None,
if_none_match: Optional[str] = None,
ignore_reset_requirements: Optional[bool] = None,
request_options: Optional["_models.RequestOptions"] = None,
**kwargs: Any
) -> "_models.SearchIndexerDataSource":
Expand All @@ -60,6 +61,8 @@ async def create_or_update(
:param if_none_match: Defines the If-None-Match condition. The operation will be performed only
if the ETag on the server does not match this value.
:type if_none_match: str
:param ignore_reset_requirements: Ignores cache reset requirements.
:type ignore_reset_requirements: bool
:param request_options: Parameter group.
:type request_options: ~azure.search.documents.indexes.models.RequestOptions
:keyword callable cls: A custom type or function that will be passed the direct response
Expand Down Expand Up @@ -92,6 +95,8 @@ async def create_or_update(
# Construct parameters
query_parameters = {} # type: Dict[str, Any]
query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
if ignore_reset_requirements is not None:
query_parameters['ignoreResetRequirements'] = self._serialize.query("ignore_reset_requirements", ignore_reset_requirements, 'bool')

# Construct headers
header_parameters = {} # type: Dict[str, Any]
Expand Down
11 changes: 11 additions & 0 deletions ...ocuments/azure/search/documents/indexes/_generated/aio/operations/_indexers_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ async def create_or_update(
indexer: "_models.SearchIndexer",
if_match: Optional[str] = None,
if_none_match: Optional[str] = None,
disable_cache_reprocessing_change_detection: Optional[bool] = None,
ignore_reset_requirements: Optional[bool] = None,
request_options: Optional["_models.RequestOptions"] = None,
**kwargs: Any
) -> "_models.SearchIndexer":
Expand All @@ -182,6 +184,11 @@ async def create_or_update(
:param if_none_match: Defines the If-None-Match condition. The operation will be performed only
if the ETag on the server does not match this value.
:type if_none_match: str
:param disable_cache_reprocessing_change_detection: Disables cache reprocessing change
detection.
:type disable_cache_reprocessing_change_detection: bool
:param ignore_reset_requirements: Ignores cache reset requirements.
:type ignore_reset_requirements: bool
:param request_options: Parameter group.
:type request_options: ~azure.search.documents.indexes.models.RequestOptions
:keyword callable cls: A custom type or function that will be passed the direct response
Expand Down Expand Up @@ -214,6 +221,10 @@ async def create_or_update(
# Construct parameters
query_parameters = {} # type: Dict[str, Any]
query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
if disable_cache_reprocessing_change_detection is not None:
query_parameters['disableCacheReprocessingChangeDetection'] = self._serialize.query("disable_cache_reprocessing_change_detection", disable_cache_reprocessing_change_detection, 'bool')
if ignore_reset_requirements is not None:
query_parameters['ignoreResetRequirements'] = self._serialize.query("ignore_reset_requirements", ignore_reset_requirements, 'bool')

# Construct headers
header_parameters = {} # type: Dict[str, Any]
Expand Down
11 changes: 11 additions & 0 deletions ...cuments/azure/search/documents/indexes/_generated/aio/operations/_skillsets_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ async def create_or_update(
skillset: "_models.SearchIndexerSkillset",
if_match: Optional[str] = None,
if_none_match: Optional[str] = None,
disable_cache_reprocessing_change_detection: Optional[bool] = None,
ignore_reset_requirements: Optional[bool] = None,
request_options: Optional["_models.RequestOptions"] = None,
**kwargs: Any
) -> "_models.SearchIndexerSkillset":
Expand All @@ -61,6 +63,11 @@ async def create_or_update(
:param if_none_match: Defines the If-None-Match condition. The operation will be performed only
if the ETag on the server does not match this value.
:type if_none_match: str
:param disable_cache_reprocessing_change_detection: Disables cache reprocessing change
detection.
:type disable_cache_reprocessing_change_detection: bool
:param ignore_reset_requirements: Ignores cache reset requirements.
:type ignore_reset_requirements: bool
:param request_options: Parameter group.
:type request_options: ~azure.search.documents.indexes.models.RequestOptions
:keyword callable cls: A custom type or function that will be passed the direct response
Expand Down Expand Up @@ -93,6 +100,10 @@ async def create_or_update(
# Construct parameters
query_parameters = {} # type: Dict[str, Any]
query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
if disable_cache_reprocessing_change_detection is not None:
query_parameters['disableCacheReprocessingChangeDetection'] = self._serialize.query("disable_cache_reprocessing_change_detection", disable_cache_reprocessing_change_detection, 'bool')
if ignore_reset_requirements is not None:
query_parameters['ignoreResetRequirements'] = self._serialize.query("ignore_reset_requirements", ignore_reset_requirements, 'bool')

# Construct headers
header_parameters = {} # type: Dict[str, Any]
Expand Down
3 changes: 3 additions & 0 deletions ...earch/azure-search-documents/azure/search/documents/indexes/_generated/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
from ._models_py3 import SearchField
from ._models_py3 import SearchIndex
from ._models_py3 import SearchIndexer
from ._models_py3 import SearchIndexerCache
from ._models_py3 import SearchIndexerDataContainer
from ._models_py3 import SearchIndexerDataIdentity
from ._models_py3 import SearchIndexerDataNoneIdentity
Expand Down Expand Up @@ -242,6 +243,7 @@
from ._models import SearchField # type: ignore
from ._models import SearchIndex # type: ignore
from ._models import SearchIndexer # type: ignore
from ._models import SearchIndexerCache # type: ignore
from ._models import SearchIndexerDataContainer # type: ignore
from ._models import SearchIndexerDataIdentity # type: ignore
from ._models import SearchIndexerDataNoneIdentity # type: ignore
Expand Down Expand Up @@ -428,6 +430,7 @@
'SearchField',
'SearchIndex',
'SearchIndexer',
'SearchIndexerCache',
'SearchIndexerDataContainer',
'SearchIndexerDataIdentity',
'SearchIndexerDataNoneIdentity',
Expand Down
51 changes: 40 additions & 11 deletions ...search/azure-search-documents/azure/search/documents/indexes/_generated/models/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ class DataChangeDetectionPolicy(msrest.serialization.Model):
"""Base type for data change detection policies.

You probably want to use the sub-classes and not this class directly. Known
sub-classes are: HighWaterMarkChangeDetectionPolicy, SearchIndexerDataNoneIdentity, SearchIndexerDataUserAssignedIdentity, SqlIntegratedChangeTrackingPolicy.
sub-classes are: HighWaterMarkChangeDetectionPolicy, SqlIntegratedChangeTrackingPolicy.

All required parameters must be populated in order to send to Azure.

Expand All @@ -1169,7 +1169,7 @@ class DataChangeDetectionPolicy(msrest.serialization.Model):
}

_subtype_map = {
'odata_type': {'#Microsoft.Azure.Search.HighWaterMarkChangeDetectionPolicy': 'HighWaterMarkChangeDetectionPolicy', '#Microsoft.Azure.Search.SearchIndexerDataNoneIdentity': 'SearchIndexerDataNoneIdentity', '#Microsoft.Azure.Search.SearchIndexerDataUserAssignedIdentity': 'SearchIndexerDataUserAssignedIdentity', '#Microsoft.Azure.Search.SqlIntegratedChangeTrackingPolicy': 'SqlIntegratedChangeTrackingPolicy'}
'odata_type': {'#Microsoft.Azure.Search.HighWaterMarkChangeDetectionPolicy': 'HighWaterMarkChangeDetectionPolicy', '#Microsoft.Azure.Search.SqlIntegratedChangeTrackingPolicy': 'SqlIntegratedChangeTrackingPolicy'}
}

def __init__(
Expand Down Expand Up @@ -4435,6 +4435,9 @@ class SearchIndexer(msrest.serialization.Model):
unaffected. Encryption with customer-managed keys is not available for free search services,
and is only available for paid services created on or after January 1, 2019.
:type encryption_key: ~azure.search.documents.indexes.models.SearchResourceEncryptionKey
:param cache: Adds caching to an enrichment pipeline to allow for incremental modification
steps without having to rebuild the index every time.
:type cache: ~azure.search.documents.indexes.models.SearchIndexerCache
"""

_validation = {
Expand All @@ -4456,6 +4459,7 @@ class SearchIndexer(msrest.serialization.Model):
'is_disabled': {'key': 'disabled', 'type': 'bool'},
'e_tag': {'key': '@odata\\.etag', 'type': 'str'},
'encryption_key': {'key': 'encryptionKey', 'type': 'SearchResourceEncryptionKey'},
'cache': {'key': 'cache', 'type': 'SearchIndexerCache'},
}

def __init__(
Expand All @@ -4475,6 +4479,31 @@ def __init__(
self.is_disabled = kwargs.get('is_disabled', False)
self.e_tag = kwargs.get('e_tag', None)
self.encryption_key = kwargs.get('encryption_key', None)
self.cache = kwargs.get('cache', None)


class SearchIndexerCache(msrest.serialization.Model):
"""SearchIndexerCache.

:param storage_connection_string: The connection string to the storage account where the cache
data will be persisted.
:type storage_connection_string: str
:param enable_reprocessing: Specifies whether incremental reprocessing is enabled.
:type enable_reprocessing: bool
"""

_attribute_map = {
'storage_connection_string': {'key': 'storageConnectionString', 'type': 'str'},
'enable_reprocessing': {'key': 'enableReprocessing', 'type': 'bool'},
}

def __init__(
self,
**kwargs
):
super(SearchIndexerCache, self).__init__(**kwargs)
self.storage_connection_string = kwargs.get('storage_connection_string', None)
self.enable_reprocessing = kwargs.get('enable_reprocessing', None)


class SearchIndexerDataContainer(msrest.serialization.Model):
Expand Down Expand Up @@ -4509,10 +4538,10 @@ def __init__(


class SearchIndexerDataIdentity(msrest.serialization.Model):
"""Base type for data identities.
"""Abstract base type for data identities.

You probably want to use the sub-classes and not this class directly. Known
sub-classes are: .
sub-classes are: SearchIndexerDataNoneIdentity, SearchIndexerDataUserAssignedIdentity.

All required parameters must be populated in order to send to Azure.

Expand All @@ -4530,7 +4559,7 @@ class SearchIndexerDataIdentity(msrest.serialization.Model):
}

_subtype_map = {
'odata_type': {}
'odata_type': {'#Microsoft.Azure.Search.SearchIndexerDataNoneIdentity': 'SearchIndexerDataNoneIdentity', '#Microsoft.Azure.Search.SearchIndexerDataUserAssignedIdentity': 'SearchIndexerDataUserAssignedIdentity'}
}

def __init__(
Expand All @@ -4541,13 +4570,13 @@ def __init__(
self.odata_type = None # type: Optional[str]


class SearchIndexerDataNoneIdentity(DataChangeDetectionPolicy):
class SearchIndexerDataNoneIdentity(SearchIndexerDataIdentity):
"""Clears the identity property of a datasource.

All required parameters must be populated in order to send to Azure.

:param odata_type: Required. Identifies the concrete type of the data change detection
policy.Constant filled by server.
:param odata_type: Required. Identifies the concrete type of the identity.Constant filled by
server.
:type odata_type: str
"""

Expand Down Expand Up @@ -4645,13 +4674,13 @@ def __init__(
self.encryption_key = kwargs.get('encryption_key', None)


class SearchIndexerDataUserAssignedIdentity(DataChangeDetectionPolicy):
class SearchIndexerDataUserAssignedIdentity(SearchIndexerDataIdentity):
"""Specifies the identity for a datasource to use.

All required parameters must be populated in order to send to Azure.

:param odata_type: Required. Identifies the concrete type of the data change detection
policy.Constant filled by server.
:param odata_type: Required. Identifies the concrete type of the identity.Constant filled by
server.
:type odata_type: str
:param user_assigned_identity: Required. The fully qualified Azure resource Id of a user
assigned managed identity typically in the form
Expand Down
55 changes: 44 additions & 11 deletions ...ch/azure-search-documents/azure/search/documents/indexes/_generated/models/_models_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ class DataChangeDetectionPolicy(msrest.serialization.Model):
"""Base type for data change detection policies.

You probably want to use the sub-classes and not this class directly. Known
sub-classes are: HighWaterMarkChangeDetectionPolicy, SearchIndexerDataNoneIdentity, SearchIndexerDataUserAssignedIdentity, SqlIntegratedChangeTrackingPolicy.
sub-classes are: HighWaterMarkChangeDetectionPolicy, SqlIntegratedChangeTrackingPolicy.

All required parameters must be populated in order to send to Azure.

Expand All @@ -1274,7 +1274,7 @@ class DataChangeDetectionPolicy(msrest.serialization.Model):
}

_subtype_map = {
'odata_type': {'#Microsoft.Azure.Search.HighWaterMarkChangeDetectionPolicy': 'HighWaterMarkChangeDetectionPolicy', '#Microsoft.Azure.Search.SearchIndexerDataNoneIdentity': 'SearchIndexerDataNoneIdentity', '#Microsoft.Azure.Search.SearchIndexerDataUserAssignedIdentity': 'SearchIndexerDataUserAssignedIdentity', '#Microsoft.Azure.Search.SqlIntegratedChangeTrackingPolicy': 'SqlIntegratedChangeTrackingPolicy'}
'odata_type': {'#Microsoft.Azure.Search.HighWaterMarkChangeDetectionPolicy': 'HighWaterMarkChangeDetectionPolicy', '#Microsoft.Azure.Search.SqlIntegratedChangeTrackingPolicy': 'SqlIntegratedChangeTrackingPolicy'}
}

def __init__(
Expand Down Expand Up @@ -4866,6 +4866,9 @@ class SearchIndexer(msrest.serialization.Model):
unaffected. Encryption with customer-managed keys is not available for free search services,
and is only available for paid services created on or after January 1, 2019.
:type encryption_key: ~azure.search.documents.indexes.models.SearchResourceEncryptionKey
:param cache: Adds caching to an enrichment pipeline to allow for incremental modification
steps without having to rebuild the index every time.
:type cache: ~azure.search.documents.indexes.models.SearchIndexerCache
"""

_validation = {
Expand All @@ -4887,6 +4890,7 @@ class SearchIndexer(msrest.serialization.Model):
'is_disabled': {'key': 'disabled', 'type': 'bool'},
'e_tag': {'key': '@odata\\.etag', 'type': 'str'},
'encryption_key': {'key': 'encryptionKey', 'type': 'SearchResourceEncryptionKey'},
'cache': {'key': 'cache', 'type': 'SearchIndexerCache'},
}

def __init__(
Expand All @@ -4904,6 +4908,7 @@ def __init__(
is_disabled: Optional[bool] = False,
e_tag: Optional[str] = None,
encryption_key: Optional["SearchResourceEncryptionKey"] = None,
cache: Optional["SearchIndexerCache"] = None,
**kwargs
):
super(SearchIndexer, self).__init__(**kwargs)
Expand All @@ -4919,6 +4924,34 @@ def __init__(
self.is_disabled = is_disabled
self.e_tag = e_tag
self.encryption_key = encryption_key
self.cache = cache


class SearchIndexerCache(msrest.serialization.Model):
"""SearchIndexerCache.

:param storage_connection_string: The connection string to the storage account where the cache
data will be persisted.
:type storage_connection_string: str
:param enable_reprocessing: Specifies whether incremental reprocessing is enabled.
:type enable_reprocessing: bool
"""

_attribute_map = {
'storage_connection_string': {'key': 'storageConnectionString', 'type': 'str'},
'enable_reprocessing': {'key': 'enableReprocessing', 'type': 'bool'},
}

def __init__(
self,
*,
storage_connection_string: Optional[str] = None,
enable_reprocessing: Optional[bool] = None,
**kwargs
):
super(SearchIndexerCache, self).__init__(**kwargs)
self.storage_connection_string = storage_connection_string
self.enable_reprocessing = enable_reprocessing


class SearchIndexerDataContainer(msrest.serialization.Model):
Expand Down Expand Up @@ -4956,10 +4989,10 @@ def __init__(


class SearchIndexerDataIdentity(msrest.serialization.Model):
"""Base type for data identities.
"""Abstract base type for data identities.

You probably want to use the sub-classes and not this class directly. Known
sub-classes are: .
sub-classes are: SearchIndexerDataNoneIdentity, SearchIndexerDataUserAssignedIdentity.

All required parameters must be populated in order to send to Azure.

Expand All @@ -4977,7 +5010,7 @@ class SearchIndexerDataIdentity(msrest.serialization.Model):
}

_subtype_map = {
'odata_type': {}
'odata_type': {'#Microsoft.Azure.Search.SearchIndexerDataNoneIdentity': 'SearchIndexerDataNoneIdentity', '#Microsoft.Azure.Search.SearchIndexerDataUserAssignedIdentity': 'SearchIndexerDataUserAssignedIdentity'}
}

def __init__(
Expand All @@ -4988,13 +5021,13 @@ def __init__(
self.odata_type = None # type: Optional[str]


class SearchIndexerDataNoneIdentity(DataChangeDetectionPolicy):
class SearchIndexerDataNoneIdentity(SearchIndexerDataIdentity):
"""Clears the identity property of a datasource.

All required parameters must be populated in order to send to Azure.

:param odata_type: Required. Identifies the concrete type of the data change detection
policy.Constant filled by server.
:param odata_type: Required. Identifies the concrete type of the identity.Constant filled by
server.
:type odata_type: str
"""

Expand Down Expand Up @@ -5103,13 +5136,13 @@ def __init__(
self.encryption_key = encryption_key


class SearchIndexerDataUserAssignedIdentity(DataChangeDetectionPolicy):
class SearchIndexerDataUserAssignedIdentity(SearchIndexerDataIdentity):
"""Specifies the identity for a datasource to use.

All required parameters must be populated in order to send to Azure.

:param odata_type: Required. Identifies the concrete type of the data change detection
policy.Constant filled by server.
:param odata_type: Required. Identifies the concrete type of the identity.Constant filled by
server.
:type odata_type: str
:param user_assigned_identity: Required. The fully qualified Azure resource Id of a user
assigned managed identity typically in the form
Expand Down
5 changes: 5 additions & 0 deletions ...ocuments/azure/search/documents/indexes/_generated/operations/_data_sources_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def create_or_update(
data_source, # type: "_models.SearchIndexerDataSource"
if_match=None, # type: Optional[str]
if_none_match=None, # type: Optional[str]
ignore_reset_requirements=None, # type: Optional[bool]
request_options=None, # type: Optional["_models.RequestOptions"]
**kwargs # type: Any
):
Expand All @@ -65,6 +66,8 @@ def create_or_update(
:param if_none_match: Defines the If-None-Match condition. The operation will be performed only
if the ETag on the server does not match this value.
:type if_none_match: str
:param ignore_reset_requirements: Ignores cache reset requirements.
:type ignore_reset_requirements: bool
:param request_options: Parameter group.
:type request_options: ~azure.search.documents.indexes.models.RequestOptions
:keyword callable cls: A custom type or function that will be passed the direct response
Expand Down Expand Up @@ -97,6 +100,8 @@ def create_or_update(
# Construct parameters
query_parameters = {} # type: Dict[str, Any]
query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
if ignore_reset_requirements is not None:
query_parameters['ignoreResetRequirements'] = self._serialize.query("ignore_reset_requirements", ignore_reset_requirements, 'bool')

# Construct headers
header_parameters = {} # type: Dict[str, Any]
Expand Down
Loading