CodeGen from PR 26250 in Azure/azure-rest-api-specs

Merge f8c977b960c60d50f16696fdeec9bf357aca6e8e into 63cef7fe4236d694d40267a2b767829a026e587f

Author: SDKAuto

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

@@ -1,11 +1,11 @@
 {
-  "commit": "4b7481587132ce0bde5f0a6d6ab590129f7b7179",
+  "commit": "0a97658f987d82aa9ec82db9b178fb5687deac73",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.9.7",
   "use": [
-    "@autorest/python@6.6.0",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.7.1",
+    "@autorest/modelerfour@4.26.2"
   ],
-  "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 --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.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --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,15 @@
     CommitmentTiersOperations,
     DeletedAccountsOperations,
     DeploymentsOperations,
+    EncryptionScopesOperations,
     ModelsOperations,
     Operations,
     PrivateEndpointConnectionsOperations,
     PrivateLinkResourcesOperations,
+    RaiBlocklistItemsOperations,
+    RaiBlocklistsOperations,
+    RaiContentFiltersOperations,
+    RaiPoliciesOperations,
     ResourceSkusOperations,
     UsagesOperations,
 )
@@ -64,14 +69,26 @@ 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
     :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
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-10-01-preview". 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.
@@ -114,6 +131,17 @@ 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
+        )
 
     def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.

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

@@ -29,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 "2023-05-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-10-01-preview". 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", "2023-10-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

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

@@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                                 _serialized.update(_new_attr)  # type: ignore
                             _new_attr = _new_attr[k]  # type: ignore
                             _serialized = _serialized[k]
-                except ValueError:
-                    continue
+                except ValueError as err:
+                    if isinstance(err, SerializationError):
+                        raise
 
         except (AttributeError, KeyError, TypeError) as err:
             msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
@@ -741,6 +742,8 @@ def query(self, name, data, data_type, **kwargs):
 
         :param data: The data to be serialized.
         :param str data_type: The type to be serialized from.
+        :keyword bool skip_quote: Whether to skip quote the serialized result.
+        Defaults to False.
         :rtype: str
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
@@ -749,10 +752,8 @@ def query(self, name, data, data_type, **kwargs):
             # Treat the list aside, since we don't want to encode the div separator
             if data_type.startswith("["):
                 internal_data_type = data_type[1:-1]
-                data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
-                if not kwargs.get("skip_quote", False):
-                    data = [quote(str(d), safe="") for d in data]
-                return str(self.serialize_iter(data, internal_data_type, **kwargs))
+                do_quote = not kwargs.get("skip_quote", False)
+                return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
 
             # Not a list, regular serialization
             output = self.serialize_data(data, data_type, **kwargs)
@@ -891,6 +892,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
          not be None or empty.
         :param str div: If set, this str will be used to combine the elements
          in the iterable into a combined string. Default is 'None'.
+        :keyword bool do_quote: Whether to quote the serialized result of each iterable element.
+        Defaults to False.
         :rtype: list, str
         """
         if isinstance(data, str):
@@ -903,9 +906,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
         for d in data:
             try:
                 serialized.append(self.serialize_data(d, iter_type, **kwargs))
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized.append(None)
 
+        if kwargs.get("do_quote", False):
+            serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
+
         if div:
             serialized = ["" if s is None else str(s) for s in serialized]
             serialized = div.join(serialized)
@@ -950,7 +958,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
         for key, value in attr.items():
             try:
                 serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized[self.serialize_unicode(key)] = None
 
         if "xml" in serialization_ctxt:

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

@@ -6,7 +6,7 @@
 # --------------------------------------------------------------------------
 
 from abc import ABC
-from typing import List, TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from azure.core.pipeline.transport import HttpRequest
 
@@ -27,18 +27,6 @@ def _convert_request(request, files=None):
     return request
 
 
-def _format_url_section(template, **kwargs):
-    components = template.split("/")
-    while components:
-        try:
-            return template.format(**kwargs)
-        except KeyError as key:
-            # Need the cast, as for some reasons "split" is typed as list[str | Any]
-            formatted_components = cast(List[str], template.split("/"))
-            components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
-            template = "/".join(components)
-
-
 class CognitiveServicesManagementClientMixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 

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.5.0"
+VERSION = "11.0.0b1"

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

@@ -22,10 +22,15 @@
     CommitmentTiersOperations,
     DeletedAccountsOperations,
     DeploymentsOperations,
+    EncryptionScopesOperations,
     ModelsOperations,
     Operations,
     PrivateEndpointConnectionsOperations,
     PrivateLinkResourcesOperations,
+    RaiBlocklistItemsOperations,
+    RaiBlocklistsOperations,
+    RaiContentFiltersOperations,
+    RaiPoliciesOperations,
     ResourceSkusOperations,
     UsagesOperations,
 )
@@ -67,14 +72,27 @@ class CognitiveServicesManagementClient(
     :ivar commitment_plans: CommitmentPlansOperations operations
     :vartype commitment_plans:
      azure.mgmt.cognitiveservices.aio.operations.CommitmentPlansOperations
+    :ivar encryption_scopes: EncryptionScopesOperations operations
+    :vartype encryption_scopes:
+     azure.mgmt.cognitiveservices.aio.operations.EncryptionScopesOperations
+    :ivar rai_policies: RaiPoliciesOperations operations
+    :vartype rai_policies: azure.mgmt.cognitiveservices.aio.operations.RaiPoliciesOperations
+    :ivar rai_blocklists: RaiBlocklistsOperations operations
+    :vartype rai_blocklists: azure.mgmt.cognitiveservices.aio.operations.RaiBlocklistsOperations
+    :ivar rai_blocklist_items: RaiBlocklistItemsOperations operations
+    :vartype rai_blocklist_items:
+     azure.mgmt.cognitiveservices.aio.operations.RaiBlocklistItemsOperations
+    :ivar rai_content_filters: RaiContentFiltersOperations operations
+    :vartype rai_content_filters:
+     azure.mgmt.cognitiveservices.aio.operations.RaiContentFiltersOperations
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
     :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
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-10-01-preview". 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.
@@ -117,6 +135,17 @@ 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
+        )
 
     def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]:
         """Runs the network request through the client's chained policies.

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

@@ -29,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 "2023-05-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-10-01-preview". 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: str = kwargs.pop("api_version", "2023-05-01")
+        api_version: str = kwargs.pop("api_version", "2023-10-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

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

@@ -18,6 +18,11 @@
 from ._private_link_resources_operations import PrivateLinkResourcesOperations
 from ._deployments_operations import DeploymentsOperations
 from ._commitment_plans_operations import CommitmentPlansOperations
+from ._encryption_scopes_operations import EncryptionScopesOperations
+from ._rai_policies_operations import RaiPoliciesOperations
+from ._rai_blocklists_operations import RaiBlocklistsOperations
+from ._rai_blocklist_items_operations import RaiBlocklistItemsOperations
+from ._rai_content_filters_operations import RaiContentFiltersOperations
 
 from ._patch import __all__ as _patch_all
 from ._patch import *  # pylint: disable=unused-wildcard-import
@@ -36,6 +41,11 @@
     "PrivateLinkResourcesOperations",
     "DeploymentsOperations",
     "CommitmentPlansOperations",
+    "EncryptionScopesOperations",
+    "RaiPoliciesOperations",
+    "RaiBlocklistsOperations",
+    "RaiBlocklistItemsOperations",
+    "RaiContentFiltersOperations",
 ]
 __all__.extend([p for p in _patch_all if p not in __all__])
 _patch_sdk()