iqm-station-control-client 9.12.0__py3-none-any.whl → 9.13.0__py3-none-any.whl

iqm/station_control/client/list_models.py

@@ -16,7 +16,7 @@
 These are used mainly for easy serialization and deserialization of list of objects.
 """
 
-from typing import Generic, TypeAlias, TypeVar
+from typing import Generic, TypeVar
 
 from pydantic import ConfigDict, RootModel
 
@@ -64,12 +64,37 @@ class ListModel(RootModel):
     )
 
 
-DutList: TypeAlias = ListModel[list[DutData]]  # type: ignore[type-arg]
-DutFieldDataList: TypeAlias = ListModel[list[DutFieldData]]  # type: ignore[type-arg]
-ObservationDataList: TypeAlias = ListModel[list[ObservationData]]  # type: ignore[type-arg]
-ObservationDefinitionList: TypeAlias = ListModel[list[ObservationDefinition]]  # type: ignore[type-arg]
-ObservationLiteList: TypeAlias = ListModel[list[ObservationLite]]  # type: ignore[type-arg]
-ObservationUpdateList: TypeAlias = ListModel[list[ObservationUpdate]]  # type: ignore[type-arg]
-ObservationSetDataList: TypeAlias = ListModel[list[ObservationSetData]]  # type: ignore[type-arg]
-SequenceMetadataDataList: TypeAlias = ListModel[list[SequenceMetadataData]]  # type: ignore[type-arg]
-RunLiteList: TypeAlias = ListModel[list[RunLite]]  # type: ignore[type-arg]
+class DutList(ListModel):
+    root: list[DutData]
+
+
+class DutFieldDataList(ListModel):
+    root: list[DutFieldData]
+
+
+class ObservationDataList(ListModel):
+    root: list[ObservationData]
+
+
+class ObservationDefinitionList(ListModel):
+    root: list[ObservationDefinition]
+
+
+class ObservationLiteList(ListModel):
+    root: list[ObservationLite]
+
+
+class ObservationUpdateList(ListModel):
+    root: list[ObservationUpdate]
+
+
+class ObservationSetDataList(ListModel):
+    root: list[ObservationSetData]
+
+
+class SequenceMetadataDataList(ListModel):
+    root: list[SequenceMetadataData]
+
+
+class RunLiteList(ListModel):
+    root: list[RunLite]

iqm/station_control/client/station_control.py

@@ -62,7 +62,7 @@ from iqm.station_control.client.serializers import (
 from iqm.station_control.client.serializers.channel_property_serializer import unpack_channel_properties
 from iqm.station_control.client.serializers.setting_node_serializer import deserialize_setting_node
 from iqm.station_control.client.serializers.sweep_serializers import deserialize_sweep_data
-from iqm.station_control.interface.list_with_meta import ListWithMeta
+from iqm.station_control.interface.list_with_meta import ListWithMeta, Meta
 from iqm.station_control.interface.models import (
     DutData,
     DutFieldData,
@@ -358,7 +358,7 @@ class StationControlClient(_StationControlClientBase):
     def create_observations(
         self, observation_definitions: Sequence[ObservationDefinition]
     ) -> ListWithMeta[ObservationData]:  # type: ignore[type-arg]
-        json_str = self._serialize_model(ObservationDefinitionList(observation_definitions))
+        json_str = self._serialize_model(ObservationDefinitionList(list(observation_definitions)))
         response = self._send_request(requests.post, "observations", json_str=json_str)
         return self._deserialize_response(response, ObservationDataList, list_with_meta=True)
 
@@ -394,7 +394,7 @@ class StationControlClient(_StationControlClientBase):
         return self._deserialize_response(response, ObservationDataList, list_with_meta=True)
 
     def update_observations(self, observation_updates: Sequence[ObservationUpdate]) -> list[ObservationData]:
-        json_str = self._serialize_model(ObservationUpdateList(observation_updates))
+        json_str = self._serialize_model(ObservationUpdateList(list(observation_updates)))
         response = self._send_request(requests.patch, "observations", json_str=json_str)
         return self._deserialize_response(response, ObservationDataList)
 
@@ -612,22 +612,23 @@ class StationControlClient(_StationControlClientBase):
     @staticmethod
     def _deserialize_response(
         response: requests.Response,
-        model_class: type[TypePydanticBase | ListModel[list[TypePydanticBase]]],  # type: ignore[type-arg]
+        model_class: type[TypePydanticBase | ListModel],
         *,
         list_with_meta: bool = False,
-    ) -> TypePydanticBase | ListWithMeta[TypePydanticBase]:  # type: ignore[type-arg]
+    ) -> TypePydanticBase | ListWithMeta:
         # Use "model_validate_json(response.text)" instead of "model_validate(response.json())".
         # This validates the provided data as a JSON string or bytes object.
         # If your incoming data is a JSON payload, this is generally considered faster.
         if list_with_meta:
-            response_with_meta = ResponseWithMeta.model_validate_json(response.text)  # type: ignore[var-annotated]
-            if response_with_meta.meta and response_with_meta.meta.errors:
-                logger.warning(
-                    "Errors in station control response:\n  - %s", "\n  - ".join(response_with_meta.meta.errors)
-                )
-            return ListWithMeta(model_class.model_validate(response_with_meta.items), meta=response_with_meta.meta)  # type: ignore[arg-type]
+            response_with_meta: ResponseWithMeta = ResponseWithMeta.model_validate_json(response.text)
+            meta = response_with_meta.meta or Meta()
+            if meta and meta.errors:
+                logger.warning("Errors in station control response:\n  - %s", "\n  - ".join(meta.errors))
+            return ListWithMeta(model_class.model_validate(response_with_meta.items), meta=meta)
         model = model_class.model_validate_json(response.text)
-        return model  # type: ignore[return-value]
+        if isinstance(model, ListModel):
+            return model.root
+        return model
 
 
 def _remove_empty_values(kwargs: dict[str, Any]) -> dict[str, Any]:

iqm/station_control/interface/list_with_meta.py

@@ -11,7 +11,7 @@
 # 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.
-"""Models to extend standard list with metadata."""
+"""Models to extend a standard list with metadata."""
 
 from collections.abc import Iterable
 from dataclasses import dataclass

{iqm_station_control_client-9.12.0.dist-info → iqm_station_control_client-9.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-station-control-client
-Version: 9.12.0
+Version: 9.13.0
 Summary: Python client for communicating with Station Control Service
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License: Apache License

{iqm_station_control_client-9.12.0.dist-info → iqm_station_control_client-9.13.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 iqm/station_control/client/__init__.py,sha256=1ND-AkIE9xLGIscH3WN44eyll9nlFhXeyCm-8EDFGQ4,942
-iqm/station_control/client/list_models.py,sha256=7JJyn5jCBOvMBJWdsVsPRLhtChMxqLa6O9hElpeXEt8,2701
+iqm/station_control/client/list_models.py,sha256=w_KUflrR9J1ODphu7dy3BOj1d4fzNrHj0J0HfgNitO4,2508
 iqm/station_control/client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/station_control/client/qon.py,sha256=_jGGTGIfoy1ANg65Ht07_7YKFAFxukxxV9lgcatq-hk,26865
-iqm/station_control/client/station_control.py,sha256=cQqHuTu3K7iVtZzdtIuihTXa_GPydyZFIjZtyCPzh7s,29208
+iqm/station_control/client/station_control.py,sha256=X19lCDgaoH36zOvNpsBxEE9BgijdeE2cp639S-G2hjw,29073
 iqm/station_control/client/utils.py,sha256=-6K4KgOgA4iyUCqX-w26JvFxlwlGBehGj4tIWCEbn74,3360
 iqm/station_control/client/iqm_server/__init__.py,sha256=nLsRHN1rnOKXwuzaq_liUpAYV3sis5jkyHccSdacV7U,624
 iqm/station_control/client/iqm_server/error.py,sha256=a8l7UTnzfbD8KDHP-uOve77S6LR1ai9uM_J_xHbLs0Y,1175
@@ -36,7 +36,7 @@ iqm/station_control/client/serializers/struct_serializer.py,sha256=7LSlrGVz0c-yi
 iqm/station_control/client/serializers/sweep_serializers.py,sha256=iFeBb4RFbHpVZifyduUypACSvulhkzdQIyG0gDoXOwM,5807
 iqm/station_control/client/serializers/task_serializers.py,sha256=mj5HWOolXLsqGaky7OYAWCW-BVp1RKN7vPtyiYpMaO8,3700
 iqm/station_control/interface/__init__.py,sha256=bBjhkiUSdwmx-CoNrT8pI4eGStI9RFUcW5CdpIRrd5k,785
-iqm/station_control/interface/list_with_meta.py,sha256=IPuho6LOiOCKEaz-QWnhbPwmWIDmcWD9JIqWf-2dxAU,1185
+iqm/station_control/interface/list_with_meta.py,sha256=M8BacgBDjbf7yabNK-OHCJWrci5hewXA9vd8MrqrZts,1187
 iqm/station_control/interface/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/station_control/interface/pydantic_base.py,sha256=pQCa-8SRgBKMSwG-KyXA1HcIxE_qGMJt9g_eOGdZ31g,1303
 iqm/station_control/interface/station_control.py,sha256=5gtDouAQ13KnyXNQUcBrpKG9pZdjIsX6fLJU9bmYJxU,20433
@@ -52,8 +52,8 @@ iqm/station_control/interface/models/sequence.py,sha256=boWlMfP3woVgVObW3OaNbxsU
 iqm/station_control/interface/models/static_quantum_architecture.py,sha256=gsfJKlYsfZVEK3dqEKXkBSIHiY14DGwNbhPJdNHMtNM,1435
 iqm/station_control/interface/models/sweep.py,sha256=HFoFIrKhlYmHIBfGltY2O9_J28OvkkZILRbDHuqR0wc,2509
 iqm/station_control/interface/models/type_aliases.py,sha256=gEYJ8zOpV1m0NVyYUbAL43psp9Lxw_0t68mYlI65Sds,1262
-iqm_station_control_client-9.12.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_station_control_client-9.12.0.dist-info/METADATA,sha256=ose-6WxuEQkHJH79-yZy0LtfoKUDOcuP0yaqvnARsbM,14107
-iqm_station_control_client-9.12.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_station_control_client-9.12.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_station_control_client-9.12.0.dist-info/RECORD,,
+iqm_station_control_client-9.13.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_station_control_client-9.13.0.dist-info/METADATA,sha256=hpH1t_jyd8TBZhZ_kSSk6pUlKKZmIyjJO0VKzYTjmRw,14107
+iqm_station_control_client-9.13.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_station_control_client-9.13.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_station_control_client-9.13.0.dist-info/RECORD,,