QuLab 2.5.2__tar.gz → 2.5.4__tar.gz

{qulab-2.5.2 → qulab-2.5.4}/PKG-INFO

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

{qulab-2.5.2 → qulab-2.5.4}/QuLab.egg-info/PKG-INFO

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

{qulab-2.5.2 → qulab-2.5.4}/qulab/executor/cli.py

@@ -1,20 +1,35 @@
 import functools
+import graphlib
 import importlib
 import os
-import sys
 from pathlib import Path
 
 import click
 from loguru import logger
 
-from ..cli.config import ENV_PREFIX, get_config_value, log_options
-from .load import find_unreferenced_workflows, get_entries, load_workflow
+from ..cli.config import get_config_value, log_options
+from .load import (WorkflowType, find_unreferenced_workflows, get_entries,
+                   load_workflow, make_graph)
 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
 
 
+@logger.catch(reraise=True)
+def check_toplogy(workflow: WorkflowType, code_path: str | Path) -> dict:
+    graph = {}
+    try:
+        graphlib.TopologicalSorter(make_graph(workflow, graph,
+                                              code_path)).static_order()
+    except graphlib.CycleError as e:
+        logger.error(
+            f"Workflow {workflow.__workflow_id__} has a circular dependency: {e}"
+        )
+        raise e
+    return graph
+
+
 def command_option(command_name):
     """命令专属配置装饰器工厂"""
 
@@ -68,7 +83,7 @@ def create(workflow, code):
     deps = find_unreferenced_workflows(code)
 
     with open(fname, 'w') as f:
-        f.write(workflow_template(list(deps)))
+        f.write(workflow_template(workflow, list(deps)))
     click.echo(f'{workflow} created')
 
 
@@ -142,6 +157,7 @@ def run(workflow, code, data, api, plot, no_dependents, update):
     data = Path(os.path.expanduser(data))
 
     wf = load_workflow(workflow, code)
+    check_toplogy(wf, code)
 
     if no_dependents:
         if hasattr(wf, 'entries'):
@@ -152,9 +168,19 @@ def run(workflow, code, data, api, plot, no_dependents, update):
     else:
         if hasattr(wf, 'entries'):
             for entry in get_entries(wf, code):
-                maintain_workflow(entry, code, data, run=True, plot=plot, update=update)
+                maintain_workflow(entry,
+                                  code,
+                                  data,
+                                  run=True,
+                                  plot=plot,
+                                  update=update)
         else:
-            maintain_workflow(wf, code, data, run=True, plot=plot, update=update)
+            maintain_workflow(wf,
+                              code,
+                              data,
+                              run=True,
+                              plot=plot,
+                              update=update)
 
 
 @click.command()
@@ -181,6 +207,8 @@ def maintain(workflow, code, data, api, plot):
     data = Path(os.path.expanduser(data))
 
     wf = load_workflow(workflow, code)
+    check_toplogy(wf, code)
+
     if hasattr(wf, 'entries'):
         for entry in get_entries(wf, code):
             maintain_workflow(entry, code, data, run=False, plot=plot)

{qulab-2.5.2 → qulab-2.5.4}/qulab/executor/load.py

@@ -1,4 +1,5 @@
 import base64
+import graphlib
 import hashlib
 import inspect
 import lzma
@@ -259,7 +260,7 @@ def load_workflow_from_template(template_path: str,
     with open(base_path / path) as f:
         content = f.read()
 
-    mtime = max(Path(template_path).stat().st_mtime, mtime)
+    mtime = max((base_path / template_path).stat().st_mtime, mtime)
     hash_str, mapping_code = encode_mapping(mapping)
 
     def replace(text):
@@ -354,14 +355,65 @@ 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, mtime=workflow.__mtime__)
-        for n in workflow.depends()
-    ]
+    if callable(getattr(workflow, 'depends', None)):
+        if not can_call_without_args(workflow.depends):
+            raise AttributeError(
+                f'Workflow {workflow.__workflow_id__} "depends" function should not have any parameters'
+            )
+        return [
+            load_workflow(n, code_path, mtime=workflow.__mtime__)
+            for n in workflow.depends()
+        ]
+    elif isinstance(getattr(workflow, 'depends', None), (list, tuple)):
+        return [
+            load_workflow(n, code_path, mtime=workflow.__mtime__)
+            for n in workflow.depends
+        ]
+    elif getattr(workflow, 'entries', None) is None:
+        return []
+    else:
+        raise AttributeError(
+            f'Workflow {workflow.__workflow_id__} "depends" should be a callable or a list'
+        )
 
 
-def get_entries(workflow: WorkflowType, code_path: str | Path) -> WorkflowType:
-    return [
-        load_workflow(n, code_path, mtime=workflow.__mtime__)
-        for n in workflow.entries()
-    ]
+def get_entries(workflow: WorkflowType,
+                code_path: str | Path) -> list[WorkflowType]:
+    if callable(getattr(workflow, 'entries', None)):
+        if not can_call_without_args(workflow.entries):
+            raise AttributeError(
+                f'Workflow {workflow.__workflow_id__} "entries" function should not have any parameters'
+            )
+        return [
+            load_workflow(n, code_path, mtime=workflow.__mtime__)
+            for n in workflow.entries()
+        ]
+    elif isinstance(getattr(workflow, 'entries', None), (list, tuple)):
+        return [
+            load_workflow(n, code_path, mtime=workflow.__mtime__)
+            for n in workflow.entries
+        ]
+    elif getattr(workflow, 'entries', None) is None:
+        return []
+    else:
+        raise AttributeError(
+            f'Workflow {workflow.__workflow_id__} "entries" should be a callable or a list'
+        )
+
+
+def make_graph(workflow: WorkflowType, graph: dict, code_path: str | Path):
+    if workflow.__workflow_id__ in graph:
+        raise graphlib.CycleError(
+            f"Workflow {workflow.__workflow_id__} has a circular dependency")
+    graph[workflow.__workflow_id__] = []
+
+    if hasattr(workflow, 'entries'):
+        for w in get_entries(workflow, code_path):
+            graph[workflow.__workflow_id__].append(w.__workflow_id__)
+            make_graph(w, graph=graph, code_path=code_path)
+    elif hasattr(workflow, 'depends'):
+        for w in get_dependents(workflow, code_path):
+            graph[workflow.__workflow_id__].append(w.__workflow_id__)
+            make_graph(w, graph=graph, code_path=code_path)
+
+    return graph

{qulab-2.5.2 → qulab-2.5.4}/qulab/executor/schedule.py

@@ -73,9 +73,17 @@ def call_analyzer(node,
                   plot=False) -> Result:
     if check:
         result = node.check_analyze(result, history=history)
+        if not isinstance(result, Result):
+            raise TypeError(
+                f'"{node.__workflow_id__}" : "check_analyze" must return a Result object'
+            )
         result.fully_calibrated = False
     else:
         result = node.analyze(result, history=history)
+        if not isinstance(result, Result):
+            raise TypeError(
+                f'"{node.__workflow_id__}" : "analyze" must return a Result object'
+            )
         result.fully_calibrated = True
         if plot:
             call_plot(node, result)

{qulab-2.5.2 → qulab-2.5.4}/qulab/executor/utils.py

@@ -30,7 +30,7 @@ def dependent_tree(node: str, code_path: str | Path) -> dict[str, list[str]]:
     return tree
 
 
-def workflow_template(deps: list[str]) -> str:
+def workflow_template(workflow: str, deps: list[str]) -> str:
     return f"""def VAR(s): pass  # 没有实际作用，只是用来抑制编辑器的警告。
 
 import numpy as np
@@ -47,7 +47,7 @@ def depends():
 
 
 def calibrate():
-    logger.info(f"run {{__name__}}")
+    logger.info(f"running {workflow} ...")
 
     # calibrate 是一个完整的校准实验，如power Rabi，Ramsey等。
     # 你需要足够的扫描点，以使得后续的 analyze 可以拟合出合适的参数。
@@ -58,10 +58,11 @@ def calibrate():
     for i in x:
         y.append(np.sin(i))
 
+    logger.info(f"running {workflow} ... finished!")
     return x, y
 
 
-def analyze(result: Result, history: Result | None) -> Result:
+def analyze(result: Result, history: Result | None = None) -> Result:
     \"\"\"
     分析校准结果。
 
@@ -93,7 +94,7 @@ def analyze(result: Result, history: Result | None) -> Result:
 
 
 def check():
-    logger.info(f"check {{__name__}}")
+    logger.info(f"checking {workflow} ...")
 
     # check 是一个快速检查实验，用于检查校准是否过时。
     # 你只需要少数扫描点，让后续的 check_analyze 知道参数是否漂移，数据
@@ -105,10 +106,11 @@ def check():
     for i in x:
         y.append(np.sin(i))
 
+    logger.info(f"checking {workflow} ... finished!")
     return x, y
 
 
-def check_analyze(result: Result, history: Result) -> Result:
+def check_analyze(result: Result, history: Result | None = None) -> Result:
     \"\"\"
     分析检查结果。
 

qulab-2.5.4/qulab/version.py

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

qulab-2.5.2/qulab/version.py

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