QuLab 2.4.2__tar.gz → 2.4.3__tar.gz

{qulab-2.4.2 → qulab-2.4.3}/PKG-INFO

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

{qulab-2.4.2 → qulab-2.4.3}/QuLab.egg-info/PKG-INFO

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

{qulab-2.4.2 → qulab-2.4.3}/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-2.4.2 → qulab-2.4.3}/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-2.4.3/qulab/version.py

@@ -0,0 +1 @@
+__version__ = "2.4.3"

qulab-2.4.2/qulab/version.py

@@ -1 +0,0 @@
-__version__ = "2.4.2"