QuLab 2.5.5__cp311-cp311-win_amd64.whl → 2.6.1__cp311-cp311-win_amd64.whl

{QuLab-2.5.5.dist-info → QuLab-2.6.1.dist-info}/METADATA

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

{QuLab-2.5.5.dist-info → QuLab-2.6.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
-qulab/__init__.py,sha256=pdlicy07Dx39pTEGZ0i41Ox9tuuuKKIdsFIrE13bneg,249
+qulab/__init__.py,sha256=F4TiURMBaXkAc0evuYi-aan00II4hzMHrOs0GfooLtg,292
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp311-win_amd64.pyd,sha256=tIPc3llk15Bgolq5q4lOYC466t4UWjxWhR91_x1v_oY,31744
+qulab/fun.cp311-win_amd64.pyd,sha256=94G8dLW-skDKP8pt3v6A9VHHXbMOEqdUAux_9mWZXTM,31744
 qulab/typing.py,sha256=3c0eKa1avEHIi5wPvh3-4l6Of5mu5Rn1MWPnMeLGNX0,71
-qulab/version.py,sha256=MDur6AV_Dwa0PNW31e6addEkEKMAh_dHbKFdazRMbHo,21
+qulab/version.py,sha256=CxIX_WubB9c4uEWgzV2lPv0dBsuUamxzVZLp62HT2u4,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=ZGnQdUFZmU812gsnqbKhaJzwWLdoPt42CukPbZ7Yv8k,6684
-qulab/executor/load.py,sha256=t48vZQVAViIwGBPnoRbfBafv5jSR4ix3z4pkvyGyX-w,17759
-qulab/executor/schedule.py,sha256=DCZmqtNzrvsA1wOTxEldI22n6UWlHtxEx6QKsHn1S8k,13344
-qulab/executor/storage.py,sha256=u7uAmZU8D-pvd6UNek1zzxbUBIZQpftSiXdag6hlkG8,7533
-qulab/executor/transform.py,sha256=AazWdlkEoOBaUJpTYsT5J4f0RanzCEeo-ThwEg8BB4Y,1262
-qulab/executor/utils.py,sha256=VZ_VPYT2MFIfrCtfEW1I7T4NKFIbOvfVac8Sv377MTY,4221
+qulab/executor/cli.py,sha256=MjwXe_ZEolVzNkGYq6G4cp-iHI0TiAlNkSuX2p0ZZQk,6760
+qulab/executor/load.py,sha256=_XxHHSgQTxaOo6zhY9UZnqPu_wiG8BT6FyBaeH67lvo,17856
+qulab/executor/schedule.py,sha256=RkhDjwsxXT2RmO6ZTcP7LGsY4M4KY6Acmykq_kQ_wcc,13992
+qulab/executor/storage.py,sha256=2Kvv7Nk98OLF6ux2PkfTTcZnHDG3g6TKpIb9e7yVbz0,8694
+qulab/executor/transform.py,sha256=tp7yW8FdISVI6xx1ZIyCiRID1SQXw-bjucaPXPkn6m0,1988
+qulab/executor/utils.py,sha256=G6hRwvrcIwJwJtcAHV8UaGLdlT0kokWHfV2D922n2mg,4935
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
 qulab/monitor/__main__.py,sha256=k2H1H5Zf9LLXTDLISJkbikLH-z0f1e5i5i6wXXYPOrE,105
 qulab/monitor/config.py,sha256=y_5StMkdrbZO1ziyKBrvIkB7Jclp9RCPK1QbsOhCxnY,785
@@ -93,9 +93,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.5.5.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.5.5.dist-info/METADATA,sha256=mYU52jH0wnkH_K_jA_KXqmMENLaoSz5KSmKVhQo2AfE,3803
-QuLab-2.5.5.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
-QuLab-2.5.5.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.5.5.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.5.5.dist-info/RECORD,,
+QuLab-2.6.1.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.6.1.dist-info/METADATA,sha256=Z5mfL3SUzgD-oTkz9OjyQJwm1nRnrEZAFH6N2XWJDlc,3803
+QuLab-2.6.1.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
+QuLab-2.6.1.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.6.1.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.6.1.dist-info/RECORD,,

qulab/__init__.py

@@ -1,5 +1,6 @@
 from .executor.storage import find_result
 from .executor.storage import get_result_by_index as get_result
+from .executor.utils import debug_analyze
 from .scan import Scan, get_record, load_record, lookup, lookup_list
 from .version import __version__
 from .visualization import autoplot

qulab/executor/cli.py

@@ -102,7 +102,7 @@ def set(key, value, api):
     from . import transform
     if api is not None:
         api = importlib.import_module(api)
-        set_config_api(api.query_config, api.update_config)
+        set_config_api(api.query_config, api.update_config, api.export_config)
     try:
         value = eval(value)
     except:
@@ -124,7 +124,7 @@ def get(key, api):
     from . import transform
     if api is not None:
         api = importlib.import_module(api)
-        set_config_api(api.query_config, api.update_config)
+        set_config_api(api.query_config, api.update_config, api.export_config)
     click.echo(transform.query_config(key))
 
 
@@ -147,7 +147,7 @@ def run(workflow, code, data, api, plot, no_dependents, update):
     )
     if api is not None:
         api = importlib.import_module(api)
-        set_config_api(api.query_config, api.update_config)
+        set_config_api(api.query_config, api.update_config, api.export_config)
     if code is None:
         code = Path.cwd()
     if data is None:
@@ -197,7 +197,7 @@ def maintain(workflow, code, data, api, plot):
     )
     if api is not None:
         api = importlib.import_module(api)
-        set_config_api(api.query_config, api.update_config)
+        set_config_api(api.query_config, api.update_config, api.export_config)
     if code is None:
         code = Path.cwd()
     if data is None:

qulab/executor/load.py

@@ -123,7 +123,7 @@ def verify_check_method(module: WorkflowType):
 
 
 def verify_dependence_key(workflow: str | tuple[str, dict[str, Any]]
-                          | tuple[str, str, dict[str, Any]]):
+                          | tuple[str, str, dict[str, Any]], base_path: Path):
     if isinstance(workflow, str):
         return
     if not isinstance(workflow, tuple) or len(workflow) not in [2, 3]:
@@ -135,7 +135,7 @@ def verify_dependence_key(workflow: str | tuple[str, dict[str, Any]]
             raise FileNotFoundError(f"File not found: {file_name}")
     elif len(workflow) == 3:
         template_path, target_path, mapping = workflow
-        if not Path(template_path).exists():
+        if not (Path(base_path) / template_path).exists():
             raise FileNotFoundError(f"File not found: {template_path}")
         if not isinstance(target_path, (Path, str)) or target_path == '':
             raise ValueError(f"Invalid target_path: {target_path}")
@@ -165,7 +165,7 @@ def verify_dependence_key(workflow: str | tuple[str, dict[str, Any]]
     return
 
 
-def verify_depends(module: WorkflowType):
+def verify_depends(module: WorkflowType, base_path):
     if not hasattr(module, 'depends'):
         return
 
@@ -184,10 +184,10 @@ def verify_depends(module: WorkflowType):
             f"Workflow {module.__file__} 'depends' should be a callable or a list"
         )
     for workflow in deps:
-        verify_dependence_key(workflow)
+        verify_dependence_key(workflow, base_path)
 
 
-def verify_entries(module: WorkflowType):
+def verify_entries(module: WorkflowType, base_path):
     if not hasattr(module, 'entries'):
         return
 
@@ -206,7 +206,7 @@ def verify_entries(module: WorkflowType):
             f"Workflow {module.__file__} 'entries' should be a callable or a list"
         )
     for workflow in deps:
-        verify_dependence_key(workflow)
+        verify_dependence_key(workflow, base_path)
 
 
 def is_workflow(module: ModuleType) -> bool:
@@ -307,7 +307,7 @@ def load_workflow_from_file(file_name: str,
     module.__mtime__ = (base_path / path).stat().st_mtime
 
     if hasattr(module, 'entries'):
-        verify_entries(module)
+        verify_entries(module, base_path)
         return module
 
     if not hasattr(module, '__timeout__'):
@@ -315,7 +315,7 @@ def load_workflow_from_file(file_name: str,
 
     if not hasattr(module, 'depends'):
         module.depends = lambda: []
-    verify_depends(module)
+    verify_depends(module, base_path)
     verify_calibrate_method(module)
     verify_check_method(module)
 

qulab/executor/schedule.py

@@ -9,7 +9,7 @@ from loguru import logger
 from .load import WorkflowType, get_dependents
 from .storage import (Result, find_result, renew_result, revoke_result,
                       save_result)
-from .transform import update_parameters
+from .transform import current_config, update_parameters
 
 
 class CalibrationFailedError(Exception):
@@ -124,7 +124,9 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
 
     if history is None:
         logger.debug(f'No history found for "{workflow.__workflow_id__}"')
-        result = Result()
+        result = Result(workflow=workflow.__workflow_id__,
+                        config_path=current_config(state_path),
+                        base_path=state_path)
         result.in_spec = False
         result.bad_data = False
         return result
@@ -150,8 +152,10 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
             raise TypeError(
                 f'"{workflow.__workflow_id__}" : "check" return not pickleable data'
             )
-        result = Result()
-        result.data = data
+        result = Result(workflow=workflow.__workflow_id__,
+                        data=data,
+                        config_path=current_config(state_path),
+                        base_path=state_path)
         #save_result(workflow.__workflow_id__, result, state_path)
 
         logger.debug(f'Checked "{workflow.__workflow_id__}" !')
@@ -179,8 +183,10 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
             raise TypeError(
                 f'"{workflow.__workflow_id__}" : "calibrate" return not pickleable data'
             )
-        result = Result()
-        result.data = data
+        result = Result(workflow=workflow.__workflow_id__,
+                        data=data,
+                        config_path=current_config(state_path),
+                        base_path=state_path)
         save_result(workflow.__workflow_id__, result, state_path)
 
         logger.debug(f'Calibrated "{workflow}" !')
@@ -208,8 +214,10 @@ def calibrate(workflow: WorkflowType, code_path: str | Path,
         raise TypeError(
             f'"{workflow.__workflow_id__}" : "calibrate" return not pickleable data'
         )
-    result = Result()
-    result.data = data
+    result = Result(workflow=workflow.__workflow_id__,
+                    data=data,
+                    config_path=current_config(state_path),
+                    base_path=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)
@@ -271,7 +279,7 @@ def diagnose(workflow: WorkflowType, code_path: str | Path,
         raise CalibrationFailedError(
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
-    update_parameters(result)
+    update_parameters(result, state_path)
     return True
 
 
@@ -327,7 +335,7 @@ def maintain(workflow: WorkflowType,
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
     if update:
-        update_parameters(result)
+        update_parameters(result, state_path)
     return
 
 
@@ -349,5 +357,5 @@ def run(workflow: WorkflowType,
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
     if update:
-        update_parameters(result)
+        update_parameters(result, state_path)
     return

qulab/executor/storage.py

@@ -1,3 +1,4 @@
+import hashlib
 import lzma
 import pickle
 import uuid
@@ -14,6 +15,7 @@ from ..cli.config import get_config_value
 
 @dataclass
 class Result():
+    workflow: str = ''
     in_spec: bool = False
     bad_data: bool = False
     fully_calibrated: bool = False
@@ -26,6 +28,7 @@ class Result():
     index: int = -1
     previous_path: Path | None = None
     base_path: Path | None = None
+    config_path: Path | None = None
 
     @property
     def previous(self):
@@ -46,6 +49,13 @@ class Result():
                 state = 'Outdated'
         return state
 
+    @property
+    def config(self):
+        if self.config_path is not None and self.base_path is not None:
+            return load_config(self.config_path, self.base_path)
+        else:
+            return None
+
     @state.setter
     def state(self, state: Literal['OK', 'Bad', 'Outdated', 'In spec',
                                    'Out of spec', 'Bad data']):
@@ -231,3 +241,35 @@ def get_result_by_index(
         return load_result(path, base_path)
     except:
         return None
+
+
+def save_config(cfg, data_path):
+    i = 0
+    buf = pickle.dumps(cfg)
+    buf = lzma.compress(buf)
+    h = hashlib.md5(buf)
+
+    while True:
+        salt = f"{i}".encode()
+        h.update(salt)
+        hashstr = h.hexdigest()
+        cfg_id = Path(hashstr[:2]) / hashstr[2:4] / hashstr[4:]
+        path = Path(data_path) / 'config' / cfg_id
+        if not path.exists():
+            path.parent.mkdir(parents=True, exist_ok=True)
+            with open(path, 'wb') as f:
+                f.write(buf)
+            break
+        elif path.read_bytes() == buf:
+            break
+        i += 1
+    return str(cfg_id)
+
+
+@lru_cache(maxsize=1024)
+def load_config(id, data_path):
+    path = Path(data_path) / 'config' / id
+    with open(path, 'rb') as f:
+        buf = f.read()
+    cfg = pickle.loads(lzma.decompress(buf))
+    return cfg

qulab/executor/transform.py

@@ -1,4 +1,6 @@
-from .storage import Result
+from .storage import Result, save_config
+
+__current_config_id = None
 
 
 def _query_config(name: str, default=None):
@@ -29,15 +31,39 @@ def _update_config(updates):
         pickle.dump(parameters, f)
 
 
-def update_parameters(result: Result):
+def _export_config() -> dict:
+    import pickle
+
+    try:
+        with open('parameters.pkl', 'rb') as f:
+            parameters = pickle.load(f)
+    except:
+        parameters = {}
+
+    return parameters
+
+
+def update_parameters(result: Result, data_path):
+    global __current_config_id
     update_config(result.parameters)
+    cfg = export_config()
+    __current_config_id = save_config(cfg, data_path)
+
+
+def current_config(data_path):
+    global __current_config_id
+    if __current_config_id is None:
+        cfg = export_config()
+        __current_config_id = save_config(cfg, data_path)
+    return __current_config_id
 
 
 query_config = _query_config
 update_config = _update_config
+export_config = _export_config
 
 
-def set_config_api(query_method, update_method):
+def set_config_api(query_method, update_method, export_method):
     """
     Set the query and update methods for the config.
 
@@ -47,9 +73,10 @@ def set_config_api(query_method, update_method):
         update_method: The update method.
             the method should take a dict of updates.
     """
-    global query_config, update_config
+    global query_config, update_config, export_config
 
     query_config = query_method
     update_config = update_method
+    export_config = export_method
 
-    return query_config, update_config
+    return query_config, update_config, export_config

qulab/executor/utils.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 
+from ..cli.config import get_config_value
 from .load import load_workflow
 
 
@@ -133,3 +134,23 @@ def check_analyze(result: Result, history: Result | None = None) -> Result:
 
     return result
 """
+
+
+def debug_analyze(
+        result_index: int,
+        code_path: str | Path = get_config_value('code', Path),
+        data_path: str | Path = get_config_value('data', Path),
+) -> None:
+    from .storage import get_result_by_index
+
+    result = get_result_by_index(result_index, data_path)
+    if result is None:
+        raise ValueError(f'Invalid result index: {result_index}')
+    workflow = result.workflow
+    wf = load_workflow(workflow, code_path)
+    if wf is None:
+        raise ValueError(f'Invalid workflow: {workflow}')
+    result = wf.analyze(result, result.previous)
+    if hasattr(wf, 'plot'):
+        wf.plot(result)
+    return result

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.5.5"
+__version__ = "2.6.1"