QuLab 2.4.12__cp310-cp310-macosx_10_9_universal2.whl → 2.4.13__cp310-cp310-macosx_10_9_universal2.whl

{QuLab-2.4.12.dist-info → QuLab-2.4.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuLab
-Version: 2.4.12
+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.12.dist-info → QuLab-2.4.13.dist-info}/RECORD

@@ -1,12 +1,12 @@
 qulab/__init__.py,sha256=P-Mx2p4TVmL91SoxoeXcj8Qm0x4xUf5Q_FLk0Yc_gIQ,138
 qulab/__main__.py,sha256=ThCRooT22_qpwFtbAvVOyHzpBCuGlfDVkXBXvApzgps,597
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-310-darwin.so,sha256=l2j8u_hDaQVbFSXjRKFyZxjCsOib1ynJsQdSGXucfj4,126864
-qulab/version.py,sha256=3Ac_4-IUz5KK-UOcxuXzEVTZr4p9bV93jrLgO3Au_zA,22
+qulab/fun.cpython-310-darwin.so,sha256=E7G2FLvF6TCJtlPXbd6ShtFPFUi5PKNfPpQrGDj6mn8,126864
+qulab/version.py,sha256=_e118vufispiK25vPHegUtgNTXX7-QuWeU66JWddGAE,22
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/__main__.py,sha256=qgZcdmx1wBZInHf6ionpuuZytIJnaDje9WRv-a8o2OM,5870
-qulab/executor/load.py,sha256=GSRrP2UXOmTgg5VDTmZy_y4xXk91H3Sd5SEX-tOEBqY,8689
-qulab/executor/schedule.py,sha256=UOace0Gpt9gR0xe1BoNSUfeHxZynaUS0BFHZhmfnB30,11849
+qulab/executor/load.py,sha256=2gpBUcVdrZcbVI-YqTAfyKhW9br4rO8gnQtoYv7AO6c,9167
+qulab/executor/schedule.py,sha256=Ww0HHRSJxk-V3FM-Qgwqn-l6qPyWjPNoCz9Yy8MVG4o,11663
 qulab/executor/storage.py,sha256=M66Q5_Uc5MMfc_QAuuaaexwAz7wxBPMkeleB5nRpQmI,4621
 qulab/executor/transform.py,sha256=inaOn6eqCs22ZZ0xAQl8s8YCoEACaXSwFNNu7jqdwAk,2148
 qulab/executor/utils.py,sha256=n3uCSKh-qdDFFeNvOpj7_es2_B4AaC-ASAlV9gPmSO0,3086
@@ -89,9 +89,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.4.12.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.4.12.dist-info/METADATA,sha256=OdTgtOdriEitEyphmV6lZTskqK97GLmDGp7hkAYQGgo,3699
-QuLab-2.4.12.dist-info/WHEEL,sha256=Yd3eJSBM2hj8W-ouaiMfFUwQYAS-D6P73Ob9yN5MZd0,114
-QuLab-2.4.12.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.4.12.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.4.12.dist-info/RECORD,,
+QuLab-2.4.13.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.4.13.dist-info/METADATA,sha256=oq0Nmb1rdu0TDEPYZWZ9JbWT7-qrfRIWu0osA1W3eq0,3699
+QuLab-2.4.13.dist-info/WHEEL,sha256=Yd3eJSBM2hj8W-ouaiMfFUwQYAS-D6P73Ob9yN5MZd0,114
+QuLab-2.4.13.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.13.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.13.dist-info/RECORD,,

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/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)
 
@@ -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/version.py

@@ -1 +1 @@
-__version__ = "2.4.12"
+__version__ = "2.4.13"