QuLab 2.4.15__cp311-cp311-macosx_10_9_universal2.whl → 2.4.16__cp311-cp311-macosx_10_9_universal2.whl

{QuLab-2.4.15.dist-info → QuLab-2.4.16.dist-info}/METADATA

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

{QuLab-2.4.15.dist-info → QuLab-2.4.16.dist-info}/RECORD

@@ -1,13 +1,13 @@
 qulab/__init__.py,sha256=P-Mx2p4TVmL91SoxoeXcj8Qm0x4xUf5Q_FLk0Yc_gIQ,138
 qulab/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-311-darwin.so,sha256=1cFTXrPgr32EX6kyYVdMM2CTag-1MMpy0D4atRhisPA,126848
-qulab/version.py,sha256=QW2MBz1JeuFtoyMh-qAewXiVGQGFzZAiBx69V3wIX5U,22
+qulab/fun.cpython-311-darwin.so,sha256=4UizSKt5rDt7vdZVD0pkpw5COMzc0CVh4OpeSim3jFU,126848
+qulab/version.py,sha256=rVOnxEJVvl0ZWvCblBzVBGcp0VALbV_koS5W-UB9zfk,22
 qulab/cli/__init__.py,sha256=tgDIkkeIoasQXAifJZ6NU8jDgpNgb2a-B0C4nF0evrE,559
 qulab/cli/config.py,sha256=QksTYD3-RBYBG8xnKLAh7EXrNOwxr128XXr30ZTFW6A,2983
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/cli.py,sha256=LRSb5-J8Tn7dj-fxwCp3OP_6YUgPRoY-f8O18sbWG8I,5164
-qulab/executor/load.py,sha256=4qQrw9O5dmWYYwxWt15z7uc6B3YuRB7xKgKi0g8-YtA,10418
+qulab/executor/load.py,sha256=yTLoWOtTvmCTuYFZ6qFsjBM_CvsrKgmUkBSHHz3223A,10899
 qulab/executor/schedule.py,sha256=SfMZys8WdmIvfW5fPM42g-F6XwewTdpC0-puhf5TA54,11721
 qulab/executor/storage.py,sha256=M66Q5_Uc5MMfc_QAuuaaexwAz7wxBPMkeleB5nRpQmI,4621
 qulab/executor/transform.py,sha256=inaOn6eqCs22ZZ0xAQl8s8YCoEACaXSwFNNu7jqdwAk,2148
@@ -91,9 +91,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.15.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.4.15.dist-info/METADATA,sha256=EgZbZvkhzL5UTZFxqJ2yHVir2RSvAkmSCNd_nUgitdE,3699
-QuLab-2.4.15.dist-info/WHEEL,sha256=K10eKSN6_vzvMOgXxWbVOQNR7Orfl6gBTCpCI8bcYx4,114
-QuLab-2.4.15.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.4.15.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.4.15.dist-info/RECORD,,
+QuLab-2.4.16.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.4.16.dist-info/METADATA,sha256=6JcU_aAzDy5e3eGklWSR_xUELNWTZukNp65w5mch6ws,3699
+QuLab-2.4.16.dist-info/WHEEL,sha256=K10eKSN6_vzvMOgXxWbVOQNR7Orfl6gBTCpCI8bcYx4,114
+QuLab-2.4.16.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.16.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.16.dist-info/RECORD,,

qulab/executor/load.py

@@ -15,6 +15,7 @@ from .storage import Result
 
 class SetConfigWorkflow():
     __timeout__ = None
+    __mtime__ = 0
 
     def __init__(self, key):
         self.key = key
@@ -200,10 +201,13 @@ def load_workflow_from_file(file_name: str,
                             package='workflows') -> WorkflowType:
     base_path = Path(base_path)
     path = Path(file_name)
+    if not (base_path / path).exists():
+        raise FileNotFoundError(f"File not found: {base_path / path}")
     module_name = f"{package}.{'.'.join([*path.parts[:-1], path.stem])}"
     spec = spec_from_file_location(module_name, base_path / path)
     module = module_from_spec(spec)
     spec.loader.exec_module(module)
+    module.__mtime__ = (base_path / path).stat().st_mtime
 
     if hasattr(module, 'entries'):
         return module
@@ -224,13 +228,16 @@ def load_workflow_from_template(template_path: str,
                                 mappping: dict[str, str],
                                 base_path: str | Path,
                                 target_path: str | None = None,
-                                package='workflows') -> WorkflowType:
+                                package='workflows',
+                                mtime: float = 0) -> WorkflowType:
     base_path = Path(base_path)
     path = Path(template_path)
 
     with open(base_path / path) as f:
         content = f.read()
 
+    mtime = max(Path(template_path).stat().st_mtime, mtime)
+
     def replace(text):
         """
         将给定文本中的所有 _D_("var") 替换为 ${var}。
@@ -267,7 +274,7 @@ def load_workflow_from_template(template_path: str,
         with open(file, 'w') as f:
             f.write(content)
     else:
-        if file.stat().st_mtime < Path(template_path).stat().st_mtime:
+        if file.stat().st_mtime < mtime:
             with open(file, 'w') as f:
                 f.write(content)
         else:
@@ -277,22 +284,24 @@ def load_workflow_from_template(template_path: str,
                 )
 
     module = load_workflow_from_file(str(path), base_path, package)
+    module.__mtime__ = max(mtime, module.__mtime__)
 
     return module
 
 
 def load_workflow(workflow: str | tuple[str, dict],
                   base_path: str | Path,
-                  package='workflows') -> WorkflowType:
+                  package='workflows',
+                  mtime: float = 0) -> WorkflowType:
     if isinstance(workflow, tuple):
         if len(workflow) == 2:
             file_name, mapping = workflow
             w = load_workflow_from_template(file_name, mapping, base_path,
-                                            None, package)
+                                            None, package, mtime)
         elif len(workflow) == 3:
             template_path, target_path, mapping = workflow
             w = load_workflow_from_template(template_path, mapping, base_path,
-                                            target_path, package)
+                                            target_path, package, mtime)
         else:
             raise ValueError(f"Invalid workflow: {workflow}")
         w.__workflow_id__ = str(Path(w.__file__).relative_to(base_path))
@@ -312,8 +321,14 @@ def load_workflow(workflow: str | tuple[str, dict],
 
 def get_dependents(workflow: WorkflowType,
                    code_path: str | Path) -> list[WorkflowType]:
-    return [load_workflow(n, code_path) for n in workflow.depends()[0]]
+    return [
+        load_workflow(n, code_path, mtime=workflow.__mtime__)
+        for n in workflow.depends()[0]
+    ]
 
 
 def get_entries(workflow: WorkflowType, code_path: str | Path) -> WorkflowType:
-    return [load_workflow(n, code_path) for n in workflow.entries()]
+    return [
+        load_workflow(n, code_path, mtime=workflow.__mtime__)
+        for n in workflow.entries()
+    ]

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.4.15"
+__version__ = "2.4.16"