QuLab 2.4.9__tar.gz → 2.4.10__tar.gz

{qulab-2.4.9 → qulab-2.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuLab
-Version: 2.4.9
+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.9 → qulab-2.4.10}/QuLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuLab
-Version: 2.4.9
+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.10/qulab/executor/__main__.py

@@ -0,0 +1,132 @@
+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
+from .schedule import run as run_workflow
+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
+
+
+@click.command()
+@click.argument('workflow')
+@click.option('--code', '-c', default=None, help='The path of the code.')
+def create(workflow, code):
+    """
+    Create a new workflow file.
+    """
+    if code is None:
+        code = Path.cwd()
+
+    fname = Path(code) / f'{workflow}'
+    fname = Path(os.path.expanduser(fname))
+    if fname.exists():
+        click.echo(f'{workflow} already exists')
+        return
+
+    fname.parent.mkdir(parents=True, exist_ok=True)
+    deps = find_unreferenced_workflows(code)
+
+    with open(fname, 'w') as f:
+        f.write(workflow_template(list(deps)))
+    click.echo(f'{workflow} created')
+
+
+@click.command()
+@click.argument('workflow')
+@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.
+    """
+    if api is not None:
+        api = importlib.import_module(api)
+        set_config_api(api.query_config, api.update_config)
+    if code is None:
+        code = Path.cwd()
+    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:
+        maintain_workflow(workflow, code, data, run=True, plot=plot)
+
+
+@click.command()
+@click.argument('workflow')
+@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.
+    """
+    if api is not None:
+        api = importlib.import_module(api)
+        set_config_api(api.query_config, api.update_config)
+    if code is None:
+        code = Path.cwd()
+    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)
+
+
+cli.add_command(maintain)
+cli.add_command(run)
+cli.add_command(create)
+
+if __name__ == '__main__':
+    cli()

{qulab-2.4.9 → qulab-2.4.10}/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-2.4.9 → qulab-2.4.10}/qulab/executor/schedule.py

@@ -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-2.4.10/qulab/version.py

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

qulab-2.4.9/qulab/executor/__main__.py

@@ -1,92 +0,0 @@
-import importlib
-from pathlib import Path
-
-import click
-
-from .load import find_unreferenced_workflows
-from .schedule import maintain as maintain_workflow
-from .schedule import run as run_workflow
-from .transform import set_config_api
-from .utils import workflow_template
-
-
-@click.group()
-def cli():
-    pass
-
-
-@click.command()
-@click.argument('workflow')
-@click.option('--code', '-c', default=None)
-def create(workflow, code):
-    """
-    Create a new workflow file.
-    """
-    if code is None:
-        code = Path.cwd()
-
-    fname = Path(code) / f'{workflow}'
-    if fname.exists():
-        click.echo(f'{workflow} already exists')
-        return
-
-    fname.parent.mkdir(parents=True, exist_ok=True)
-    deps = find_unreferenced_workflows(code)
-
-    with open(fname, 'w') as f:
-        f.write(workflow_template(list(deps)))
-    click.echo(f'{workflow} created')
-
-
-@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)
-def run(workflow, code, data, api, plot, no_dependents):
-    """
-    Run a workflow.
-    """
-    if api is not None:
-        api = importlib.import_module(api)
-        set_config_api(api.query_config, api.update_config)
-    if code is None:
-        code = Path.cwd()
-    if data is None:
-        data = Path(code) / 'logs'
-
-    if no_dependents:
-        run_workflow(workflow, code, data, plot=plot)
-    else:
-        maintain_workflow(workflow, code, data, run=True, plot=plot)
-
-
-@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)
-def maintain(workflow, code, data, api, plot):
-    """
-    Maintain a workflow.
-    """
-    if api is not None:
-        api = importlib.import_module(api)
-        set_config_api(api.query_config, api.update_config)
-    if code is None:
-        code = Path.cwd()
-    if data is None:
-        data = Path(code) / 'logs'
-
-    maintain_workflow(workflow, code, data, run=False, plot=plot)
-
-
-cli.add_command(maintain)
-cli.add_command(run)
-cli.add_command(create)
-
-if __name__ == '__main__':
-    cli()

qulab-2.4.9/qulab/version.py

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