QuLab 2.5.3__tar.gz → 2.5.4__tar.gz

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuLab
-Version: 2.5.3
+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.3 → qulab-2.5.4}/qulab/executor/cli.py

@@ -83,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')
 
 

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

@@ -355,18 +355,50 @@ 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) -> list[WorkflowType]:
-    return [
-        load_workflow(n, code_path, mtime=workflow.__mtime__)
-        for n in workflow.entries()
-    ]
+    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):

{qulab-2.5.3 → 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.3 → 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.3/qulab/version.py

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