QuLab 2.7.12__cp310-cp310-macosx_10_9_universal2.whl → 2.7.13__cp310-cp310-macosx_10_9_universal2.whl

qulab/executor/schedule.py

@@ -1,4 +1,5 @@
 import functools
+import inspect
 import pickle
 import uuid
 from datetime import datetime, timedelta
@@ -231,21 +232,7 @@ def call_analyzer(node: WorkflowType,
     if hasattr(node, 'oracle') and callable(node.oracle):
         logger.debug(
             f'"{node.__workflow_id__}" has oracle method, calling ...')
-        try:
-            report = node.oracle(report,
-                                 history=history,
-                                 system_state=get_heads(report.base_path))
-        except Exception as e:
-            logger.exception(e)
-            report.oracle = {}
-        if not isinstance(report, Report):
-            raise TypeError(
-                f'"{node.__workflow_id__}" : function "oracle" must return a Report object'
-            )
-        if not is_pickleable(report.oracle):
-            raise TypeError(
-                f'"{node.__workflow_id__}" : function "oracle" return not pickleable data'
-            )
+        report = call_oracle(node, report, history)
     report.fully_calibrated = True
     save_report(node.__workflow_id__, report, state_path, overwrite=True)
     if plot:
@@ -253,6 +240,35 @@ def call_analyzer(node: WorkflowType,
     return report
 
 
+def call_oracle(node: WorkflowType, report: Report, history: Report | None):
+    sig = inspect.signature(node.oracle)
+    try:
+        if 'history' in sig.parameters and 'system_state' in sig.parameters:
+            report = node.oracle(report,
+                                 history=history,
+                                 system_state=get_heads(report.base_path))
+        elif 'history' in sig.parameters:
+            report = node.oracle(report, history=history)
+        elif 'system_state' in sig.parameters:
+            report = node.oracle(report,
+                                 system_state=get_heads(report.base_path))
+        else:
+            report = node.oracle(report)
+    except Exception as e:
+        logger.exception(e)
+        report.oracle = {}
+        return report
+    if not isinstance(report, Report):
+        raise TypeError(
+            f'"{node.__workflow_id__}" : function "oracle" must return a Report object'
+        )
+    if not is_pickleable(report.oracle):
+        raise TypeError(
+            f'"{node.__workflow_id__}" : function "oracle" return not pickleable data'
+        )
+    return report
+
+
 def check_data(workflow: WorkflowType, state_path: str | Path, plot: bool,
                session_id: str) -> Report:
     """

qulab/tools/__init__.py

@@ -0,0 +1,39 @@
+class _Missing():
+
+    def __repr__(self):
+        return "Missing"
+
+
+Missing = _Missing()
+
+
+def connect_trace(*mappings):
+    if not mappings:
+        return {}
+    result = {}
+    first_mapping = mappings[0]
+    for key in first_mapping:
+        current_value = key
+        trajectory = []
+        for mapping in mappings:
+            if current_value is Missing:
+                trajectory.append(Missing)
+                continue
+            if current_value in mapping:
+                next_value = mapping[current_value]
+                trajectory.append(next_value)
+                current_value = next_value
+            else:
+                trajectory.append(Missing)
+                current_value = Missing
+        result[key] = trajectory
+    return result
+
+
+def connect(*mappings):
+    if not mappings:
+        return {}
+    return {
+        k: v[-1]
+        for k, v in connect_trace(*mappings).items() if v[-1] is not Missing
+    }

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.7.12"
+__version__ = "2.7.13"

{QuLab-2.7.12.dist-info → qulab-2.7.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuLab
-Version: 2.7.12
+Version: 2.7.13
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{QuLab-2.7.12.dist-info → qulab-2.7.13.dist-info}/RECORD

@@ -1,17 +1,17 @@
 qulab/__init__.py,sha256=KJcUcZ5qXY6wlAoirzK_B-dgtDjsLmOE671v3gcXO_c,286
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-310-darwin.so,sha256=q6n9jyXo1VGeyNH2HB0BVU1nuFcez-k-bmzJTdR8wF8,126864
+qulab/fun.cpython-310-darwin.so,sha256=R-OBPkXPgRwsfaAJzlKb69ZWAc4A8Jh7F8YCWyM0RsM,126864
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
 qulab/utils.py,sha256=JIXMSmZU0uYfKG_tzawpK7vRNPRir_hJE8JlqkVLX2o,1260
-qulab/version.py,sha256=lU1Df-qhbluQkmwozAIUZOHD7dGWclt66rz4f2uhpqA,22
+qulab/version.py,sha256=aT1ObWeGn4CAPTB2n1JwBZCtp9XDVJssGu0Z4ACIIQ4,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=tgDIkkeIoasQXAifJZ6NU8jDgpNgb2a-B0C4nF0evrE,559
 qulab/cli/config.py,sha256=Ei7eSYnbwPPlluDnm8YmWONYiI4g7WtvlZGQdr1Z6vo,3688
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/cli.py,sha256=gGka2M6xccfM8facsIJ2qZ1y2Yx8C4BRhc1JG6nK9mo,8932
 qulab/executor/load.py,sha256=4FY_SwumLDUewC265v4j_ZGGpfYOgH4c8PtglYcWpBw,18077
-qulab/executor/schedule.py,sha256=YmVD0NH2YouAjWHjky_0IVfYv23J9upYFOxy8gVfJqw,18454
+qulab/executor/schedule.py,sha256=9pTOVWzKiDc7ip8iuB_47poJcYOvoBI9eQwTrDTA3p0,19044
 qulab/executor/storage.py,sha256=gI6g28BmKKEZ_Pl-hFwvpiOj3mF8Su-yjj3hfMXs1VY,11630
 qulab/executor/transform.py,sha256=4DyGXv1Iw36cCPqbqXlsn0Lw6gFjQpp_6Hcta50YQxU,2181
 qulab/executor/utils.py,sha256=cF6-2jlvlHyTjNHdxXKG04Fjfm3_3wfDQAF1G8DQphk,5686
@@ -85,6 +85,7 @@ qulab/sys/rpc/socket.py,sha256=e3R0gwOHpLEkSp7Tb43FMSDvqSG-pjrkskdISKQRseE,713
 qulab/sys/rpc/utils.py,sha256=6YGFOkY7o09lkA_I1FIP9_1Up3k2F1KOkftvu0_8lxo,594
 qulab/sys/rpc/worker.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/sys/rpc/zmq_socket.py,sha256=2uc9MjCRUwWm6iPmi2VGnOYNf9yWFSUzEVYrx0jZvPU,8272
+qulab/tools/__init__.py,sha256=o1t6UpJQPyj4mWY66axgQkgsqUzdkhEGBJo44x9U1iE,946
 qulab/visualization/__init__.py,sha256=26cuHt3QIJXUb3VaMxlJx3IQTOUVJFKlYBZr7WMP53M,6129
 qulab/visualization/__main__.py,sha256=9zKK3yZFy0leU40ou6BpRC1Fsetfc1gjjFzIZYIwP6Y,1639
 qulab/visualization/_autoplot.py,sha256=31B7pn1pK19abpQDGYBU9a_27cDL87LBpx9vKqlcYAo,14165
@@ -94,9 +95,9 @@ qulab/visualization/plot_seq.py,sha256=UWTS6p9nfX_7B8ehcYo6UnSTUCjkBsNU9jiOeW2ca
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
 qulab/visualization/rot3d.py,sha256=lMrEJlRLwYe6NMBlGkKYpp_V9CTipOAuDy6QW_cQK00,734
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-QuLab-2.7.12.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.7.12.dist-info/METADATA,sha256=XO2FY8TwAPQk7FAnVETtmCVj_II9n12tnTeOD1oR7lI,3699
-QuLab-2.7.12.dist-info/WHEEL,sha256=Yd3eJSBM2hj8W-ouaiMfFUwQYAS-D6P73Ob9yN5MZd0,114
-QuLab-2.7.12.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.7.12.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.7.12.dist-info/RECORD,,
+qulab-2.7.13.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.7.13.dist-info/METADATA,sha256=jcgTSB8rZA06Umse8zUuaxfFLGdyBD4skLwUxqGCUOs,3699
+qulab-2.7.13.dist-info/WHEEL,sha256=QgR3XCD-6bLIVi9XRH__kfiwMJXw7QeWoMWYRnaC8WY,114
+qulab-2.7.13.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.7.13.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.7.13.dist-info/RECORD,,

{QuLab-2.7.12.dist-info → qulab-2.7.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_10_9_universal2