[Appconfig] Migrate to generate from tsp (Azure#37438)

Author: Yalin Li

sdk/appconfiguration/azure-appconfiguration/MANIFEST.in

@@ -1,7 +1,6 @@
-recursive-include tests *.py
 include *.md
 include LICENSE
-include azure/__init__.py
-recursive-include samples *.py *.md
-recursive-include doc *.rst
 include azure/appconfiguration/py.typed
+recursive-include tests *.py
+recursive-include samples *.py *.md
+include azure/__init__.py

sdk/appconfiguration/azure-appconfiguration/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/appconfiguration/azure-appconfiguration",
-  "Tag": "python/appconfiguration/azure-appconfiguration_6552b5023e"
+  "Tag": "python/appconfiguration/azure-appconfiguration_adbb64a91f"
 }

sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py

@@ -12,23 +12,18 @@
 from azure.core.pipeline.policies import BearerTokenCredentialPolicy
 from azure.core.polling import LROPoller
 from azure.core.tracing.decorator import distributed_trace
-from azure.core.exceptions import (
-    ResourceExistsError,
-    ResourceNotFoundError,
-    ResourceModifiedError,
-    ResourceNotModifiedError,
-)
+from azure.core.exceptions import ResourceNotModifiedError
 from azure.core.rest import HttpRequest, HttpResponse
 from ._azure_appconfiguration_error import ResourceReadOnlyError
 from ._azure_appconfiguration_requests import AppConfigRequestsCredentialsPolicy
-from ._generated import AzureAppConfiguration
+from ._generated import AzureAppConfigurationClient as AzureAppConfigurationClientGenerated
 from ._generated.models import (
-    SnapshotUpdateParameters,
     SnapshotStatus,
     SnapshotFields,
     SnapshotComposition,
     LabelFields,
     ConfigurationSettingFields,
+    SnapshotUpdateParameters,
 )
 from ._models import (
     ConfigurationSetting,
@@ -38,8 +33,6 @@
     ConfigurationSettingLabel,
 )
 from ._utils import (
-    prep_if_match,
-    prep_if_none_match,
     get_key_filter,
     get_label_filter,
     parse_connection_string,
@@ -91,8 +84,8 @@ def __init__(self, base_url: str, credential: TokenCredential, **kwargs: Any) ->
                 f"Unsupported credential: {type(credential)}. Use an instance of token credential from azure.identity"
             )
         # mypy doesn't compare the credential type hint with the API surface in patch.py
-        self._impl = AzureAppConfiguration(
-            credential, base_url, per_call_policies=self._sync_token_policy, **kwargs  # type: ignore[arg-type]
+        self._impl = AzureAppConfigurationClientGenerated(
+            base_url, credential, per_call_policies=self._sync_token_policy, **kwargs  # type: ignore[arg-type]
         )
 
     @classmethod
@@ -138,7 +131,7 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
         :return: The response of your network call. Does not do error handling on your response.
         :rtype: ~azure.core.rest.HttpResponse
         """
-        return self._impl._send_request(request, stream=stream, **kwargs)
+        return self._impl.send_request(request, stream=stream, **kwargs)
 
     @overload
     def list_configuration_settings(
@@ -285,23 +278,13 @@ def get_configuration_setting(
         """
         if isinstance(accept_datetime, datetime):
             accept_datetime = str(accept_datetime)
-
-        error_map: Dict[int, Any] = {}
-        if match_condition == MatchConditions.IfNotModified:
-            error_map.update({412: ResourceModifiedError})
-        if match_condition == MatchConditions.IfPresent:
-            error_map.update({412: ResourceNotFoundError})
-        if match_condition == MatchConditions.IfMissing:
-            error_map.update({412: ResourceExistsError})
-
         try:
             key_value = self._impl.get_key_value(
                 key=key,
                 label=label,
                 accept_datetime=accept_datetime,
-                if_match=prep_if_match(etag, match_condition),
-                if_none_match=prep_if_none_match(etag, match_condition),
-                error_map=error_map,
+                etag=etag,
+                match_condition=match_condition,
                 **kwargs,
             )
             return ConfigurationSetting._from_generated(key_value)
@@ -336,13 +319,11 @@ def add_configuration_setting(
             added_config_setting = client.add_configuration_setting(config_setting)
         """
         key_value = configuration_setting._to_generated()
-        error_map = {412: ResourceExistsError}
-        key_value_added = self._impl.put_key_value(
+        key_value_added = self._impl._put_key_value(
             entity=key_value,
             key=key_value.key,  # type: ignore
             label=key_value.label,
-            if_none_match="*",
-            error_map=error_map,
+            match_condition=MatchConditions.IfMissing,
             **kwargs,
         )
         return ConfigurationSetting._from_generated(key_value_added)
@@ -393,21 +374,12 @@ def set_configuration_setting(
         """
         key_value = configuration_setting._to_generated()
         error_map: Dict[int, Any] = {409: ResourceReadOnlyError}
-        if match_condition == MatchConditions.IfNotModified:
-            error_map.update({412: ResourceModifiedError})
-        if match_condition == MatchConditions.IfModified:
-            error_map.update({412: ResourceNotModifiedError})
-        if match_condition == MatchConditions.IfPresent:
-            error_map.update({412: ResourceNotFoundError})
-        if match_condition == MatchConditions.IfMissing:
-            error_map.update({412: ResourceExistsError})
-
-        key_value_set = self._impl.put_key_value(
+        key_value_set = self._impl._put_key_value(
             entity=key_value,
             key=key_value.key,  # type: ignore
             label=key_value.label,
-            if_match=prep_if_match(configuration_setting.etag, match_condition),
-            if_none_match=prep_if_none_match(etag or configuration_setting.etag, match_condition),
+            etag=etag or configuration_setting.etag,
+            match_condition=match_condition,
             error_map=error_map,
             **kwargs,
         )
@@ -452,19 +424,11 @@ def delete_configuration_setting(  # pylint:disable=delete-operation-wrong-retur
             )
         """
         error_map: Dict[int, Any] = {409: ResourceReadOnlyError}
-        if match_condition == MatchConditions.IfNotModified:
-            error_map.update({412: ResourceModifiedError})
-        if match_condition == MatchConditions.IfModified:
-            error_map.update({412: ResourceNotModifiedError})
-        if match_condition == MatchConditions.IfPresent:
-            error_map.update({412: ResourceNotFoundError})
-        if match_condition == MatchConditions.IfMissing:
-            error_map.update({412: ResourceExistsError})
-
         key_value_deleted = self._impl.delete_key_value(
             key=key,
             label=label,
-            if_match=prep_if_match(etag, match_condition),
+            etag=etag,
+            match_condition=match_condition,
             error_map=error_map,
             **kwargs,
         )
@@ -573,32 +537,20 @@ def set_read_only(
             read_only_config_setting = client.set_read_only(config_setting)
             read_only_config_setting = client.set_read_only(config_setting, read_only=False)
         """
-        error_map: Dict[int, Any] = {}
-        if match_condition == MatchConditions.IfNotModified:
-            error_map.update({412: ResourceModifiedError})
-        if match_condition == MatchConditions.IfModified:
-            error_map.update({412: ResourceNotModifiedError})
-        if match_condition == MatchConditions.IfPresent:
-            error_map.update({412: ResourceNotFoundError})
-        if match_condition == MatchConditions.IfMissing:
-            error_map.update({412: ResourceExistsError})
-
         if read_only:
             key_value = self._impl.put_lock(
                 key=configuration_setting.key,
                 label=configuration_setting.label,
-                if_match=prep_if_match(configuration_setting.etag, match_condition),
-                if_none_match=prep_if_none_match(configuration_setting.etag, match_condition),
-                error_map=error_map,
+                etag=configuration_setting.etag,
+                match_condition=match_condition,
                 **kwargs,
             )
         else:
             key_value = self._impl.delete_lock(
                 key=configuration_setting.key,
                 label=configuration_setting.label,
-                if_match=prep_if_match(configuration_setting.etag, match_condition),
-                if_none_match=prep_if_none_match(configuration_setting.etag, match_condition),
-                error_map=error_map,
+                etag=configuration_setting.etag,
+                match_condition=match_condition,
                 **kwargs,
             )
         return ConfigurationSetting._from_generated(key_value)
@@ -710,21 +662,11 @@ def archive_snapshot(
         :rtype: ~azure.appconfiguration.ConfigurationSnapshot
         :raises: :class:`~azure.core.exceptions.HttpResponseError`
         """
-        error_map: Dict[int, Any] = {}
-        if match_condition == MatchConditions.IfNotModified:
-            error_map.update({412: ResourceModifiedError})
-        if match_condition == MatchConditions.IfModified:
-            error_map.update({412: ResourceNotModifiedError})
-        if match_condition == MatchConditions.IfPresent:
-            error_map.update({412: ResourceNotFoundError})
-        if match_condition == MatchConditions.IfMissing:
-            error_map.update({412: ResourceExistsError})
-        generated_snapshot = self._impl.update_snapshot(
+        generated_snapshot = self._impl._update_snapshot(
             name=name,
             entity=SnapshotUpdateParameters(status=SnapshotStatus.ARCHIVED),
-            if_match=prep_if_match(etag, match_condition),
-            if_none_match=prep_if_none_match(etag, match_condition),
-            error_map=error_map,
+            etag=etag,
+            match_condition=match_condition,
             **kwargs,
         )
         return ConfigurationSnapshot._from_generated(generated_snapshot)
@@ -750,21 +692,11 @@ def recover_snapshot(
         :rtype: ~azure.appconfiguration.ConfigurationSnapshot
         :raises: :class:`~azure.core.exceptions.HttpResponseError`
         """
-        error_map: Dict[int, Any] = {}
-        if match_condition == MatchConditions.IfNotModified:
-            error_map.update({412: ResourceModifiedError})
-        if match_condition == MatchConditions.IfModified:
-            error_map.update({412: ResourceNotModifiedError})
-        if match_condition == MatchConditions.IfPresent:
-            error_map.update({412: ResourceNotFoundError})
-        if match_condition == MatchConditions.IfMissing:
-            error_map.update({412: ResourceExistsError})
-        generated_snapshot = self._impl.update_snapshot(
+        generated_snapshot = self._impl._update_snapshot(
             name=name,
             entity=SnapshotUpdateParameters(status=SnapshotStatus.READY),
-            if_match=prep_if_match(etag, match_condition),
-            if_none_match=prep_if_none_match(etag, match_condition),
-            error_map=error_map,
+            etag=etag,
+            match_condition=match_condition,
             **kwargs,
         )
         return ConfigurationSnapshot._from_generated(generated_snapshot)
@@ -784,9 +716,7 @@ def get_snapshot(
         :rtype: ~azure.appconfiguration.ConfigurationSnapshot
         :raises: :class:`~azure.core.exceptions.HttpResponseError`
         """
-        generated_snapshot = self._impl.get_snapshot(
-            name=name, if_match=None, if_none_match=None, select=fields, **kwargs
-        )
+        generated_snapshot = self._impl.get_snapshot(name=name, select=fields, **kwargs)
         return ConfigurationSnapshot._from_generated(generated_snapshot)
 
     @distributed_trace

sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_generated/__init__.py

@@ -2,22 +2,31 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._azure_app_configuration import AzureAppConfiguration
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._client import AzureAppConfigurationClient  # type: ignore
+from .._version import VERSION
+
+__version__ = VERSION
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
-    "AzureAppConfiguration",
+    "AzureAppConfigurationClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 
 _patch_sdk()

sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_generated/_azure_app_configuration.py renamed to sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_generated/_client.py

@@ -2,49 +2,46 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import Any, Optional
+from typing import Any, TYPE_CHECKING, Union
 from typing_extensions import Self
 
 from azure.core import PipelineClient
 from azure.core.credentials import AzureKeyCredential
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
 
-from . import models as _models
-from ._configuration import AzureAppConfigurationConfiguration
+from ._configuration import AzureAppConfigurationClientConfiguration
+from ._operations import AzureAppConfigurationClientOperationsMixin
 from ._serialization import Deserializer, Serializer
-from .operations import AzureAppConfigurationOperationsMixin
 
+if TYPE_CHECKING:
+    from azure.core.credentials import TokenCredential
 
-class AzureAppConfiguration(AzureAppConfigurationOperationsMixin):  # pylint: disable=client-accepts-api-version-keyword
-    """AzureAppConfiguration.
 
-    :param credential: Credential needed for the client to connect to Azure. Required.
-    :type credential: ~azure.core.credentials.AzureKeyCredential
-    :param endpoint: The endpoint of the App Configuration instance to send requests to. Required.
+class AzureAppConfigurationClient(AzureAppConfigurationClientOperationsMixin):
+    """Azure App Configuration REST API.
+
+    :param endpoint: Required.
     :type endpoint: str
-    :param sync_token: Used to guarantee real-time consistency between requests. Default value is
-     None.
-    :type sync_token: str
-    :keyword api_version: Api Version. Default value is "2023-11-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :param credential: Credential used to authenticate requests to the service. Is either a
+     AzureKeyCredential type or a TokenCredential type. Required.
+    :type credential: ~azure.core.credentials.AzureKeyCredential or
+     ~azure.core.credentials.TokenCredential
+    :keyword api_version: The API version to use for this operation. Default value is "2023-11-01".
+     Note that overriding this default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
      Retry-After header is present.
     """
 
-    def __init__(
-        self, credential: AzureKeyCredential, endpoint: str, sync_token: Optional[str] = None, **kwargs: Any
-    ) -> None:
+    def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCredential"], **kwargs: Any) -> None:
         _endpoint = "{endpoint}"
-        self._config = AzureAppConfigurationConfiguration(
-            credential=credential, endpoint=endpoint, sync_token=sync_token, **kwargs
-        )
+        self._config = AzureAppConfigurationClientConfiguration(endpoint=endpoint, credential=credential, **kwargs)
         _policies = kwargs.pop("policies", None)
         if _policies is None:
             _policies = [
@@ -64,18 +61,17 @@ def __init__(
             ]
         self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs)
 
-        client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
-        self._serialize = Serializer(client_models)
-        self._deserialize = Deserializer(client_models)
+        self._serialize = Serializer()
+        self._deserialize = Deserializer()
         self._serialize.client_side_validation = False
 
-    def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
+    def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest
         >>> request = HttpRequest("GET", "https://www.example.org/")
         <HttpRequest [GET], url: 'https://www.example.org/'>
-        >>> response = client._send_request(request)
+        >>> response = client.send_request(request)
         <HttpResponse: 200 OK>
 
         For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request