fix: E2E tests regression

Author: kikomiss

azure-quantum/azure/quantum/cirq/targets/quantinuum.py

@@ -2,6 +2,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 ##
+import json
 import numpy as np
 
 from typing import TYPE_CHECKING, Any, Dict, Sequence
@@ -97,7 +98,7 @@ def submit(
         metadata = {
             "qubits": len(program.all_qubits()),
             "repetitions": repetitions,
-            "measurement_dict": self._measurement_dict(program)
+            "measurement_dict": json.dumps(self._measurement_dict(program))
         }
         # Override metadata with value from kwargs
         metadata.update(kwargs.get("metadata", {}))

azure-quantum/azure/quantum/qiskit/backends/ionq.py

@@ -27,6 +27,8 @@
 if TYPE_CHECKING:
     from azure.quantum.qiskit import AzureQuantumProvider
 
+import json
+
 import logging
 
 logger = logging.getLogger(__name__)
@@ -244,7 +246,7 @@ def _prepare_job_metadata(self, circuit, **kwargs):
         _, _, meas_map = qiskit_circ_to_ionq_circ(circuit, gateset=self.gateset())
 
         metadata = super()._prepare_job_metadata(circuit, **kwargs)
-        metadata["meas_map"] = meas_map
+        metadata["meas_map"] = json.dumps(meas_map)
 
         return metadata
 

azure-quantum/tests/unit/common.py

@@ -318,14 +318,14 @@ def create_echo_target(
         **kwargs
     ) -> Target:
         """
-        Create a `Microsoft.Test.echo-target` Target for simple job submission tests.
+        Create a `Microsoft.Test.FirstParty.echo-target` Target for simple job submission tests.
         Uses the Workspace returned from `create_workspace()` method. 
         """
         workspace = self.create_workspace(credential=credential, **kwargs)
         target = Target(
             workspace=workspace,
             name="echo-output",
-            provider_id="Microsoft.Test",
+            provider_id="Microsoft.Test.FirstParty",
             input_data_format = "microsoft.quantum-log.v1",
             output_data_format = "microsoft.quantum-log.v1"
         )

azure-quantum/tests/unit/test_microsoft_elements_dft.py

@@ -16,14 +16,8 @@ class TestMicrosoftElementsDftJob(QuantumTestBase):
     @pytest.mark.microsoft_elements_dft
     def test_dft_success(self):
         dft_input_params = {
-            "tasks": [
-                {
-                    "taskType": "spe",
-                    "basisSet": { "name": "def2-svp", "cartesian": False },
-                    "xcFunctional": { "name": "m06-2x", "gridLevel": 4 },
-                    "scf": { "method": "rks", "maxSteps": 100, "convergeThreshold": 1e-8 }
-                }
-            ]
+            "driver": "energy",
+            "model": {"method": "m06-2x", "basis": "def2-svp"},
         }
 
         job = self._run_job(dft_input_params)
@@ -37,14 +31,8 @@ def test_dft_success(self):
     @pytest.mark.microsoft_elements_dft
     def test_dft_failure_invalid_input(self):
         dft_input_params = {
-            "tasks": [
-                {
-                    "taskType": "invlidTask",
-                    "basisSet": { "name": "def2-svp", "cartesian": False },
-                    "xcFunctional": { "name": "m06-2x", "gridLevel": 4 },
-                    "scf": { "method": "rks", "maxSteps": 100, "convergeThreshold": 1e-8 }
-                }
-            ]
+            "driver": "energy",
+            "model": {"method": "m06-2x", "basis": "invalidBasis"},
         }
 
         job = self._run_job(dft_input_params)
@@ -58,14 +46,8 @@ def test_dft_failure_invalid_input(self):
     @pytest.mark.microsoft_elements_dft
     def test_dft_failure_algorithm_produces_output(self):
         dft_input_params = {
-            "tasks": [
-                {
-                    "taskType": "spe",
-                    "basisSet": { "name": "def2-svp", "cartesian": False },
-                    "xcFunctional": { "name": "m06-2x", "gridLevel": 4 },
-                    "scf": { "method": "rks", "maxSteps": 1, "convergeThreshold": 1e-8 }
-                }
-            ]
+            "driver": "energy",
+            "model": {"method": "m06-2x", "basis": "invalidBasis"},
         }
 
         job = self._run_job(dft_input_params)
@@ -82,12 +64,11 @@ def _run_job(self, input_params) -> Job:
         target = workspace.get_targets("microsoft.dft")
         dir_path = os.path.dirname(os.path.realpath(__file__))
 
-        with open(f"{dir_path}/molecule.xyz", "r") as file:
-            job = target.submit(input_data=file.read(), input_params=input_params)
-            job.wait_until_completed(timeout_secs=DEFAULT_TIMEOUT_SECS)
-            job.refresh()
+        job = target.submit(input_data=[f"{dir_path}/molecule.xyz"], input_params=input_params)
+        job.wait_until_completed(timeout_secs=DEFAULT_TIMEOUT_SECS)
+        job.refresh()
 
-            return job
+        return job
 
 test_xyz_file = Path(__file__).parent / "molecule.xyz"