QuLab 2.5.5__tar.gz → 2.6.0__tar.gz

{qulab-2.5.5 → qulab-2.6.0}/PKG-INFO

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

{qulab-2.5.5 → qulab-2.6.0}/QuLab.egg-info/PKG-INFO

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

{qulab-2.5.5 → qulab-2.6.0}/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-2.5.5 → qulab-2.6.0}/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,8 @@ 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))
         result.in_spec = False
         result.bad_data = False
         return result
@@ -150,8 +151,9 @@ 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))
         #save_result(workflow.__workflow_id__, result, state_path)
 
         logger.debug(f'Checked "{workflow.__workflow_id__}" !')
@@ -179,8 +181,9 @@ 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))
         save_result(workflow.__workflow_id__, result, state_path)
 
         logger.debug(f'Calibrated "{workflow}" !')
@@ -208,8 +211,9 @@ 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))
     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 +275,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 +331,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 +353,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-2.5.5 → qulab-2.6.0}/qulab/executor/storage.py

@@ -14,6 +14,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 +27,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 +48,14 @@ class Result():
                 state = 'Outdated'
         return state
 
+    @property
+    def config(self):
+        from . import transform
+        if self.config_path is not None and self.base_path is not None:
+            return transform._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']):

qulab-2.6.0/qulab/executor/transform.py

@@ -0,0 +1,122 @@
+import functools
+import hashlib
+import lzma
+import pickle
+from pathlib import Path
+
+from .storage import Result
+
+__config_id = None
+
+
+def _query_config(name: str, default=None):
+    import pickle
+
+    try:
+        with open('parameters.pkl', 'rb') as f:
+            parameters = pickle.load(f)
+    except:
+        parameters = {}
+
+    return parameters.get(name, default)
+
+
+def _update_config(updates):
+    import pickle
+
+    try:
+        with open('parameters.pkl', 'rb') as f:
+            parameters = pickle.load(f)
+    except:
+        parameters = {}
+
+    for k, v in updates.items():
+        parameters[k] = v
+
+    with open('parameters.pkl', 'wb') as f:
+        pickle.dump(parameters, f)
+
+
+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 __config_id
+    update_config(result.parameters)
+    cfg = export_config()
+    __config_id = _save_config(cfg, data_path)
+
+
+def current_config(data_path):
+    global __config_id
+    if __config_id is None:
+        cfg = export_config()
+        __config_id = _save_config(cfg, data_path)
+    return __config_id
+
+
+def _save_config(cfg, data_path):
+    global __config_id
+    i = 0
+    buf = pickle.dumps(cfg)
+    buf = lzma.compress(buf)
+    h = hashlib.md5(buf)
+
+    while True:
+        salt = f"{i:08d}".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
+    __config_id = str(cfg_id)
+    return __config_id
+
+
+@functools.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
+
+
+query_config = _query_config
+update_config = _update_config
+export_config = _export_config
+
+
+def set_config_api(query_method, update_method, export_method):
+    """
+    Set the query and update methods for the config.
+
+    Args:
+        query_method: The query method.
+            the method should take a key and return the value.
+        update_method: The update method.
+            the method should take a dict of updates.
+    """
+    global query_config, update_config, export_config
+
+    query_config = query_method
+    update_config = update_method
+    export_config = export_method
+
+    return query_config, update_config, export_config

{qulab-2.5.5 → qulab-2.6.0}/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', Path),
+        data_path: str | Path = get_config_value('data_path', 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)
+    if hasattr(wf, 'plot'):
+        wf.plot(result)
+    return result

qulab-2.6.0/qulab/version.py

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

qulab-2.5.5/qulab/executor/transform.py

@@ -1,55 +0,0 @@
-from .storage import Result
-
-
-def _query_config(name: str, default=None):
-    import pickle
-
-    try:
-        with open('parameters.pkl', 'rb') as f:
-            parameters = pickle.load(f)
-    except:
-        parameters = {}
-
-    return parameters.get(name, default)
-
-
-def _update_config(updates):
-    import pickle
-
-    try:
-        with open('parameters.pkl', 'rb') as f:
-            parameters = pickle.load(f)
-    except:
-        parameters = {}
-
-    for k, v in updates.items():
-        parameters[k] = v
-
-    with open('parameters.pkl', 'wb') as f:
-        pickle.dump(parameters, f)
-
-
-def update_parameters(result: Result):
-    update_config(result.parameters)
-
-
-query_config = _query_config
-update_config = _update_config
-
-
-def set_config_api(query_method, update_method):
-    """
-    Set the query and update methods for the config.
-
-    Args:
-        query_method: The query method.
-            the method should take a key and return the value.
-        update_method: The update method.
-            the method should take a dict of updates.
-    """
-    global query_config, update_config
-
-    query_config = query_method
-    update_config = update_method
-
-    return query_config, update_config

qulab-2.5.5/qulab/version.py

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