[AutoRelease] t2-cognitiveservices-2024-11-12-24074(can only be merged by SDK owner) (Azure#38466)

* code and test

* Update CHANGELOG.md

* update testcases

* Update sdk/cognitiveservices/azure-mgmt-cognitiveservices/CHANGELOG.md

---------

Co-authored-by: azure-sdk <PythonSdkPipelines>
Co-authored-by: ChenxiJiang333 <[email protected]>
Co-authored-by: ChenxiJiang333 <[email protected]>
Co-authored-by: Yuchao Yan <[email protected]>

Author: 3 people

sdk/cognitiveservices/azure-mgmt-cognitiveservices/CHANGELOG.md

@@ -1,5 +1,106 @@
 # Release History
 
+## 13.6.0 (2024-12-19)
+
+### Features Added
+
+  - Client `CognitiveServicesManagementClient` added method `calculate_model_capacity`
+  - Client `CognitiveServicesManagementClient` added operation group `location_based_model_capacities`
+  - Client `CognitiveServicesManagementClient` added operation group `model_capacities`
+  - Client `CognitiveServicesManagementClient` added operation group `encryption_scopes`
+  - Client `CognitiveServicesManagementClient` added operation group `rai_policies`
+  - Client `CognitiveServicesManagementClient` added operation group `rai_blocklists`
+  - Client `CognitiveServicesManagementClient` added operation group `rai_blocklist_items`
+  - Client `CognitiveServicesManagementClient` added operation group `rai_content_filters`
+  - Client `CognitiveServicesManagementClient` added operation group `network_security_perimeter_configurations`
+  - Client `CognitiveServicesManagementClient` added operation group `defender_for_ai_settings`
+  - Model `AccountModel` added property `publisher`
+  - Model `AccountModel` added property `source_account`
+  - Model `AccountProperties` added property `aml_workspace`
+  - Model `AccountProperties` added property `rai_monitor_config`
+  - Model `CapacityConfig` added property `allowed_values`
+  - Model `CommitmentPlanAccountAssociation` added property `tags`
+  - Model `Deployment` added property `tags`
+  - Model `DeploymentModel` added property `publisher`
+  - Model `DeploymentModel` added property `source_account`
+  - Model `DeploymentProperties` added property `dynamic_throttling_enabled`
+  - Model `DeploymentProperties` added property `current_capacity`
+  - Model `DeploymentProperties` added property `capacity_settings`
+  - Model `DeploymentProperties` added property `parent_deployment_name`
+  - Model `Model` added property `description`
+  - Enum `ModelLifecycleStatus` added member `DEPRECATED`
+  - Enum `ModelLifecycleStatus` added member `DEPRECATING`
+  - Enum `ModelLifecycleStatus` added member `STABLE`
+  - Model `ModelSku` added property `cost`
+  - Model `NetworkRuleSet` added property `bypass`
+  - Added model `BillingMeterInfo`
+  - Added enum `ByPassSelection`
+  - Added model `CalculateModelCapacityParameter`
+  - Added model `CalculateModelCapacityResult`
+  - Added model `CalculateModelCapacityResultEstimatedCapacity`
+  - Added enum `ContentLevel`
+  - Added model `CustomBlocklistConfig`
+  - Added model `DefenderForAISetting`
+  - Added model `DefenderForAISettingResult`
+  - Added enum `DefenderForAISettingState`
+  - Added model `DeploymentCapacitySettings`
+  - Added model `DeploymentSkuListResult`
+  - Added model `EncryptionScope`
+  - Added model `EncryptionScopeListResult`
+  - Added model `EncryptionScopeProperties`
+  - Added enum `EncryptionScopeProvisioningState`
+  - Added enum `EncryptionScopeState`
+  - Added model `ModelCapacityCalculatorWorkload`
+  - Added model `ModelCapacityCalculatorWorkloadRequestParam`
+  - Added model `ModelCapacityListResult`
+  - Added model `ModelCapacityListResultValueItem`
+  - Added model `ModelSkuCapacityProperties`
+  - Added model `NetworkSecurityPerimeter`
+  - Added model `NetworkSecurityPerimeterAccessRule`
+  - Added model `NetworkSecurityPerimeterAccessRuleProperties`
+  - Added model `NetworkSecurityPerimeterAccessRulePropertiesSubscriptionsItem`
+  - Added model `NetworkSecurityPerimeterConfiguration`
+  - Added model `NetworkSecurityPerimeterConfigurationAssociationInfo`
+  - Added model `NetworkSecurityPerimeterConfigurationList`
+  - Added model `NetworkSecurityPerimeterConfigurationProperties`
+  - Added model `NetworkSecurityPerimeterProfileInfo`
+  - Added enum `NspAccessRuleDirection`
+  - Added model `ProvisioningIssue`
+  - Added model `ProvisioningIssueProperties`
+  - Added model `RaiBlockListItemsResult`
+  - Added model `RaiBlockListResult`
+  - Added model `RaiBlocklist`
+  - Added model `RaiBlocklistConfig`
+  - Added model `RaiBlocklistItem`
+  - Added model `RaiBlocklistItemBulkRequest`
+  - Added model `RaiBlocklistItemProperties`
+  - Added model `RaiBlocklistProperties`
+  - Added model `RaiContentFilter`
+  - Added model `RaiContentFilterListResult`
+  - Added model `RaiContentFilterProperties`
+  - Added model `RaiMonitorConfig`
+  - Added model `RaiPolicy`
+  - Added model `RaiPolicyContentFilter`
+  - Added enum `RaiPolicyContentSource`
+  - Added model `RaiPolicyListResult`
+  - Added enum `RaiPolicyMode`
+  - Added model `RaiPolicyProperties`
+  - Added enum `RaiPolicyType`
+  - Added model `SkuResource`
+  - Added model `UserOwnedAmlWorkspace`
+  - Operation group `CognitiveServicesManagementClientOperationsMixin` added method `calculate_model_capacity`
+  - Operation group `DeploymentsOperations` added method `begin_update`
+  - Operation group `DeploymentsOperations` added method `list_skus`
+  - Added operation group `DefenderForAISettingsOperations`
+  - Added operation group `EncryptionScopesOperations`
+  - Added operation group `LocationBasedModelCapacitiesOperations`
+  - Added operation group `ModelCapacitiesOperations`
+  - Added operation group `NetworkSecurityPerimeterConfigurationsOperations`
+  - Added operation group `RaiBlocklistItemsOperations`
+  - Added operation group `RaiBlocklistsOperations`
+  - Added operation group `RaiContentFiltersOperations`
+  - Added operation group `RaiPoliciesOperations`
+
 ## 13.5.0 (2023-07-21)
 
 ### Features Added

sdk/cognitiveservices/azure-mgmt-cognitiveservices/README.md

@@ -1,7 +1,7 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Cognitive Services Management Client Library.
-This package has been tested with Python 3.7+.
+This package has been tested with Python 3.8+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 ## _Disclaimer_
@@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For
 
 ### Prerequisites
 
-- Python 3.7+ is required to use this package.
+- Python 3.8+ is required to use this package.
 - [Azure subscription](https://azure.microsoft.com/free/)
 
 ### Install the package
@@ -59,6 +59,3 @@ Code samples for this package can be found at:
 If you encounter any bugs or have suggestions, please file an issue in the
 [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
 section of the project. 
-
-
-![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-cognitiveservices%2FREADME.png)

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

@@ -1,11 +1,11 @@
 {
-  "commit": "4b7481587132ce0bde5f0a6d6ab590129f7b7179",
+  "commit": "0383d4a163beb3e58e7b4cb3c06172d32ddd8c85",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.10.2",
   "use": [
-    "@autorest/python@6.6.0",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.19.0",
+    "@autorest/modelerfour@4.27.0"
   ],
-  "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.6.0 --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 --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.19.0 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
   "readme": "specification/cognitiveservices/resource-manager/readme.md"
 }

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

@@ -8,9 +8,12 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
+from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
 from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
 
 from . import models as _models
 from ._configuration import CognitiveServicesManagementClientConfiguration
@@ -20,12 +23,21 @@
     CognitiveServicesManagementClientOperationsMixin,
     CommitmentPlansOperations,
     CommitmentTiersOperations,
+    DefenderForAISettingsOperations,
     DeletedAccountsOperations,
     DeploymentsOperations,
+    EncryptionScopesOperations,
+    LocationBasedModelCapacitiesOperations,
+    ModelCapacitiesOperations,
     ModelsOperations,
+    NetworkSecurityPerimeterConfigurationsOperations,
     Operations,
     PrivateEndpointConnectionsOperations,
     PrivateLinkResourcesOperations,
+    RaiBlocklistItemsOperations,
+    RaiBlocklistsOperations,
+    RaiContentFiltersOperations,
+    RaiPoliciesOperations,
     ResourceSkusOperations,
     UsagesOperations,
 )
@@ -54,6 +66,11 @@ class CognitiveServicesManagementClient(
     :vartype commitment_tiers: azure.mgmt.cognitiveservices.operations.CommitmentTiersOperations
     :ivar models: ModelsOperations operations
     :vartype models: azure.mgmt.cognitiveservices.operations.ModelsOperations
+    :ivar location_based_model_capacities: LocationBasedModelCapacitiesOperations operations
+    :vartype location_based_model_capacities:
+     azure.mgmt.cognitiveservices.operations.LocationBasedModelCapacitiesOperations
+    :ivar model_capacities: ModelCapacitiesOperations operations
+    :vartype model_capacities: azure.mgmt.cognitiveservices.operations.ModelCapacitiesOperations
     :ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
     :vartype private_endpoint_connections:
      azure.mgmt.cognitiveservices.operations.PrivateEndpointConnectionsOperations
@@ -64,13 +81,32 @@ class CognitiveServicesManagementClient(
     :vartype deployments: azure.mgmt.cognitiveservices.operations.DeploymentsOperations
     :ivar commitment_plans: CommitmentPlansOperations operations
     :vartype commitment_plans: azure.mgmt.cognitiveservices.operations.CommitmentPlansOperations
+    :ivar encryption_scopes: EncryptionScopesOperations operations
+    :vartype encryption_scopes: azure.mgmt.cognitiveservices.operations.EncryptionScopesOperations
+    :ivar rai_policies: RaiPoliciesOperations operations
+    :vartype rai_policies: azure.mgmt.cognitiveservices.operations.RaiPoliciesOperations
+    :ivar rai_blocklists: RaiBlocklistsOperations operations
+    :vartype rai_blocklists: azure.mgmt.cognitiveservices.operations.RaiBlocklistsOperations
+    :ivar rai_blocklist_items: RaiBlocklistItemsOperations operations
+    :vartype rai_blocklist_items:
+     azure.mgmt.cognitiveservices.operations.RaiBlocklistItemsOperations
+    :ivar rai_content_filters: RaiContentFiltersOperations operations
+    :vartype rai_content_filters:
+     azure.mgmt.cognitiveservices.operations.RaiContentFiltersOperations
+    :ivar network_security_perimeter_configurations:
+     NetworkSecurityPerimeterConfigurationsOperations operations
+    :vartype network_security_perimeter_configurations:
+     azure.mgmt.cognitiveservices.operations.NetworkSecurityPerimeterConfigurationsOperations
+    :ivar defender_for_ai_settings: DefenderForAISettingsOperations operations
+    :vartype defender_for_ai_settings:
+     azure.mgmt.cognitiveservices.operations.DefenderForAISettingsOperations
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: The ID of the target subscription. Required.
     :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 "2023-05-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2024-10-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
@@ -87,7 +123,25 @@ def __init__(
         self._config = CognitiveServicesManagementClientConfiguration(
             credential=credential, subscription_id=subscription_id, **kwargs
         )
-        self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        _policies = kwargs.pop("policies", None)
+        if _policies is None:
+            _policies = [
+                policies.RequestIdPolicy(**kwargs),
+                self._config.headers_policy,
+                self._config.user_agent_policy,
+                self._config.proxy_policy,
+                policies.ContentDecodePolicy(**kwargs),
+                ARMAutoResourceProviderRegistrationPolicy(),
+                self._config.redirect_policy,
+                self._config.retry_policy,
+                self._config.authentication_policy,
+                self._config.custom_hook_policy,
+                self._config.logging_policy,
+                policies.DistributedTracingPolicy(**kwargs),
+                policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+                self._config.http_logging_policy,
+            ]
+        self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
 
         client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
@@ -104,6 +158,12 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.models = ModelsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.location_based_model_capacities = LocationBasedModelCapacitiesOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.model_capacities = ModelCapacitiesOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
         self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
@@ -114,8 +174,25 @@ def __init__(
         self.commitment_plans = CommitmentPlansOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
+        self.encryption_scopes = EncryptionScopesOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.rai_policies = RaiPoliciesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.rai_blocklists = RaiBlocklistsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.rai_blocklist_items = RaiBlocklistItemsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.rai_content_filters = RaiContentFiltersOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.network_security_perimeter_configurations = NetworkSecurityPerimeterConfigurationsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.defender_for_ai_settings = DefenderForAISettingsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
 
-    def _send_request(self, request: HttpRequest, **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
@@ -135,12 +212,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
 
         request_copy = deepcopy(request)
         request_copy.url = self._client.format_url(request_copy.url)
-        return self._client.send_request(request_copy, **kwargs)
+        return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
 
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "CognitiveServicesManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 

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

@@ -8,7 +8,6 @@
 
 from typing import Any, TYPE_CHECKING
 
-from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
 from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
 
@@ -19,7 +18,7 @@
     from azure.core.credentials import TokenCredential
 
 
-class CognitiveServicesManagementClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
+class CognitiveServicesManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
     """Configuration for CognitiveServicesManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
@@ -29,14 +28,13 @@ 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 "2023-05-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2024-10-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: str = kwargs.pop("api_version", "2023-05-01")
+        api_version: str = kwargs.pop("api_version", "2024-10-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
@@ -48,6 +46,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
         self.api_version = api_version
         self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
         kwargs.setdefault("sdk_moniker", "mgmt-cognitiveservices/{}".format(VERSION))
+        self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 
     def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +55,9 @@ def _configure(self, **kwargs: Any) -> None:
         self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
         self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
         self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
-        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
         self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.authentication_policy = kwargs.get("authentication_policy")
         if self.credential and not self.authentication_policy:
             self.authentication_policy = ARMChallengeAuthenticationPolicy(