QuLab 2.7.18__cp310-cp310-macosx_10_9_universal2.whl → 2.7.19__cp310-cp310-macosx_10_9_universal2.whl

qulab/executor/load.py

@@ -81,16 +81,6 @@ class SetConfigWorkflow():
 WorkflowType = ModuleType | SetConfigWorkflow
 
 
-def get_source(workflow: WorkflowType, code_path: str | Path) -> str:
-    if isinstance(code_path, str):
-        code_path = Path(code_path)
-    try:
-        with open(code_path / workflow.__workflow_id__, 'r') as f:
-            return f.read()
-    except:
-        return ''
-
-
 def can_call_without_args(func):
     if not callable(func):
         return False
@@ -320,6 +310,8 @@ def load_workflow_from_file(file_name: str,
     module = module_from_spec(spec)
     spec.loader.exec_module(module)
     module.__mtime__ = (base_path / path).stat().st_mtime
+    source_code = (base_path / path).read_text()
+    module.__source__ = source_code
 
     if hasattr(module, 'entries'):
         verify_entries(module, base_path)
@@ -347,11 +339,11 @@ def load_workflow_from_template(template_path: str,
     path = Path(template_path)
 
     with open(base_path / path) as f:
-        content = f.read()
+        template = f.read()
 
     mtime = max((base_path / template_path).stat().st_mtime, mtime)
 
-    content, hash_str = inject_mapping(content, mapping, str(path))
+    content, hash_str = inject_mapping(template, mapping, str(path))
 
     if target_path is None:
         if path.stem == 'template':
@@ -365,22 +357,19 @@ def load_workflow_from_template(template_path: str,
         path = target_path
 
     file = base_path / path
-    if not file.exists():
+    if not file.exists() or file.stat().st_mtime < mtime:
         file.parent.mkdir(parents=True, exist_ok=True)
         with open(file, 'w') as f:
             f.write(content)
-    else:
-        if file.stat().st_mtime < mtime:
-            with open(file, 'w') as f:
-                f.write(content)
-        else:
-            if file.read_text() != content:
-                logger.warning(
-                    f"`{file}` already exists and is different from the new one generated from template `{template_path}`"
-                )
+    elif file.read_text() != content:
+        logger.warning(
+            f"`{file}` already exists and is different from the new one generated from template `{template_path}`"
+        )
 
     module = load_workflow_from_file(str(path), base_path, package)
     module.__mtime__ = max(mtime, module.__mtime__)
+    if module.__source__ == content:
+        module.__source__ = template, mapping, str(template_path)
 
     return module
 
@@ -422,8 +411,6 @@ def load_workflow(workflow: str | tuple[str, dict],
             w.__workflow_id__ = str(Path(w.__file__).relative_to(base_path))
     else:
         raise TypeError(f"Invalid workflow: {workflow}")
-    
-    w.__source__ = get_source(w, base_path)
 
     return w
 

qulab/executor/storage.py

@@ -36,6 +36,20 @@ class Report():
     config_path: Path | None = field(default=None, repr=False)
     script_path: Path | None = field(default=None, repr=False)
 
+    def __getstate__(self):
+        state = self.__dict__.copy()
+        state.pop('base_path')
+        for k in ['path', 'previous_path', 'config_path', 'script_path']:
+            if state[k] is not None:
+                state[k] = str(state[k])
+        return state
+    
+    def __setstate__(self, state):
+        for k in ['path', 'previous_path', 'config_path', 'script_path']:
+            if state[k] is not None:
+                state[k] = Path(state[k])
+        self.__dict__.update(state)
+
     @property
     def previous(self):
         if self.previous_path is not None and self.base_path is not None:
@@ -84,7 +98,9 @@ class Report():
     @property
     def script(self):
         if self.script_path is not None and self.base_path is not None:
-            return load_item(self.script_path, self.base_path)
+            source = load_item(self.script_path, self.base_path)
+            if isinstance(source, str):
+                return source
         else:
             return None
 

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.7.18"
+__version__ = "2.7.19"

{qulab-2.7.18.dist-info → qulab-2.7.19.dist-info}/METADATA

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

{qulab-2.7.18.dist-info → qulab-2.7.19.dist-info}/RECORD

@@ -1,18 +1,18 @@
 qulab/__init__.py,sha256=KJcUcZ5qXY6wlAoirzK_B-dgtDjsLmOE671v3gcXO_c,286
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-310-darwin.so,sha256=KlkYG7XsXZ9QZ7OLrjkSflgM0zHin4OpaDLlKkfrh5s,126864
+qulab/fun.cpython-310-darwin.so,sha256=JNmhMFDYBLA9A5KZ-ozH7Bl8z9GpyYoy2BgVjKDszC4,126864
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
 qulab/utils.py,sha256=_0gm0sHwwIhk0tYRCLu4oNaS6Tt8meGWt6byu7Kk95Y,2993
-qulab/version.py,sha256=xLneP_cqIForMj5AICyQrp13un8yGC7zOY4cjyKywXk,22
+qulab/version.py,sha256=l3aREioriZeXEjFmLR4Dbu7Nj408gevOUOElKwDjjD4,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=tgDIkkeIoasQXAifJZ6NU8jDgpNgb2a-B0C4nF0evrE,559
 qulab/cli/config.py,sha256=Ei7eSYnbwPPlluDnm8YmWONYiI4g7WtvlZGQdr1Z6vo,3688
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/cli.py,sha256=z8W1RivKdABQSOGy2viNUvG73QvOBpE9gSKjw45vSVA,9794
-qulab/executor/load.py,sha256=omD2aklKZnHOosahI-Vs6sQkGdn4U9PgnDIAbrEOhi0,17786
+qulab/executor/load.py,sha256=YndvzagvWR8Sg6WHZ-gP-Of0FrFOyh_E_a3VXsjDf1Q,17502
 qulab/executor/schedule.py,sha256=0BV5LGxhqdIlGwW6-o5_5mljAtdtL1La8EDNBFi8pzU,18585
-qulab/executor/storage.py,sha256=gI6g28BmKKEZ_Pl-hFwvpiOj3mF8Su-yjj3hfMXs1VY,11630
+qulab/executor/storage.py,sha256=jFUXYcBFyH2vVzrSzmXtyLtEgIMRczfk27Yb95pV5JM,12217
 qulab/executor/template.py,sha256=1c7xd0U82fLaqb8O0NQIVVd7aRLuCZNT11-heFw2n9Q,7540
 qulab/executor/transform.py,sha256=BDx0c4nqTHMAOLVqju0Ydd91uxNm6EpVIfssjZse0bI,2284
 qulab/executor/utils.py,sha256=l_b0y2kMwYKyyXeFtoblPYwKNU-wiFQ9PMo9QlWl9wE,6213
@@ -97,9 +97,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.7.18.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.7.18.dist-info/METADATA,sha256=rp74Kor5oIm4kmZLnVjpvrmHiNu5K113K9vjiSBmkPU,3699
-qulab-2.7.18.dist-info/WHEEL,sha256=PolFmPkBRqOxJCMvmNEJhcMPAgrWNQIyPvTInzN4IZk,114
-qulab-2.7.18.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.7.18.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.7.18.dist-info/RECORD,,
+qulab-2.7.19.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.7.19.dist-info/METADATA,sha256=5Xnc4iYsS7_SHRxyEwF9nXTeK9D6d4IZQ8pvWEsPMwc,3699
+qulab-2.7.19.dist-info/WHEEL,sha256=PolFmPkBRqOxJCMvmNEJhcMPAgrWNQIyPvTInzN4IZk,114
+qulab-2.7.19.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.7.19.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.7.19.dist-info/RECORD,,