iqm-station-control-client 2.20__py3-none-any.whl → 3.0__py3-none-any.whl

iqm/station_control/client/serializers/sweep_serializers.py

@@ -22,8 +22,8 @@ from iqm.data_definitions.station_control.v1.sweep_request_pb2 import SweepReque
 from iqm.data_definitions.station_control.v2.task_service_pb2 import SweepResultsResponse as SweepResultsResponseProto
 
 from exa.common.api import proto_serialization
-from exa.common.api.model.setting_node_model import SettingNodeModel
 from exa.common.api.proto_serialization import array
+from exa.common.data.setting_node import SettingNode
 from exa.common.sweep.database_serialization import decode_and_validate_sweeps, encode_nd_sweeps
 from iqm.station_control.client.serializers.datetime_serializers import deserialize_datetime, serialize_datetime
 from iqm.station_control.client.serializers.playlist_serializers import pack_playlist, unpack_playlist
@@ -67,7 +67,7 @@ def serialize_sweep_data(sweep_data: SweepData) -> dict:
     return {
         "sweep_id": str(sweep_data.sweep_id),
         "dut_label": sweep_data.dut_label,
-        "settings": SettingNodeModel.encode(sweep_data.settings).model_dump_json() if sweep_data.settings else None,
+        "settings": sweep_data.settings.model_dump_json() if sweep_data.settings else None,
         "sweeps": encode_nd_sweeps(sweep_data.sweeps),
         "return_parameters": sweep_data.return_parameters,
         "created_timestamp": serialize_datetime(sweep_data.created_timestamp),
@@ -83,7 +83,7 @@ def deserialize_sweep_data(data: dict) -> SweepData:
     return SweepData(
         sweep_id=uuid.UUID(data["sweep_id"]),
         dut_label=data["dut_label"],
-        settings=SettingNodeModel(**json.loads(data["settings"])).decode(),
+        settings=SettingNode(**json.loads(data["settings"])),
         sweeps=decode_and_validate_sweeps(data["sweeps"]),
         return_parameters=data["return_parameters"],
         created_timestamp=deserialize_datetime(data["created_timestamp"]),

iqm/station_control/client/station_control.py

@@ -30,7 +30,6 @@ import requests
 
 from exa.common.data.setting_node import SettingNode
 from exa.common.errors.exa_error import RequestError
-from exa.common.qcm_data.chad_model import CHAD
 from exa.common.qcm_data.qcm_data_client import QCMDataClient
 from iqm.station_control.client.list_models import (
     DutFieldDataList,
@@ -110,7 +109,7 @@ class StationControlClient:
         - range: Range test (inclusive).
             For example, ``created_timestamp__range=(datetime(2023, 10, 12), datetime(2024, 10, 14))``
         - in: In a given iterable; often a list, tuple, or queryset.
-            For example, ``dut_field__in=["QB1.frequency", "QB2.readout.frequency"]``
+            For example, ``dut_field__in=["QB1.frequency", "gates.measure.constant.QB2.frequency"]``
         - icontains: Case-insensitive containment test.
             For example, ``origin_uri__icontains="local"``
         - overlap: Returns objects where the data shares any results with the values passed.
@@ -169,7 +168,7 @@ class StationControlClient:
 
     def get_settings(self) -> SettingNode:
         """Return a tree representation of the default settings as defined in the configuration file."""
-        return self._get_cached_settings().copy()
+        return self._get_cached_settings().model_copy()
 
     @cache
     def _get_cached_settings(self) -> SettingNode:
@@ -184,7 +183,7 @@ class StationControlClient:
         except RequestError as err:
             if str(err).find("An error occurred on the server with the error code 404") >= 0 and self._qcm_data_client:
                 return self._qcm_data_client.get_chip_design_record(dut_label)
-            response = self._send_request(requests.get, f"chads/{dut_label}")
+            raise err
         return response.json()
 
     @cache
@@ -203,36 +202,6 @@ class StationControlClient:
         decoded_dict = unpack_channel_properties(response.content)
         return decoded_dict
 
-    @cache
-    def get_chad(self, dut_label: str) -> CHAD:
-        """DEPRECATED."""
-        logger.warning(
-            "StationControlClient.get_chad is deprecated, use StationControlClient.get_chip_design_record instead."
-        )
-        try:
-            response = self._send_request(requests.get, f"chads/{dut_label}")
-            return CHAD(**response.json())
-        except RequestError as err:
-            if str(err).find("An error occurred on the server with the error code 404") >= 0 and self._qcm_data_client:
-                chad_dict = self._qcm_data_client.get_chad(dut_label)
-                return CHAD(**chad_dict)
-            raise err
-
-    @cache
-    def get_qubit_design_properties(self, dut_label: str) -> dict:
-        """DEPRECATED."""
-        logger.warning(
-            "StationControlClient.get_qubit_design_properties is deprecated, "
-            "use StationControlClient.get_chip_design_record instead."
-        )
-        try:
-            response = self._send_request(requests.get, f"qubit-design-properties/{dut_label}")
-            return response.json()
-        except RequestError as err:
-            if str(err).find("An error occurred on the server with the error code 404") >= 0 and self._qcm_data_client:
-                return self._qcm_data_client.get_qubit_design_properties(dut_label)
-            raise err
-
     def sweep(
         self,
         sweep_definition: SweepDefinition,

iqm/station_control/interface/models/observation.py

@@ -19,7 +19,8 @@ import uuid
 
 from pydantic import ConfigDict
 
-from iqm.station_control.interface.pydantic_base import PydanticBase, Uncertainty, Value
+from exa.common.data.value import Uncertainty, Value
+from iqm.station_control.interface.pydantic_base import PydanticBase
 
 
 class ObservationBase(PydanticBase):

iqm/station_control/interface/models/sweep.py

@@ -17,7 +17,6 @@ from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
 import uuid
-import warnings
 
 from iqm.models.playlist import Playlist
 
@@ -50,26 +49,6 @@ class SweepDefinition(SweepBase):
     playlist: Playlist | None
     """A :class:`~iqm.models.playlist.Playlist` that should be uploaded to the controllers."""
 
-    def __init__(self, *args, playlist: Playlist | None = None, playlists: Playlist | None = None, **kwargs):
-        super().__init__(*args, **kwargs)
-        if playlists is not None:
-            warnings.warn("'playlists' attribute is deprecated, use 'playlist' instead.", DeprecationWarning)
-            self.playlist = playlists
-        elif playlist is not None:
-            self.playlist = playlist
-        else:
-            self.playlist = None
-
-    @property
-    def playlists(self):
-        """Returns playlists for backwards compatibility."""
-        warnings.warn("'playlists' attribute is deprecated, use 'playlist' instead.", DeprecationWarning)
-        return self.playlist
-
-    @playlists.setter
-    def playlists(self, playlist):
-        self.playlist = playlist
-
 
 class SweepStatus(Enum):
     """Status for sweeps."""

iqm/station_control/interface/pydantic_base.py

@@ -13,12 +13,7 @@
 # limitations under the License.
 """Pydantic related models and types."""
 
-import base64
-from typing import Annotated, Any
-
-import numpy as np
-from pydantic import BaseModel, ConfigDict, PlainSerializer, PlainValidator, WithJsonSchema
-from pydantic_core import core_schema
+from pydantic import BaseModel, ConfigDict
 
 
 class PydanticBase(BaseModel):
@@ -33,43 +28,3 @@ class PydanticBase(BaseModel):
         validate_default=True,  # Validate default values during validation
         ser_json_inf_nan="constants",  # Will serialize Infinity and NaN values as Infinity and NaN.
     )
-
-
-def validate_value(value: Any) -> Any:
-    """Validate (i.e. deserialize) JSON serializable value to Python type, to support complex and ndarray types."""
-    if isinstance(value, dict):
-        if "__complex__" in value:
-            value = complex(value["real"], value["imag"])
-        elif "__ndarray__" in value:
-            data = base64.b64decode(value["data"])
-            value = np.frombuffer(data, value["dtype"]).reshape(value["shape"])
-    return value
-
-
-def serialize_value(value: Any) -> Any:
-    """Serialize value type to JSON serializable type, to support complex and ndarray types."""
-    if isinstance(value, complex):
-        value = {"__complex__": "true", "real": value.real, "imag": value.imag}
-    elif isinstance(value, np.ndarray):
-        # ensure array buffer is contiguous and in C order
-        value = np.require(value, requirements=["A", "C"])
-        data = base64.b64encode(value.data)
-        value = {"__ndarray__": "true", "data": data, "dtype": str(value.dtype), "shape": value.shape}
-    return value
-
-
-# TODO: We might want to rename these to ObservationValue and ObservationUncertainty, respectively.
-Value = Annotated[
-    bool | str | int | float | complex | np.ndarray,
-    PlainValidator(validate_value),
-    PlainSerializer(serialize_value),
-    WithJsonSchema(core_schema.any_schema()),
-]
-
-
-Uncertainty = Annotated[
-    int | float | complex | np.ndarray,
-    PlainValidator(validate_value),
-    PlainSerializer(serialize_value),
-    WithJsonSchema(core_schema.any_schema()),
-]

{iqm_station_control_client-2.20.dist-info → iqm_station_control_client-3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-station-control-client
-Version: 2.20
+Version: 3.0
 Summary: Python client for communicating with Station Control Service
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License: Apache License
@@ -213,11 +213,11 @@ Classifier: Intended Audience :: Science/Research
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
-Requires-Dist: iqm-exa-common <26,>=25
+Requires-Dist: iqm-exa-common <27,>=26
 Requires-Dist: iqm-data-definitions <3.0,>=2.8
 Requires-Dist: opentelemetry-exporter-otlp ==1.25.0
 Requires-Dist: protobuf <5.0,>=4.25.3
-Requires-Dist: pydantic <3.0,>=2.9.2
+Requires-Dist: pydantic <3.0,>=2.10.4
 Requires-Dist: PyYAML ==6.0
 Requires-Dist: requests ==2.32.3
 Requires-Dist: tqdm >=4.59.0

{iqm_station_control_client-2.20.dist-info → iqm_station_control_client-3.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 iqm/station_control/client/__init__.py,sha256=BmBIBdZa10r-IWCFzZ1-0DG6GQKPIXqGXltfXop4ZeQ,942
 iqm/station_control/client/list_models.py,sha256=SjD0DbCrM9z1SSuGoQS83lyJmDLuMOatpJUoW8itW9s,2335
-iqm/station_control/client/station_control.py,sha256=CKeqlGp1TEVRfW9NqYo22jXW3H_iBtDFIpxK0alSMN8,35021
+iqm/station_control/client/station_control.py,sha256=pvSGWObxTs61Iyiv7pcl9SDLvKijkaZZYzJC8VoGIgo,33584
 iqm/station_control/client/utils.py,sha256=3VVLCXt6rcKNQc4HerlMxpxkRfTFMYCwOQHF2DS1OG8,1143
 iqm/station_control/client/serializers/__init__.py,sha256=8os3EGOtNTRFaviZdGwDyMt9GUpM3ZP7icPKAxOg1qg,1438
 iqm/station_control/client/serializers/channel_property_serializer.py,sha256=ChlX8B-blM5hjv3pUExHOd-vE3O_myPwILu36KZYYNU,7121
@@ -9,21 +9,21 @@ iqm/station_control/client/serializers/playlist_serializers.py,sha256=S8RuKdqeJx
 iqm/station_control/client/serializers/run_serializers.py,sha256=4zH0I5EvvaP7wgLMprXXWa36nAPO4Lv0fPkCrDC_v-g,6698
 iqm/station_control/client/serializers/setting_node_serializer.py,sha256=m4Sbm8Qr3GiSNiE-Jh8gFEgfscfN1xxELb0vCa9cK70,1197
 iqm/station_control/client/serializers/struct_serializer.py,sha256=QztBsbRlRG_UrtpQLE3bi0WKEVn48kVB91H1g26PvqQ,3270
-iqm/station_control/client/serializers/sweep_serializers.py,sha256=yzzBzxQeIk-oPOZ3j7n0qJ646y2iEa3TtH7Vj5updK0,5780
+iqm/station_control/client/serializers/sweep_serializers.py,sha256=2COfE3ewusjeIp7q3sQWEpc9nzUrfjMNTeemihtpzKA,5725
 iqm/station_control/client/serializers/task_serializers.py,sha256=mUi6IeNBUQnWy5U65C2fL597lcee71YAo9o8VM-aCnE,2712
 iqm/station_control/interface/__init__.py,sha256=MIQla-cBKPbZqBkp-LNyPfjiV0gzf-IFEwrMMhsnKlg,785
 iqm/station_control/interface/list_with_meta.py,sha256=GAXIDEXKeua6-2FoQ_O1tkhx-d8pBMGHaIkdvgg-cag,1185
-iqm/station_control/interface/pydantic_base.py,sha256=4Gl9tnClnmwh2XQ0bJ0aN7w0QqX_lJf8l1Ybc4yL7eY,2985
+iqm/station_control/interface/pydantic_base.py,sha256=MVzcsH7wG1DON-qTw6KLpUDay7_b_9CDQgymVzg9HwI,1303
 iqm/station_control/interface/models/__init__.py,sha256=PbENb1YhX2OLGTiJNvj70e5Acj7f8jMP3hp5ncH5U-0,1527
 iqm/station_control/interface/models/dut.py,sha256=dd1SpcsBe4P057jvcPqv39SjzekewwP07hThFe5ulNA,1216
-iqm/station_control/interface/models/observation.py,sha256=XP76qSjjEIUOEh78k4vIqFSAWI71qiX190I6NCpyJKQ,3228
+iqm/station_control/interface/models/observation.py,sha256=Jce4lIsUtHRIFT3nr-cbKvh3dbR2Y_yM5x0yyvUdjF8,3261
 iqm/station_control/interface/models/observation_set.py,sha256=Ko2o3-9I38NfjNF2IQPcwfbwpkTQ3PIU7fUiSaDleX8,3031
 iqm/station_control/interface/models/run.py,sha256=m-iE3QMPQUOF7bsw8JCAM1Bd6bDVhAgxrtc_AC7rCkc,4097
 iqm/station_control/interface/models/sequence.py,sha256=uOqMwF1x-vW6UHs2WnPD3PsuSgV3a8OTAsgn_4UENLw,2723
-iqm/station_control/interface/models/sweep.py,sha256=FhxR-1nzRa5vp0vbFKOlFqrqvViPk30Qh0NmSMtib-g,3744
+iqm/station_control/interface/models/sweep.py,sha256=6SQ4Ty4_Rm1KTeR7YfrLmwyD-AnNE495LMxYu8dM4Ko,2947
 iqm/station_control/interface/models/type_aliases.py,sha256=3LB9viZVi8osavY5kKF8TH1crayG7-MLjgBqXDCqL2s,1018
-iqm_station_control_client-2.20.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_station_control_client-2.20.dist-info/METADATA,sha256=ol1-PAEfsJEaWiO1DpP6t1tplS2ohIiWEcILOfM8PL0,13971
-iqm_station_control_client-2.20.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_station_control_client-2.20.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_station_control_client-2.20.dist-info/RECORD,,
+iqm_station_control_client-3.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_station_control_client-3.0.dist-info/METADATA,sha256=XRYYj8Sfri864rILkOZ-XzrZz6syXgiZheJk1wGVCTA,13971
+iqm_station_control_client-3.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_station_control_client-3.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_station_control_client-3.0.dist-info/RECORD,,