QuLab 2.4.8__cp310-cp310-win_amd64.whl → 2.4.10__cp310-cp310-win_amd64.whl

{QuLab-2.4.8.dist-info → QuLab-2.4.10.dist-info}/METADATA

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

{QuLab-2.4.8.dist-info → QuLab-2.4.10.dist-info}/RECORD

@@ -1,12 +1,12 @@
 qulab/__init__.py,sha256=vkFybY8YSsQilYdThPRD83-btPAR41sy_WCXiM-6mME,141
 qulab/__main__.py,sha256=sQ1z8lk9Q4pq7X9lEzLcY8t6Izr6uxQXO0t3qnTUxEs,575
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp310-win_amd64.pyd,sha256=XEdahLzLmEzF7zzjcaxq3eEjYtTFN0j9PT6BQOzY_cM,31232
-qulab/version.py,sha256=rEeDjnd5O4uUbgUNz7NIJlvu9OJZL-L-gFEWeMnqgCo,21
+qulab/fun.cp310-win_amd64.pyd,sha256=KAsRuAJTtGSRKXTifm4XSgrCYw2fJgSo2okOeGjpzaU,31232
+qulab/version.py,sha256=xpqAldAat_EPvLePX9Bp7bPX0gGKeKjd9kZbsEQVax4,22
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
-qulab/executor/__main__.py,sha256=1Mg5fJ0dYSWQnP6wgTa0s6U_WH7NT2lCnCQOHyx_I7c,2430
-qulab/executor/load.py,sha256=jZHkEzFF8ufFAIajkRDKmHYYJxbxI3RcEbAFIbl9VQ0,6208
-qulab/executor/schedule.py,sha256=IxWaqmAUti5Mb0varEvNyiRoH_3zWTJ1eNZ5BofNM3E,9567
+qulab/executor/__main__.py,sha256=MMkkqpCH-Upwb1gBfvaN2ZuehXkJIMJGa1amYXEjn-Q,4017
+qulab/executor/load.py,sha256=pxq8oFaJLJOT21ue9q-BNlFeJZcjxmGNN0Cz_TColxA,6211
+qulab/executor/schedule.py,sha256=edPjE9U6_WQisSiOCcqov4DVbBVKTPWrBFwcy0ReC2s,10213
 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
@@ -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.8.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.4.8.dist-info/METADATA,sha256=mtxyFWjYkoRE3MPGQBZ4PZdFpnveKXJUfgM7OabU4Vo,3803
-QuLab-2.4.8.dist-info/WHEEL,sha256=rzGfZgUcGeKSgIHGYMuqg4xE4VPHxnaldXH6BG0zjVk,101
-QuLab-2.4.8.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.4.8.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.4.8.dist-info/RECORD,,
+QuLab-2.4.10.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.4.10.dist-info/METADATA,sha256=NaE66YybeLcxWfsqXuotu8HuNYogTN6I68L0N33IlUg,3804
+QuLab-2.4.10.dist-info/WHEEL,sha256=rzGfZgUcGeKSgIHGYMuqg4xE4VPHxnaldXH6BG0zjVk,101
+QuLab-2.4.10.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.10.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.10.dist-info/RECORD,,

qulab/executor/__main__.py

@@ -1,7 +1,10 @@
+import functools
 import importlib
+import sys, os
 from pathlib import Path
 
 import click
+from loguru import logger
 
 from .load import find_unreferenced_workflows
 from .schedule import maintain as maintain_workflow
@@ -10,6 +13,31 @@ from .transform import set_config_api
 from .utils import workflow_template
 
 
+def log_options(func):
+
+    @click.option("--debug", is_flag=True, help="Enable debug mode.")
+    @click.option("--log", type=str, help="Log file path.")
+    @functools.wraps(func)  # 保持函数元信息
+    def wrapper(*args, log=None, debug=False, **kwargs):
+        print(f"{func} {log=}, {debug=}")
+        if log is None and not debug:
+            logger.remove()
+            logger.add(sys.stderr, level='INFO')
+        elif log is None and debug:
+            logger.remove()
+            logger.add(sys.stderr, level='DEBUG')
+        elif log is not None and not debug:
+            logger.configure(handlers=[dict(sink=log, level='INFO')])
+        elif log is not None and debug:
+            logger.configure(handlers=[
+                dict(sink=log, level='DEBUG'),
+                dict(sink=sys.stderr, level='DEBUG')
+            ])
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 @click.group()
 def cli():
     pass
@@ -17,7 +45,7 @@ def cli():
 
 @click.command()
 @click.argument('workflow')
-@click.option('--code', '-c', default=None)
+@click.option('--code', '-c', default=None, help='The path of the code.')
 def create(workflow, code):
     """
     Create a new workflow file.
@@ -26,6 +54,7 @@ def create(workflow, code):
         code = Path.cwd()
 
     fname = Path(code) / f'{workflow}'
+    fname = Path(os.path.expanduser(fname))
     if fname.exists():
         click.echo(f'{workflow} already exists')
         return
@@ -40,11 +69,15 @@ def create(workflow, code):
 
 @click.command()
 @click.argument('workflow')
-@click.option('--code', '-c', default=None)
-@click.option('--data', '-d', default=None)
-@click.option('--api', '-a', default=None)
-@click.option('--plot', '-p', is_flag=True)
-@click.option('--no-dependents', '-n', is_flag=True)
+@click.option('--code', '-c', default=None, help='The path of the code.')
+@click.option('--data', '-d', default=None, help='The path of the data.')
+@click.option('--api', '-a', default=None, help='The modlule name of the api.')
+@click.option('--plot', '-p', is_flag=True, help='Plot the result.')
+@click.option('--no-dependents',
+              '-n',
+              is_flag=True,
+              help='Do not run dependents.')
+@log_options
 def run(workflow, code, data, api, plot, no_dependents):
     """
     Run a workflow.
@@ -57,6 +90,9 @@ def run(workflow, code, data, api, plot, no_dependents):
     if data is None:
         data = Path(code) / 'logs'
 
+    code = Path(os.path.expanduser(code))
+    data = Path(os.path.expanduser(data))
+
     if no_dependents:
         run_workflow(workflow, code, data, plot=plot)
     else:
@@ -65,10 +101,11 @@ def run(workflow, code, data, api, plot, no_dependents):
 
 @click.command()
 @click.argument('workflow')
-@click.option('--code', '-c', default=None)
-@click.option('--data', '-d', default=None)
-@click.option('--api', '-a', default=None)
-@click.option('--plot', '-p', is_flag=True)
+@click.option('--code', '-c', default=None, help='The path of the code.')
+@click.option('--data', '-d', default=None, help='The path of the data.')
+@click.option('--api', '-a', default=None, help='The modlule name of the api.')
+@click.option('--plot', '-p', is_flag=True, help='Plot the result.')
+@log_options
 def maintain(workflow, code, data, api, plot):
     """
     Maintain a workflow.
@@ -81,6 +118,9 @@ def maintain(workflow, code, data, api, plot):
     if data is None:
         data = Path(code) / 'logs'
 
+    code = Path(os.path.expanduser(code))
+    data = Path(os.path.expanduser(data))
+
     maintain_workflow(workflow, code, data, run=False, plot=plot)
 
 

qulab/executor/load.py

@@ -150,7 +150,7 @@ def find_unreferenced_workflows(path: str) -> list[str]:
                 )
                 continue
             try:
-                depends_list = depends_func()
+                depends_list = depends_func()[0]
             except Exception as e:
                 warnings.warn(f"Error calling depends() in {rel_str}: {e}")
                 continue

qulab/executor/schedule.py

@@ -82,7 +82,7 @@ def call_plot(node, result, check=False):
         node.plot(state, params, other)
 
 
-# @functools.lru_cache(maxsize=128)
+@functools.lru_cache(maxsize=128)
 def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
                plot: bool, session_id: str) -> Result:
     """
@@ -140,7 +140,7 @@ def check_data(workflow: str, code_path: str | Path, state_path: str | Path,
     return result
 
 
-# @functools.lru_cache(maxsize=128)
+@functools.lru_cache(maxsize=128)
 def calibrate(workflow, code_path: str | Path, state_path: str | Path,
               plot: bool, session_id: str) -> Result:
     node = load_workflow(workflow, code_path)
@@ -172,15 +172,29 @@ def diagnose(node, code_path: str | Path, state_path: str | Path, plot: bool,
     # bad data case
     recalibrated = []
     if result.bad_data:
+        logger.debug(f'"{node}": Bad data, diagnosing dependents')
         recalibrated = [
             diagnose(n, code_path, state_path, plot, session_id)
             for n in get_dependents(node, code_path)
         ]
-    if not any(recalibrated) and recalibrated:
+    if not any(recalibrated):
+        if result.bad_data:
+            raise CalibrationFailedError(
+                f'"{node}": bad data but no dependents recalibrated.')
         logger.debug(f'"{node}": no dependents recalibrated.')
-        return False
     # calibrate
-    logger.debug(f'recalibrate "{node}" because some dependents recalibrated')
+    if any(recalibrated):
+        logger.debug(
+            f'recalibrate "{node}" because some dependents recalibrated.')
+    elif not result.in_spec and not result.bad_data:
+        logger.debug(f'recalibrate "{node}" because out of spec.')
+    elif result.in_spec:
+        logger.error(f'Never reach: recalibrate "{node}" because in spec.')
+    elif result.bad_data:
+        logger.error(f'Never reach: recalibrate "{node}" because bad data.')
+    else:
+        logger.error(f'Never reach: recalibrate "{node}"')
+
     result = calibrate(node, code_path, state_path, plot, session_id)
     if result.bad_data or not result.in_spec:
         raise CalibrationFailedError(
@@ -193,7 +207,7 @@ def get_dependents(workflow: str, code_path: str | Path) -> list[str]:
     return [n for n in load_workflow(workflow, code_path).depends()[0]]
 
 
-#@logger.catch(reraise=True)
+@logger.catch(reraise=True)
 def maintain(node,
              code_path: str | Path,
              state_path: str | Path,
@@ -236,6 +250,7 @@ def maintain(node,
     return
 
 
+@logger.catch(reraise=True)
 def run(node,
         code_path: str | Path,
         state_path: str | Path,

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.4.8"
+__version__ = "2.4.10"