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

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

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

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

@@ -1,17 +1,17 @@
 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=4UizSKt5rDt7vdZVD0pkpw5COMzc0CVh4OpeSim3jFU,126848
-qulab/version.py,sha256=rVOnxEJVvl0ZWvCblBzVBGcp0VALbV_koS5W-UB9zfk,22
+qulab/fun.cpython-311-darwin.so,sha256=jPG-O3zEKS-xcQrACZN9B5p5szRn1MaMFJh2W1BFDSM,126848
+qulab/version.py,sha256=vQo2edKgYGHn5FfacX8TS2Blt-3b9unuA9CvJvhZhfo,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=yTLoWOtTvmCTuYFZ6qFsjBM_CvsrKgmUkBSHHz3223A,10899
-qulab/executor/schedule.py,sha256=SfMZys8WdmIvfW5fPM42g-F6XwewTdpC0-puhf5TA54,11721
+qulab/executor/cli.py,sha256=owdDSaSuzTPQA5SlNCxX4nHWITU1BF0VZMj7tLqCZhM,5781
+qulab/executor/load.py,sha256=eKysHL5EHKd_YcfHOVwRoaNsD-k0cTuxDY_7Yn5W8hA,11078
+qulab/executor/schedule.py,sha256=bXQzn3e3tCvAVdEBsvh5ecAThP52njyxbsrlrxC9TzA,11922
 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=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
 qulab/monitor/__main__.py,sha256=w3yUcqq195LzSnXTkQcuC1RSFRhy4oQ_PEBmucXguME,97
 qulab/monitor/config.py,sha256=fQ5JcsMApKc1UwANEnIvbDQZl8uYW0tle92SaYtX9lI,744
@@ -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.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-2.4.18.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.4.18.dist-info/METADATA,sha256=SX3AKzWxSqBxr-pLe9B0pVY65i7zCPltEgIkq-yKVWU,3699
+QuLab-2.4.18.dist-info/WHEEL,sha256=K10eKSN6_vzvMOgXxWbVOQNR7Orfl6gBTCpCI8bcYx4,114
+QuLab-2.4.18.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.18.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.18.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)
@@ -117,12 +120,16 @@ def get(key, api):
               '-n',
               is_flag=True,
               help='Do not run dependents.')
+@click.option('--update', '-u', is_flag=True)
 @log_options
 @command_option('run')
-def run(workflow, code, data, api, plot, no_dependents):
+def run(workflow, code, data, api, plot, no_dependents, update):
     """
     Run a workflow.
     """
+    logger.info(
+        f'[CMD]: run {workflow} --code {code} --data {data} --api {api}{" --plot" if plot else ""}{" --no-dependents" if no_dependents else ""}{" --update " if update else ""}'
+    )
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config)
@@ -139,15 +146,15 @@ def run(workflow, code, data, api, plot, no_dependents):
     if no_dependents:
         if hasattr(wf, 'entries'):
             for entry in get_entries(wf, code):
-                run_workflow(entry, code, data, plot=plot)
+                run_workflow(entry, code, data, plot=plot, update=update)
         else:
-            run_workflow(wf, code, data, plot=plot)
+            run_workflow(wf, code, data, plot=plot, update=update)
     else:
         if hasattr(wf, 'entries'):
             for entry in get_entries(wf, code):
-                maintain_workflow(entry, code, data, run=True, plot=plot)
+                maintain_workflow(entry, code, data, run=True, plot=plot, update=update)
         else:
-            maintain_workflow(wf, code, data, run=True, plot=plot)
+            maintain_workflow(wf, code, data, run=True, plot=plot, update=update)
 
 
 @click.command()
@@ -159,6 +166,9 @@ def maintain(workflow, code, data, api, plot):
     """
     Maintain a workflow.
     """
+    logger.info(
+        f'[CMD]: maintain {workflow} --code {code} --data {data} --api {api}{" --plot" if plot else ""}'
+    )
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config)

qulab/executor/load.py

@@ -21,7 +21,7 @@ class SetConfigWorkflow():
         self.key = key
 
     def depends(self):
-        return [[]]
+        return []
 
     def check_state(self, history: Result) -> bool:
         from . import transform
@@ -254,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]
@@ -323,7 +327,7 @@ def get_dependents(workflow: WorkflowType,
                    code_path: str | Path) -> list[WorkflowType]:
     return [
         load_workflow(n, code_path, mtime=workflow.__mtime__)
-        for n in workflow.depends()[0]
+        for n in workflow.depends()
     ]
 
 

qulab/executor/schedule.py

@@ -236,7 +236,8 @@ def maintain(workflow: WorkflowType,
              state_path: str | Path,
              session_id: str | None = None,
              run: bool = False,
-             plot: bool = False):
+             plot: bool = False,
+             update: bool = True):
     if session_id is None:
         session_id = uuid.uuid4().hex
     logger.debug(f'run "{workflow.__workflow_id__}"'
@@ -280,7 +281,8 @@ def maintain(workflow: WorkflowType,
         raise CalibrationFailedError(
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
-    transform.update_parameters(result)
+    if update:
+        transform.update_parameters(result)
     return
 
 
@@ -288,13 +290,19 @@ def maintain(workflow: WorkflowType,
 def run(workflow: WorkflowType,
         code_path: str | Path,
         state_path: str | Path,
-        plot: bool = False):
+        plot: bool = False,
+        update: bool = True):
     session_id = uuid.uuid4().hex
     logger.debug(f'run "{workflow.__workflow_id__}" without dependences.')
-    result = calibrate(workflow, code_path, state_path, plot, session_id=session_id)
+    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!'
         )
-    transform.update_parameters(result)
+    if update:
+        transform.update_parameters(result)
     return

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.16"
+__version__ = "2.4.18"