QuLab 2.4.11__tar.gz → 2.4.13__tar.gz

{qulab-2.4.11 → qulab-2.4.13}/PKG-INFO

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

{qulab-2.4.11 → qulab-2.4.13}/QuLab.egg-info/PKG-INFO

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

{qulab-2.4.11 → qulab-2.4.13}/qulab/executor/load.py

@@ -128,8 +128,8 @@ def find_unreferenced_workflows(path: str) -> list[str]:
     for file_path in root.rglob("*.py"):
         if file_path.name == "__init__.py":
             continue
-        if file_path.name.endswith("_template.py") or re.match(
-                r'.*_tmp_[0-9a-fA-F]{8}.py', file_path.name):
+        if file_path.name == 'template.py' or file_path.name.endswith(
+                "_template.py"):
             continue
         try:
             rel_path = file_path.relative_to(root)
@@ -157,7 +157,7 @@ def find_unreferenced_workflows(path: str) -> list[str]:
                 )
                 continue
             try:
-                depends_list = depends_func()[0]
+                depends_list = [n.__workflow_id__ for n in get_dependents(module, root)]
             except Exception as e:
                 warnings.warn(f"Error calling depends() in {rel_str}: {e}")
                 continue
@@ -222,10 +222,17 @@ def load_workflow_from_template(file_name: str,
 
     hash_str = hashlib.md5(pickle.dumps(mappping)).hexdigest()[:8]
     if subtitle is None:
-        path = path.parent / path.stem.replace('_template',
-                                               f'_tmp{hash_str}.py')
+        if path.stem == 'template':
+            path = path.parent / f'tmp{hash_str}.py'
+        else:
+            path = path.parent / path.stem.replace('_template',
+                                                   f'_tmp{hash_str}.py')
     else:
-        path = path.parent / path.stem.replace('_template', f'_{subtitle}.py')
+        if path.stem == 'template':
+            path = path.parent / f'{subtitle}.py'
+        else:
+            path = path.parent / path.stem.replace('_template',
+                                                   f'_{subtitle}.py')
 
     with open(base_path / path, 'w') as f:
         f.write(content)
@@ -262,3 +269,8 @@ def load_workflow(workflow: str | tuple[str, dict],
         raise TypeError(f"Invalid workflow: {workflow}")
 
     return w
+
+
+def get_dependents(workflow: WorkflowType,
+                   code_path: str | Path) -> list[WorkflowType]:
+    return [load_workflow(n, code_path) for n in workflow.depends()[0]]

{qulab-2.4.11 → qulab-2.4.13}/qulab/executor/schedule.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from loguru import logger
 
 from . import transform
-from .load import WorkflowType, load_workflow
+from .load import WorkflowType, get_dependents
 from .storage import (Result, find_result, get_head, renew_result,
                       revoke_result, save_result)
 
@@ -51,7 +51,7 @@ def check_state(workflow: WorkflowType, code_path: str | Path,
             f'check_state failed: "{workflow.__workflow_id__}" has bad data')
         return False
     for n in get_dependents(workflow, code_path):
-        r = find_result(n, state_path)
+        r = find_result(n.__workflow_id__, state_path)
         if r is None or r.checked_time > result.checked_time:
             logger.debug(
                 f'check_state failed: "{workflow.__workflow_id__}" has outdated dependencies'
@@ -158,7 +158,7 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
 @functools.lru_cache(maxsize=128)
 def calibrate(workflow: WorkflowType, code_path: str | Path,
               state_path: str | Path, plot: bool, session_id: str) -> Result:
-    history = find_result(workflow, state_path)
+    history = find_result(workflow.__workflow_id__, state_path)
 
     logger.debug(f'Calibrating "{workflow.__workflow_id__}" ...')
     data = workflow.calibrate()
@@ -230,11 +230,6 @@ def diagnose(workflow: WorkflowType, code_path: str | Path,
     return True
 
 
-def get_dependents(workflow: WorkflowType,
-                   code_path: str | Path) -> list[WorkflowType]:
-    return [load_workflow(n, code_path) for n in workflow.depends()[0]]
-
-
 @logger.catch(reraise=True)
 def maintain(workflow: WorkflowType,
              code_path: str | Path,

qulab-2.4.13/qulab/version.py

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

qulab-2.4.11/qulab/version.py

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