iqm-station-control-client 10.1.0__py3-none-any.whl → 11.0.0__py3-none-any.whl

iqm/station_control/client/qon.py

@@ -47,11 +47,16 @@ Suffixes: TypeAlias = dict[str, str]
 """Suffixes in a dut_field, split into key/value pairs."""
 
 
-def locus_to_locus_str(locus: Locus) -> str:
+def locus_to_locus_str(locus: Iterable[str]) -> str:
     """Convert a locus into a locus string."""
     return LOCUS_SEPARATOR.join(locus)
 
 
+def locus_str_to_locus(locus_str: str) -> Locus:
+    """Convert a locus string into a locus."""
+    return tuple(locus_str.split(LOCUS_SEPARATOR))
+
+
 class Domain(StrEnum):
     """Known observation domains/categories."""
 
@@ -251,8 +256,9 @@ class QONMetric(QON):
     """
 
     method: Annotated[str, Field(pattern=_PATTERN)]
-    locus: str
-    """Sequence of names of QPU components on which the gate is applied, or on which the experiment is run."""
+    locus_str: str
+    """Sequence of names of QPU components on which the gate is applied, or on which the experiment is run,
+    encoded into a string."""
     metric: Annotated[str, Field(pattern=r"^[A-Za-z_0-9][A-Za-z0-9_]*$")]
     """Measured metric."""
 
@@ -267,6 +273,11 @@ class QONMetric(QON):
         """Return the QON domain for metrics."""
         return Domain.METRIC
 
+    @property
+    def locus(self) -> Locus:
+        """Locus of the metric."""
+        return locus_str_to_locus(self.locus_str)
+
     @classmethod
     def _parse(cls, method: str, method_specific_part: str) -> QONMetric:
         """Parse a metric observation name using the appropriate registered subclass.
@@ -316,7 +327,7 @@ class QONGateMetric(QONMetric):
         method: ssro
         gate: measure
         implementation: constant
-        locus: QB1
+        locus_str: QB1
         metric: fidelity
         suffixes: {"aaa": "bbb", "par": "d1"}
 
@@ -325,7 +336,7 @@ class QONGateMetric(QONMetric):
         method: ssro
         gate: measure
         implementation: constant
-        locus: QB1
+        locus_str: QB1
         metric: fidelity
         suffixes: {}
 
@@ -334,7 +345,7 @@ class QONGateMetric(QONMetric):
         method: rb
         gate: prx
         implementation: drag_crf
-        locus: QB4
+        locus_str: QB4
         metric: fidelity
         suffixes: {"par": "d2"}
     """
@@ -347,7 +358,7 @@ class QONGateMetric(QONMetric):
     """Suffixes defining the metric further (if any)."""
 
     def __str__(self) -> str:
-        parts = [self.domain, self.method, self.gate, self.implementation, self.locus, self.metric]
+        parts = [self.domain, self.method, self.gate, self.implementation, self.locus_str, self.metric]
         name = _FIELD_SEPARATOR.join(parts)
         if self.suffixes:
             suffix_str = _SUFFIX_SEPARATOR.join(f"{k}={v}" for k, v in sorted(self.suffixes.items()))
@@ -372,12 +383,12 @@ class QONGateMetric(QONMetric):
         parts, suffixes = _split_obs_name(method_specific_part, maxsplit=3)
         if len(parts) < 4:
             raise ValueError(f"{method} gate quality metric name has less than 6 parts")
-        gate, implementation, locus, metric = parts
+        gate, implementation, locus_str, metric = parts
         return cls(
             method=method,
             gate=gate,
             implementation=implementation,
-            locus=locus,
+            locus_str=locus_str,
             metric=metric,
             suffixes=suffixes,
         )
@@ -388,7 +399,7 @@ class QONGateMetric(QONMetric):
 class QONSystemMetric(QONMetric):
     """QON representing a system quality metric.
 
-    Has the form ``metrics.{method}.{locus}.{metric}``.
+    Has the form ``metrics.{method}.{locus_str}.{metric}``.
 
     Can parse/represent e.g. the following metrics:
 
@@ -397,21 +408,21 @@ class QONSystemMetric(QONMetric):
         method: irb
         gate: circuit
         implementation: random_circuit
-        locus: QB4
+        locus_str: QB4
         metric: fidelity
         suffixes: {"par": "d2"}
 
     ``metrics.ghz_state.QB1__QB2.coherence_lower_bound``
 
         method: ghz_state
-        locus: QB1__QB2
+        locus_str: QB1__QB2
         metric: coherence_lower_bound
 
     Subclasses implement parsing and string representation for specific methods.
     """
 
     def __str__(self) -> str:
-        parts = [self.domain, self.method, self.locus, self.metric]
+        parts = [self.domain, self.method, self.locus_str, self.metric]
         return _FIELD_SEPARATOR.join(parts)
 
     @classmethod
@@ -432,10 +443,10 @@ class QONSystemMetric(QONMetric):
         parts = method_specific_part.split(_FIELD_SEPARATOR, maxsplit=1)
         if len(parts) < 2:
             raise ValueError(f"{method} system quality metric name has less than 4 parts")
-        locus, metric = parts
+        locus_str, metric = parts
         return cls(
             method=method,
-            locus=locus,
+            locus_str=locus_str,
             metric=metric,
         )
 
@@ -479,8 +490,8 @@ class QONGateParam(QON):
     """Name of the gate/quantum operation."""
     implementation: Annotated[str, Field(pattern=_PATTERN)]
     """Name of the gate implementation."""
-    locus: str
-    """Sequence of names of QPU components on which the gate is applied."""
+    locus_str: str
+    """Sequence of names of QPU components on which the gate is applied, encoded into a string."""
     parameter: str
     """Name of the gate parameter. May have further dotted structure."""
 
@@ -488,8 +499,13 @@ class QONGateParam(QON):
     def domain(self) -> Domain:
         return Domain.GATE_PARAMETER
 
+    @property
+    def locus(self) -> Locus:
+        """Locus of the gate parameter."""
+        return locus_str_to_locus(self.locus_str)
+
     def __str__(self) -> str:
-        return _FIELD_SEPARATOR.join([self.domain, self.gate, self.implementation, self.locus, self.parameter])
+        return _FIELD_SEPARATOR.join([self.domain, self.gate, self.implementation, self.locus_str, self.parameter])
 
     @classmethod
     def _parse(cls, gate: str, rest: str) -> QONGateParam:
@@ -497,11 +513,11 @@ class QONGateParam(QON):
         parts = rest.split(_FIELD_SEPARATOR, maxsplit=2)
         if len(parts) < 3:
             raise ValueError("Gate parameter observation name has less than 5 parts")
-        implementation, locus, param = parts
+        implementation, locus_str, param = parts
         return cls(
             gate=gate,
             implementation=implementation,
-            locus=locus,
+            locus_str=locus_str,
             parameter=param,
         )
 

iqm/station_control/interface/models/jobs.py

@@ -181,3 +181,12 @@ class JobExecutorStatus(Enum):
     def terminal_statuses(cls) -> set[JobExecutorStatus]:
         """Statuses from which the execution can't continue."""
         return {cls.ABORTED, cls.FAILED, cls.READY}
+
+    @classmethod
+    def in_progress_statuses(cls) -> set[JobExecutorStatus]:
+        """Statuses representing jobs that should be cleaned up on restart.
+
+        Returns all non-terminal statuses.
+        """
+        all_statuses = set(cls)
+        return all_statuses - cls.terminal_statuses()

{iqm_station_control_client-10.1.0.dist-info → iqm_station_control_client-11.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-station-control-client
-Version: 10.1.0
+Version: 11.0.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-10.1.0.dist-info → iqm_station_control_client-11.0.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=jpnmUqFvmzGxhq6fDBrV2crIgGNY5NfYqj5odpyWO-w,2524
 iqm/station_control/client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iqm/station_control/client/qon.py,sha256=_Ljolt5YAnosn1abThi8CooI883VqkNEFrcUsiDBYiY,27213
+iqm/station_control/client/qon.py,sha256=9URsapeqVXi2h6xX0BKpl2fYKKkwGicLN-isI_Mmh0s,27768
 iqm/station_control/client/station_control.py,sha256=XbRkDvKiRvNsCQmMZPe1tkBDYR57q9oYLRC2HHsIRKg,29089
 iqm/station_control/client/utils.py,sha256=-6K4KgOgA4iyUCqX-w26JvFxlwlGBehGj4tIWCEbn74,3360
 iqm/station_control/client/iqm_server/__init__.py,sha256=nLsRHN1rnOKXwuzaq_liUpAYV3sis5jkyHccSdacV7U,624
@@ -43,7 +43,7 @@ iqm/station_control/interface/station_control.py,sha256=5gtDouAQ13KnyXNQUcBrpKG9
 iqm/station_control/interface/models/__init__.py,sha256=BP9iIwHi0nw8CUzScXOsu8bhxnE_rRulOsRVO5L1hx0,1989
 iqm/station_control/interface/models/dut.py,sha256=Hc_0XllXeIPGWhHsY7PC_jMpi7swpqo3jQQEQVnF3AM,1216
 iqm/station_control/interface/models/dynamic_quantum_architecture.py,sha256=3YlI9e1XxdbkBzlOdxmzYTccJ8AJRnRSIp-JoBf8Yyw,4698
-iqm/station_control/interface/models/jobs.py,sha256=L-c2uTqWSTVb6Kq3GGSi5i6w9ZacdCCIEPUqpErR8lY,6579
+iqm/station_control/interface/models/jobs.py,sha256=MGo0MOg-mTw3rF7vNCYNGAns6-eyl30ubqiEQWCFJ9c,6876
 iqm/station_control/interface/models/monitor.py,sha256=ItlgxtBup1hHg64uKeMKiFE7MaRRqSYdVRttsFD_XeU,1352
 iqm/station_control/interface/models/observation.py,sha256=IblYdzJN88BNlyxUVR_dIx7BgD_GHGLhHUwy89Fib-I,3281
 iqm/station_control/interface/models/observation_set.py,sha256=y6uqslVF2kO1zREPE6EtrvG9ZVrLo0S2Sk7ZhRL8pks,3993
@@ -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=StsUwqwPp1N9wh79w40C6eEp7OmQ8E5AnJX7w2mqTnQ,1153
-iqm_station_control_client-10.1.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_station_control_client-10.1.0.dist-info/METADATA,sha256=9nZRAjTZES5s-9uom4_sZbg9ZwDat9SJSjiqMid92kk,14107
-iqm_station_control_client-10.1.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_station_control_client-10.1.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_station_control_client-10.1.0.dist-info/RECORD,,
+iqm_station_control_client-11.0.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_station_control_client-11.0.0.dist-info/METADATA,sha256=jiog131yThfz5_ybdxA9BcEAMm-kTtrqcaAMmpdFt4w,14107
+iqm_station_control_client-11.0.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_station_control_client-11.0.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_station_control_client-11.0.0.dist-info/RECORD,,