QuLab 2.4.12__cp310-cp310-win_amd64.whl → 2.4.14__cp310-cp310-win_amd64.whl

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

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

@@ -1,15 +1,15 @@
 qulab/__init__.py,sha256=vkFybY8YSsQilYdThPRD83-btPAR41sy_WCXiM-6mME,141
 qulab/__main__.py,sha256=vUnluugYF1cH2UA44odFW1Z4AKecBZIfAihvsbhhSe0,629
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp310-win_amd64.pyd,sha256=8pXnOm2J5CwpbTQJmAEBFIcWJ3fJ0p99tsAwsiW_BWQ,31232
-qulab/version.py,sha256=3Ac_4-IUz5KK-UOcxuXzEVTZr4p9bV93jrLgO3Au_zA,22
+qulab/fun.cp310-win_amd64.pyd,sha256=UYlwuWIM6wHQzBVChDCW2SoTcIq6GeLlXU0eyeYi-P0,31232
+qulab/version.py,sha256=IPQCIOITfbX8l3dhIiuTYy89V7yOtf70dflfUCn6Dgk,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=WNpJmHAxXaQKPkmycsqbqeuAuiudNi-4GscmBKfdKlw,9713
+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
-qulab/executor/utils.py,sha256=n3uCSKh-qdDFFeNvOpj7_es2_B4AaC-ASAlV9gPmSO0,3086
+qulab/executor/utils.py,sha256=jp3F0swO9gpKhmTauxbgEK9WVorjI9FAL6zT60cYTdk,3106
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
 qulab/monitor/__main__.py,sha256=k2H1H5Zf9LLXTDLISJkbikLH-z0f1e5i5i6wXXYPOrE,105
 qulab/monitor/config.py,sha256=y_5StMkdrbZO1ziyKBrvIkB7Jclp9RCPK1QbsOhCxnY,785
@@ -89,9 +89,9 @@ qulab/visualization/plot_seq.py,sha256=Uo1-dB1YE9IN_A9tuaOs9ZG3S5dKDQ_l98iD2Wbxp
 qulab/visualization/qdat.py,sha256=HubXFu4nfcA7iUzghJGle1C86G6221hicLR0b-GqhKQ,5887
 qulab/visualization/rot3d.py,sha256=jGHJcqj1lEWBUV-W4GUGONGacqjrYvuFoFCwPse5h1Y,757
 qulab/visualization/widgets.py,sha256=HcYwdhDtLreJiYaZuN3LfofjJmZcLwjMfP5aasebgDo,3266
-QuLab-2.4.12.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.4.12.dist-info/METADATA,sha256=SHtCS_P4r8VmZXrsFopdlOZDbdEvgdKejBsJzB4xHJ8,3804
-QuLab-2.4.12.dist-info/WHEEL,sha256=rzGfZgUcGeKSgIHGYMuqg4xE4VPHxnaldXH6BG0zjVk,101
-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.14.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.4.14.dist-info/METADATA,sha256=37tzAZ4vAtg_Jf8j4qWlL6uXf8DmPfztQdyfQ0TUoTk,3804
+QuLab-2.4.14.dist-info/WHEEL,sha256=rzGfZgUcGeKSgIHGYMuqg4xE4VPHxnaldXH6BG0zjVk,101
+QuLab-2.4.14.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.14.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.14.dist-info/RECORD,,

qulab/executor/load.py

@@ -128,15 +128,15 @@ 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)
         except ValueError:
             continue
 
-        module = load_workflow_from_module(str(rel_path), root)
+        module = load_workflow_from_file(str(rel_path), root)
 
         if is_workflow(module):
             rel_str = str(rel_path)
@@ -147,7 +147,7 @@ def find_unreferenced_workflows(path: str) -> list[str]:
 
     # Check dependencies for each workflow module
     for rel_str in workflows:
-        module = load_workflow_from_module(rel_str, root)
+        module = load_workflow_from_file(rel_str, root)
 
         depends_func = getattr(module, "depends", None)
         if depends_func and callable(depends_func):
@@ -157,7 +157,9 @@ 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
@@ -183,9 +185,9 @@ def find_unreferenced_workflows(path: str) -> list[str]:
     return unreferenced
 
 
-def load_workflow_from_module(file_name: str,
-                              base_path: str | Path,
-                              package='workflows') -> WorkflowType:
+def load_workflow_from_file(file_name: str,
+                            base_path: str | Path,
+                            package='workflows') -> WorkflowType:
     if file_name.startswith('cfg:'):
         return SetConfigWorkflow(file_name[4:])
     base_path = Path(base_path)
@@ -217,20 +219,45 @@ def load_workflow_from_template(file_name: str,
 
     with open(base_path / path) as f:
         content = f.read()
-    template = string.Template(content)
+
+    def replace(text):
+        """
+        将给定文本中的所有 _D_("var") 替换为 ${var}。
+        
+        Args:
+            text (str): 包含 _D_ 调用的字符串。
+        
+        Returns:
+            str: 已经替换的新字符串。
+        """
+        pattern = re.compile(r'_D_\s*\(\s*(["\'])(\w+)\1\s*\)')
+        replacement = r'${\2}'
+        new_text = re.sub(pattern, replacement, text)
+        return new_text
+
+    template = string.Template(replace(content))
     content = template.substitute(mappping)
 
     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)
+    file = base_path / path
+    if not file.exists():
+        with open(file, 'w') as f:
+            f.write(content)
 
-    module = load_workflow_from_module(str(path), base_path, package)
+    module = load_workflow_from_file(str(path), base_path, package)
 
     return module
 
@@ -256,9 +283,14 @@ def load_workflow(workflow: str | tuple[str, dict],
             w = SetConfigWorkflow(key)
             w.__workflow_id__ = workflow
         else:
-            w = load_workflow_from_module(workflow, base_path, package)
+            w = load_workflow_from_file(workflow, base_path, package)
             w.__workflow_id__ = str(Path(w.__file__).relative_to(base_path))
     else:
         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,
@@ -294,8 +289,9 @@ def run(workflow: WorkflowType,
         code_path: str | Path,
         state_path: str | Path,
         plot: bool = False):
+    session_id = uuid.uuid4().hex
     logger.debug(f'run "{workflow.__workflow_id__}" without dependences.')
-    result = calibrate(workflow, code_path, state_path, plot)
+    result = calibrate(workflow, code_path, state_path, plot, session_id=session_id)
     if result.bad_data or not result.in_spec:
         raise CalibrationFailedError(
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'

qulab/executor/utils.py

@@ -34,6 +34,8 @@ def workflow_template(deps: list[str]) -> str:
     return f"""
 from loguru import logger
 
+def _D_(s): pass
+
 import numpy as np
 
 

qulab/version.py

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