[AutoPR track2_azure-mgmt-cognitiveservices] Tianxinliu/20230501

sdk/cognitiveservices/azure-mgmt-cognitiveservices/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "2d9846d81852452cf10270b18329ac382a881bf7",
+  "commit": "f19fe4d284229130f8bc3262fab6bb1cacf9c69a",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest": "3.9.2",
   "use": [
-    "@autorest/python@6.2.16",
+    "@autorest/python@6.4.12",
     "@autorest/modelerfour@4.24.3"
   ],
-  "autorest_command": "autorest specification/cognitiveservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.2.16 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/cognitiveservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.4.12 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
   "readme": "specification/cognitiveservices/resource-manager/readme.md"
 }

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/_cognitive_services_management_client.py

@@ -22,10 +22,12 @@
     CommitmentTiersOperations,
     DeletedAccountsOperations,
     DeploymentsOperations,
+    ModelsOperations,
     Operations,
     PrivateEndpointConnectionsOperations,
     PrivateLinkResourcesOperations,
     ResourceSkusOperations,
+    UsagesOperations,
 )
 
 if TYPE_CHECKING:
@@ -44,10 +46,14 @@ class CognitiveServicesManagementClient(
     :vartype deleted_accounts: azure.mgmt.cognitiveservices.operations.DeletedAccountsOperations
     :ivar resource_skus: ResourceSkusOperations operations
     :vartype resource_skus: azure.mgmt.cognitiveservices.operations.ResourceSkusOperations
+    :ivar usages: UsagesOperations operations
+    :vartype usages: azure.mgmt.cognitiveservices.operations.UsagesOperations
     :ivar operations: Operations operations
     :vartype operations: azure.mgmt.cognitiveservices.operations.Operations
     :ivar commitment_tiers: CommitmentTiersOperations operations
     :vartype commitment_tiers: azure.mgmt.cognitiveservices.operations.CommitmentTiersOperations
+    :ivar models: ModelsOperations operations
+    :vartype models: azure.mgmt.cognitiveservices.operations.ModelsOperations
     :ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
     :vartype private_endpoint_connections:
      azure.mgmt.cognitiveservices.operations.PrivateEndpointConnectionsOperations
@@ -64,7 +70,7 @@ class CognitiveServicesManagementClient(
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2022-12-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-05-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
@@ -81,7 +87,7 @@ def __init__(
         self._config = CognitiveServicesManagementClientConfiguration(
             credential=credential, subscription_id=subscription_id, **kwargs
         )
-        self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
@@ -92,10 +98,12 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.resource_skus = ResourceSkusOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.usages = UsagesOperations(self._client, self._config, self._serialize, self._deserialize)
         self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
         self.commitment_tiers = CommitmentTiersOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
+        self.models = ModelsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
@@ -136,5 +144,5 @@ def __enter__(self) -> "CognitiveServicesManagementClient":
         self._client.__enter__()
         return self
 
-    def __exit__(self, *exc_details) -> None:
+    def __exit__(self, *exc_details: Any) -> None:
         self._client.__exit__(*exc_details)

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/_configuration.py

@@ -6,7 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-import sys
 from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
 
 from ._version import VERSION
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
-
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
@@ -35,14 +29,14 @@ class CognitiveServicesManagementClientConfiguration(Configuration):  # pylint:
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2022-12-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-05-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(CognitiveServicesManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2022-12-01"] = kwargs.pop("api_version", "2022-12-01")
+        api_version: str = kwargs.pop("api_version", "2023-05-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/_serialization.py

@@ -629,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                         if xml_desc.get("attr", False):
                             if xml_ns:
                                 ET.register_namespace(xml_prefix, xml_ns)
-                                xml_name = "{}{}".format(xml_ns, xml_name)
+                                xml_name = "{{{}}}{}".format(xml_ns, xml_name)
                             serialized.set(xml_name, new_attr)  # type: ignore
                             continue
                         if xml_desc.get("text", False):
@@ -1271,7 +1271,7 @@ def _extract_name_from_internal_type(internal_type):
     xml_name = internal_type_xml_map.get("name", internal_type.__name__)
     xml_ns = internal_type_xml_map.get("ns", None)
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{{{}}}{}".format(xml_ns, xml_name)
     return xml_name
 
 
@@ -1295,7 +1295,7 @@ def xml_key_extractor(attr, attr_desc, data):
     # Integrate namespace if necessary
     xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{{{}}}{}".format(xml_ns, xml_name)
 
     # If it's an attribute, that's simple
     if xml_desc.get("attr", False):

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "13.4.0"
+VERSION = "11.0.0b1"

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/aio/_cognitive_services_management_client.py

@@ -22,10 +22,12 @@
     CommitmentTiersOperations,
     DeletedAccountsOperations,
     DeploymentsOperations,
+    ModelsOperations,
     Operations,
     PrivateEndpointConnectionsOperations,
     PrivateLinkResourcesOperations,
     ResourceSkusOperations,
+    UsagesOperations,
 )
 
 if TYPE_CHECKING:
@@ -45,11 +47,15 @@ class CognitiveServicesManagementClient(
      azure.mgmt.cognitiveservices.aio.operations.DeletedAccountsOperations
     :ivar resource_skus: ResourceSkusOperations operations
     :vartype resource_skus: azure.mgmt.cognitiveservices.aio.operations.ResourceSkusOperations
+    :ivar usages: UsagesOperations operations
+    :vartype usages: azure.mgmt.cognitiveservices.aio.operations.UsagesOperations
     :ivar operations: Operations operations
     :vartype operations: azure.mgmt.cognitiveservices.aio.operations.Operations
     :ivar commitment_tiers: CommitmentTiersOperations operations
     :vartype commitment_tiers:
      azure.mgmt.cognitiveservices.aio.operations.CommitmentTiersOperations
+    :ivar models: ModelsOperations operations
+    :vartype models: azure.mgmt.cognitiveservices.aio.operations.ModelsOperations
     :ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
     :vartype private_endpoint_connections:
      azure.mgmt.cognitiveservices.aio.operations.PrivateEndpointConnectionsOperations
@@ -67,7 +73,7 @@ class CognitiveServicesManagementClient(
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2022-12-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-05-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
@@ -84,7 +90,7 @@ def __init__(
         self._config = CognitiveServicesManagementClientConfiguration(
             credential=credential, subscription_id=subscription_id, **kwargs
         )
-        self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
@@ -95,10 +101,12 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.resource_skus = ResourceSkusOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.usages = UsagesOperations(self._client, self._config, self._serialize, self._deserialize)
         self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
         self.commitment_tiers = CommitmentTiersOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
+        self.models = ModelsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
@@ -139,5 +147,5 @@ async def __aenter__(self) -> "CognitiveServicesManagementClient":
         await self._client.__aenter__()
         return self
 
-    async def __aexit__(self, *exc_details) -> None:
+    async def __aexit__(self, *exc_details: Any) -> None:
         await self._client.__aexit__(*exc_details)

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/aio/_configuration.py

@@ -6,7 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-import sys
 from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
 
 from .._version import VERSION
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
-
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
@@ -35,14 +29,14 @@ class CognitiveServicesManagementClientConfiguration(Configuration):  # pylint:
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
     :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2022-12-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-05-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(CognitiveServicesManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2022-12-01"] = kwargs.pop("api_version", "2022-12-01")
+        api_version: str = kwargs.pop("api_version", "2023-05-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/aio/operations/__init__.py

@@ -9,9 +9,11 @@
 from ._accounts_operations import AccountsOperations
 from ._deleted_accounts_operations import DeletedAccountsOperations
 from ._resource_skus_operations import ResourceSkusOperations
+from ._usages_operations import UsagesOperations
 from ._operations import Operations
 from ._cognitive_services_management_client_operations import CognitiveServicesManagementClientOperationsMixin
 from ._commitment_tiers_operations import CommitmentTiersOperations
+from ._models_operations import ModelsOperations
 from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
 from ._private_link_resources_operations import PrivateLinkResourcesOperations
 from ._deployments_operations import DeploymentsOperations
@@ -25,9 +27,11 @@
     "AccountsOperations",
     "DeletedAccountsOperations",
     "ResourceSkusOperations",
+    "UsagesOperations",
     "Operations",
     "CognitiveServicesManagementClientOperationsMixin",
     "CommitmentTiersOperations",
+    "ModelsOperations",
     "PrivateEndpointConnectionsOperations",
     "PrivateLinkResourcesOperations",
     "DeploymentsOperations",