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

Merge 05795bad336565cc5b3b95f2ba6f3425f53e0689 into 1d7059db3c66d17d75e325d15c597ebbecfc60f4

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

@@ -1,11 +1,11 @@
 {
-  "commit": "33a7dbc1743fdacb8e2259011a035154a98cad66",
+  "commit": "942039c000786b8ffae3c83a99bf1eb5fbfcb6b9",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.9.7",
   "use": [
-    "@autorest/python@6.2.16",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.7.1",
+    "@autorest/modelerfour@4.26.2"
   ],
-  "autorest_command": "autorest specification/search/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/search/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/search/resource-manager/readme.md"
 }

sdk/search/azure-mgmt-search/azure/mgmt/search/_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
@@ -36,22 +30,35 @@ class SearchManagementClientConfiguration(Configuration):  # pylint: disable=too
     :param subscription_id: The unique identifier for a Microsoft Azure subscription. You can
      obtain this value from the Azure Resource Manager API or the portal. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2022-09-01". Note that overriding this
+    :param location: The unique location name for a Microsoft Azure geographic region. Required.
+    :type location: str
+    :param sku_name: The unique search service sku name supported by Azure Cognitive Search.
+     Required.
+    :type sku_name: str
+    :keyword api_version: Api Version. Default value is "2023-11-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:
+    def __init__(
+        self, credential: "TokenCredential", subscription_id: str, location: str, sku_name: str, **kwargs: Any
+    ) -> None:
         super(SearchManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2022-09-01"] = kwargs.pop("api_version", "2022-09-01")
+        api_version: str = kwargs.pop("api_version", "2023-11-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
         if subscription_id is None:
             raise ValueError("Parameter 'subscription_id' must not be None.")
+        if location is None:
+            raise ValueError("Parameter 'location' must not be None.")
+        if sku_name is None:
+            raise ValueError("Parameter 'sku_name' must not be None.")
 
         self.credential = credential
         self.subscription_id = subscription_id
+        self.location = location
+        self.sku_name = sku_name
         self.api_version = api_version
         self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
         kwargs.setdefault("sdk_moniker", "mgmt-search/{}".format(VERSION))

sdk/search/azure-mgmt-search/azure/mgmt/search/_search_management_client.py

@@ -21,16 +21,20 @@
     PrivateEndpointConnectionsOperations,
     PrivateLinkResourcesOperations,
     QueryKeysOperations,
+    SearchManagementClientOperationsMixin,
     ServicesOperations,
     SharedPrivateLinkResourcesOperations,
+    UsagesOperations,
 )
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class SearchManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class SearchManagementClient(
+    SearchManagementClientOperationsMixin
+):  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
     """Client that can be used to manage Azure Cognitive Search services and API keys.
 
     :ivar operations: Operations operations
@@ -49,14 +53,21 @@ class SearchManagementClient:  # pylint: disable=client-accepts-api-version-keyw
     :ivar shared_private_link_resources: SharedPrivateLinkResourcesOperations operations
     :vartype shared_private_link_resources:
      azure.mgmt.search.operations.SharedPrivateLinkResourcesOperations
+    :ivar usages: UsagesOperations operations
+    :vartype usages: azure.mgmt.search.operations.UsagesOperations
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: The unique identifier for a Microsoft Azure subscription. You can
      obtain this value from the Azure Resource Manager API or the portal. Required.
     :type subscription_id: str
+    :param location: The unique location name for a Microsoft Azure geographic region. Required.
+    :type location: str
+    :param sku_name: The unique search service sku name supported by Azure Cognitive Search.
+     Required.
+    :type sku_name: 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-09-01". Note that overriding this
+    :keyword api_version: Api Version. 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
@@ -67,13 +78,15 @@ def __init__(
         self,
         credential: "TokenCredential",
         subscription_id: str,
+        location: str,
+        sku_name: str,
         base_url: str = "https://management.azure.com",
         **kwargs: Any
     ) -> None:
         self._config = SearchManagementClientConfiguration(
-            credential=credential, subscription_id=subscription_id, **kwargs
+            credential=credential, subscription_id=subscription_id, location=location, sku_name=sku_name, **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,6 +105,7 @@ def __init__(
         self.shared_private_link_resources = SharedPrivateLinkResourcesOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
+        self.usages = UsagesOperations(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.
@@ -122,5 +136,5 @@ def __enter__(self) -> "SearchManagementClient":
         self._client.__enter__()
         return self
 
-    def __exit__(self, *exc_details) -> None:
+    def __exit__(self, *exc_details: Any) -> None:
         self._client.__exit__(*exc_details)

sdk/search/azure-mgmt-search/azure/mgmt/search/_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):
@@ -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:
@@ -1271,7 +1281,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 +1305,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/search/azure-mgmt-search/azure/mgmt/search/_vendor.py

@@ -5,10 +5,19 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import List, cast
+from abc import ABC
+from typing import TYPE_CHECKING
 
 from azure.core.pipeline.transport import HttpRequest
 
+from ._configuration import SearchManagementClientConfiguration
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import,ungrouped-imports
+    from azure.core import PipelineClient
+
+    from ._serialization import Deserializer, Serializer
+
 
 def _convert_request(request, files=None):
     data = request.content if not files else None
@@ -18,13 +27,10 @@ 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 SearchManagementClientMixinABC(ABC):
+    """DO NOT use this class. It is for internal typing use only."""
+
+    _client: "PipelineClient"
+    _config: SearchManagementClientConfiguration
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

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

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

sdk/search/azure-mgmt-search/azure/mgmt/search/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
@@ -36,22 +30,35 @@ class SearchManagementClientConfiguration(Configuration):  # pylint: disable=too
     :param subscription_id: The unique identifier for a Microsoft Azure subscription. You can
      obtain this value from the Azure Resource Manager API or the portal. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2022-09-01". Note that overriding this
+    :param location: The unique location name for a Microsoft Azure geographic region. Required.
+    :type location: str
+    :param sku_name: The unique search service sku name supported by Azure Cognitive Search.
+     Required.
+    :type sku_name: str
+    :keyword api_version: Api Version. Default value is "2023-11-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:
+    def __init__(
+        self, credential: "AsyncTokenCredential", subscription_id: str, location: str, sku_name: str, **kwargs: Any
+    ) -> None:
         super(SearchManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2022-09-01"] = kwargs.pop("api_version", "2022-09-01")
+        api_version: str = kwargs.pop("api_version", "2023-11-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
         if subscription_id is None:
             raise ValueError("Parameter 'subscription_id' must not be None.")
+        if location is None:
+            raise ValueError("Parameter 'location' must not be None.")
+        if sku_name is None:
+            raise ValueError("Parameter 'sku_name' must not be None.")
 
         self.credential = credential
         self.subscription_id = subscription_id
+        self.location = location
+        self.sku_name = sku_name
         self.api_version = api_version
         self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
         kwargs.setdefault("sdk_moniker", "mgmt-search/{}".format(VERSION))