QuLab 2.4.15__cp311-cp311-win_amd64.whl → 2.4.17__cp311-cp311-win_amd64.whl

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

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

@@ -1,17 +1,17 @@
 qulab/__init__.py,sha256=vkFybY8YSsQilYdThPRD83-btPAR41sy_WCXiM-6mME,141
 qulab/__main__.py,sha256=g9iBs8xxX6Yik7cmgllQkpBN8C4JNoZVsEOyCCLCyFU,63
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp311-win_amd64.pyd,sha256=EIukgpUfAMTwdIoEcGJZBLGKAwiHnUEh1iIL9fUioxs,31744
-qulab/version.py,sha256=QW2MBz1JeuFtoyMh-qAewXiVGQGFzZAiBx69V3wIX5U,22
+qulab/fun.cp311-win_amd64.pyd,sha256=H1XtP6wtWvUAQY8wmhNWbq2MJGwYoujLil94KpfThb4,31744
+qulab/version.py,sha256=7sdjAp5MKcoRwUjjN0nAZGMtB3lz4cfXjSGNTq8NnJ4,22
 qulab/cli/__init__.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
 qulab/cli/config.py,sha256=gvMObzaVJ-xTJ1GmhP3sATayfDasYlijX1krSGeccNY,3071
 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/cli.py,sha256=9x7yCvEI41MaALE5Hv9-15Z_IGs2_Kswo3EjCoh_RPE,5595
+qulab/executor/load.py,sha256=eKysHL5EHKd_YcfHOVwRoaNsD-k0cTuxDY_7Yn5W8hA,11078
 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=jp3F0swO9gpKhmTauxbgEK9WVorjI9FAL6zT60cYTdk,3106
+qulab/executor/utils.py,sha256=RmnT0wMTAvavM-abgFt2tQN8TaaHuk86-YAiOUQCoBU,3101
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
 qulab/monitor/__main__.py,sha256=k2H1H5Zf9LLXTDLISJkbikLH-z0f1e5i5i6wXXYPOrE,105
 qulab/monitor/config.py,sha256=y_5StMkdrbZO1ziyKBrvIkB7Jclp9RCPK1QbsOhCxnY,785
@@ -91,9 +91,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.15.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.4.15.dist-info/METADATA,sha256=9k0ereN9Bo_fbFCBZtL5IHpTeyNuG4zJE8H7PxVzRPM,3804
-QuLab-2.4.15.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
-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.17.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.4.17.dist-info/METADATA,sha256=DwgNA--FfjwweGZlKCLdUpvP80VyQQiYE-iisAp0d5E,3804
+QuLab-2.4.17.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
+QuLab-2.4.17.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.17.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.17.dist-info/RECORD,,

qulab/executor/cli.py

@@ -54,6 +54,7 @@ def create(workflow, code):
     """
     Create a new workflow file.
     """
+    logger.info(f'[CMD]: create {workflow} --code {code}')
     if code is None:
         code = Path.cwd()
 
@@ -82,6 +83,7 @@ def set(key, value, api):
     """
     Set a config.
     """
+    logger.info(f'[CMD]: set {key} {value} --api {api}')
     from . import transform
     if api is not None:
         api = importlib.import_module(api)
@@ -103,6 +105,7 @@ def get(key, api):
     """
     Get a config.
     """
+    logger.info(f'[CMD]: get {key} --api {api}')
     from . import transform
     if api is not None:
         api = importlib.import_module(api)
@@ -123,6 +126,9 @@ def run(workflow, code, data, api, plot, no_dependents):
     """
     Run a workflow.
     """
+    logger.info(
+        f'[CMD]: run {workflow} --code {code} --data {data} --api {api} --plot {plot} --no-dependents {no_dependents}'
+    )
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config)
@@ -159,6 +165,9 @@ def maintain(workflow, code, data, api, plot):
     """
     Maintain a workflow.
     """
+    logger.info(
+        f'[CMD]: maintain {workflow} --code {code} --data {data} --api {api} --plot {plot}'
+    )
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config)

qulab/executor/load.py

@@ -15,12 +15,13 @@ from .storage import Result
 
 class SetConfigWorkflow():
     __timeout__ = None
+    __mtime__ = 0
 
     def __init__(self, key):
         self.key = key
 
     def depends(self):
-        return [[]]
+        return []
 
     def check_state(self, history: Result) -> bool:
         from . import transform
@@ -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}。
@@ -247,6 +254,10 @@ def load_workflow_from_template(template_path: str,
         return new_text
 
     template = string.Template(replace(content))
+    keys = template.get_identifiers()
+    missing = set(keys) - set(mappping.keys())
+    if missing:
+        raise KeyError(f"{template_path}: Missing keys in mapping: {missing}")
     content = template.substitute(mappping)
 
     hash_str = hashlib.md5(pickle.dumps(mappping)).hexdigest()[:8]
@@ -267,7 +278,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 +288,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 +325,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()
+    ]
 
 
 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/executor/utils.py

@@ -25,7 +25,7 @@ def dependent_tree(node: str, code_path: str | Path) -> dict[str, list[str]]:
     Returns a dict of nodes and their dependents.
     '''
     tree = {}
-    for n in load_workflow(node, code_path).depends()[0]:
+    for n in load_workflow(node, code_path).depends():
         tree[n] = dependent_tree(n, code_path)
     return tree
 
@@ -43,7 +43,7 @@ import numpy as np
 __timeout__ = 7*24*3600
 
 def depends():
-    return [{deps!r}]
+    return {deps!r}
 
 
 def calibrate():

qulab/version.py

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