iqm-station-control-client 9.8.0__py3-none-any.whl → 9.10.0__py3-none-any.whl

iqm/station_control/client/qon.py

@@ -38,6 +38,9 @@ LOCUS_SEPARATOR: Final[str] = "__"
 Locus: TypeAlias = tuple[str, ...]
 """Sequence of QPU component physical names a quantum operation acts on. The order may matter."""
 
+Suffixes: TypeAlias = dict[str, str]
+"""Suffixes in a dut_field, split into key/value pairs."""
+
 
 def locus_to_locus_str(locus: Locus) -> str:
     """Convert a locus into a locus string."""
@@ -61,7 +64,7 @@ class UnknownObservationError(RuntimeError):
     """Observation name was syntactically correct but contained unknown elements."""
 
 
-def _parse_suffixes(suffixes: Iterable[str]) -> dict[str, str]:
+def _parse_suffixes(suffixes: Iterable[str]) -> Suffixes:
     """Parse the given suffixes and return them in a sorted dictionary."""
     suffix_dict = {}
     for suffix in suffixes:
@@ -227,7 +230,7 @@ class QONMetric(QON):
     """Sequence of names of QPU components on which the gate/operation is applied."""
     metric: str
     """Measured metric."""
-    suffixes: dict[str, str] = field(default_factory=dict)
+    suffixes: Suffixes = field(default_factory=dict)
     """Suffixes defining the metric further (if any)."""
 
     @property
@@ -366,7 +369,7 @@ class QONGateParam(QON):
         )
 
 
-def _split_obs_name(obs_name: str) -> tuple[list[str], dict[str, Any]]:
+def _split_obs_name(obs_name: str) -> tuple[list[str], Suffixes]:
     """Split the given observation name into path elements and suffixes."""
     # some observation names may have suffixes, split them off
     fragments = obs_name.split(_SUFFIX_SEPARATOR)
@@ -377,6 +380,19 @@ def _split_obs_name(obs_name: str) -> tuple[list[str], dict[str, Any]]:
     return path, suffixes
 
 
+def _convert_to_float(value: Any) -> float:
+    """Attempt to convert the given value to float.
+
+    Raises:
+        ValueError: Conversion not possible.
+
+    """
+    try:
+        return float(value)  # type: ignore[arg-type]
+    except (ValueError, TypeError) as e:
+        raise ValueError(f"Cannot convert value to float: {type(value)}") from e
+
+
 GATE_FIDELITY_METHODS = {
     "prx": "rb",
     "measure": "ssro",
@@ -406,8 +422,8 @@ class ObservationFinder(dict):
     """
 
     def __init__(self, observations: Iterable[ObservationBase], skip_unparseable: bool = False):
-        def parse_observation_into_dict(name: str, dictionary: dict[str, Any]) -> tuple[dict[str, Any], str]:
-            """Insert the given observation name, split into path elements, into a nested dictionary.
+        def parse_observation_into_dict(name: str, dictionary: dict[str, Any]) -> tuple[dict[str, Any], str, Suffixes]:
+            """Help insert the given observation name, split into path elements, into a nested dictionary.
 
             The returned values allow the caller to insert whatever they want under the last path element
             of ``name`` in the nested dict.
@@ -417,7 +433,8 @@ class ObservationFinder(dict):
                 dictionary: Nested dictionary in which the path elements of ``name`` are inserted.
 
             Returns:
-                The dict corresponding to the second-last path element of ``name``, last path element of ``name``.
+                The dict corresponding to the second-last path element of ``name``, last path element of ``name``,
+                suffixes in ``name``.
 
             Raises:
                 ValueError: Failed to parse ``name`` because it was syntactically incorrect.
@@ -443,12 +460,20 @@ class ObservationFinder(dict):
                     raise UnknownObservationError("Unknown observation domain.")
             for path_element in path[:-1]:
                 dictionary = dictionary.setdefault(path_element, {})
-            return dictionary, path[-1]
+            return dictionary, path[-1], suffixes
 
         for obs in observations:
             try:
-                last_dict, last_element = parse_observation_into_dict(obs.dut_field, self)
-                last_dict[last_element] = obs
+                last_dict, last_element, _ = parse_observation_into_dict(obs.dut_field, self)
+                # TODO how to handle suffixes?
+                if (existing_obs := last_dict.get(last_element)) is not None:
+                    logger.warning(
+                        "Repeated observations: using %s, ignoring %s",
+                        existing_obs.dut_field,
+                        obs.dut_field,
+                    )
+                else:
+                    last_dict[last_element] = obs
             except (ValueError, UnknownObservationError) as err:
                 message = f"{obs.dut_field}: {err}"
                 if skip_unparseable:
@@ -503,8 +528,8 @@ class ObservationFinder(dict):
                             pass  # skip this key if conversion fails
         return result
 
-    def _get_path_value(self, path: Iterable[str]) -> float:
-        """Follow ``path``, return the final value."""
+    def _follow_path(self, path: Iterable[str]) -> dict[str, Any] | ObservationBase:
+        """Follow ``path``, return the final node/value."""
         node: dict[str, Any] | ObservationBase = self
         for step in path:
             if isinstance(node, ObservationBase):
@@ -513,25 +538,18 @@ class ObservationFinder(dict):
             if next_node is None:
                 raise KeyError(f"path step '{step}' could not be found")
             node = next_node
+        return node
 
+    def _get_path_value(self, path: Iterable[str]) -> float:
+        """Follow ``path``, return the final value."""
+        node = self._follow_path(path)
         if not isinstance(node, ObservationBase):
             raise KeyError(f"path {path} does not end in an observation")
-
-        try:
-            return float(node.value)  # type: ignore[arg-type]
-        except (ValueError, TypeError) as e:
-            raise ValueError(f"Cannot convert value to float: {type(node.value)}") from e
+        return _convert_to_float(node.value)
 
     def _get_path_node(self, path: Iterable[str]) -> dict[str, Any]:
         """Follow ``path``, return the final node."""
-        node: dict[str, Any] | ObservationBase = self
-        for step in path:
-            if isinstance(node, ObservationBase):
-                raise KeyError(f"path step '{step}' could not be found")
-            next_node = node.get(step)
-            if next_node is None:
-                raise KeyError(f"path step '{step}' could not be found")
-            node = next_node
+        node = self._follow_path(path)
         if isinstance(node, ObservationBase):
             raise KeyError(f"path {path} does not end in a node")
         return node
@@ -577,14 +595,7 @@ class ObservationFinder(dict):
             node = self._get_path_node(["metrics", "ssro", gate_name, impl_name, locus_str])
             error_0_to_1 = node["error_0_to_1"].value
             error_1_to_0 = node["error_1_to_0"].value
-
-            def convert_to_float(value):
-                try:
-                    return float(value)  # type: ignore[arg-type]
-                except (ValueError, TypeError) as e:
-                    raise ValueError(f"Cannot convert value to float: {type(value)}") from e
-
-            return convert_to_float(error_0_to_1), convert_to_float(error_1_to_0)
+            return _convert_to_float(error_0_to_1), _convert_to_float(error_1_to_0)
         except KeyError:
             logger.warning("Missing errors for %s.%s.%s.", gate_name, impl_name, locus_str)
             return None

{iqm_station_control_client-9.8.0.dist-info → iqm_station_control_client-9.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-station-control-client
-Version: 9.8.0
+Version: 9.10.0
 Summary: Python client for communicating with Station Control Service
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License: Apache License
@@ -215,12 +215,12 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: iqm-exa-common <27,>=26
 Requires-Dist: iqm-data-definitions <3.0,>=2.13
-Requires-Dist: opentelemetry-exporter-otlp ==1.25.0
+Requires-Dist: opentelemetry-exporter-otlp <2.0,>=1.25.0
 Requires-Dist: protobuf <5.0,>=4.25.3
 Requires-Dist: types-protobuf
 Requires-Dist: grpcio <2.0,>=1.65.4
 Requires-Dist: pydantic <3.0,>=2.10.4
-Requires-Dist: PyYAML ==6.0
+Requires-Dist: PyYAML <7.0,>=6.0
 Requires-Dist: requests ==2.32.3
 Requires-Dist: types-requests
 Requires-Dist: tqdm >=4.59.0

{iqm_station_control_client-9.8.0.dist-info → iqm_station_control_client-9.10.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iqm/station_control/client/qon.py,sha256=7OLZPYwLUt-wx0bk8cmG3eVplGAgdTIQXpwKomFc9Q0,22495
+iqm/station_control/client/qon.py,sha256=--vWZ8ueX3pFIZPSt4N_5eQt4Ski_FJCceXDHKr77Ns,22782
 iqm/station_control/client/station_control.py,sha256=cQqHuTu3K7iVtZzdtIuihTXa_GPydyZFIjZtyCPzh7s,29208
 iqm/station_control/client/utils.py,sha256=-6K4KgOgA4iyUCqX-w26JvFxlwlGBehGj4tIWCEbn74,3360
 iqm/station_control/client/iqm_server/__init__.py,sha256=nLsRHN1rnOKXwuzaq_liUpAYV3sis5jkyHccSdacV7U,624
@@ -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.8.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_station_control_client-9.8.0.dist-info/METADATA,sha256=2KR6OuIUaYaP9Vnky4FyklA27cbqaTnau3dPHjhY2Hk,14096
-iqm_station_control_client-9.8.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_station_control_client-9.8.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_station_control_client-9.8.0.dist-info/RECORD,,
+iqm_station_control_client-9.10.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_station_control_client-9.10.0.dist-info/METADATA,sha256=9SztJZ-XCq-bP8s7NO3Eek5r4h8Hg448HqeU_p_F2wU,14107
+iqm_station_control_client-9.10.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_station_control_client-9.10.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_station_control_client-9.10.0.dist-info/RECORD,,