[Draft - Do not merge] [Quantum] Use Post Storage URI and SAS token like Quantum Python SDK (27643)

src/quantum/azext_quantum/operations/job.py

@@ -13,14 +13,15 @@
 import uuid
 import knack.log
 
-from azure.cli.command_modules.storage.operations.account import show_storage_account_connection_string
 from azure.cli.core.azclierror import (FileOperationError, AzureInternalError,
                                        InvalidArgumentValueError, AzureResponseError,
                                        RequiredArgumentMissingError)
 
-from .._storage import create_container, upload_blob
-
+from ..vendored_sdks.azure_quantum_python.workspace import Workspace
+from ..vendored_sdks.azure_quantum_python.storage import upload_blob
+from ..vendored_sdks.azure_storage_blob import ContainerClient
 from .._client_factory import cf_jobs
+
 from .workspace import WorkspaceInfo
 from .target import TargetInfo, get_provider
 
@@ -234,15 +235,19 @@ def submit(cmd, resource_group_name, workspace_name, location, target_id, job_in
             raise RequiredArgumentMissingError("No storage account specified or linked with workspace.")
         storage = ws.properties.storage_account.split('/')[-1]
     job_id = str(uuid.uuid4())
-    container_name = "quantum-job-" + job_id
-    connection_string_dict = show_storage_account_connection_string(cmd, resource_group_name, storage)
-    connection_string = connection_string_dict["connectionString"]
-    container_client = create_container(connection_string, container_name)
     blob_name = "inputData"
 
+    resource_id = "/subscriptions/" + ws_info.subscription + "/resourceGroups/" + ws_info.resource_group + "/providers/Microsoft.Quantum/Workspaces/" + ws_info.name
+    workspace = Workspace(resource_id=resource_id, location=location)
+
+    knack_logger.warning("Getting Azure credential token...")
+    container_uri = workspace.get_container_uri(job_id=job_id)
+    container_client = ContainerClient.from_container_url(container_uri)
+
     knack_logger.warning("Uploading input data...")
     try:
-        blob_uri = upload_blob(container_client, blob_name, content_type, content_encoding, blob_data, False)
+        blob_uri = upload_blob(container_client, blob_name, content_type, content_encoding, blob_data, return_sas_token=False)
+        logger.debug("  - blob uri: %s", blob_uri)
     except Exception as e:
         # Unexplained behavior:
         #    QIR bitcode input and QIO (gzip) input data get UnicodeDecodeError on jobs run in tests using
@@ -253,9 +258,6 @@ def submit(cmd, resource_group_name, workspace_name, location, target_id, job_in
             error_msg += f"\nReason: {e.reason}"
         raise AzureResponseError(error_msg) from e
 
-    start_of_blob_name = blob_uri.find(blob_name)
-    container_uri = blob_uri[0:start_of_blob_name - 1]
-
     # Combine separate command-line parameters (like shots, target_capability, and entry_point) with job_params
     if job_params is None:
         job_params = {}

src/quantum/azext_quantum/tests/latest/test_quantum_jobs.py

@@ -198,12 +198,32 @@ def test_submit(self):
         test_location = get_test_workspace_location()
         test_resource_group = get_test_resource_group()
         test_workspace_temp = get_test_workspace_random_name()
-        test_provider_sku_list = "qci/qci-freepreview,rigetti/azure-quantum-credits,ionq/pay-as-you-go-cred,microsoft-qc/learn-and-develop"
+        test_provider_sku_list = "qci/qci-freepreview,rigetti/azure-quantum-credits,ionq/aq-internal-testing"
         test_storage = get_test_workspace_storage()
 
         self.cmd(f"az quantum workspace create -g {test_resource_group} -w {test_workspace_temp} -l {test_location} -a {test_storage} -r {test_provider_sku_list} --skip-autoadd")
         self.cmd(f"az quantum workspace set -g {test_resource_group} -w {test_workspace_temp} -l {test_location}")
 
+        # Submit a job to Rigetti and look for SAS tokens in URIs in the output
+        results = self.cmd("az quantum job submit -t rigetti.sim.qvm --job-input-format rigetti.quil.v1 -t rigetti.sim.qvm --job-input-file src/quantum/azext_quantum/tests/latest/input_data/bell-state.quil --job-output-format rigetti.quil-results.v1 -o json").get_output_in_json()
+        self.assertIn("?sv=", results["containerUri"])
+        self.assertIn("&st=", results["containerUri"])
+        self.assertIn("&se=", results["containerUri"])
+        self.assertIn("&sp=", results["containerUri"])
+        self.assertIn("&sig=", results["containerUri"])
+
+        self.assertIn("?sv=", results["inputDataUri"])
+        self.assertIn("&st=", results["inputDataUri"])
+        self.assertIn("&se=", results["inputDataUri"])
+        self.assertIn("&sp=", results["inputDataUri"])
+        self.assertIn("&sig=", results["inputDataUri"])
+
+        self.assertIn("?sv=", results["outputDataUri"])
+        self.assertIn("&st=", results["outputDataUri"])
+        self.assertIn("&se=", results["outputDataUri"])
+        self.assertIn("&sp=", results["outputDataUri"])
+        self.assertIn("&sig=", results["outputDataUri"])
+
         # Run a Quil pass-through job on Rigetti
         results = self.cmd("az quantum run -t rigetti.sim.qvm --job-input-format rigetti.quil.v1 -t rigetti.sim.qvm --job-input-file src/quantum/azext_quantum/tests/latest/input_data/bell-state.quil --job-output-format rigetti.quil-results.v1 -o json").get_output_in_json()
         self.assertIn("ro", results)

src/quantum/azext_quantum/tests/latest/utils.py

@@ -9,12 +9,11 @@
 TEST_WORKSPACE_DEFAULT_LOCATION = "westus2"
 TEST_WORKSPACE_DEFAULT_STORAGE = "e2etests"
 TEST_WORKSPACE_DEFAULT_STORAGE_GRS = "e2etestsgrs"
-TEST_WORKSPACE_DEFAULT_PROVIDER_SKU_LIST = "microsoft-qc/learn-and-develop"
-TEST_CAPABILITIES_DEFAULT = "new.microsoft-qc;submit.microsoft-qc"
-
-TEST_TARGET_DEFAULT_PROVIDER_SKU_LIST = "microsoft-qc/learn-and-develop"
-TEST_TARGET_DEFAULT_PROVIDER = "microsoft-qc"
-TEST_TARGET_DEFAULT_TARGET = "microsoft.estimator"
+TEST_WORKSPACE_DEFAULT_PROVIDER_SKU_LIST = "Microsoft.ChemistryHpc/Basic"
+TEST_CAPABILITIES_DEFAULT = "new.Microsoft.ChemistryHpc;submit.Microsoft.ChemistryHpc"
+TEST_TARGET_DEFAULT_PROVIDER_SKU_LIST = "Microsoft.ChemistryHpc/Basic"
+TEST_TARGET_DEFAULT_PROVIDER = "Microsoft.ChemistryHpc"
+TEST_TARGET_DEFAULT_TARGET = "microsoft.hpc"
 
 
 def get_from_os_environment(env_name, default):

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

@@ -0,0 +1,66 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+"""Credentials for Azure SDK clients."""
+
+from ._auth_record import AuthenticationRecord
+from ._exceptions import AuthenticationRequiredError, CredentialUnavailableError
+from ._constants import AzureAuthorityHosts, KnownAuthorities
+from ._credentials import (
+    AuthorizationCodeCredential,
+    AzureDeveloperCliCredential,
+    AzureCliCredential,
+    AzurePowerShellCredential,
+    CertificateCredential,
+    ChainedTokenCredential,
+    ClientAssertionCredential,
+    ClientSecretCredential,
+    DefaultAzureCredential,
+    DeviceCodeCredential,
+    EnvironmentCredential,
+    InteractiveBrowserCredential,
+    ManagedIdentityCredential,
+    OnBehalfOfCredential,
+    SharedTokenCacheCredential,
+    UsernamePasswordCredential,
+    VisualStudioCodeCredential,
+    WorkloadIdentityCredential,
+    AzurePipelinesCredential,
+)
+from ._persistent_cache import TokenCachePersistenceOptions
+from ._bearer_token_provider import get_bearer_token_provider
+
+
+__all__ = [
+    "AuthenticationRecord",
+    "AuthenticationRequiredError",
+    "AuthorizationCodeCredential",
+    "AzureAuthorityHosts",
+    "AzureCliCredential",
+    "AzureDeveloperCliCredential",
+    "AzurePipelinesCredential",
+    "AzurePowerShellCredential",
+    "CertificateCredential",
+    "ChainedTokenCredential",
+    "ClientAssertionCredential",
+    "ClientSecretCredential",
+    "CredentialUnavailableError",
+    "DefaultAzureCredential",
+    "DeviceCodeCredential",
+    "EnvironmentCredential",
+    "InteractiveBrowserCredential",
+    "KnownAuthorities",
+    "OnBehalfOfCredential",
+    "ManagedIdentityCredential",
+    "SharedTokenCacheCredential",
+    "TokenCachePersistenceOptions",
+    "UsernamePasswordCredential",
+    "VisualStudioCodeCredential",
+    "WorkloadIdentityCredential",
+    "get_bearer_token_provider",
+]
+
+from ._version import VERSION
+
+__version__ = VERSION