Missing private key in update in database (#243)

* Most likely fix the bug

* Move the coverage to the right dependency group

Author: fretchen

.github/workflows/spooler_tests.yml

@@ -44,7 +44,7 @@ jobs:
           poetry install
       - name: Run Tests
         run: |
-          poetry run pytest tests
+          poetry run pytest --cov=src tests
   lint:
 
     runs-on: ubuntu-latest

poetry.lock

@@ -28,6 +28,7 @@ mypy = "^1.8.0"
 python-decouple = "^3.6"
 ipykernel = "^6.28.0"
 icecream = "^2.1.3"
+pytest-cov = "^5.0.0"
 
 [tool.poetry.group.docs]
 optional = true

pyproject.toml

@@ -410,9 +410,7 @@ def add_job(
             result_dict: The dictionary with the results of the job.
             status_msg_dict: The status dictionary of the job.
         """
-
         result_dict, status_msg_dict, clean_dict = self._prep_job(json_dict, job_id)
-
         if status_msg_dict.status == "ERROR":
             return result_dict, status_msg_dict
         # now we can generate the circuit for each experiment
@@ -615,15 +613,15 @@ def gen_circuit(
                 with open(exp_script, "a", encoding="UTF-8") as script_file:
                     script_file.write(code)
             except:
-                print("Something wrong. Does file path exists?")
+                logging.error("Something wrong. Does file path exists?")
 
         code = "Experiment.final_action()" + "\n" + "stop(Experiment.t+0.1)"
         # pylint: disable=bare-except
         try:
             with open(exp_script, "a", encoding="UTF-8") as script_file:
                 script_file.write(code)
         except:
-            print("Something wrong. Does file path exists?")
+            logging.error("Something wrong. Does file path exists?")
         self.remote_client.set_labscript_file(
             exp_script
         )  # CAUTION !! This command only selects the file. It does not generate it!
@@ -661,7 +659,7 @@ def gen_circuit(
                     shots_array.append(this_run.get_results("/measure", "nat"))
                     got_nat = True
                 except Exception as exc:
-                    print(exc)
+                    logging.exception(exc)
                     sleep(self.labscript_params.t_wait)
                     n_tries += 1
         exp_sub_dict = create_memory_data(shots_array, exp_name, n_shots, ins_list)

src/sqooler/spoolers.py

@@ -79,7 +79,6 @@ def main(
             will run forever.
     """
     backends_list = list(backends.keys())
-
     # set the appropiate display names for all the back-ends
     for requested_backend, spooler in backends.items():
         # the content
@@ -114,6 +113,7 @@ def main(
         if job_dict.job_json_path == "None":
             counter += 1
             continue
+        logging.debug("Got a job in %s", requested_backend)
         job_json_dict = storage_provider.get_job_content(
             storage_path=job_dict.job_json_path, job_id=job_dict.job_id
         )
@@ -146,8 +146,14 @@ def main(
             status_msg_dict.error_message += "; " + slimmed_tb
             logging.exception("Error in add_job for %s .", requested_backend)
 
+        logging.debug("Updating in database.")
+        spooler.get_private_jwk()
         storage_provider.update_in_database(
-            result_dict, status_msg_dict, job_dict.job_id, requested_backend
+            result_dict,
+            status_msg_dict,
+            job_dict.job_id,
+            requested_backend,
+            private_jwk,
         )
 
         counter += 1
@@ -169,6 +175,5 @@ def run_json_circuit(json_dict: dict, job_id: str, spooler: Spooler) -> dict:
     result_dict, status_msg_dict = spooler.add_job(json_dict, job_id)
     if not status_msg_dict.status == "DONE":
         logging.error(status_msg_dict.error_message)
-        print(status_msg_dict.error_message)
         raise AssertionError("Job failed")
     return result_dict.model_dump()

src/sqooler/utils.py

@@ -0,0 +1,89 @@
+"""
+In this file, we define some utility functions that are used in the 
+tests that invole the sqooler and the utils.
+"""
+
+from typing import Literal, Optional
+
+from typing_extensions import Annotated
+from pydantic import Field
+from sqooler.schemes import (
+    ExperimentDict,
+    ExperimentalInputDict,
+    GateInstruction,
+)
+
+from sqooler.spoolers import (
+    create_memory_data,
+)
+
+
+class DummyInstruction(GateInstruction):
+    """
+    The test instruction for testing the whole system.
+
+    Attributes:
+        name: The string to identify the instruction
+        wires: The wire on which the instruction should be applied
+            so the indices should be between 0 and N_MAX_WIRES-1
+        params: has to be empty
+    """
+
+    name: Literal["test"]
+    wires: Annotated[
+        list[Annotated[int, Field(ge=0, le=0)]], Field(min_length=0, max_length=1)
+    ]
+    params: Annotated[
+        list[Annotated[int, Field(ge=1, le=10)]],
+        Field(min_length=1, max_length=1),
+    ]
+    parameters: str = "omega, delta, phi"
+    description: str = "Apply the Rydberg and Rabi coupling over the whole array."
+    # TODO: This should become most likely a type that is then used for the enforcement of the wires.
+    coupling_map: list = [[0], [1], [2], [0, 1, 2, 3, 4]]
+    qasm_def: str = "gate rydberg_full(omega, delta, phi) {}"
+
+
+class DummyFullInstruction(GateInstruction):
+    """
+    The time evolution under the global Hamiltonian. It does not allow for any local control.
+
+    Attributes:
+        name: The string to identify the instruction
+        wires: The wire on which the instruction should be applied
+            so the indices should be between 0 and N_MAX_WIRES-1
+        params: Define the paramert for `RX`, `RZ`and `RydbergBlock` in this order
+    """
+
+    name: Literal["test"] = "test"
+    wires: Annotated[
+        list[Annotated[int, Field(ge=0, le=5)]],
+        Field(min_length=2, max_length=5),
+    ]
+    params: Annotated[
+        list[Annotated[float, Field(ge=0, le=5)]],
+        Field(min_length=3, max_length=3),
+    ]
+
+    # a string that is sent over to the config dict and that is necessary for compatibility with QISKIT.
+    parameters: str = "omega, delta, phi"
+    description: str = "Apply the Rydberg and Rabi coupling over the whole array."
+    # TODO: This should become most likely a type that is then used for the enforcement of the wires.
+    coupling_map: list = [[0], [0, 1, 2, 3, 4]]
+    qasm_def: str = "gate rydberg_full(omega, delta, phi) {}"
+
+
+def dummy_gen_circuit(
+    exp_name: str,
+    json_dict: ExperimentalInputDict,
+    job_id: Optional[str] = None,  # pylint: disable=unused-argument
+) -> ExperimentDict:
+    """
+    A dummy function to generate a circuit from the experiment dict.
+    """
+    n_shots = json_dict.shots
+    ins_list = json_dict.instructions
+    _ = json_dict.seed
+    shots_array = [1, 2, 3]
+    exp_sub_dict = create_memory_data(shots_array, exp_name, n_shots, ins_list)
+    return exp_sub_dict