From 81524defcaed13f9d4a66feaa53c9daa67503f2b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 20:57:08 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 23.12.1 → 24.1.1](https://github.com/psf/black/compare/23.12.1...24.1.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a51872df5..10a1b88d4 100644 --- a/.pre-commit-config.yaml +++ b/.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 From 3447e801e731cb27aadc0a02423b57aa4330f2d4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 20:57:59 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- serverscripts/qibocal-index-reports.py | 1 + src/qibocal/auto/draw.py | 1 + src/qibocal/auto/execute.py | 1 + src/qibocal/auto/graph.py | 1 + src/qibocal/auto/runcard.py | 7 ++++--- src/qibocal/auto/task.py | 7 ++++--- src/qibocal/auto/validate.py | 1 + src/qibocal/auto/validation.py | 1 + src/qibocal/auto/validators/chi2.py | 1 + src/qibocal/cli/__init__.py | 1 + src/qibocal/cli/_base.py | 1 + src/qibocal/cli/upload.py | 1 + src/qibocal/cli/utils.py | 1 + src/qibocal/config.py | 1 + src/qibocal/fitting/classifier/run.py | 1 + .../protocols/characterization/dispersive_shift.py | 8 +++++--- .../characterization/dispersive_shift_qutrit.py | 14 ++++++++------ .../randomized_benchmarking/circuit_tools.py | 1 + .../randomized_benchmarking/fitting.py | 1 + .../characterization/readout_mitigation_matrix.py | 6 +++--- .../two_qubit_interaction/chevron.py | 1 + .../two_qubit_interaction/chsh/utils.py | 1 - .../two_qubit_interaction/cz_virtualz.py | 1 + src/qibocal/protocols/characterization/utils.py | 2 +- src/qibocal/update.py | 1 + tests/test_auto.py | 1 + tests/test_cli_utils.py | 1 + tests/test_protocols.py | 1 + tests/test_task_options.py | 1 + tests/test_update.py | 1 + 30 files changed, 48 insertions(+), 20 deletions(-) diff --git a/serverscripts/qibocal-index-reports.py b/serverscripts/qibocal-index-reports.py index 3f6eb8989..4bc31c155 100644 --- a/serverscripts/qibocal-index-reports.py +++ b/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 diff --git a/src/qibocal/auto/draw.py b/src/qibocal/auto/draw.py index f4b22bdc8..79603c772 100644 --- a/src/qibocal/auto/draw.py +++ b/src/qibocal/auto/draw.py @@ -1,4 +1,5 @@ """Drawing utilities for execution graphs.""" + from typing import Set import networkx as nx diff --git a/src/qibocal/auto/execute.py b/src/qibocal/auto/execute.py index bd2dab5ae..bc794a50b 100644 --- a/src/qibocal/auto/execute.py +++ b/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 diff --git a/src/qibocal/auto/graph.py b/src/qibocal/auto/graph.py index 70e97490b..937af0d60 100644 --- a/src/qibocal/auto/graph.py +++ b/src/qibocal/auto/graph.py @@ -1,4 +1,5 @@ """Execution graph and navigation utilities.""" + import networkx as nx from .runcard import Action, Id diff --git a/src/qibocal/auto/runcard.py b/src/qibocal/auto/runcard.py index e46c94d51..82f22bd37 100644 --- a/src/qibocal/auto/runcard.py +++ b/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 @@ -30,9 +31,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.""" diff --git a/src/qibocal/auto/task.py b/src/qibocal/auto/task.py index ae1b98e13..d47fd2dda 100644 --- a/src/qibocal/auto/task.py +++ b/src/qibocal/auto/task.py @@ -1,4 +1,5 @@ """Action execution tracker.""" + import copy from dataclasses import dataclass, field from pathlib import Path @@ -151,9 +152,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 diff --git a/src/qibocal/auto/validate.py b/src/qibocal/auto/validate.py index 1af4ede80..5ba543ce7 100644 --- a/src/qibocal/auto/validate.py +++ b/src/qibocal/auto/validate.py @@ -1,4 +1,5 @@ """Extra tools to validate an execution graph.""" + from .graph import Graph diff --git a/src/qibocal/auto/validation.py b/src/qibocal/auto/validation.py index 50cd37277..22f83ff02 100644 --- a/src/qibocal/auto/validation.py +++ b/src/qibocal/auto/validation.py @@ -1,4 +1,5 @@ """Validation module.""" + from dataclasses import dataclass from typing import NewType, Optional, Union diff --git a/src/qibocal/auto/validators/chi2.py b/src/qibocal/auto/validators/chi2.py index 97207c984..aa525faec 100644 --- a/src/qibocal/auto/validators/chi2.py +++ b/src/qibocal/auto/validators/chi2.py @@ -1,4 +1,5 @@ """Chi2 validation""" + from typing import Union from qibolab.qubits import QubitId, QubitPairId diff --git a/src/qibocal/cli/__init__.py b/src/qibocal/cli/__init__.py index 39ace6eff..91f980149 100644 --- a/src/qibocal/cli/__init__.py +++ b/src/qibocal/cli/__init__.py @@ -1,2 +1,3 @@ """CLI entry point.""" + from ._base import command diff --git a/src/qibocal/cli/_base.py b/src/qibocal/cli/_base.py index 6599f3242..027946144 100644 --- a/src/qibocal/cli/_base.py +++ b/src/qibocal/cli/_base.py @@ -1,4 +1,5 @@ """Adds global CLI options.""" + import getpass import pathlib diff --git a/src/qibocal/cli/upload.py b/src/qibocal/cli/upload.py index a78b36f11..feee352a9 100644 --- a/src/qibocal/cli/upload.py +++ b/src/qibocal/cli/upload.py @@ -1,4 +1,5 @@ """Upload report to server.""" + import base64 import json import pathlib diff --git a/src/qibocal/cli/utils.py b/src/qibocal/cli/utils.py index 89a4e2d67..21e064a2d 100644 --- a/src/qibocal/cli/utils.py +++ b/src/qibocal/cli/utils.py @@ -1,4 +1,5 @@ """Helper functions for the cli module""" + import datetime import getpass import json diff --git a/src/qibocal/config.py b/src/qibocal/config.py index 07e65d265..53ccaebba 100644 --- a/src/qibocal/config.py +++ b/src/qibocal/config.py @@ -1,4 +1,5 @@ """Custom logger implemenation.""" + import logging import os diff --git a/src/qibocal/fitting/classifier/run.py b/src/qibocal/fitting/classifier/run.py index 5431d1c49..045854d93 100644 --- a/src/qibocal/fitting/classifier/run.py +++ b/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 diff --git a/src/qibocal/protocols/characterization/dispersive_shift.py b/src/qibocal/protocols/characterization/dispersive_shift.py index 1bb7aac4c..6938331af 100644 --- a/src/qibocal/protocols/characterization/dispersive_shift.py +++ b/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( diff --git a/src/qibocal/protocols/characterization/dispersive_shift_qutrit.py b/src/qibocal/protocols/characterization/dispersive_shift_qutrit.py index da7e5cb77..712ae6c49 100644 --- a/src/qibocal/protocols/characterization/dispersive_shift_qutrit.py +++ b/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( diff --git a/src/qibocal/protocols/characterization/randomized_benchmarking/circuit_tools.py b/src/qibocal/protocols/characterization/randomized_benchmarking/circuit_tools.py index d5677c7de..ddbc637f8 100644 --- a/src/qibocal/protocols/characterization/randomized_benchmarking/circuit_tools.py +++ b/src/qibocal/protocols/characterization/randomized_benchmarking/circuit_tools.py @@ -1,4 +1,5 @@ """Collection of function to generate qibo circuits.""" + from copy import deepcopy from typing import Callable diff --git a/src/qibocal/protocols/characterization/randomized_benchmarking/fitting.py b/src/qibocal/protocols/characterization/randomized_benchmarking/fitting.py index 3c61368c8..f4f25f28e 100644 --- a/src/qibocal/protocols/characterization/randomized_benchmarking/fitting.py +++ b/src/qibocal/protocols/characterization/randomized_benchmarking/fitting.py @@ -1,6 +1,7 @@ """In this python script the fitting methods for the gate set protocols are defined. They consist mostly of exponential decay fitting. """ + from typing import Optional, Union import numpy as np diff --git a/src/qibocal/protocols/characterization/readout_mitigation_matrix.py b/src/qibocal/protocols/characterization/readout_mitigation_matrix.py index e2be1abb7..cf4fcda57 100644 --- a/src/qibocal/protocols/characterization/readout_mitigation_matrix.py +++ b/src/qibocal/protocols/characterization/readout_mitigation_matrix.py @@ -31,9 +31,9 @@ class ReadoutMitigationMatrixParameters(Parameters): @dataclass class ReadoutMitigationMatrixResults(Results): - readout_mitigation_matrix: dict[ - tuple[QubitId, ...], npt.NDArray[np.float64] - ] = field(default_factory=dict) + readout_mitigation_matrix: dict[tuple[QubitId, ...], npt.NDArray[np.float64]] = ( + field(default_factory=dict) + ) """Readout mitigation matrices (inverse of measurement matrix).""" measurement_matrix: dict[tuple[QubitId, ...], npt.NDArray[np.float64]] = field( default_factory=dict diff --git a/src/qibocal/protocols/characterization/two_qubit_interaction/chevron.py b/src/qibocal/protocols/characterization/two_qubit_interaction/chevron.py index 31cbb5150..b4bb77991 100644 --- a/src/qibocal/protocols/characterization/two_qubit_interaction/chevron.py +++ b/src/qibocal/protocols/characterization/two_qubit_interaction/chevron.py @@ -1,4 +1,5 @@ """SWAP experiment for two qubit gates, chevron plot.""" + from dataclasses import dataclass, field from typing import Optional diff --git a/src/qibocal/protocols/characterization/two_qubit_interaction/chsh/utils.py b/src/qibocal/protocols/characterization/two_qubit_interaction/chsh/utils.py index 9665029f0..fea6225d1 100644 --- a/src/qibocal/protocols/characterization/two_qubit_interaction/chsh/utils.py +++ b/src/qibocal/protocols/characterization/two_qubit_interaction/chsh/utils.py @@ -1,6 +1,5 @@ """Auxiliary functions to run CHSH protocol.""" - READOUT_BASIS = ["ZZ", "ZX", "XZ", "XX"] diff --git a/src/qibocal/protocols/characterization/two_qubit_interaction/cz_virtualz.py b/src/qibocal/protocols/characterization/two_qubit_interaction/cz_virtualz.py index fa48a5268..ef2356122 100644 --- a/src/qibocal/protocols/characterization/two_qubit_interaction/cz_virtualz.py +++ b/src/qibocal/protocols/characterization/two_qubit_interaction/cz_virtualz.py @@ -1,4 +1,5 @@ """CZ virtual correction experiment for two qubit gates, tune landscape.""" + from dataclasses import dataclass, field from typing import Optional diff --git a/src/qibocal/protocols/characterization/utils.py b/src/qibocal/protocols/characterization/utils.py index ac95f3090..5a1ecefa0 100644 --- a/src/qibocal/protocols/characterization/utils.py +++ b/src/qibocal/protocols/characterization/utils.py @@ -597,7 +597,7 @@ def plot_results(data: Data, qubit: QubitId, qubit_states: list, fit: Results): "accuracy", "testing time [s]", "training time [s]", - ) + ), # pylint: disable=E1101 ) for i, model in enumerate(models_name): diff --git a/src/qibocal/update.py b/src/qibocal/update.py index cfe869822..7ed1bcb3c 100644 --- a/src/qibocal/update.py +++ b/src/qibocal/update.py @@ -1,4 +1,5 @@ """Helper functions to update parameters in platform.""" + from typing import Union from qibolab import pulses diff --git a/tests/test_auto.py b/tests/test_auto.py index 6ace2b6da..763046852 100644 --- a/tests/test_auto.py +++ b/tests/test_auto.py @@ -1,4 +1,5 @@ """Test graph execution.""" + import pathlib import pytest diff --git a/tests/test_cli_utils.py b/tests/test_cli_utils.py index 38bc14203..8123cfac6 100644 --- a/tests/test_cli_utils.py +++ b/tests/test_cli_utils.py @@ -1,4 +1,5 @@ """Testing cli utils.""" + from qibolab import create_platform from qibocal.cli.utils import create_qubits_dict diff --git a/tests/test_protocols.py b/tests/test_protocols.py index 5e570f0b8..6428867be 100644 --- a/tests/test_protocols.py +++ b/tests/test_protocols.py @@ -1,4 +1,5 @@ """Test routines' acquisition method using dummy platform""" + import pathlib import pytest diff --git a/tests/test_task_options.py b/tests/test_task_options.py index b8e88d647..de21b4665 100644 --- a/tests/test_task_options.py +++ b/tests/test_task_options.py @@ -1,4 +1,5 @@ """Test routines' acquisition method using dummy platform""" + from copy import deepcopy import pytest diff --git a/tests/test_update.py b/tests/test_update.py index 0038f6ae4..7eab83aa8 100644 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -1,4 +1,5 @@ """Testing update_* helper functions. """ + import random import re