QuLab 2.7.7__cp311-cp311-win_amd64.whl → 2.7.9__cp311-cp311-win_amd64.whl

{QuLab-2.7.7.dist-info → QuLab-2.7.9.dist-info}/METADATA

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

{QuLab-2.7.7.dist-info → QuLab-2.7.9.dist-info}/RECORD

@@ -1,18 +1,18 @@
 qulab/__init__.py,sha256=RZme5maBSMZpP6ckXymqZpo2sRYttwEpTYCIzIvys1c,292
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp311-win_amd64.pyd,sha256=JDP-epj88xBhm33dIAx8Lhd-vessLGjsHCZzh_kCM5U,31744
+qulab/fun.cp311-win_amd64.pyd,sha256=8ns5kxnTz3ufdO6uEj-SZBkxydb_PIewI7Ww4cGZUN0,31744
 qulab/typing.py,sha256=PRtwbCHWY2ROKK8GHq4Bo8llXrIGo6xC73DrQf7S9os,71
 qulab/utils.py,sha256=UyZNPIyvis5t2MJBkXXLO5EmYP3mQZbt87zmYAHgoyk,1291
-qulab/version.py,sha256=TXxZaBvn1Y_BQ2YYBZ0iedwKmA3iOfYiZehFXuAoky0,21
+qulab/version.py,sha256=2Uj8_mq4WyOkRTNLvNp4euDlxbbREHlgUVtU-CUptMY,21
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
 qulab/cli/config.py,sha256=tNmH4ggdgrFqcQa2WZKLpidiYTg95_UnT0paDJ4fi4c,3204
 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=DHQ5dI5YX8_frWplOoLEb9htcfM5-mikiSBNSPWT1io,16725
-qulab/executor/storage.py,sha256=sBD-aNvj29l5HtoTpk_627qarZkPn33F-hcc80AuF6k,11079
+qulab/executor/schedule.py,sha256=A5LOTFFJjU7zNEkv80hnq1cYGG-uPJYrhHO6KPY8pRg,16911
+qulab/executor/storage.py,sha256=JH817-d6izBiz6wBGWvWxNEY_IPhRwRmGcB_eUpvE8U,11364
 qulab/executor/transform.py,sha256=s0kxWQx8Sr9pMIQke1BLNM6KqrSogAkjB6Zkapl8YSU,2189
 qulab/executor/utils.py,sha256=cF6-2jlvlHyTjNHdxXKG04Fjfm3_3wfDQAF1G8DQphk,5686
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
@@ -94,9 +94,9 @@ qulab/visualization/plot_seq.py,sha256=Uo1-dB1YE9IN_A9tuaOs9ZG3S5dKDQ_l98iD2Wbxp
 qulab/visualization/qdat.py,sha256=HubXFu4nfcA7iUzghJGle1C86G6221hicLR0b-GqhKQ,5887
 qulab/visualization/rot3d.py,sha256=jGHJcqj1lEWBUV-W4GUGONGacqjrYvuFoFCwPse5h1Y,757
 qulab/visualization/widgets.py,sha256=HcYwdhDtLreJiYaZuN3LfofjJmZcLwjMfP5aasebgDo,3266
-QuLab-2.7.7.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.7.7.dist-info/METADATA,sha256=wLdPCOG28AtjkgODhWfbkl1uLP1i3G9Rj-feGwWtHKM,3803
-QuLab-2.7.7.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
-QuLab-2.7.7.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.7.7.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.7.7.dist-info/RECORD,,
+QuLab-2.7.9.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.7.9.dist-info/METADATA,sha256=nayB2CBp0e-8E_7hK5rw-hyIH14dVb1TmIl8w0CCu-E,3803
+QuLab-2.7.9.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
+QuLab-2.7.9.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.7.9.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.7.9.dist-info/RECORD,,

qulab/executor/schedule.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from loguru import logger
 
 from .load import WorkflowType, get_dependents
-from .storage import (Report, find_report, get_heads, renew_report,
+from .storage import (Report, find_report, get_head, get_heads, renew_report,
                       revoke_report, save_report)
 from .transform import current_config, obey_the_oracle, update_parameters
 
@@ -120,42 +120,6 @@ def check_state(workflow: WorkflowType, code_path: str | Path,
     return True
 
 
-def call_analyzer(node: WorkflowType,
-                  report: Report,
-                  history: Report | None,
-                  check=False,
-                  plot=False) -> Report:
-    if check:
-        report = node.check_analyze(report, history=history)
-        veryfy_analyzed_report(report, node.__workflow_id__, "check_analyze")
-        report.fully_calibrated = False
-    else:
-        report = node.analyze(report, history=history)
-        veryfy_analyzed_report(report, node.__workflow_id__, "analyze")
-        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.fully_calibrated = True
-        if plot:
-            call_plot(node, report)
-    return report
-
-
 @logger.catch()
 def call_plot(node: WorkflowType, report: Report, check=False):
     if hasattr(node, 'plot') and callable(node.plot):
@@ -177,12 +141,11 @@ def call_check(workflow: WorkflowType, session_id: str, state_path: Path):
                     data=data,
                     config_path=current_config(state_path),
                     base_path=state_path,
-                    heads=get_heads(state_path))
+                    heads=get_heads(state_path),
+                    previous_path=get_head(workflow.__workflow_id__,
+                                           state_path))
 
-    save_report(workflow.__workflow_id__,
-                report,
-                state_path,
-                refresh_heads=False)
+    save_report(workflow.__workflow_id__, report, state_path)
 
     set_cache(session_id, (workflow, 'check'), report)
     return report
@@ -203,7 +166,9 @@ def call_calibrate(workflow: WorkflowType, session_id: str, state_path: Path):
                     data=data,
                     config_path=current_config(state_path),
                     base_path=state_path,
-                    heads=get_heads(state_path))
+                    heads=get_heads(state_path),
+                    previous_path=get_head(workflow.__workflow_id__,
+                                           state_path))
 
     save_report(workflow.__workflow_id__, report, state_path)
 
@@ -211,8 +176,60 @@ def call_calibrate(workflow: WorkflowType, session_id: str, state_path: Path):
     return report
 
 
-def check_data(workflow: WorkflowType, code_path: str | Path,
-               state_path: str | Path, plot: bool, session_id: str) -> Report:
+def call_check_analyzer(node: WorkflowType,
+                        report: Report,
+                        history: Report | None,
+                        state_path: Path,
+                        plot=False) -> Report:
+    report = node.check_analyze(report, history=history)
+    veryfy_analyzed_report(report, node.__workflow_id__, "check_analyze")
+    report.fully_calibrated = False
+    if report.in_spec:
+        logger.debug(
+            f'"{node.__workflow_id__}": checked in spec, renewing report')
+        renew_report(node.__workflow_id__, report.previous, state_path)
+    else:
+        logger.debug(
+            f'"{node.__workflow_id__}": checked out of spec, revoking report')
+        revoke_report(node.__workflow_id__, report.previous, state_path)
+    return report
+
+
+def call_analyzer(node: WorkflowType,
+                  report: Report,
+                  history: Report | None,
+                  state_path: Path,
+                  plot=False) -> Report:
+
+    report = node.analyze(report, history=history)
+    veryfy_analyzed_report(report, node.__workflow_id__, "analyze")
+    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.fully_calibrated = True
+    save_report(node.__workflow_id__, report, state_path, overwrite=True)
+    if plot:
+        call_plot(node, report)
+    return report
+
+
+def check_data(workflow: WorkflowType, state_path: str | Path, plot: bool,
+               session_id: str) -> Report:
     """
     check data answers two questions:
     Is the parameter associated with this cal in spec,
@@ -225,7 +242,9 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
         report = Report(workflow=workflow.__workflow_id__,
                         config_path=current_config(state_path),
                         base_path=state_path,
-                        heads=get_heads(state_path))
+                        heads=get_heads(state_path),
+                        previous_path=get_head(workflow.__workflow_id__,
+                                               state_path))
         report.in_spec = False
         report.bad_data = False
         return report
@@ -250,21 +269,11 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
         report = call_check(workflow, session_id, state_path)
 
         logger.debug(f'Checked "{workflow.__workflow_id__}" !')
-        report = call_analyzer(workflow,
-                               report,
-                               history,
-                               check=True,
-                               plot=plot)
-        if report.in_spec:
-            logger.debug(
-                f'"{workflow.__workflow_id__}": checked in spec, renewing report'
-            )
-            renew_report(workflow.__workflow_id__, report, state_path)
-        else:
-            logger.debug(
-                f'"{workflow.__workflow_id__}": checked out of spec, revoking report'
-            )
-            revoke_report(workflow.__workflow_id__, report, state_path)
+        report = call_check_analyzer(workflow,
+                                     report,
+                                     history,
+                                     state_path,
+                                     plot=plot)
     else:
         logger.debug(
             f'Checking "{workflow.__workflow_id__}" with "calibrate" method ...'
@@ -276,17 +285,13 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
         report = call_analyzer(workflow,
                                report,
                                history,
-                               check=False,
+                               state_path,
                                plot=plot)
-        save_report(workflow.__workflow_id__,
-                    report,
-                    state_path,
-                    overwrite=True)
     return report
 
 
-def calibrate(workflow: WorkflowType, code_path: str | Path,
-              state_path: str | Path, plot: bool, session_id: str) -> Report:
+def calibrate(workflow: WorkflowType, state_path: str | Path, plot: bool,
+              session_id: str) -> Report:
     history = find_report(workflow.__workflow_id__, state_path)
 
     logger.debug(f'Calibrating "{workflow.__workflow_id__}" ...')
@@ -295,9 +300,11 @@ def calibrate(workflow: WorkflowType, code_path: str | Path,
 
     logger.debug(f'Calibrated "{workflow.__workflow_id__}" !')
 
-    report = call_analyzer(workflow, report, history, check=False, plot=plot)
-
-    save_report(workflow.__workflow_id__, report, state_path, overwrite=True)
+    report = call_analyzer(workflow,
+                           report,
+                           history,
+                           state_path,
+                           plot=plot)
     return report
 
 
@@ -308,7 +315,7 @@ def diagnose(workflow: WorkflowType, code_path: str | Path,
     '''
     logger.debug(f'diagnose "{workflow.__workflow_id__}"')
     # check_data
-    report = check_data(workflow, code_path, state_path, plot, session_id)
+    report = check_data(workflow, state_path, plot, session_id)
     # in spec case
     if report.in_spec:
         logger.debug(
@@ -350,7 +357,7 @@ def diagnose(workflow: WorkflowType, code_path: str | Path,
     else:
         logger.error(f'Never reach: recalibrate "{workflow.__workflow_id__}"')
 
-    report = calibrate(workflow, code_path, state_path, plot, session_id)
+    report = calibrate(workflow, state_path, plot, session_id)
     if report.bad_data or not report.in_spec:
         obey_the_oracle(report, state_path)
         raise CalibrationFailedError(
@@ -393,7 +400,7 @@ def maintain(workflow: WorkflowType,
             f'"{workflow.__workflow_id__}": In spec, no need to maintain')
         return
     # check_data
-    report = check_data(workflow, code_path, state_path, plot, session_id)
+    report = check_data(workflow, state_path, plot, session_id)
     if report.in_spec:
         if not run:
             logger.debug(
@@ -412,7 +419,7 @@ def maintain(workflow: WorkflowType,
                 f'"{workflow.__workflow_id__}": All dependents diagnosed')
     # calibrate
     logger.debug(f'recalibrate "{workflow.__workflow_id__}"')
-    report = calibrate(workflow, code_path, state_path, plot, session_id)
+    report = calibrate(workflow, state_path, plot, session_id)
     if report.bad_data or not report.in_spec:
         if not freeze:
             obey_the_oracle(report, state_path)
@@ -432,11 +439,7 @@ def run(workflow: WorkflowType,
         freeze: bool = False):
     session_id = uuid.uuid4().hex
     logger.debug(f'run "{workflow.__workflow_id__}" without dependences.')
-    report = calibrate(workflow,
-                       code_path,
-                       state_path,
-                       plot,
-                       session_id=session_id)
+    report = calibrate(workflow, state_path, plot, session_id=session_id)
     if report.bad_data or not report.in_spec:
         if not freeze:
             obey_the_oracle(report, state_path)

qulab/executor/storage.py

@@ -149,8 +149,11 @@ def save_report(workflow: str,
         f'Saving report for "{workflow}", {report.in_spec=}, {report.bad_data=}, {report.fully_calibrated=}'
     )
     base_path = Path(base_path)
-    if overwrite:
+    try:
         buf = lzma.compress(pickle.dumps(report))
+    except:
+        raise ValueError(f"Can't pickle report for {workflow}")
+    if overwrite:
         path = report.path
         if path is None:
             raise ValueError("Report path is None, can't overwrite.")
@@ -158,8 +161,6 @@ def save_report(workflow: str,
             index = int.from_bytes(f.read(8), 'big')
         report.index = index
     else:
-        report.previous_path = get_head(workflow, base_path)
-        buf = lzma.compress(pickle.dumps(report))
         path = random_path(base_path / 'objects')
         (base_path / 'objects' / path).parent.mkdir(parents=True,
                                                     exist_ok=True)
@@ -168,7 +169,6 @@ def save_report(workflow: str,
                                     base_path,
                                     context=str(path),
                                     width=35)
-
     with open(base_path / 'objects' / path, "wb") as f:
         f.write(report.index.to_bytes(8, 'big'))
         f.write(buf)
@@ -202,22 +202,30 @@ def find_report(
     return load_report(path, base_path)
 
 
-def renew_report(workflow: str, report, base_path: str | Path):
+def renew_report(workflow: str, report: Report | None, base_path: str | Path):
     logger.debug(f'Renewing report for "{workflow}"')
-    report = find_report(workflow, base_path)
     if report is not None:
         report.checked_time = datetime.now()
-        return save_report(workflow, report, base_path)
+        return save_report(workflow,
+                           report,
+                           base_path,
+                           overwrite=True,
+                           refresh_heads=True)
+    else:
+        raise ValueError(f"Can't renew report for {workflow}")
 
 
-def revoke_report(workflow: str, report, base_path: str | Path):
+def revoke_report(workflow: str, report: Report | None, base_path: str | Path):
     logger.debug(f'Revoking report for "{workflow}"')
     base_path = Path(base_path)
-    path = get_head(workflow, base_path)
-    if path is not None:
-        report = load_report(path, base_path)
+    if report is not None:
         report.in_spec = False
-        return save_report(workflow, report, base_path)
+        report.previous_path = report.path
+        return save_report(workflow,
+                           report,
+                           base_path,
+                           overwrite=False,
+                           refresh_heads=True)
 
 
 def set_head(workflow: str, path: Path, base_path: str | Path):

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.7.7"
+__version__ = "2.7.9"