chore: updated tests for additional job parameters

Author: vanyae-cqc

integration/test_gpu_decoder_config.py

@@ -85,9 +85,9 @@ def test_gpu_decoder_config_flow(
             programs=[qir_program_ref],
             name=f"qir gpu decoder config execute job for {test_case_name}",
             n_shots=[100],
+            max_cost=[10.0],
             backend_config=qnx.QuantinuumConfig(
                 device_name="H1-1E",
-                max_cost=10,
             ),
             gpu_decoder_config=gpu_decoder_config_ref,
             project=proj_ref,

integration/test_qir.py

@@ -197,8 +197,9 @@ def test_execution_on_NG_devices(
         job_ref = qnx.start_execute_job(
             programs=[qir_ref],
             n_shots=[10],
+            max_cost=[10.0],
             backend_config=qnx.QuantinuumConfig(
-                device_name="Helios-1E", max_cost=10, compiler_options={"max-qubits": 5}
+                device_name="Helios-1E", compiler_options={"max-qubits": 5}
             ),
             project=project_ref,
             name=f"qir job for {test_case_name}",

integration/test_qsys_jobs.py

@@ -25,12 +25,10 @@
 @pytest.mark.parametrize(
     "backend_config",
     [
-        SeleneConfig(
-            n_qubits=5,
-        ),
+        SeleneConfig(),
         HeliosConfig(
             system_name="Helios-1E-lite",
-            emulator_config=HeliosEmulatorConfig(n_qubits=5),
+            emulator_config=HeliosEmulatorConfig(),
         ),
     ],
 )
@@ -58,6 +56,7 @@ def test_guppy_execution(
             backend_config=backend_config,
             project=project_ref,
             name=f"selene job for {test_case_name}",
+            n_qubits=[5],
         )
 
         qnx.jobs.wait_for(job_ref)

qnexus/client/hugr.py

@@ -4,8 +4,8 @@
 uploaded to Nexus before stability is achieved might not work in the future.
 """
 
-import warnings
 import base64
+import warnings
 from datetime import datetime
 from typing import Any, Literal, Union, cast
 from uuid import UUID

qnexus/client/jobs/__init__.py

@@ -60,7 +60,6 @@
     SystemRef,
     WasmModuleRef,
 )
-
 from qnexus.models.scope import ScopeFilterEnum
 from qnexus.models.utils import assert_never
 
@@ -613,6 +612,8 @@ def execute(
     credential_name: str | None = None,
     user_group: str | None = None,
     timeout: float | None = 300.0,
+    max_cost: float | list[float] | list[None] = list(),
+    n_qubits: int | list[int] | list[None] = list(),
 ) -> list[ExecutionResult]:
     """
     Utility method to run an execute job and return the results. Blocks until
@@ -635,6 +636,8 @@ def execute(
         language=language,
         credential_name=credential_name,
         user_group=user_group,
+        max_cost=max_cost,
+        n_qubits=n_qubits,
     )
 
     wait_for(job=execute_job_ref, timeout=timeout)

qnexus/client/jobs/_execute.py

@@ -58,7 +58,7 @@ def start_execute_job(
     wasm_module: WasmModuleRef | None = None,
     gpu_decoder_config: GpuDecoderConfigRef | None = None,
     user_group: str | None = None,
-    max_cost: float | list[float] | list[None] = list(), 
+    max_cost: float | list[float] | list[None] = list(),
     n_qubits: int | list[int] | list[None] = list(),
 ) -> ExecuteJobRef:
     """
@@ -88,6 +88,10 @@ def start_execute_job(
 
     if len(n_shots) != len(program_ids):
         raise ValueError("Number of programs must equal number of n_shots.")
+    if len(max_cost) != len(program_ids):
+        raise ValueError("Number of programs must equal number of max_cost.")
+    if len(n_qubits) != len(program_ids):
+        raise ValueError("Number of programs must equal number of n_qubits.")
 
     attributes_dict = CreateAnnotations(
         name=name,

qnexus/client/qir.py

@@ -1,7 +1,7 @@
 """Client API for QIR in Nexus."""
 
-import warnings
 import base64
+import warnings
 from datetime import datetime
 from typing import Any, Literal, Union, cast
 from uuid import UUID

tests/test_jobs.py

@@ -0,0 +1,54 @@
+"""Tests related to running jobs."""
+
+import uuid
+from datetime import datetime
+
+import pytest
+from quantinuum_schemas.models.backend_config import SeleneConfig
+
+import qnexus as qnx
+from qnexus.models.annotations import Annotations
+from qnexus.models.references import (
+    HUGRRef,
+    ProjectRef,
+)
+
+
+@pytest.mark.parametrize(
+    "n_shots, max_cost, n_qubits, error_param",
+    [
+        ([10], [10, 20], [5, 10], "n_shots"),
+        ([10, 20], [10], [5, 10], "max_cost"),
+        ([10, 20], [10, 20], [5], "n_qubits"),
+    ],
+)
+def test_job_parameterization(
+    n_shots: list[int],
+    max_cost: list[float],
+    n_qubits: list[int],
+    error_param: str,
+) -> None:
+    """Test that we can parameterize max_cost and n_qubits for a Hugr program submission."""
+
+    my_proj = ProjectRef(
+        id=uuid.uuid4(), annotations=Annotations(), contents_modified=datetime.now()
+    )
+
+    hugr_ref = HUGRRef(
+        id=uuid.uuid4(),
+        annotations=Annotations(),
+        project=my_proj,
+    )
+
+    with pytest.raises(
+        ValueError, match=f"Number of programs must equal number of {error_param}."
+    ):
+        qnx.start_execute_job(
+            programs=[hugr_ref, hugr_ref],
+            n_shots=n_shots,
+            backend_config=SeleneConfig(),
+            project=my_proj,
+            name="This job will never run",
+            max_cost=max_cost,
+            n_qubits=n_qubits,
+        )