QuLab 2.7.18__tar.gz → 2.7.19__tar.gz

{qulab-2.7.18 → qulab-2.7.19}/PKG-INFO

@@ -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 → qulab-2.7.19}/QuLab.egg-info/PKG-INFO

@@ -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 → qulab-2.7.19}/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-2.7.18 → qulab-2.7.19}/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-2.7.19/qulab/version.py

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

qulab-2.7.18/qulab/version.py

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