Quantum: Add 'az quantum suite-offer quotas' command

src/quantum/HISTORY.rst

@@ -3,6 +3,18 @@
 Release History
 ===============
 
+1.0.0b27
+++++++++++++++
+* Added the ``az quantum suite-offer target list`` command to list the targets, availability, and overall, Standard, and High average queue times available through a suite offer, without requiring a workspace.
+* Removed the redundant provider column from the ``az quantum suite-offer target list`` table output.
+* Updated ``az quantum suite-offer quotas`` to return ``0`` for missing Standard and High usage values.
+* Updated the ``az quantum workspace quotas`` command to include v2 target quota allocations and usages while preserving the existing response format for v1 providers.
+* Added always-on validation for V2 workspace target quota allocations on create and update, allowing requested Standard and High values between current workspace usage and suite target allocation, inclusive.
+
+1.0.0b26
+++++++++++++++
+* Added the ``az quantum suite-offer quotas`` command to view quota allocations merged with their consumed usages for a suite offer in the subscription.
+
 1.0.0b25
 ++++++++++++++
 * Added the ``az quantum suite-offer list`` command to list the suite offers available to the subscription, including provider, location, and subscription-level quota allocations.

src/quantum/azext_quantum/_client_factory.py

@@ -28,6 +28,15 @@ def base_url(location):
     return f"https://{normalized_location}.quantum.azure.com/"
 
 
+def base_url_v2(location):
+    if 'AZURE_QUANTUM_BASEURL_V2' in os.environ:
+        return os.environ['AZURE_QUANTUM_BASEURL_V2']
+    normalized_location = normalize_location(location)
+    if is_env('dogfood'):
+        return f"https://{normalized_location}-v2.quantum-test.azure.com/"
+    return f"https://{normalized_location}-v2.quantum.azure.com/"
+
+
 def _get_data_credentials(cli_ctx, subscription_id=None):
     from azure.cli.core._profile import Profile
     profile = Profile(cli_ctx=cli_ctx)
@@ -85,6 +94,11 @@ def cf_quotas(cli_ctx, subscription: str, resource_group: str, ws_name: str, end
     return cf_quantum(cli_ctx, subscription, resource_group, ws_name, endpoint).services.quotas
 
 
+def cf_suite_offers_data_plane(cli_ctx, subscription: str, location: str):
+    endpoint = base_url_v2(location)
+    return cf_quantum(cli_ctx, subscription, None, None, endpoint).services.suite_offers
+
+
 # Helper clients
 
 def cf_vm_image_term(cli_ctx):

src/quantum/azext_quantum/_help.py

@@ -223,7 +223,7 @@
 
 helps['quantum suite-offer list'] = """
     type: command
-    short-summary: List the Azure Quantum suite offers available to the current subscription, including provider, location, and subscription-level quota allocations.
+    short-summary: List the Azure Quantum suite offers available to the current subscription, including provider ID, name, company, and location.
     examples:
       - name: List all suite offers available to the current subscription.
         text: |-
@@ -233,6 +233,44 @@
             az quantum suite-offer list --query "[].{provider:properties.providerId, location:properties.location}" -o table
 """
 
+helps['quantum suite-offer quotas'] = """
+    type: command
+    short-summary: View quota allocations and their consumed usages for a suite offer in the current subscription.
+    long-summary: |
+        Returns the v2 quota allocations (limits) for each target of the suite offer together
+        with the consumed usages. Each entry reports the allocated and used standard and high priority
+        minutes. Missing usage values are returned as 0.
+    examples:
+      - name: View the quota usages for a suite offer.
+        text: |-
+            az quantum suite-offer quotas --provider-id MyProvider -o table
+      - name: View the raw quota usage details for a suite offer.
+        text: |-
+            az quantum suite-offer quotas -p MyProvider
+"""
+
+helps['quantum suite-offer target'] = """
+    type: group
+    short-summary: List targets available through an Azure Quantum suite offer.
+"""
+
+helps['quantum suite-offer target list'] = """
+    type: command
+    short-summary: List the targets and their status available through a suite offer, without requiring a workspace.
+    long-summary: |
+        Returns each target exposed by the suite offer together with its current
+        availability and overall average queue time. Standard- and High-priority average queue times
+        are also returned when supplied by the provider. Data is resolved directly from the data plane
+        without requiring an Azure Quantum workspace.
+    examples:
+      - name: List the targets available in a suite offer.
+        text: |-
+            az quantum suite-offer target list --provider-id MyProvider -o table
+      - name: List the raw target status details for a suite offer.
+        text: |-
+            az quantum suite-offer target list -p MyProvider
+"""
+
 helps['quantum offerings'] = """
     type: group
     short-summary: Manage provider offerings for Azure Quantum.
@@ -326,6 +364,9 @@
 helps['quantum workspace create'] = """
     type: command
     short-summary: Create a new Azure Quantum workspace.
+    long-summary: >-
+        Target quota values are absolute. For V2 workspaces, each requested Standard and High allocation is validated
+        against the provider's suite target allocation before the workspace is created.
     examples:
       - name: Create a new Azure Quantum workspace with the providers that offer free credit.
         text: |-
@@ -369,11 +410,15 @@
 
 helps['quantum workspace quotas'] = """
     type: command
-    short-summary: List the quotas for the given (or current) Azure Quantum workspace.
+    short-summary: List quota allocations and consumed usages for an Azure Quantum workspace.
+    long-summary: |
+        Preserves the existing quota dimension response for v1 providers. For v2 providers, returns
+        separate StandardMinutesLifetime and HighMinutesLifetime rows for each target, with targetId,
+        limit, and utilization reported in minutes. Missing allocation or usage values are returned as 0.
     examples:
-      - name: List the quota information of a specified Azure Quantum workspace. If a default workspace has been set, the -g and -w parameters are not required.
+      - name: View quota allocations and usages for the given (or current) workspace. If a default workspace has been set, the -g and -w parameters are not required.
         text: |-
-            az quantum workspace quotas -g MyResourceGroup -w MyWorkspace
+            az quantum workspace quotas -g MyResourceGroup -w MyWorkspace -o table
 """
 
 helps['quantum workspace set'] = """
@@ -400,6 +445,10 @@
 helps['quantum workspace update'] = """
     type: command
     short-summary: Update the given (or current) Azure Quantum workspace.
+    long-summary: >-
+        Target quota values are absolute. Each requested Standard and High allocation is validated against the current
+        workspace target usage and provider's suite target allocation, with equality allowed at both boundaries.
+        Priority values omitted from an existing target allocation are preserved and validated.
     examples:
       - name: Enable a provided Azure Quantum workspace api keys.
         text: |-

src/quantum/azext_quantum/_params.py

@@ -184,7 +184,7 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals
     entry_point_type = CLIArgumentType(help='The entry point for the QIR program or circuit. Required for some provider QIR jobs.')
     skip_autoadd_type = CLIArgumentType(help='If specified, the plans that offer free credits will not automatically be added.')
     workspace_kind_type = CLIArgumentType(options_list=['--workspace-kind'], help='The kind of the workspace to create.', choices=['V1', 'V2'])
-    quota_type = CLIArgumentType(options_list=['--quota'], help='Target quota allocation as provider-id, target-id, standard-minutes-lifetime, and optional high-minutes-lifetime key=value pairs, a JSON object or array, or `@{file}` with JSON content. standard-minutes-lifetime is required for a new allocation. camelCase keys (providerId, targetId, ...) are also accepted. Repeat --quota once per target.', action=QuotaAction, nargs='+')
+    quota_type = CLIArgumentType(options_list=['--quota'], help='Target quota allocation for a V2 workspace as provider-id, target-id, standard-minutes-lifetime, and optional high-minutes-lifetime key=value pairs, a JSON object or array, or `@{file}` with JSON content. Use --workspace-kind V2 when creating a workspace. Values are absolute and cannot exceed the suite target allocation or, when updating, be below current workspace usage. standard-minutes-lifetime is required for a new allocation. camelCase keys (providerId, targetId, ...) are also accepted. Repeat --quota once per target.', action=QuotaAction, nargs='+')
     key_type = CLIArgumentType(options_list=['--key-type'], help='The api keys to be regenerated, should be Primary and/or Secondary.')
     enable_key_type = CLIArgumentType(options_list=['--enable-api-key'], help='Enable or disable API key authentication.')
     job_type_type = CLIArgumentType(options_list=['--job-type'], help='Job type to be listed, example "QuantumComputing".')
@@ -316,3 +316,9 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals
         c.argument('workspace_name', workspace_name_type)
         c.argument('enable_key', enable_key_type)
         c.argument('quota', quota_type)
+
+    with self.argument_context('quantum suite-offer quotas') as c:
+        c.argument('provider_id', provider_id_type, required=True)
+
+    with self.argument_context('quantum suite-offer target list') as c:
+        c.argument('provider_id', provider_id_type, required=True)

src/quantum/azext_quantum/commands.py

@@ -30,6 +30,20 @@ def one(provider, target):
     ]
 
 
+def transform_suite_offer_targets(providers):
+    return [
+        OrderedDict([
+            ('Target-id', target['id']),
+            ('Current Availability', target['currentAvailability']),
+            ('Average Queue Time (seconds)', target['averageQueueTime']),
+            ('Average Standard Queue Time (seconds)', target.get('averageQueueTimeStandardPriority')),
+            ('Average High Queue Time (seconds)', target.get('averageQueueTimeHighPriority'))
+        ])
+        for provider in providers
+        for target in provider['targets']
+    ]
+
+
 def transform_job(result):
     transformed_result = OrderedDict([
         ('Name', result['name']),
@@ -103,6 +117,55 @@ def one(offer):
     return [one(offer) for offer in suite_offers]
 
 
+def _quota_hours(minutes):
+    """Convert lifetime quota minutes to hours (2 dp)."""
+    hours = 0 if minutes is None else minutes / 60
+    return f"{hours:.2f}"
+
+
+def transform_suite_offer_quotas(quotas):
+    def one(quota):
+        allocation = quota.get('allocation') or {}
+        usage = quota.get('usage') or {}
+
+        def cell(source, key):
+            return _quota_hours(source.get(key))
+
+        return OrderedDict([
+            ('Target', quota.get('targetId', '')),
+            ('Std Allocated (hrs)', cell(allocation, 'standardMinutesLifetime')),
+            ('Std Used (hrs)', cell(usage, 'standardMinutesLifetime')),
+            ('High Allocated (hrs)', cell(allocation, 'highMinutesLifetime')),
+            ('High Used (hrs)', cell(usage, 'highMinutesLifetime'))
+        ])
+
+    return [one(quota) for quota in quotas]
+
+
+def transform_workspace_quotas(quotas):
+    def one(quota):
+        is_target_quota = quota.get('targetId') is not None
+
+        def value(key):
+            result = quota.get(key, 0)
+            if is_target_quota and isinstance(result, float):
+                return round(result, 2)
+            return result
+
+        return OrderedDict([
+            ('Scope', quota.get('scope', '')),
+            ('Provider ID', quota.get('providerId', '')),
+            ('Target', quota.get('targetId', '')),
+            ('Dimension', quota.get('dimension', '')),
+            ('Limit', value('limit')),
+            ('Utilization', value('utilization')),
+            ('Holds', value('holds')),
+            ('Period', quota.get('period', '')),
+        ])
+
+    return [one(quota) for quota in quotas]
+
+
 def transform_output(results):
     def one(key, value):
         repeat = round(20 * value)
@@ -167,7 +230,7 @@ def load_command_table(self, _):
         w.show_command('show', validator=validate_workspace_info)
         w.command('set', 'set', validator=validate_workspace_info)
         w.command('clear', 'clear')
-        w.command('quotas', 'quotas', validator=validate_workspace_info)
+        w.command('quotas', 'quotas', validator=validate_workspace_info, table_transformer=transform_workspace_quotas)
         w.command('keys list', 'list_keys')
         w.command('keys regenerate', 'regenerate_keys')
         w.command('update', 'update')
@@ -206,3 +269,7 @@ def load_command_table(self, _):
 
     with self.command_group('quantum suite-offer', suite_offers_ops) as s:
         s.command('list', 'list_suite_offers', table_transformer=transform_suite_offers)
+        s.command('quotas', 'suite_offer_quotas', table_transformer=transform_suite_offer_quotas)
+
+    with self.command_group('quantum suite-offer target', suite_offers_ops) as st:
+        st.command('list', 'suite_offer_targets', table_transformer=transform_suite_offer_targets)

src/quantum/azext_quantum/operations/suite_offers.py

@@ -5,7 +5,21 @@
 
 # pylint: disable=line-too-long
 
-from .._client_factory import cf_suite_offers
+from collections import OrderedDict
+
+from azure.cli.core.azclierror import InvalidArgumentValueError, ResourceNotFoundError
+from azure.cli.core.commands.client_factory import get_subscription_id
+from azure.core.exceptions import ResourceNotFoundError as AzureResourceNotFoundError
+
+from .._client_factory import cf_suite_offers, cf_suite_offers_data_plane
+
+# Scope used for target quota rows returned by this command.
+_SUITE_OFFER_QUOTA_SCOPE = "SubscriptionTarget"
+
+
+def _quota_usage_value(usage, field):
+    value = usage.get(field) if usage is not None else None
+    return value if value is not None else 0
 
 
 def list_suite_offers(cmd):
@@ -14,3 +28,112 @@ def list_suite_offers(cmd):
     """
     client = cf_suite_offers(cmd.cli_ctx)
     return client.list_by_subscription()
+
+
+def suite_offer_quotas(cmd, provider_id):
+    """
+    Return the v2 quota allocations, merged with their consumed usages, for a suite offer
+    in the current subscription.
+    """
+    subscription_id = get_subscription_id(cmd.cli_ctx)
+
+    # 1. Control-plane: locate the suite offer for the requested provider.
+    offers = cf_suite_offers(cmd.cli_ctx).list_by_subscription()
+    offer = next(
+        (o for o in offers
+         if o.properties is not None
+         and o.properties.provider_id is not None
+         and o.properties.provider_id.lower() == provider_id.lower()),
+        None,
+    )
+    if offer is None:
+        raise InvalidArgumentValueError(
+            f"No suite offer was found for provider '{provider_id}' in subscription '{subscription_id}'."
+        )
+
+    # 2. Data-plane (v2): fetch the consumed quota usages for that provider.
+    client = cf_suite_offers_data_plane(cmd.cli_ctx, subscription_id, offer.properties.location)
+    try:
+        usages = client.list_quota_usages(subscription_id, provider_id)
+    except AzureResourceNotFoundError as ex:
+        raise ResourceNotFoundError(
+            f"No quota usages were found for provider '{provider_id}'."
+        ) from ex
+
+    # 3. Merge allocations (limits) with usages (consumed).
+    return _merge_suite_offer_quotas(offer, usages, provider_id)
+
+
+def suite_offer_targets(cmd, provider_id):
+    """
+    List the targets and their status available through a suite offer,
+    without requiring an Azure Quantum workspace.
+    """
+    subscription_id = get_subscription_id(cmd.cli_ctx)
+
+    # 1. Control-plane: locate the suite offer to resolve its region.
+    offers = cf_suite_offers(cmd.cli_ctx).list_by_subscription()
+    offer = next(
+        (o for o in offers
+         if o.properties is not None
+         and o.properties.provider_id is not None
+         and o.properties.provider_id.lower() == provider_id.lower()),
+        None,
+    )
+    if offer is None:
+        raise InvalidArgumentValueError(
+            f"No suite offer was found for provider '{provider_id}' in subscription '{subscription_id}'."
+        )
+
+    # 2. Data-plane (v2): fetch the provider and target status.
+    client = cf_suite_offers_data_plane(cmd.cli_ctx, subscription_id, offer.properties.location)
+    try:
+        status = client.get_provider_status(subscription_id, provider_id)
+    except AzureResourceNotFoundError as ex:
+        raise ResourceNotFoundError(
+            f"No target status was found for provider '{provider_id}'."
+        ) from ex
+
+    # The endpoint returns a single provider; wrap it so the table transformer shared with
+    # 'az quantum target list' can iterate provider rows.
+    return [status]
+
+
+def _minutes(standard, high):
+    """Build a {standardMinutesLifetime, highMinutesLifetime} block."""
+    return OrderedDict([
+        ("standardMinutesLifetime", standard),
+        ("highMinutesLifetime", high),
+    ])
+
+
+def _merge_suite_offer_quotas(offer, usages, provider_id):
+    """
+    Build one row per target quota allocation, attaching its matching data-plane usage.
+    Suite offer quotas are reported at the SubscriptionTarget scope only.
+    """
+    # Data-plane usages keyed by target id.
+    usage_by_target = {
+        usage.target_id: usage for usage in (usages or []) if usage.target_id is not None
+    }
+
+    rows = []
+    for target_quota in offer.properties.target_quotas or []:
+        usage = usage_by_target.get(target_quota.target_id)
+        usage_values = usage.usage if usage is not None else None
+
+        row = OrderedDict()
+        row["providerId"] = provider_id
+        row["scope"] = _SUITE_OFFER_QUOTA_SCOPE
+        row["targetId"] = target_quota.target_id
+        row["allocation"] = _minutes(
+            target_quota.standard_minutes_lifetime,
+            target_quota.high_minutes_lifetime,
+        )
+        row["usage"] = _minutes(
+            _quota_usage_value(usage_values, "standardMinutesLifetime"),
+            _quota_usage_value(usage_values, "highMinutesLifetime"),
+        )
+        rows.append(row)
+
+    return rows