iqm-exa-common 26.33.0__py3-none-any.whl → 27.0.0__py3-none-any.whl

exa/common/control/sweep/sweep.py

@@ -15,13 +15,11 @@
 """Base immutable class for sweeps specifications."""
 
 from typing import Any
-import warnings
 
-from exa.common.control.sweep.option import CenterSpanOptions, StartStopOptions, SweepOptions
+from exa.common.control.sweep.option import CenterSpanOptions, StartStopOptions
 from exa.common.control.sweep.sweep_values import SweepValues
 from exa.common.data.base_model import BaseModel
 from exa.common.data.parameter import Parameter
-from exa.common.errors.exa_error import InvalidSweepOptionsTypeError
 
 
 class Sweep(BaseModel):
@@ -33,30 +31,6 @@ class Sweep(BaseModel):
     data: SweepValues
     """List of values for :attr:`parameter`"""
 
-    def __init__(
-        self, parameter: Parameter, options: SweepOptions | None = None, *, data: SweepValues | None = None, **kwargs
-    ) -> None:
-        if options is None and data is None:
-            raise ValueError("Either 'options' or 'data' is required.")
-        if options is not None and data is not None:
-            raise ValueError(
-                "Can't use both 'options' and 'data' at the same time, give only either of the parameters."
-            )
-        if options is not None:
-            warnings.warn("'options' attribute is deprecated, use 'data' instead.", DeprecationWarning)
-
-            if not isinstance(options, SweepOptions):
-                raise InvalidSweepOptionsTypeError(str(type(options)))
-
-            if isinstance(options, StartStopOptions):
-                data = self.__from_start_stop(parameter, options)
-            elif isinstance(options, CenterSpanOptions):
-                data = self.__from_center_span(parameter, options)
-            else:
-                data = options.data
-
-        super().__init__(parameter=parameter, data=data, **kwargs)  # type: ignore[call-arg]  # type: ignore[call-arg]
-
     def model_post_init(self, __context: Any) -> None:
         if not all(self.parameter.validate(value) for value in self.data):
             raise ValueError(f"Invalid range data {self.data} for parameter type {self.parameter.data_type}.")
@@ -75,6 +49,6 @@ class Sweep(BaseModel):
         return options.data
 
     @staticmethod
-    def _validate_value(parameter: Parameter, value: int | float | complex | str | bool, value_label: str):
+    def _validate_value(parameter: Parameter, value: complex | str | bool, value_label: str) -> None:
         if not parameter.validate(value):
             raise ValueError(f"Invalid {value_label} value {value} for parameter type {parameter.data_type}.")

exa/common/errors/exa_error.py

@@ -1,8 +1,3 @@
-from typing_extensions import deprecated
-
-from exa.common.helpers.deprecation import format_deprecated
-
-
 class ExaError(Exception):
     """Base class for exa errors.
 
@@ -11,11 +6,11 @@ class ExaError(Exception):
 
     """
 
-    def __init__(self, message: str, *args):
+    def __init__(self, message: str, *args) -> None:
         super().__init__(message, *args)
         self.message = message
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.message
 
 
@@ -25,11 +20,3 @@ class UnknownSettingError(ExaError, AttributeError):
 
 class EmptyComponentListError(ExaError, ValueError):
     """Error raised when an empty list is given as components for running an experiment."""
-
-
-@deprecated(format_deprecated(old="`InvalidSweepOptionsTypeError`", new="`Sweep.data`", since="28.3.2025"))
-class InvalidSweepOptionsTypeError(ExaError, TypeError):
-    """The type of sweep options is invalid."""
-
-    def __init__(self, options: str, *args):
-        super().__init__(f"Options have unsupported type of {options}", *args)

{iqm_exa_common-26.33.0.dist-info → iqm_exa_common-27.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-exa-common
-Version: 26.33.0
+Version: 27.0.0
 Summary: Framework for control and measurement of superconducting qubits: common library
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License: Apache License

{iqm_exa_common-26.33.0.dist-info → iqm_exa_common-27.0.0.dist-info}/RECORD

@@ -10,10 +10,7 @@ exa/common/api/proto_serialization/sequence.py,sha256=4yQgdTUenbsY8yNu7JqSQSq2Us
 exa/common/api/proto_serialization/setting_node.py,sha256=oAlJOmkQTmMSd6wpofoDLz3YIlkiqxX7kY84WnZZ4b4,4073
 exa/common/control/__init__.py,sha256=00T_xV0lL20QZcEt__vWq81N1oGF0KpJMhTitfAI4VI,629
 exa/common/control/sweep/__init__.py,sha256=GzKoQdQsLutcHhmrLPyPrW1n7Cpg766p3OWDHlRpuTs,607
-exa/common/control/sweep/exponential_sweep.py,sha256=OIGqSifkAgQcS2EdffDpIjibB80XteLVF82kS63vPro,2121
-exa/common/control/sweep/fixed_sweep.py,sha256=QXO5lrllHHlhLiA95s8iTE82QkAEzgjJ2dA0flRJLhs,1493
-exa/common/control/sweep/linear_sweep.py,sha256=fX7OuZDYtUSGcAJLsGTVHcCIRkUHkZNLy5YSe_kgb8M,1966
-exa/common/control/sweep/sweep.py,sha256=CeCd7-nh0nIlaay4ggMICu61anVxlg3MISGhkK44-VQ,3520
+exa/common/control/sweep/sweep.py,sha256=7iaW_8baA0vZZjR7s6P1jkkG-B5Ncjez25xyExbKlf4,2260
 exa/common/control/sweep/sweep_values.py,sha256=c868qpnh3SP6DYN3eAt0SLaePuzzQwxTWYwnQwL4A-I,2277
 exa/common/control/sweep/option/__init__.py,sha256=Z01JS0FpchMvR8zfWBCs3jcPjh2H8X29YkN0SFxWLTY,906
 exa/common/control/sweep/option/center_span_base_options.py,sha256=uHWt4euQVF7EVXJid8wnIXo8PtJnyUdydxxAXPEMnV4,2558
@@ -31,7 +28,7 @@ exa/common/data/setting_node.py,sha256=rTXo-D9v42L8HkJoNoCMtm8cyUEuNtpYGhHfi45ZP
 exa/common/data/settingnode_v2.html.jinja2,sha256=mo-rlLLmU-Xxf6znJAisispAZK8sbV-2C13byKAtj_Q,3166
 exa/common/data/value.py,sha256=mtMws5UPGx1pCADK6Q2Tx4BwCXznvVRSNQRfcQ3NMmY,1853
 exa/common/errors/__init__.py,sha256=ArMBdpmx1EUenBpzrSNG63kmUf7PM0gCqSYnaCnL9Qk,597
-exa/common/errors/exa_error.py,sha256=iw8ueZgqx1JXkfjRoJfPUsSE7cfhzIWpdDaFuka9Ss0,990
+exa/common/errors/exa_error.py,sha256=wFfJbdeGs15XVF0VJvXPEjNavC2hXVJjchFcLfCfAiw,560
 exa/common/errors/station_control_errors.py,sha256=s0LimSOthQF8NWKyW556p-9vEapOxtn_W5ZiZVPTv_g,4489
 exa/common/helpers/__init__.py,sha256=IgtVD3tojIFA4MTV2mT5uYM6jb2qny9kBIIhEZT2PuI,610
 exa/common/helpers/data_helper.py,sha256=-AP0vwrf7WgyumLsicDtNP2VP5rhG4_oiOZgG4alNb4,2001
@@ -51,8 +48,8 @@ exa/common/qcm_data/qcm_data_client.py,sha256=Rze6yQd0xUeH6eUMv3wduYbiDCTP3C4WEC
 exa/common/sweep/__init__.py,sha256=uEKk5AtzSgSnf8Y0geRPwUpqXIBIXpeCxsN64sX7F1o,591
 exa/common/sweep/database_serialization.py,sha256=9n96OqmEnjy1x2F1HwaNOQgwX_39HjLtE9EUoetSw0E,7493
 exa/common/sweep/util.py,sha256=-QE2AaH-WDkYAVH5-Z-30leLgY0x4efmby4kc1JTCgY,3732
-iqm_exa_common-26.33.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_exa_common-26.33.0.dist-info/METADATA,sha256=YnFvhRiZetp91TDRdJBb0Jsr5DQNVpteUTMXkeqc-zA,14742
-iqm_exa_common-26.33.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_exa_common-26.33.0.dist-info/top_level.txt,sha256=Clphg2toaZ3_jSFRPhjMNEmLurkMNMc4lkK2EFYsSlM,4
-iqm_exa_common-26.33.0.dist-info/RECORD,,
+iqm_exa_common-27.0.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_exa_common-27.0.0.dist-info/METADATA,sha256=HSADQ--8rxKTImWGTmuX7t6lDJ1Tajdke8LLVC98trw,14741
+iqm_exa_common-27.0.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_exa_common-27.0.0.dist-info/top_level.txt,sha256=Clphg2toaZ3_jSFRPhjMNEmLurkMNMc4lkK2EFYsSlM,4
+iqm_exa_common-27.0.0.dist-info/RECORD,,

exa/common/control/sweep/exponential_sweep.py

@@ -1,53 +0,0 @@
-# Copyright 2024 IQM
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Sweep specification with exponentially spaced values."""
-
-from typing import Any
-
-from typing_extensions import deprecated
-
-from exa.common.control.sweep.option import CenterSpanBaseOptions, StartStopBaseOptions
-from exa.common.control.sweep.sweep import Sweep
-from exa.common.data.parameter import Parameter
-from exa.common.errors.exa_error import InvalidSweepOptionsTypeError
-from exa.common.helpers.deprecation import format_deprecated
-
-
-@deprecated(format_deprecated(old="`ExponentialSweep`", new="`Sweep`", since="28.3.2025"))
-class ExponentialSweep(Sweep):
-    """Generates parameter values spaced evenly on a geometric progression based on `options`.
-
-    - If `options` is instance of :class:`.StartStopBaseOptions`,
-      the start and stop of the interval are calculated from powers of start and stop.
-    - If `options` is instance of :class:`.CenterSpanBaseOptions`,
-      the start and stop of the interval are calculated from powers of start and stop,
-      which are derived from center and span.
-
-    Raises:
-        ValueError: Error is raised if `options` is inconsistent.
-
-    """
-
-    def __init__(
-        self,
-        parameter: Parameter,
-        options: StartStopBaseOptions | CenterSpanBaseOptions | None = None,
-        *,
-        data: list[Any] | None = None,
-        **kwargs,
-    ) -> None:
-        if options and not isinstance(options, StartStopBaseOptions | CenterSpanBaseOptions):
-            raise InvalidSweepOptionsTypeError(str(type(options)))
-        super().__init__(parameter, options, data=data, **kwargs)

exa/common/control/sweep/fixed_sweep.py

@@ -1,37 +0,0 @@
-# Copyright 2024 IQM
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Sweep specification with arbitrary values."""
-
-from typing import Any
-
-from typing_extensions import deprecated
-
-from exa.common.control.sweep.option import FixedOptions
-from exa.common.control.sweep.sweep import Sweep
-from exa.common.data.parameter import Parameter
-from exa.common.errors.exa_error import InvalidSweepOptionsTypeError
-from exa.common.helpers.deprecation import format_deprecated
-
-
-@deprecated(format_deprecated(old="`FixedSweep`", new="`Sweep`", since="28.3.2025"))
-class FixedSweep(Sweep):
-    """A sweep over arbitrary set of values, given by `options`."""
-
-    def __init__(
-        self, parameter: Parameter, options: FixedOptions | None = None, *, data: list[Any] | None = None, **kwargs
-    ) -> None:
-        if options and not isinstance(options, FixedOptions):
-            raise InvalidSweepOptionsTypeError(str(type(options)))
-        super().__init__(parameter, options, data=data, **kwargs)

exa/common/control/sweep/linear_sweep.py

@@ -1,51 +0,0 @@
-# Copyright 2024 IQM
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Sweep specification with linearly spaced values."""
-
-from typing import Any
-
-from typing_extensions import deprecated
-
-from exa.common.control.sweep.option import CenterSpanOptions, StartStopOptions
-from exa.common.control.sweep.sweep import Sweep
-from exa.common.data.parameter import Parameter
-from exa.common.errors.exa_error import InvalidSweepOptionsTypeError
-from exa.common.helpers.deprecation import format_deprecated
-
-
-@deprecated(format_deprecated(old="`LinearSweep`", new="`Sweep`", since="28.3.2025"))
-class LinearSweep(Sweep):
-    """Generates evenly spaced parameter values based on `options`.
-
-    - If `options` is instance of :class:`.StartStopOptions`, then start and stop options are used for interval
-    - If `options` is instance of :class:`.CenterSpanOptions`,
-      then the start and stop of the interval are calculated from center and span values
-
-    Raises:
-        ValueError: Error is raised if `options` is inconsistent.
-
-    """
-
-    def __init__(
-        self,
-        parameter: Parameter,
-        options: StartStopOptions | CenterSpanOptions | None = None,
-        *,
-        data: list[Any] | None = None,
-        **kwargs,
-    ) -> None:
-        if options and not isinstance(options, StartStopOptions | CenterSpanOptions):
-            raise InvalidSweepOptionsTypeError(str(type(options)))
-        super().__init__(parameter, options, data=data, **kwargs)