[Quantum] Submit jobs directly to service, Phase 1

src/quantum/azext_quantum/_help.py

@@ -15,7 +15,7 @@
     type: command
     short-summary: Submit a job to run on Azure Quantum, and waits for the result.
     examples:
-      - name: Submit the Q# program from the current folder and wait for the result.
+      - name: Submit a Q# program from the current folder and wait for the result.
         text: |-
             az quantum execute -g MyResourceGroup -w MyWorkspace -l MyLocation -t MyTarget
       - name: Submit and wait for a Q# program from the current folder with job and program parameters.
@@ -32,7 +32,7 @@
     type: command
     short-summary: Equivalent to `az quantum execute`
     examples:
-      - name: Submit the Q# program from the current folder and wait for the result.
+      - name: Submit a Q# program from the current folder and wait for the result.
         text: |-
             az quantum run -g MyResourceGroup -w MyWorkspace -l MyLocation -t MyTarget
       - name: Submit and wait for a Q# program from the current folder with job and program parameters.
@@ -81,24 +81,29 @@
 
 helps['quantum job submit'] = """
     type: command
-    short-summary: Submit a Q# project to run on Azure Quantum.
+    short-summary: Submit a program or circuit to run on Azure Quantum.
     examples:
-      - name: Submit the Q# program from the current folder.
+      - name: Submit a Q# program from the current folder.
         text: |-
             az quantum job submit -g MyResourceGroup -w MyWorkspace -l MyLocation \\
                -t MyTarget --job-name MyJob
-      - name: Submit the Q# program from the current folder with job parameters for a target.
+      - name: Submit a Q# program from the current folder with job parameters for a target.
         text: |-
             az quantum job submit -g MyResourceGroup -w MyWorkspace -l MyLocation \\
                -t MyTarget --job-name MyJob --job-params param1=value1 param2=value2
-      - name: Submit the Q# program with program parameters (e.g. n-qubits = 2).
+      - name: Submit a Q# program with program parameters (e.g. n-qubits = 2).
         text: |-
             az quantum job submit -g MyResourceGroup -w MyWorkspace -l MyLocation \\
                -t MyTarget --job-name MyJob -- --n-qubits=2
       - name: Submit a Q# program from the current folder with a target-capability parameter.
         text: |-
             az quantum job submit -g MyResourceGroup -w MyWorkspace -l MyLocation -t MyTarget \\
                 --target-capability MyTargetCapability
+      - name: Submit QIR bitcode from a file in the current folder.
+        text: |-
+            az quantum job submit -g MyResourceGroup -w MyWorkspace -l MyLocation -t MyTarget \\
+                --job-name MyJob --job-input-format qir.v1 --job-input-file MyQirBitcode.bc \\
+                --entry-point MyQirEntryPoint
 """
 
 helps['quantum job wait'] = """

src/quantum/azext_quantum/_params.py

@@ -6,7 +6,6 @@
 # pylint: disable=line-too-long,protected-access,no-self-use,too-many-statements
 
 import argparse
-import json
 from knack.arguments import CLIArgumentType
 from azure.cli.core.azclierror import InvalidArgumentValueError, CLIError
 from azure.cli.core.util import shell_safe_json_parse
@@ -53,6 +52,10 @@ def load_arguments(self, _):
     provider_sku_list_type = CLIArgumentType(options_list=['--provider-sku-list', '-r'], help='Comma separated list of Provider/SKU pairs. Separate the Provider and SKU with a slash. Enclose the entire list in quotes. Values from `az quantum offerings list -l <location> -o table`')
     auto_accept_type = CLIArgumentType(help='If specified, provider terms are accepted without an interactive Y/N prompt.')
     autoadd_only_type = CLIArgumentType(help='If specified, only the plans flagged "autoAdd" are displayed.')
+    job_input_file_type = CLIArgumentType(help='The location of the input file to submit. Required for QIR, QIO, and pass-through jobs. Ignored on Q# jobs.')
+    job_input_format_type = CLIArgumentType(help='The format of the file to submit. Omit this parameter on Q# jobs.')
+    job_output_format_type = CLIArgumentType(help='The expected job output format. Ignored on Q# jobs.')
+    entry_point_type = CLIArgumentType(help='The entry point for the QIR program or circuit. Required for QIR. Ignored on Q# jobs.')
 
     with self.argument_context('quantum workspace') as c:
         c.argument('workspace_name', workspace_name_type)
@@ -84,6 +87,10 @@ def load_arguments(self, _):
     with self.argument_context('quantum job submit') as c:
         c.argument('job_params', job_params_type)
         c.argument('target_capability', target_capability_type)
+        c.argument('job_input_file', job_input_file_type)
+        c.argument('job_input_format', job_input_format_type)
+        c.argument('job_output_format', job_output_format_type)
+        c.argument('entry_point', entry_point_type)
         c.positional('program_args', program_args_type)
 
     with self.argument_context('quantum execute') as c:
@@ -96,6 +103,10 @@ def load_arguments(self, _):
         c.argument('no_build', no_build_type)
         c.argument('job_params', job_params_type)
         c.argument('target_capability', target_capability_type)
+        c.argument('job_input_file', job_input_file_type)
+        c.argument('job_input_format', job_input_format_type)
+        c.argument('job_output_format', job_output_format_type)
+        c.argument('entry_point', entry_point_type)
         c.positional('program_args', program_args_type)
 
     with self.argument_context('quantum run') as c:
@@ -108,6 +119,10 @@ def load_arguments(self, _):
         c.argument('no_build', no_build_type)
         c.argument('job_params', job_params_type)
         c.argument('target_capability', target_capability_type)
+        c.argument('job_input_file', job_input_file_type)
+        c.argument('job_input_format', job_input_format_type)
+        c.argument('job_output_format', job_output_format_type)
+        c.argument('entry_point', entry_point_type)
         c.positional('program_args', program_args_type)
 
     with self.argument_context('quantum offerings') as c:

src/quantum/azext_quantum/_storage.py

@@ -0,0 +1,116 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# This file is a reduced version of qdk-python\azure-quantum\azure\quantum\storage.py
+# It only contains the functions required to do inputData blob upload for job submission.
+# Other cosmetic changes were made to appease the Azure CLI CI/CD checks.
+
+# Unused imports were removed to reduce Pylint style-rule violations.
+import logging
+from datetime import datetime, timedelta
+from typing import Any
+from azure.storage.blob import (
+    BlobServiceClient,
+    ContainerClient,
+    BlobClient,
+    BlobSasPermissions,
+    ContentSettings,
+    generate_blob_sas,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def create_container(
+    connection_string: str, container_name: str
+) -> ContainerClient:
+    """
+    Creates and initialize a container; returns the client needed to access it.
+    """
+    blob_service_client = BlobServiceClient.from_connection_string(
+        connection_string
+    )
+    logger.info(
+        f'{"Initializing storage client for account:"}'
+        + f"{blob_service_client.account_name}"
+    )
+
+    container_client = blob_service_client.get_container_client(container_name)
+    create_container_using_client(container_client)
+    return container_client
+
+
+def create_container_using_client(container_client: ContainerClient):
+    """
+    Creates the container if it doesn't already exist.
+    """
+    if not container_client.exists():
+        logger.debug(
+            f'{"  - uploading to **new** container:"}'
+            f"{container_client.container_name}"
+        )
+        container_client.create_container()
+
+
+def upload_blob(
+    container: ContainerClient,
+    blob_name: str,
+    content_type: str,
+    content_encoding: str,
+    data: Any,
+    return_sas_token: bool = True,
+) -> str:
+    """
+    Uploads the given data to a blob record.
+    If a blob with the given name already exist, it throws an error.
+
+    Returns a uri with a SAS token to access the newly created blob.
+    """
+    create_container_using_client(container)
+    logger.info(
+        f"Uploading blob '{blob_name}'"
+        + f"to container '{container.container_name}'"
+        + f"on account: '{container.account_name}'"
+    )
+
+    content_settings = ContentSettings(
+        content_type=content_type, content_encoding=content_encoding
+    )
+
+    blob = container.get_blob_client(blob_name)
+
+    blob.upload_blob(data, content_settings=content_settings)
+    logger.debug(f"  - blob '{blob_name}' uploaded. generating sas token.")
+
+    if return_sas_token:
+        uri = get_blob_uri_with_sas_token(blob)
+    else:
+        uri = remove_sas_token(blob.url)
+    logger.debug(f"  - blob access url: '{uri}'.")
+
+    return uri
+
+
+def get_blob_uri_with_sas_token(blob: BlobClient):
+    """Returns a URI for the given blob that contains a SAS Token"""
+    sas_token = generate_blob_sas(
+        blob.account_name,
+        blob.container_name,
+        blob.blob_name,
+        account_key=blob.credential.account_key,
+        permission=BlobSasPermissions(read=True),
+        expiry=datetime.utcnow() + timedelta(days=14),
+    )
+
+    return blob.url + "?" + sas_token
+
+
+def remove_sas_token(sas_uri: str) -> str:
+    """Removes the SAS Token from the given URI if it contains one"""
+    index = sas_uri.find("?")
+    if index != -1:
+        sas_uri = sas_uri[0:index]
+
+    return sas_uri

src/quantum/azext_quantum/azext_metadata.json

@@ -1,4 +1,4 @@
 {
     "azext.isPreview": true,
-    "azext.minCliCoreVersion": "2.23.0"
+    "azext.minCliCoreVersion": "2.41.0"
 }