QuLab 2.7.4__cp310-cp310-macosx_10_9_universal2.whl → 2.7.6__cp310-cp310-macosx_10_9_universal2.whl

{QuLab-2.7.4.dist-info → QuLab-2.7.6.dist-info}/METADATA

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

{QuLab-2.7.4.dist-info → QuLab-2.7.6.dist-info}/RECORD

@@ -1,18 +1,18 @@
 qulab/__init__.py,sha256=tKRZe2WafDGcwbu7ddlMaePerN842aRbxcrECsu5pas,286
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-310-darwin.so,sha256=scM6yZPSYiGGAwMGAuACSAqcxgvv4CLrMRCit-lot0o,126864
+qulab/fun.cpython-310-darwin.so,sha256=QgEHTFx4ediOVIUKGllGdaak8zXnkawvicMAoWGO33E,126864
 qulab/typing.py,sha256=5xCLfrp1aZpKpDy4p2arbFszw2eK3hGUjZa-XSvC_-8,69
 qulab/utils.py,sha256=JIXMSmZU0uYfKG_tzawpK7vRNPRir_hJE8JlqkVLX2o,1260
-qulab/version.py,sha256=yGtQGdDAdfOPd0Cjx7MVgaq0BXaJxnboEQcVODQ3F3o,21
+qulab/version.py,sha256=ElxLmcD9H2GsJrWa-NsuGSxQyl8yztVfJ8oaA66f8oQ,21
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=tgDIkkeIoasQXAifJZ6NU8jDgpNgb2a-B0C4nF0evrE,559
 qulab/cli/config.py,sha256=SdNmWzweWAdyk8M2oKYhMxnkaJ0qIayPlsLGCNlVqME,3108
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
-qulab/executor/cli.py,sha256=glpQUV67_85sMpQoc3i2jw63I2WySwCd5sMXykEYzB0,8913
-qulab/executor/load.py,sha256=QKe2qs-kCPp0PjvnVMR5XVgSa1IkN5BSHkNPZ2EpC38,18007
-qulab/executor/schedule.py,sha256=YRAYs0PgR0mhhy4rJX8Ddi65peSfh7SfsvudVjLJQAU,15248
-qulab/executor/storage.py,sha256=-v7Yd1SrLa8Uy2JHHKFJN1Qp48PPgtWhHC7kcFdACLo,10546
+qulab/executor/cli.py,sha256=n0wl27xaiMWg18rVDOaKgLTEXaN0tSv4whTUQxvzBoM,8932
+qulab/executor/load.py,sha256=RJpgDuxNc3sUzr65K6a4vO-Qa72_lYsJGrPZDfw9Rus,18077
+qulab/executor/schedule.py,sha256=jBUK0vXeu-gbieSaH245exlGu3TW6vg9o0GIEF43IvA,16796
+qulab/executor/storage.py,sha256=k8rcyUHaAixMtWRTNfQrjFhingYqBb0fJZwHBLVE_UM,11002
 qulab/executor/transform.py,sha256=kaDJePBhVc32gZkQN8YBuA69lYYW9YhDZmCnUKaWuQw,2189
 qulab/executor/utils.py,sha256=XDk3duNrqDsCqZyZUmPqIAIIiykiafcOMBpy9NVAOAw,5686
 qulab/monitor/__init__.py,sha256=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
@@ -94,9 +94,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.4.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.7.4.dist-info/METADATA,sha256=DZjKwpU-3U8zznsKZI9xODqr9ApQFS3ICSCiBLcwR4o,3698
-QuLab-2.7.4.dist-info/WHEEL,sha256=Yd3eJSBM2hj8W-ouaiMfFUwQYAS-D6P73Ob9yN5MZd0,114
-QuLab-2.7.4.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.7.4.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.7.4.dist-info/RECORD,,
+QuLab-2.7.6.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.7.6.dist-info/METADATA,sha256=CUCFSSV87lDFOp15xOhzDpvmL3P7TMje6GOlrckku_E,3698
+QuLab-2.7.6.dist-info/WHEEL,sha256=Yd3eJSBM2hj8W-ouaiMfFUwQYAS-D6P73Ob9yN5MZd0,114
+QuLab-2.7.6.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.7.6.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.7.6.dist-info/RECORD,,

qulab/executor/cli.py

@@ -263,6 +263,7 @@ def maintain(workflow, code, data, api, retry, plot):
                                   run=False,
                                   plot=plot,
                                   freeze=False)
+            break
         except CalibrationFailedError as e:
             if i == retry - 1:
                 raise e

qulab/executor/load.py

@@ -77,6 +77,9 @@ class SetConfigWorkflow():
 
         return False
 
+    def __hash__(self):
+        return hash(self.__workflow_id__)
+
 
 WorkflowType = ModuleType | SetConfigWorkflow
 

qulab/executor/schedule.py

@@ -11,6 +11,38 @@ from .storage import (Result, find_result, get_heads, renew_result,
                       revoke_result, save_result)
 from .transform import current_config, obey_the_oracle, update_parameters
 
+__session_id = None
+__session_cache = {}
+
+
+def set_cache(session_id, key, result: Result):
+    global __session_id
+    if __session_id is None:
+        __session_id = session_id
+    if __session_id != session_id:
+        __session_cache.clear()
+    if result.workflow.startswith('cfg:'):
+        __session_cache[key] = result
+    else:
+        __session_cache[key] = result.base_path, result.path
+
+
+def get_cache(session_id, key) -> Result:
+    from .storage import load_result
+    global __session_id
+    if __session_id is None or __session_id != session_id:
+        return None
+    index = __session_cache.get(key, None)
+    if index is None:
+        return None
+    if isinstance(index, tuple):
+        base_path, path = index
+        return load_result(base_path, path)
+    elif isinstance(index, Result):
+        return index
+    else:
+        return None
+
 
 class CalibrationFailedError(Exception):
     pass
@@ -130,7 +162,6 @@ def call_plot(node, result: Result, check=False):
         node.plot(result)
 
 
-@functools.lru_cache(maxsize=128)
 def check_data(workflow: WorkflowType, code_path: str | Path,
                state_path: str | Path, plot: bool, session_id: str) -> Result:
     """
@@ -138,13 +169,19 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
     Is the parameter associated with this cal in spec,
     and is the cal scan working as expected?
     """
+    result = get_cache(session_id, (workflow, 'check_data'))
+    if result is not None:
+        logger.debug(f'Cache hit for "{workflow.__workflow_id__}:check_data"')
+        return result
+
     history = find_result(workflow.__workflow_id__, state_path)
 
     if history is None:
         logger.debug(f'No history found for "{workflow.__workflow_id__}"')
         result = Result(workflow=workflow.__workflow_id__,
                         config_path=current_config(state_path),
-                        base_path=state_path)
+                        base_path=state_path,
+                        heads=get_heads(state_path))
         result.in_spec = False
         result.bad_data = False
         return result
@@ -173,7 +210,8 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
         result = Result(workflow=workflow.__workflow_id__,
                         data=data,
                         config_path=current_config(state_path),
-                        base_path=state_path)
+                        base_path=state_path,
+                        heads=get_heads(state_path))
         #save_result(workflow.__workflow_id__, result, state_path)
 
         logger.debug(f'Checked "{workflow.__workflow_id__}" !')
@@ -204,7 +242,8 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
         result = Result(workflow=workflow.__workflow_id__,
                         data=data,
                         config_path=current_config(state_path),
-                        base_path=state_path)
+                        base_path=state_path,
+                        heads=get_heads(state_path))
         save_result(workflow.__workflow_id__, result, state_path)
 
         logger.debug(f'Calibrated "{workflow.__workflow_id__}" !')
@@ -218,12 +257,17 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
                     state_path,
                     overwrite=True)
 
+    set_cache(session_id, (workflow, 'check_data'), result)
     return result
 
 
-@functools.lru_cache(maxsize=128)
 def calibrate(workflow: WorkflowType, code_path: str | Path,
               state_path: str | Path, plot: bool, session_id: str) -> Result:
+    result = get_cache(session_id, (workflow, 'calibrate'))
+    if result is not None:
+        logger.debug(f'Cache hit for "{workflow.__workflow_id__}:calibrate"')
+        return result
+
     history = find_result(workflow.__workflow_id__, state_path)
 
     logger.debug(f'Calibrating "{workflow.__workflow_id__}" ...')
@@ -235,11 +279,14 @@ def calibrate(workflow: WorkflowType, code_path: str | Path,
     result = Result(workflow=workflow.__workflow_id__,
                     data=data,
                     config_path=current_config(state_path),
-                    base_path=state_path)
+                    base_path=state_path,
+                    heads=get_heads(state_path))
     save_result(workflow.__workflow_id__, result, state_path)
     logger.debug(f'Calibrated "{workflow.__workflow_id__}" !')
     result = call_analyzer(workflow, result, history, check=False, plot=plot)
     save_result(workflow.__workflow_id__, result, state_path, overwrite=True)
+
+    set_cache(session_id, (workflow, 'calibrate'), result)
     return result
 
 

qulab/executor/storage.py

@@ -27,11 +27,13 @@ class Result():
     parameters: dict = field(default_factory=dict)
     oracle: dict = field(default_factory=dict)
     other_infomation: dict = field(default_factory=dict)
-    data: Any = field(default_factory=tuple)
+    data: Any = field(default_factory=tuple, repr=False)
     index: int = -1
-    previous_path: Path | None = None
-    base_path: Path | None = None
-    config_path: Path | None = None
+    previous_path: Path | None = field(default=None, repr=False)
+    heads: dict[str, Path] = field(default_factory=dict, repr=False)
+    base_path: Path | None = field(default=None, repr=False)
+    path: Path | None = field(default=None, repr=False)
+    config_path: Path | None = field(default=None, repr=False)
 
     @property
     def previous(self):
@@ -100,7 +102,8 @@ def save_config_key_history(key: str, result: Result,
         else:
             __current_config_cache = {}
 
-    __current_config_cache[key] = result.data
+    __current_config_cache[
+        key] = result.data, result.calibrated_time, result.checked_time
 
     with open(base_path / 'parameters.pkl', 'wb') as f:
         pickle.dump(__current_config_cache, f)
@@ -118,14 +121,18 @@ def find_config_key_history(key: str, base_path: str | Path) -> Result | None:
             __current_config_cache = {}
 
     if key in __current_config_cache:
-        value = __current_config_cache.get(key, None)
-        result = Result(workflow=f'cfg:{key}',
-                        bad_data=False,
-                        in_spec=True,
-                        fully_calibrated=True,
-                        parameters={key: value},
-                        data=value)
-        result.bad_data = False
+        value, calibrated_time, checked_time = __current_config_cache.get(
+            key, None)
+        result = Result(
+            workflow=f'cfg:{key}',
+            bad_data=False,
+            in_spec=True,
+            fully_calibrated=True,
+            parameters={key: value},
+            data=value,
+            calibrated_time=calibrated_time,
+            checked_time=checked_time,
+        )
         return result
     return None
 
@@ -143,7 +150,10 @@ def save_result(workflow: str,
     base_path = Path(base_path)
     if overwrite:
         buf = lzma.compress(pickle.dumps(result))
-        path = get_head(workflow, base_path)
+        path = result.path
+        if path is None:
+            path = get_head(workflow, base_path)
+            result.path = path
         with open(base_path / 'objects' / path, "rb") as f:
             index = int.from_bytes(f.read(8), 'big')
         result.index = index
@@ -153,6 +163,7 @@ def save_result(workflow: str,
         path = random_path(base_path / 'objects')
         (base_path / 'objects' / path).parent.mkdir(parents=True,
                                                     exist_ok=True)
+        result.path = path
         result.index = create_index("result",
                                     base_path,
                                     context=str(path),

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.7.4"
+__version__ = "2.7.6"