feat(qio): fix dict update

Author: Sonderfall

qiskit_scaleway/backends/base_job.py

@@ -87,29 +87,25 @@ def submit(self, session_id: str) -> None:
             name=self.backend().name,
             version=self.backend().version,
             options=options,
-            frozenset=True,
         )
 
         client_data = ClientData(
             user_agent=USER_AGENT,
-            frozenset=True,
         )
 
-        computation_model_dict = QuantumComputationModel(
+        computation_model_json = QuantumComputationModel(
             programs=programs,
             backend=backend_data,
             client=client_data,
             noise_model=noise_model,
-            frozenset=True,
-        ).to_dict()
+        ).to_json_str()
 
-        computation_parameters_dict = QuantumComputationParameters(
+        computation_parameters_json = QuantumComputationParameters(
             shots=shots,
-            frozenset=True,
-        ).to_dict()
+        ).to_json_str()
 
         model = self._client.create_model(
-            payload=computation_model_dict,
+            payload=computation_model_json,
         )
 
         if not model:
@@ -119,7 +115,7 @@ def submit(self, session_id: str) -> None:
             name=self._name,
             session_id=session_id,
             model_id=model.id,
-            parameters=computation_parameters_dict,
+            parameters=computation_parameters_json,
         ).id
 
     def result(
@@ -133,12 +129,10 @@ def result(
         program_results = list(
             map(
                 lambda r: self._extract_payload_from_response(r).to_qiskit_result(
-                    **{
-                        "backend_name": self.backend().name,
-                        "backend_version": self.backend().version,
-                        "job_id": self._job_id,
-                        "qobj_id": ", ".join(x.name for x in self._circuits),
-                    }
+                    backend_name=self.backend().name,
+                    backend_version=self.backend().version,
+                    job_id=self._job_id,
+                    qobj_id=", ".join(x.name for x in self._circuits),
                 ),
                 job_results,
             )
@@ -164,7 +158,7 @@ def _extract_payload_from_response(
             else:
                 raise RuntimeError("Got result with empty data and url fields")
 
-        return QuantumProgramResult.from_json(result)
+        return QuantumProgramResult.from_json_str(result)
 
     def _wait_for_result(
         self, timeout: Optional[int], fetch_interval: int

qiskit_scaleway/backends/qsim/job.py

@@ -74,28 +74,24 @@ def submit(self, session_id: str) -> None:
             name=self.backend().name,
             version=self.backend().version,
             options=options,
-            frozenset=True,
         )
 
         client_data = ClientData(
             user_agent=USER_AGENT,
-            frozenset=True,
         )
 
-        computation_model_dict = QuantumComputationModel(
+        computation_model_json = QuantumComputationModel(
             programs=programs,
             backend=backend_data,
             client=client_data,
-            frozenset=True,
-        ).to_dict()
+        ).to_json_str()
 
-        computation_parameters_dict = QuantumComputationParameters(
+        computation_parameters_json = QuantumComputationParameters(
             shots=options.pop("shots"),
-            frozenset=True,
-        ).to_dict()
+        ).to_json_str()
 
         model = self._client.create_model(
-            payload=computation_model_dict,
+            payload=computation_model_json,
         )
 
         if not model:
@@ -105,7 +101,7 @@ def submit(self, session_id: str) -> None:
             name=self._name,
             session_id=session_id,
             model_id=model.id,
-            parameters=computation_parameters_dict,
+            parameters=computation_parameters_json,
         ).id
 
     def __to_cirq_result(self, program_result: QuantumProgramResult) -> "cirq.Result":
@@ -143,11 +139,14 @@ def result(
 
         conv_method = match.get(format, self.__to_qiskit_result)
 
-        results = list(
+        program_results = list(
             map(
                 lambda r: conv_method(self._extract_payload_from_response(r)),
                 job_results,
             )
         )
 
-        return results
+        if len(program_results) == 1:
+            return program_results[0]
+
+        return program_results