QuLab 2.4.4__cp311-cp311-macosx_10_9_universal2.whl → 2.4.6__cp311-cp311-macosx_10_9_universal2.whl

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

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

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

@@ -1,15 +1,15 @@
 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-311-darwin.so,sha256=EmXnOuhfxk4lsE7ZUEUEAqapDREh4G5KCwimptXm6rM,126848
-qulab/version.py,sha256=eqe1IjXqXc-Xs4eOzTI446GCAcUfeCDsvtEbD5f7b1A,21
+qulab/fun.cpython-311-darwin.so,sha256=lv3X6rjswckPxJ8ztPehlluwseqcgsDOPOEh3yrGFJY,126848
+qulab/version.py,sha256=jzWsJzFuYAnC9Fllul1PYEIxXD-Lspqc6-IMg65EXLc,21
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
-qulab/executor/__main__.py,sha256=soBde_CbTJvvzIU1r2W2DCfQQY4fXMiwtzsXwTfohqw,2273
+qulab/executor/__main__.py,sha256=1Mg5fJ0dYSWQnP6wgTa0s6U_WH7NT2lCnCQOHyx_I7c,2430
 qulab/executor/load.py,sha256=jZHkEzFF8ufFAIajkRDKmHYYJxbxI3RcEbAFIbl9VQ0,6208
-qulab/executor/schedule.py,sha256=-jd8cr-C6gv2WbJr8OUTQceqaqeV6fgGrSZ74xLN-Fo,8999
+qulab/executor/schedule.py,sha256=blxX1wYEjbJcV6Su3ftQma8fGoMMQ_1t276PPoDjhfU,9524
 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/executor/utils.py,sha256=n3uCSKh-qdDFFeNvOpj7_es2_B4AaC-ASAlV9gPmSO0,3086
 qulab/monitor/__init__.py,sha256=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
 qulab/monitor/__main__.py,sha256=w3yUcqq195LzSnXTkQcuC1RSFRhy4oQ_PEBmucXguME,97
 qulab/monitor/config.py,sha256=fQ5JcsMApKc1UwANEnIvbDQZl8uYW0tle92SaYtX9lI,744
@@ -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.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=K10eKSN6_vzvMOgXxWbVOQNR7Orfl6gBTCpCI8bcYx4,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-2.4.6.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.4.6.dist-info/METADATA,sha256=xcG5D2k2LSHdq1VqLFx2isvhwkmWO-j72g0wyl2rLKY,3698
+QuLab-2.4.6.dist-info/WHEEL,sha256=K10eKSN6_vzvMOgXxWbVOQNR7Orfl6gBTCpCI8bcYx4,114
+QuLab-2.4.6.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.6.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.6.dist-info/RECORD,,

qulab/executor/__main__.py

@@ -4,7 +4,8 @@ from pathlib import Path
 import click
 
 from .load import find_unreferenced_workflows
-from .schedule import maintain as maintain_workflow, run as run_workflow
+from .schedule import maintain as maintain_workflow
+from .schedule import run as run_workflow
 from .transform import set_config_api
 from .utils import workflow_template
 
@@ -41,9 +42,10 @@ def create(workflow, code):
 @click.argument('workflow')
 @click.option('--code', '-c', default=None)
 @click.option('--data', '-d', default=None)
-@click.option('--api', '-g', default=None)
+@click.option('--api', '-a', default=None)
+@click.option('--plot', '-p', is_flag=True)
 @click.option('--no-dependents', '-n', is_flag=True)
-def run(workflow, code, data, api, no_dependents):
+def run(workflow, code, data, api, plot, no_dependents):
     """
     Run a workflow.
     """
@@ -56,17 +58,18 @@ def run(workflow, code, data, api, no_dependents):
         data = Path(code) / 'logs'
 
     if no_dependents:
-        run_workflow(workflow, code, data)
+        run_workflow(workflow, code, data, plot=plot)
     else:
-        maintain_workflow(workflow, code, data, run=True)
+        maintain_workflow(workflow, code, data, run=True, plot=plot)
 
 
 @click.command()
 @click.argument('workflow')
 @click.option('--code', '-c', default=None)
 @click.option('--data', '-d', default=None)
-@click.option('--api', '-g', default=None)
-def maintain(workflow, code, data, api):
+@click.option('--api', '-a', default=None)
+@click.option('--plot', '-p', is_flag=True)
+def maintain(workflow, code, data, api, plot):
     """
     Maintain a workflow.
     """
@@ -78,7 +81,7 @@ def maintain(workflow, code, data, api):
     if data is None:
         data = Path(code) / 'logs'
 
-    maintain_workflow(workflow, code, data, run=False)
+    maintain_workflow(workflow, code, data, run=False, plot=plot)
 
 
 cli.add_command(maintain)

qulab/executor/schedule.py

@@ -59,7 +59,7 @@ def check_state(workflow: str, code_path: str | Path,
     return True
 
 
-def call_analyzer(node, data, history, check=False):
+def call_analyzer(node, data, history, check=False, plot=False):
     if check:
         result = transform.params_to_result(
             node.check_analyze(*data,
@@ -69,13 +69,21 @@ def call_analyzer(node, data, history, check=False):
         result = transform.params_to_result(
             node.analyze(*data, history=transform.result_to_params(history)))
         result.fully_calibrated = True
+        if plot:
+            call_plot(node, result)
     result.data = data
     return result
 
 
+def call_plot(node, result, check=False):
+    if hasattr(node, 'plot') and callable(node.plot):
+        state, params, other = transform.result_to_params(result)
+        node.plot(state, params, other)
+
+
 @functools.lru_cache(maxsize=128)
 def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
-               session_id: str) -> Result:
+               plot: bool, session_id: str) -> Result:
     """
     check data answers two questions:
     Is the parameter associated with this cal in spec,
@@ -109,7 +117,7 @@ def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
         save_result(workflow, result, state_path)
 
         logger.debug(f'Checked "{workflow}" !')
-        result = call_analyzer(node, data, history, check=True)
+        result = call_analyzer(node, data, history, check=True, plot=plot)
         if result.in_spec:
             logger.debug(f'"{workflow}": checked in spec, renewing result')
             renew_result(workflow, state_path)
@@ -124,7 +132,7 @@ def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
         save_result(workflow, result, state_path)
 
         logger.debug(f'Calibrated "{workflow}" !')
-        result = call_analyzer(node, data, history, check=False)
+        result = call_analyzer(node, data, history, check=False, plot=plot)
         save_result(workflow, result, state_path,
                     get_head(workflow, state_path))
 
@@ -133,7 +141,7 @@ def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
 
 @functools.lru_cache(maxsize=128)
 def calibrate(workflow, code_path: str | Path, state_path: str | Path,
-              session_id: str) -> Result:
+              plot: bool, session_id: str) -> Result:
     node = load_workflow(workflow, code_path)
     history = find_result(workflow, state_path)
 
@@ -143,38 +151,36 @@ def calibrate(workflow, code_path: str | Path, state_path: str | Path,
     result.data = data
     save_result(workflow, result, state_path)
     logger.debug(f'Calibrated "{workflow}" !')
-    result = call_analyzer(node, data, history, check=False)
+    result = call_analyzer(node, data, history, check=False, plot=plot)
     save_result(workflow, result, state_path, get_head(workflow, state_path))
     return result
 
 
-def diagnose(node, code_path: str | Path, state_path: str | Path,
+def diagnose(node, code_path: str | Path, state_path: str | Path, plot: bool,
              session_id: str):
     '''
     Returns: True if node or dependent recalibrated.
     '''
     logger.debug(f'diagnose "{node}"')
     # check_data
-    result = check_data(node, code_path, state_path, session_id)
+    result = check_data(node, code_path, state_path, plot, session_id)
     # in spec case
     if result.in_spec:
+        logger.debug(f'"{node}": Checked! In spec, no need to diagnose')
         return False
     # bad data case
     recalibrated = []
     if result.bad_data:
         recalibrated = [
-            diagnose(n, code_path, state_path, session_id)
+            diagnose(n, code_path, state_path, plot, session_id)
             for n in get_dependents(node, code_path)
         ]
-    if not any(recalibrated):
+    if not any(recalibrated) and recalibrated:
+        logger.debug(f'"{node}": no dependents recalibrated.')
         return False
     # calibrate
-    if result.fully_calibrated and result.in_spec:
-        pass
-    else:
-        logger.debug(
-            f'recalibrate "{node}" because some dependents recalibrated')
-        result = calibrate(node, code_path, state_path, session_id)
+    logger.debug(f'recalibrate "{node}" because some dependents recalibrated')
+    result = calibrate(node, code_path, state_path, plot, session_id)
     if result.bad_data or not result.in_spec:
         raise CalibrationFailedError(
             f'"{node}": All dependents passed, but calibration failed!')
@@ -191,7 +197,8 @@ def maintain(node,
              code_path: str | Path,
              state_path: str | Path,
              session_id: str | None = None,
-             run: bool = False):
+             run: bool = False,
+             plot: bool = False):
     if session_id is None:
         session_id = uuid.uuid4().hex
     logger.debug(f'run "{node}"' if run else f'maintain "{node}"')
@@ -206,7 +213,7 @@ def maintain(node,
         logger.debug(f'"{node}": In spec, no need to maintain')
         return
     # check_data
-    result = check_data(node, code_path, state_path, session_id)
+    result = check_data(node, code_path, state_path, plot, session_id)
     if result.in_spec:
         if not run:
             logger.debug(f'"{node}": In spec, no need to maintain')
@@ -215,12 +222,12 @@ def maintain(node,
         logger.debug(f'"{node}": Bad data, diagnosing dependents')
         for n in get_dependents(node, code_path):
             logger.debug(f'diagnose "{n}" because of "{node}" bad data')
-            diagnose(n, code_path, state_path, session_id)
+            diagnose(n, code_path, state_path, plot, session_id)
         else:
             logger.debug(f'"{node}": All dependents diagnosed')
     # calibrate
     logger.debug(f'recalibrate "{node}"')
-    result = calibrate(node, code_path, state_path, session_id)
+    result = calibrate(node, code_path, state_path, plot, session_id)
     if result.bad_data or not result.in_spec:
         raise CalibrationFailedError(
             f'"{node}": All dependents passed, but calibration failed!')
@@ -228,9 +235,12 @@ 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,
+        plot: bool = False):
     logger.debug(f'run "{node}" without dependences.')
-    result = calibrate(node, code_path, state_path)
+    result = calibrate(node, code_path, state_path, plot)
     if result.bad_data or not result.in_spec:
         raise CalibrationFailedError(
             f'"{node}": All dependents passed, but calibration failed!')

qulab/executor/utils.py

@@ -38,7 +38,7 @@ import numpy as np
 
 
 # 多长时间应该检查一次校准实验，单位是秒。
-__timeout__ = 200
+__timeout__ = 7*24*3600
 
 def depends():
     return [{deps!r}]

qulab/version.py

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