Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Creating CLI extension for Azure Quantum #1879

Merged
merged 76 commits into from
Feb 1, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
9ddc0e4
Azure quantum extension v0 (#2)
anpaz Jun 12, 2020
6663ec4
Fixing style issues
anpaz Jun 12, 2020
43c4bd7
Merge pull request #4 from anpaz-msft/quantum/master
anpaz Jun 12, 2020
739e015
Merge branch 'master' into master
anpaz Jun 12, 2020
75410f3
Incorporating feedback (#6)
anpaz Jun 17, 2020
000e8c4
Help
anpaz Jun 18, 2020
a5eb2e1
Make storage account optional (#7)
anpaz Jun 20, 2020
d389d1e
Storage is now optional (#8)
anpaz Jun 26, 2020
aa8a4b2
Making storage an argument, not an env variable (#9)
anpaz Jun 26, 2020
91e8e99
Adding implementation of 'az quantum workspace delete' command.
ricardo-espinoza Oct 19, 2020
1d3f7f8
Setting new temporary version.
ricardo-espinoza Oct 19, 2020
cdd3c07
Fixing missing file in test change
ricardo-espinoza Oct 19, 2020
b6c5cf6
Adding details to README.md (#5)
anpaz Oct 20, 2020
e5b5aa4
Updating generated files for Azure Quantum resource manager from new …
ricardo-espinoza Oct 20, 2020
d092bb3
Remove manual edit of generated file.
ricardo-espinoza Oct 20, 2020
8446cd8
Merge pull request #11 from anpaz/ricardoe/quantum/update-swagger-files
ricardo-espinoza Oct 20, 2020
485a152
Merge pull request #10 from anpaz/ricardoe/workspaces/delete
ricardo-espinoza Oct 20, 2020
ff55bea
Updating generated files for Azure Quantum data plane from new swagge…
ricardo-espinoza Oct 21, 2020
41d8837
Merge pull request #12 from anpaz/ricardoe/quantum/update-swagger-fil…
ricardo-espinoza Oct 21, 2020
14909d0
Updating generated files for Azure Quantum resource manager from new …
ricardo-espinoza Nov 7, 2020
dd5d5d1
Adding implementation of 'az quantum workspace create' command. (#14)
ricardo-espinoza Nov 12, 2020
912ce6f
Update Azure CLI quantum extension to multi-region (#17)
ricardo-espinoza Dec 8, 2020
0b230ee
Updating swagger files per commit 44563991425d862ba4e8090a2b5b6caf833…
ricardo-espinoza Dec 8, 2020
6445133
Fixing tests for multi-region URL change on Az CLI quantum extension …
ricardo-espinoza Dec 10, 2020
6325cb0
Incorporating ARM feedback (#18)
anpaz Dec 15, 2020
189b388
run command
anpaz Dec 28, 2020
e334f5c
Setting default location in workspace calls if not specified (#20)
ricardo-espinoza Jan 4, 2021
4b2d993
updating python azure quantum rest client (#21)
anpaz Jan 8, 2021
3cd44d9
Update generated files from swagger file (Version 2021-01-11) (#22)
ricardo-espinoza Jan 15, 2021
097e3d0
Hot fixes on December 2020 release of Azure CLI extension (#23)
ricardo-espinoza Jan 15, 2021
ac57090
Update CLI with generated clients from more recent swagger files (#24)
ricardo-espinoza Jan 17, 2021
184f269
Update src/quantum/README.rst
ricardo-espinoza Jan 18, 2021
6166a86
Update src/quantum/README.rst
ricardo-espinoza Jan 18, 2021
9d3cd76
Update src/quantum/README.rst
ricardo-espinoza Jan 18, 2021
2d8813b
Update src/quantum/README.rst
ricardo-espinoza Jan 18, 2021
172e848
Require location as a mandatory parameter in workspace specification …
ricardo-espinoza Jan 19, 2021
17b5ff2
Merge pull request #26 from Azure/master
ricardo-espinoza Jan 22, 2021
4b13bb6
Resetting the version history for the released version.
ricardo-espinoza Jan 25, 2021
f5ee1c0
Fix description of workspace clear command
ricardo-espinoza Jan 25, 2021
2113afa
Merge pull request #27 from anpaz/ricardoe/cr/2021-01-25
ricardo-espinoza Jan 25, 2021
0be66ff
Updatig Readme file to RST format.
ricardo-espinoza Jan 25, 2021
ddc6450
Update Readme file per pull request comments.
ricardo-espinoza Jan 25, 2021
efcd2dd
Fixing az quantum run and execute commands to include location parameter
ricardo-espinoza Jan 25, 2021
a8b84d5
Merge pull request #28 from anpaz/ricardoe/bugfix/24509
ricardo-espinoza Jan 25, 2021
5ae53c4
Performing role assignment on storage account on workspace creation. …
ricardo-espinoza Jan 27, 2021
b4879b5
Add warning message about providers during workspace creation (#30)
ricardo-espinoza Jan 27, 2021
407a80c
Enable command az quantum workspace quotas (#31)
ricardo-espinoza Jan 28, 2021
2b8da4d
Removing extra space in Readme.rst
ricardo-espinoza Jan 28, 2021
150e7e6
Fix punctuation in Readme.rst
ricardo-espinoza Jan 28, 2021
d0aaa9e
Update src/quantum/README.rst
ricardo-espinoza Jan 28, 2021
815a6f9
Update src/quantum/azext_quantum/_params.py
ricardo-espinoza Jan 28, 2021
ccadf4a
First round of code review feedback on Readme.rst
ricardo-espinoza Jan 28, 2021
eae418f
Improve code readability on job commands
ricardo-espinoza Jan 28, 2021
0b05b48
Avoid IndexError in case of malformed URL
ricardo-espinoza Jan 28, 2021
f596766
Extended info on targetId parameter
ricardo-espinoza Jan 28, 2021
b0bafff
Add help to each individual command
ricardo-espinoza Jan 28, 2021
8e83036
Reorganize sections in Readme.rst and merge in a single set of instru…
ricardo-espinoza Jan 28, 2021
e3775db
Merge pull request #32 from anpaz/ricardoe/cr/2021-01-28
ricardo-espinoza Jan 28, 2021
ffa92d6
Static analysis fixes
ricardo-espinoza Jan 29, 2021
42ee982
Fix CLI Linter errors
ricardo-espinoza Jan 29, 2021
2e47a48
Fix CLI Linter errors. Part 2
ricardo-espinoza Jan 29, 2021
dca48d8
Fix typo in show command.
ricardo-espinoza Jan 29, 2021
a34aa0f
Fix show command for Linter
ricardo-espinoza Jan 29, 2021
70e095c
Use standard name for show command method
ricardo-espinoza Jan 29, 2021
55cabc5
Modify workspace create test to skip role assignment
ricardo-espinoza Jan 29, 2021
fdfae06
Update tests with workspace names used currently.
ricardo-espinoza Jan 29, 2021
76c53fd
Update test recordings.
ricardo-espinoza Jan 29, 2021
b6da8f1
Set subscription for the recordings.
ricardo-espinoza Jan 29, 2021
91e7224
Update test recordings.
ricardo-espinoza Jan 29, 2021
350d952
Update QDK version number
ricardo-espinoza Jan 29, 2021
931a28c
Remove asserts and checks for subscription
ricardo-espinoza Jan 29, 2021
dd71ef3
Experiment: Remove check for preview subscription
ricardo-espinoza Jan 29, 2021
090c3fe
Refresh recordings with current test values.
ricardo-espinoza Jan 29, 2021
cd42ead
Update recordings after typo fix.
ricardo-espinoza Jan 29, 2021
46a61c2
Remove commented out API that references subscription
ricardo-espinoza Jan 29, 2021
847fd48
Enable QuantumJobsScenarioTest.test_submit_args only on live mode
ricardo-espinoza Jan 29, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@

/src/account/ @zikalino

/src/azext_quantum/ @anpaz-msft
anpaz marked this conversation as resolved.
Show resolved Hide resolved

/src/datashare/ @fengzhou-msft

/src/k8sconfiguration/ @NarayanThiru
Expand Down
9 changes: 9 additions & 0 deletions src/quantum/HISTORY.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.. :changelog:

Release History
===============

0.11.2906.2
ricardo-espinoza marked this conversation as resolved.
Show resolved Hide resolved
++++++
* Initial release. Version intended to work with Azure Quantum Private Preview
and with QDK version 0.11.2906.*
14 changes: 14 additions & 0 deletions src/quantum/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Microsoft Azure CLI 'quantum' Extension
anpaz marked this conversation as resolved.
Show resolved Hide resolved
==========================================

Azure Quantum is the first open Quantum computing platform. It offers a range of services
from quantum hardware to full-state simulators and quantum inspired optimizations,
providing developers and customers access to the most competitive quantum offering
on the market.

To learn more about azure quantum visit:
ricardo-espinoza marked this conversation as resolved.
Show resolved Hide resolved
https://azure.microsoft.com/en-us/services/quantum/

To learn more about quantum computing and Microsoft's Quantum Development Kit visit:
ricardo-espinoza marked this conversation as resolved.
Show resolved Hide resolved
https://docs.microsoft.com/quantum/

26 changes: 26 additions & 0 deletions src/quantum/azext_quantum/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

from azure.cli.core import AzCommandsLoader

import azext_quantum._help # pylint: disable=unused-import


class QuantumCommandsLoader(AzCommandsLoader):

def __init__(self, cli_ctx=None):
super(QuantumCommandsLoader, self).__init__(cli_ctx=cli_ctx)

def load_command_table(self, args):
from azext_quantum.commands import load_command_table
load_command_table(self, args)
return self.command_table

def load_arguments(self, command):
from azext_quantum._params import load_arguments
load_arguments(self, command)


COMMAND_LOADER_CLS = QuantumCommandsLoader
51 changes: 51 additions & 0 deletions src/quantum/azext_quantum/_client_factory.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

# pylint: disable=line-too-long

import os


def is_env(name):
return 'AZURE_QUANTUM_ENV' in os.environ and os.environ['AZURE_QUANTUM_ENV'] == name


def base_url():
if 'AZURE_QUANTUM_BASEURL' in os.environ:
return os.environ['AZURE_QUANTUM_BASEURL']
if is_env('canary'):
return "https://app-jobs-canarysouthcentralus.azurewebsites.net/"
return "https://app-jobscheduler-prod.azurewebsites.net/"
anpaz marked this conversation as resolved.
Show resolved Hide resolved


def _get_data_credentials(cli_ctx, subscription_id=None):
from azure.cli.core._profile import Profile
profile = Profile(cli_ctx=cli_ctx)
creds, _, _ = profile.get_login_credentials(subscription_id=subscription_id, resource="https://quantum.microsoft.com")
anpaz marked this conversation as resolved.
Show resolved Hide resolved
return creds


def cf_quantum(cli_ctx, subscription_id=None, resource_group_name=None, workspace_name=None):
from .vendored_sdks.azure_quantum import QuantumClient
creds = _get_data_credentials(cli_ctx, subscription_id)
return QuantumClient(creds, subscription_id, resource_group_name, workspace_name, base_url=base_url())


def cf_quantum_mgmt(cli_ctx, *_):
from azure.cli.core.commands.client_factory import get_mgmt_service_client
from .vendored_sdks.azure_mgmt_quantum import QuantumManagementClient
return get_mgmt_service_client(cli_ctx, QuantumManagementClient)


def cf_workspaces(cli_ctx, *_):
return cf_quantum_mgmt(cli_ctx).workspaces


def cf_providers(cli_ctx, subscription_id=None, resource_group_name=None, workspace_name=None):
return cf_quantum(cli_ctx, subscription_id, resource_group_name, workspace_name).providers


def cf_jobs(cli_ctx, subscription_id=None, resource_group_name=None, workspace_name=None):
return cf_quantum(cli_ctx, subscription_id, resource_group_name, workspace_name).jobs
27 changes: 27 additions & 0 deletions src/quantum/azext_quantum/_help.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# coding=utf-8
ricardo-espinoza marked this conversation as resolved.
Show resolved Hide resolved
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

from knack.help_files import helps # pylint: disable=unused-import

helps['quantum'] = """
type: group
short-summary: Manage Azure Quantum Workspaces and submit jobs to Azure Quantum Providers.
anpaz marked this conversation as resolved.
Show resolved Hide resolved
"""

helps['quantum job'] = """
type: group
short-summary: Manage jobs for Azure Quantum.
"""

helps['quantum target'] = """
type: group
short-summary: Manage execution targets for Azure Quantum workspaces.
"""

helps['quantum workspace'] = """
type: group
short-summary: Manage Azure Quantum workspaces.
"""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In Azure CLI's convention, we create help entry for each command group and command. We put examples in command's help. For example,

helps['quantum workspace create']

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thanks for the suggestion.

45 changes: 45 additions & 0 deletions src/quantum/azext_quantum/_params.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
# pylint: disable=line-too-long

from knack.arguments import CLIArgumentType


def load_arguments(self, _):
workspace_name_type = CLIArgumentType(options_list=['--workspace-name', '-w'], help='Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.', id_part=None, required=False)
program_args = CLIArgumentType(nargs='*', help='List of arguments expected by the Q# operation specified as --name=value after `--`.')
anpaz marked this conversation as resolved.
Show resolved Hide resolved
target_id = CLIArgumentType(options_list=['--target-id', '-t'], help='Target id.')
project = CLIArgumentType(help='The location of the Q# project to submit. Defaults to current folder.')
job_name = CLIArgumentType(help='A friendly name to give to this execution of the program.')
shots = CLIArgumentType(help='The number of times to execute the Q# program on the given target.')
no_build = CLIArgumentType(help='If specified, the Q# program is not built before submitting.')

with self.argument_context('quantum workspace') as c:
c.argument('workspace_name', workspace_name_type)

with self.argument_context('quantum target') as c:
c.argument('workspace_name', workspace_name_type)
c.argument('target_id', options_list=['--target-id', '-t'], help='Target id.')

with self.argument_context('quantum job') as c:
c.argument('workspace_name', workspace_name_type)
c.argument('job_id', options_list=['--job-id', '-id'], help='Job id.')
c.argument('target_id', target_id)
c.argument('project', project)
c.argument('job_name', job_name)
c.argument('shots', shots)
c.argument('no_build', no_build)

with self.argument_context('quantum job submit') as c:
c.positional('program_args', program_args)

with self.argument_context('quantum execute') as c:
c.argument('workspace_name', workspace_name_type)
c.argument('target_id', target_id)
c.argument('project', project)
c.argument('job_name', job_name)
c.argument('shots', shots)
c.argument('no_build', no_build)
c.positional('program_args', program_args)
51 changes: 51 additions & 0 deletions src/quantum/azext_quantum/_validators.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

# pylint: disable=line-too-long

import os

from .operations.workspace import WorkspaceInfo
from .operations.target import TargetInfo


def validate_workspace_info(cmd, namespace):
"""
Makes sure all parameters for a workspace are available.
"""
group = getattr(namespace, 'resource_group_name', None)
name = getattr(namespace, 'workspace_name', None)
ws = WorkspaceInfo(cmd, group, name)

if not ws.subscription:
anpaz marked this conversation as resolved.
Show resolved Hide resolved
raise ValueError("Missing subscription argument")
ricardo-espinoza marked this conversation as resolved.
Show resolved Hide resolved
if not ws.resource_group:
raise ValueError("Missing resource-group argument")
if not ws.name:
raise ValueError("Missing workspace-name argument")


def validate_target_info(cmd, namespace):
"""
Makes sure all parameters for a target are available.
"""
target_id = getattr(namespace, 'target_id', None)
target = TargetInfo(cmd, target_id)

if not target.target_id:
anpaz marked this conversation as resolved.
Show resolved Hide resolved
raise ValueError("Missing target-id argument")


def validate_workspace_and_target_info(cmd, namespace):
"""
Makes sure all parameters for both, a workspace and a target are available.
"""
validate_workspace_info(cmd, namespace)
validate_target_info(cmd, namespace)

# For the time being (Private Preview), we also need the AZURE_QUANTUM_STORAGE env variable populated
# with the Azure Storage connection string to use to upload the program.
if 'AZURE_QUANTUM_STORAGE' not in os.environ:
anpaz marked this conversation as resolved.
Show resolved Hide resolved
raise ValueError(f"Please set the AZURE_QUANTUM_STORAGE environment variable with an Azure Storage's connection string.")
4 changes: 4 additions & 0 deletions src/quantum/azext_quantum/azext_metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"azext.isPreview": true,
"azext.minCliCoreVersion": "2.5.1"
}
103 changes: 103 additions & 0 deletions src/quantum/azext_quantum/commands.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

# pylint: disable=line-too-long

from collections import OrderedDict
from azure.cli.core.commands import CliCommandType
from ._validators import validate_workspace_info, validate_target_info, validate_workspace_and_target_info


def transform_targets(providers):
def one(provider, target):
return OrderedDict([
('Provider', provider),
('Target-id', target['id']),
('Current Availability', target['currentAvailability']),
('Average Queue Time', target['averageQueueTime'])
])

return [
one(provider['id'], target)
for provider in providers
for target in provider['targets']
]


def transform_job(result):
result = OrderedDict([
('Id', result['id']),
('Status', result['status']),
('Target', result['target']),
('Submission time', result['creationTime']),
('Completion time', result['endExecutionTime'])
])
return result


def transform_jobs(results):
def creation(job):
return job['creationTime']

return [transform_job(job) for job in sorted(results, key=creation, reverse=True)]


def transform_output(results):
def one(key, value):
repeat = round(20 * value)
barra = "\u2588" * repeat
anpaz marked this conversation as resolved.
Show resolved Hide resolved
return OrderedDict([
('Result', key),
('Frequency', f"{value:10.8f}"),
('', f"\u2590{barra:<22} |"),
])

if 'Histogram' in results:
histogram = results['Histogram']
# The Histogram serialization is odd entries are key and even entries values
# Make sure we have even entries
if (len(histogram) % 2) == 0:
table = []
items = range(0, len(histogram), 2)
for i in items:
key = histogram[i]
value = histogram[i + 1]
table.append(one(key, value))
return table

elif 'histogram' in results:
histogram = results['histogram']
return [one(key, histogram[key]) for key in histogram]

return results


def load_command_table(self, _):

workspace_ops = CliCommandType(operations_tmpl='azext_quantum.operations.workspace#{}')
job_ops = CliCommandType(operations_tmpl='azext_quantum.operations.job#{}')
target_ops = CliCommandType(operations_tmpl='azext_quantum.operations.target#{}')

with self.command_group('quantum workspace', workspace_ops) as w:
w.command('list', 'list')
w.command('show', 'show', validator=validate_workspace_info)
w.command('set', 'set', validator=validate_workspace_info)
w.command('clear', 'clear')

with self.command_group('quantum target', target_ops) as w:
anpaz marked this conversation as resolved.
Show resolved Hide resolved
w.command('list', 'list', validator=validate_workspace_info, table_transformer=transform_targets)
w.command('show', 'show', validator=validate_target_info)
w.command('set', 'set', validator=validate_target_info)
w.command('clear', 'clear')

with self.command_group('quantum job', job_ops) as j:
j.command('list', 'list', validator=validate_workspace_info, table_transformer=transform_jobs)
j.command('show', 'show', validator=validate_workspace_info, table_transformer=transform_job)
j.command('submit', 'submit', validator=validate_workspace_and_target_info, table_transformer=transform_job)
j.command('wait', 'wait', validator=validate_workspace_info, table_transformer=transform_job)
j.command('output', 'output', validator=validate_workspace_info, table_transformer=transform_output)

with self.command_group('quantum', job_ops, is_preview=True) as q:
q.command('execute', 'execute', validator=validate_workspace_and_target_info, table_transformer=transform_output)
4 changes: 4 additions & 0 deletions src/quantum/azext_quantum/operations/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
Loading