Update data plane client from swagger (#4318)

* Update generated client to latest Azure Quantum Python Data Plane

Co-authored-by: XField <[email protected]>

src/quantum/azext_quantum/commands.py

@@ -27,15 +27,25 @@ def one(provider, target):
 
 
 def transform_job(result):
-    result = OrderedDict([
+    transformed_result = OrderedDict([
         ('Name', result['name']),
         ('Id', result['id']),
         ('Status', result['status']),
         ('Target', result['target']),
         ('Submission time', result['creationTime']),
         ('Completion time', result['endExecutionTime'])
     ])
-    return result
+
+    # For backwards compatibility check if the field is present and only display if present
+    cost_estimate = result['costEstimate']
+    if cost_estimate is not None:
+        amount = cost_estimate['estimatedTotal']
+        currency = cost_estimate['currencyCode']
+        if (amount is not None) and (currency is not None):
+            price = str(amount) + ' ' + currency
+            transformed_result['Price estimate'] = price
+
+    return transformed_result
 
 
 def transform_jobs(results):

src/quantum/azext_quantum/vendored_sdks/azure_quantum/__init__.py

@@ -12,8 +12,7 @@
 __version__ = VERSION
 __all__ = ['QuantumClient']
 
-try:
-    from ._patch import patch_sdk  # type: ignore
-    patch_sdk()
-except ImportError:
-    pass
+# `._patch.py` is used for handwritten extensions to the generated code
+# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
+from ._patch import patch_sdk
+patch_sdk()

src/quantum/azext_quantum/vendored_sdks/azure_quantum/_configuration.py

@@ -10,7 +10,6 @@
 
 from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
-from azure.mgmt.core.policies import ARMHttpLoggingPolicy
 
 from ._version import VERSION
 
@@ -46,6 +45,7 @@ def __init__(
         **kwargs  # type: Any
     ):
         # type: (...) -> None
+        super(QuantumClientConfiguration, self).__init__(**kwargs)
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
         if subscription_id is None:
@@ -54,7 +54,6 @@ def __init__(
             raise ValueError("Parameter 'resource_group_name' must not be None.")
         if workspace_name is None:
             raise ValueError("Parameter 'workspace_name' must not be None.")
-        super(QuantumClientConfiguration, self).__init__(**kwargs)
 
         self.credential = credential
         self.subscription_id = subscription_id
@@ -73,7 +72,7 @@ def _configure(
         self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
         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.http_logging_policy = kwargs.get('http_logging_policy') or policies.HttpLoggingPolicy(**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)

src/quantum/azext_quantum/vendored_sdks/azure_quantum/_patch.py

@@ -0,0 +1,31 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+# The MIT License (MIT)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the ""Software""), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# --------------------------------------------------------------------------
+
+# This file is used for handwritten extensions to the generated code. Example:
+# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
+def patch_sdk():
+    pass

src/quantum/azext_quantum/vendored_sdks/azure_quantum/_quantum_client.py

@@ -6,46 +6,45 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
+from copy import deepcopy
 from typing import TYPE_CHECKING
 
-from azure.mgmt.core import ARMPipelineClient
+from azure.core import PipelineClient
 from msrest import Deserializer, Serializer
 
+from . import models
+from ._configuration import QuantumClientConfiguration
+from .operations import JobsOperations, ProvidersOperations, QuotasOperations, StorageOperations
+
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from typing import Any, Optional
 
     from azure.core.credentials import TokenCredential
-    from azure.core.pipeline.transport import HttpRequest, HttpResponse
-
-from ._configuration import QuantumClientConfiguration
-from .operations import JobsOperations
-from .operations import ProvidersOperations
-from .operations import StorageOperations
-from .operations import QuotasOperations
-from . import models
-
+    from azure.core.rest import HttpRequest, HttpResponse
 
 class QuantumClient(object):
     """Azure Quantum REST API client.
 
     :ivar jobs: JobsOperations operations
-    :vartype jobs: azure.quantum.operations.JobsOperations
+    :vartype jobs: azure.quantum._client.operations.JobsOperations
     :ivar providers: ProvidersOperations operations
-    :vartype providers: azure.quantum.operations.ProvidersOperations
+    :vartype providers: azure.quantum._client.operations.ProvidersOperations
     :ivar storage: StorageOperations operations
-    :vartype storage: azure.quantum.operations.StorageOperations
+    :vartype storage: azure.quantum._client.operations.StorageOperations
     :ivar quotas: QuotasOperations operations
-    :vartype quotas: azure.quantum.operations.QuotasOperations
+    :vartype quotas: azure.quantum._client.operations.QuotasOperations
     :param credential: Credential needed for the client to connect to Azure.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000).
+    :param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g.
+     00000000-0000-0000-0000-000000000000).
     :type subscription_id: str
     :param resource_group_name: Name of an Azure resource group.
     :type resource_group_name: str
     :param workspace_name: Name of the workspace.
     :type workspace_name: str
-    :param str base_url: Service URL
+    :param base_url: Service URL. Default value is 'https://quantum.azure.com'.
+    :type base_url: str
     """
 
     def __init__(
@@ -54,48 +53,49 @@ def __init__(
         subscription_id,  # type: str
         resource_group_name,  # type: str
         workspace_name,  # type: str
-        base_url=None,  # type: Optional[str]
+        base_url="https://quantum.azure.com",  # type: str
         **kwargs  # type: Any
     ):
         # type: (...) -> None
-        if not base_url:
-            base_url = 'https://quantum.azure.com'
-        self._config = QuantumClientConfiguration(credential, subscription_id, resource_group_name, workspace_name, **kwargs)
-        self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        self._config = QuantumClientConfiguration(credential=credential, subscription_id=subscription_id, resource_group_name=resource_group_name, workspace_name=workspace_name, **kwargs)
+        self._client = PipelineClient(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)
-        self._serialize.client_side_validation = False
         self._deserialize = Deserializer(client_models)
+        self._serialize.client_side_validation = False
+        self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.providers = ProvidersOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.storage = StorageOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.quotas = QuotasOperations(self._client, self._config, self._serialize, self._deserialize)
+
 
-        self.jobs = JobsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.providers = ProvidersOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.storage = StorageOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.quotas = QuotasOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-
-    def _send_request(self, http_request, **kwargs):
-        # type: (HttpRequest, Any) -> HttpResponse
+    def _send_request(
+        self,
+        request,  # type: HttpRequest
+        **kwargs  # type: Any
+    ):
+        # type: (...) -> HttpResponse
         """Runs the network request through the client's chained policies.
 
-        :param http_request: The network request you want to make. Required.
-        :type http_request: ~azure.core.pipeline.transport.HttpRequest
-        :keyword bool stream: Whether the response payload will be streamed. Defaults to True.
+        >>> 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)
+        <HttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
+
+        :param request: The network request you want to make. Required.
+        :type request: ~azure.core.rest.HttpRequest
+        :keyword bool stream: Whether the response payload will be streamed. Defaults to False.
         :return: The response of your network call. Does not do error handling on your response.
-        :rtype: ~azure.core.pipeline.transport.HttpResponse
+        :rtype: ~azure.core.rest.HttpResponse
         """
-        path_format_arguments = {
-            'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
-            'resourceGroupName': self._serialize.url("self._config.resource_group_name", self._config.resource_group_name, 'str'),
-            'workspaceName': self._serialize.url("self._config.workspace_name", self._config.workspace_name, 'str'),
-        }
-        http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
-        stream = kwargs.pop("stream", True)
-        pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
-        return pipeline_response.http_response
+
+        request_copy = deepcopy(request)
+        request_copy.url = self._client.format_url(request_copy.url)
+        return self._client.send_request(request_copy, **kwargs)
 
     def close(self):
         # type: () -> None

src/quantum/azext_quantum/vendored_sdks/azure_quantum/_vendor.py

@@ -0,0 +1,27 @@
+# --------------------------------------------------------------------------
+# 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.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.core.pipeline.transport import HttpRequest
+
+def _convert_request(request, files=None):
+    data = request.content if not files else None
+    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
+    if files:
+        request.set_formdata_body(files)
+    return request
+
+def _format_url_section(template, **kwargs):
+    components = template.split("/")
+    while components:
+        try:
+            return template.format(**kwargs)
+        except KeyError as key:
+            formatted_components = template.split("/")
+            components = [
+                c for c in formatted_components if "{}".format(key.args[0]) not in c
+            ]
+            template = "/".join(components)

src/quantum/azext_quantum/vendored_sdks/azure_quantum/aio/__init__.py

@@ -8,3 +8,8 @@
 
 from ._quantum_client import QuantumClient
 __all__ = ['QuantumClient']
+
+# `._patch.py` is used for handwritten extensions to the generated code
+# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
+from ._patch import patch_sdk
+patch_sdk()

src/quantum/azext_quantum/vendored_sdks/azure_quantum/aio/_configuration.py

@@ -10,7 +10,6 @@
 
 from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
-from azure.mgmt.core.policies import ARMHttpLoggingPolicy
 
 from .._version import VERSION
 
@@ -43,6 +42,7 @@ def __init__(
         workspace_name: str,
         **kwargs: Any
     ) -> None:
+        super(QuantumClientConfiguration, self).__init__(**kwargs)
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
         if subscription_id is None:
@@ -51,7 +51,6 @@ def __init__(
             raise ValueError("Parameter 'resource_group_name' must not be None.")
         if workspace_name is None:
             raise ValueError("Parameter 'workspace_name' must not be None.")
-        super(QuantumClientConfiguration, self).__init__(**kwargs)
 
         self.credential = credential
         self.subscription_id = subscription_id
@@ -69,7 +68,7 @@ def _configure(
         self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
         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.http_logging_policy = kwargs.get('http_logging_policy') or policies.HttpLoggingPolicy(**kwargs)
         self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs)
         self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs)
         self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs)

src/quantum/azext_quantum/vendored_sdks/azure_quantum/aio/_patch.py

@@ -0,0 +1,31 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+# The MIT License (MIT)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the ""Software""), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# --------------------------------------------------------------------------
+
+# This file is used for handwritten extensions to the generated code. Example:
+# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
+def patch_sdk():
+    pass