QuLab 2.4.2__cp310-cp310-macosx_10_9_universal2.whl → 2.4.4__cp310-cp310-macosx_10_9_universal2.whl

{QuLab-2.4.2.dist-info → QuLab-2.4.4.dist-info}/METADATA

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

{QuLab-2.4.2.dist-info → QuLab-2.4.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 qulab/__init__.py,sha256=P-Mx2p4TVmL91SoxoeXcj8Qm0x4xUf5Q_FLk0Yc_gIQ,138
 qulab/__main__.py,sha256=V5jIyfuCSi5dI6jvqgH_BpXG0URd6bgneDdVCM1dGSA,545
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-310-darwin.so,sha256=gvblHrHtC05bG4q-RkPStkuft_g0qLVUS-SuKKysCDQ,126864
-qulab/version.py,sha256=-Jl0X_XeIIfpbtU5rpBV7cuIV0QKuAB3xXzeRWGaObE,21
+qulab/fun.cpython-310-darwin.so,sha256=oIGlzkghvNCx6DMriXrvHThAWZRuN_PYx1ZtH_F9pnQ,126864
+qulab/version.py,sha256=eqe1IjXqXc-Xs4eOzTI446GCAcUfeCDsvtEbD5f7b1A,21
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/__main__.py,sha256=soBde_CbTJvvzIU1r2W2DCfQQY4fXMiwtzsXwTfohqw,2273
 qulab/executor/load.py,sha256=jZHkEzFF8ufFAIajkRDKmHYYJxbxI3RcEbAFIbl9VQ0,6208
-qulab/executor/schedule.py,sha256=u3S8b6AwfdXyM_kAfrWr9zCi15qS40nRRdFEVyzJMmI,8503
-qulab/executor/storage.py,sha256=uYT2GtNEVX-lwICvDFBRH4hanBnPGue1lu2srvqYI_A,4518
-qulab/executor/transform.py,sha256=Sy1ZmzkaP4RhUMempYxcIRjuzTxbC9UikUMBKuoVleE,2148
+qulab/executor/schedule.py,sha256=-jd8cr-C6gv2WbJr8OUTQceqaqeV6fgGrSZ74xLN-Fo,8999
+qulab/executor/storage.py,sha256=M66Q5_Uc5MMfc_QAuuaaexwAz7wxBPMkeleB5nRpQmI,4621
+qulab/executor/transform.py,sha256=inaOn6eqCs22ZZ0xAQl8s8YCoEACaXSwFNNu7jqdwAk,2148
 qulab/executor/utils.py,sha256=vrwk2fAfSp3YLVZfrYPvxsVPpeuE2n-4G2Ae0eqdT4s,3080
 qulab/monitor/__init__.py,sha256=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
 qulab/monitor/__main__.py,sha256=w3yUcqq195LzSnXTkQcuC1RSFRhy4oQ_PEBmucXguME,97
@@ -89,9 +89,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.4.2.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.4.2.dist-info/METADATA,sha256=oeR6hPeYbUZz3ezTtCU2Mk-K8UymuWiufLMHC5Ytgww,3698
-QuLab-2.4.2.dist-info/WHEEL,sha256=Yd3eJSBM2hj8W-ouaiMfFUwQYAS-D6P73Ob9yN5MZd0,114
-QuLab-2.4.2.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.4.2.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.4.2.dist-info/RECORD,,
+QuLab-2.4.4.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.4.4.dist-info/METADATA,sha256=sVpPm8F4UlDlp6SxrbM-h_IU5EFIc_QB2__DgWrJlD4,3698
+QuLab-2.4.4.dist-info/WHEEL,sha256=Yd3eJSBM2hj8W-ouaiMfFUwQYAS-D6P73Ob9yN5MZd0,114
+QuLab-2.4.4.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.4.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.4.dist-info/RECORD,,

qulab/executor/schedule.py

@@ -7,8 +7,8 @@ from loguru import logger
 
 from . import transform
 from .load import load_workflow
-from .storage import (Result, find_result, renew_result, revoke_result,
-                      save_result)
+from .storage import (Result, find_result, get_head, renew_result,
+                      revoke_result, save_result)
 
 
 class CalibrationFailedError(Exception):
@@ -59,6 +59,20 @@ def check_state(workflow: str, code_path: str | Path,
     return True
 
 
+def call_analyzer(node, data, history, check=False):
+    if check:
+        result = transform.params_to_result(
+            node.check_analyze(*data,
+                               history=transform.result_to_params(history)))
+        result.fully_calibrated = False
+    else:
+        result = transform.params_to_result(
+            node.analyze(*data, history=transform.result_to_params(history)))
+        result.fully_calibrated = True
+    result.data = data
+    return result
+
+
 @functools.lru_cache(maxsize=128)
 def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
                session_id: str) -> Result:
@@ -90,11 +104,12 @@ def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
             node, 'check_analyze') and callable(node.check_analyze):
         logger.debug(f'Checking "{workflow}" with "check" method ...')
         data = node.check()
-        logger.debug(f'Checked "{workflow}" !')
-        result = transform.params_to_result(
-            node.check_analyze(*data,
-                               history=transform.result_to_params(history)))
+        result = Result()
         result.data = data
+        save_result(workflow, result, state_path)
+
+        logger.debug(f'Checked "{workflow}" !')
+        result = call_analyzer(node, data, history, check=True)
         if result.in_spec:
             logger.debug(f'"{workflow}": checked in spec, renewing result')
             renew_result(workflow, state_path)
@@ -104,31 +119,32 @@ def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
     else:
         logger.debug(f'Checking "{workflow}" with "calibrate" method ...')
         data = node.calibrate()
-        logger.debug(f'Calibrated "{workflow}" !')
-        result = transform.params_to_result(
-            node.analyze(*data, history=transform.result_to_params(history)))
+        result = Result()
         result.data = data
-        result.fully_calibrated = True
         save_result(workflow, result, state_path)
 
+        logger.debug(f'Calibrated "{workflow}" !')
+        result = call_analyzer(node, data, history, check=False)
+        save_result(workflow, result, state_path,
+                    get_head(workflow, state_path))
+
     return result
 
 
 @functools.lru_cache(maxsize=128)
 def calibrate(workflow, code_path: str | Path, state_path: str | Path,
               session_id: str) -> Result:
-    result = Result()
     node = load_workflow(workflow, code_path)
     history = find_result(workflow, state_path)
 
     logger.debug(f'Calibrating "{workflow}" ...')
     data = node.calibrate()
-    logger.debug(f'Calibrated "{workflow}" !')
-    result = transform.params_to_result(
-        node.analyze(*data, history=transform.result_to_params(history)))
+    result = Result()
     result.data = data
-    result.fully_calibrated = True
     save_result(workflow, result, state_path)
+    logger.debug(f'Calibrated "{workflow}" !')
+    result = call_analyzer(node, data, history, check=False)
+    save_result(workflow, result, state_path, get_head(workflow, state_path))
     return result
 
 
@@ -212,8 +228,7 @@ def maintain(node,
     return
 
 
-def run(node, code_path: str | Path,
-             state_path: str | Path):
+def run(node, code_path: str | Path, state_path: str | Path):
     logger.debug(f'run "{node}" without dependences.')
     result = calibrate(node, code_path, state_path)
     if result.bad_data or not result.in_spec:

qulab/executor/storage.py

@@ -47,12 +47,16 @@ def random_path(base: Path) -> Path:
             return path
 
 
-def save_result(workflow: str, result: Result, base_path: str | Path):
+def save_result(workflow: str,
+                result: Result,
+                base_path: str | Path,
+                path: Path | None = None):
     logger.debug(
         f'Saving result for "{workflow}", {result.in_spec=}, {result.bad_data=}, {result.fully_calibrated=}'
     )
     base_path = Path(base_path)
-    path = random_path(base_path)
+    if path is None:
+        path = random_path(base_path)
     (base_path / 'objects' / path).parent.mkdir(parents=True, exist_ok=True)
     result.previous = get_head(workflow, base_path)
     with open(base_path / 'objects' / path, "wb") as f:

qulab/executor/transform.py

@@ -57,7 +57,7 @@ def params_to_result(params: tuple) -> Result:
     if state in ['In spec', 'OK']:
         result.in_spec = True
         result.bad_data = False
-    elif state == ['Bad data', 'Bad']:
+    elif state in ['Bad data', 'Bad']:
         result.bad_data = True
         result.in_spec = False
     else:

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.4.2"
+__version__ = "2.4.4"