Merge branch 'main' into handlers

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
       - id: check-merge-conflict
       - id: debug-statements
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.1.1
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort

serverscripts/qibocal-index-reports.py

@@ -1,6 +1,7 @@
 """qibocal-index-reports.py
 Generates a JSON index with reports information.
 """
+
 import json
 import pathlib
 import sys

src/qibocal/auto/draw.py

@@ -1,4 +1,5 @@
 """Drawing utilities for execution graphs."""
+
 from typing import Set
 
 import networkx as nx

src/qibocal/auto/execute.py

@@ -1,4 +1,5 @@
 """Tasks execution."""
+
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Optional, Set

src/qibocal/auto/graph.py

@@ -1,4 +1,5 @@
 """Execution graph and navigation utilities."""
+
 import networkx as nx
 
 from .runcard import Action, Id

src/qibocal/auto/runcard.py

@@ -1,4 +1,5 @@
 """Specify runcard layout, handles (de)serialization."""
+
 import os
 from functools import cached_property
 from typing import Any, NewType, Optional, Union
@@ -33,9 +34,9 @@ class Action:
     """Alternative subsequent actions, branching from the current one."""
     priority: Optional[int] = None
     """Priority level, determining the execution order."""
-    qubits: Union[
-        list[QubitId], list[tuple[QubitId, QubitId]], list[list[QubitId]]
-    ] = Field(default_factory=list)
+    qubits: Union[list[QubitId], list[tuple[QubitId, QubitId]], list[list[QubitId]]] = (
+        Field(default_factory=list)
+    )
     """Local qubits (optional)."""
     update: bool = True
     """Runcard update mechanism."""

src/qibocal/auto/task.py

@@ -1,4 +1,5 @@
 """Action execution tracker."""
+
 import copy
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -142,9 +143,9 @@ def run(
             if self.parameters.nshots is None:
                 self.action.parameters["nshots"] = platform.settings.nshots
             if self.parameters.relaxation_time is None:
-                self.action.parameters[
-                    "relaxation_time"
-                ] = platform.settings.relaxation_time
+                self.action.parameters["relaxation_time"] = (
+                    platform.settings.relaxation_time
+                )
             operation: Routine = self.operation
             parameters = self.parameters
 

src/qibocal/auto/validate.py

@@ -1,4 +1,5 @@
 """Extra tools to validate an execution graph."""
+
 from .graph import Graph
 
 

src/qibocal/auto/validation.py

@@ -1,4 +1,5 @@
 """Validation module."""
+
 from dataclasses import dataclass, field
 from typing import Callable, NewType, Optional, Union
 

src/qibocal/auto/validators/chi2.py

@@ -1,4 +1,5 @@
 """Chi2 validation"""
+
 from typing import List, Optional, Union
 
 import numpy as np

src/qibocal/cli/__init__.py

@@ -1,2 +1,3 @@
 """CLI entry point."""
+
 from ._base import command

src/qibocal/cli/_base.py

@@ -1,4 +1,5 @@
 """Adds global CLI options."""
+
 import getpass
 import pathlib
 

src/qibocal/cli/fit.py

@@ -47,7 +47,9 @@ def fit(path, update):
     # dump updated runcard
     if platform is not None and update:  # pragma: no cover
         # cannot test update since dummy may produce wrong values and trigger errors
+        (path / UPDATED_PLATFORM).mkdir(parents=True, exist_ok=True)
         dump_runcard(platform, path / UPDATED_PLATFORM)
 
     # dump json
+
     (path / META).write_text(json.dumps(meta, indent=4))

src/qibocal/cli/upload.py

@@ -1,4 +1,5 @@
 """Upload report to server."""
+
 import base64
 import json
 import pathlib

src/qibocal/cli/utils.py

@@ -1,4 +1,5 @@
 """Helper functions for the cli module"""
+
 import datetime
 import getpass
 import json

src/qibocal/config.py

@@ -1,4 +1,5 @@
 """Custom logger implemenation."""
+
 import logging
 import os
 

src/qibocal/fitting/classifier/run.py

@@ -163,6 +163,7 @@ def create_model(self, hyperpars):
 @dataclass
 class BenchmarkResults:
     r"""Class that stores the models information."""
+
     accuracy: float
     testing_time: float
     training_time: float

src/qibocal/protocols/characterization/couplers/coupler_resonator_spectroscopy.py

@@ -165,7 +165,16 @@ def _plot(
 
     for qubit in qubit_pair:
         if qubit in data.data.keys():
-            return flux_dependence_plot(data, fit, qubit)
+            fig = flux_dependence_plot(data, fit, qubit)[0]
+            fig.update_yaxes(title_text="Pulse Amplitude [a.u.]", row=1, col=1)
+            fig.layout.annotations[0].update(
+                text="Signal [a.u.] Qubit" + str(qubit),
+            )
+            fig.layout.annotations[1].update(
+                text="Phase [rad] Qubit" + str(qubit),
+            )
+
+            return [fig], ""
 
 
 def _update(results: CouplerSpectroscopyResults, platform: Platform, qubit: QubitId):

src/qibocal/protocols/characterization/dispersive_shift.py

@@ -274,9 +274,11 @@ def _plot(data: DispersiveShiftData, qubit, fit: DispersiveShiftResults):
                 2 * len(q_data),
             )
             params = data_fit[
-                "fitted_parameters_state_zero"
-                if i == 0
-                else "fitted_parameters_state_one"
+                (
+                    "fitted_parameters_state_zero"
+                    if i == 0
+                    else "fitted_parameters_state_one"
+                )
             ][qubit]
             fig.add_trace(
                 go.Scatter(

src/qibocal/protocols/characterization/dispersive_shift_qutrit.py

@@ -247,12 +247,14 @@ def _plot(data: DispersiveShiftQutritData, qubit, fit: DispersiveShiftQutritResu
                 2 * len(q_data),
             )
             params = data_fit[
-                "fitted_parameters_state_zero"
-                if i == 0
-                else (
-                    "fitted_parameters_state_one"
-                    if i == 1
-                    else "fitted_parameters_state_two"
+                (
+                    "fitted_parameters_state_zero"
+                    if i == 0
+                    else (
+                        "fitted_parameters_state_one"
+                        if i == 1
+                        else "fitted_parameters_state_two"
+                    )
                 )
             ][qubit]
             fig.add_trace(

src/qibocal/protocols/characterization/flux_dependence/qubit_crosstalk.py

@@ -71,12 +71,7 @@ def _acquisition(
     sequence = PulseSequence()
     ro_pulses = {}
     qd_pulses = {}
-    Ec = {}
-    Ej = {}
     for qubit in qubits:
-        Ec[qubit] = qubits[qubit].Ec
-        Ej[qubit] = qubits[qubit].Ej
-
         qd_pulses[qubit] = platform.create_qubit_drive_pulse(
             qubit, start=0, duration=params.drive_duration
         )
@@ -124,7 +119,7 @@ def _acquisition(
         )
         for flux_qubit in flux_qubits
     ]
-    data = QubitCrosstalkData(resonator_type=platform.resonator_type, Ec=Ec, Ej=Ej)
+    data = QubitCrosstalkData(resonator_type=platform.resonator_type)
 
     options = ExecutionParameters(
         nshots=params.nshots,