QuLab 2.5.1__cp311-cp311-macosx_10_9_universal2.whl → 2.5.3__cp311-cp311-macosx_10_9_universal2.whl

{QuLab-2.5.1.dist-info → QuLab-2.5.3.dist-info}/METADATA

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

{QuLab-2.5.1.dist-info → QuLab-2.5.3.dist-info}/RECORD

@@ -1,17 +1,17 @@
 qulab/__init__.py,sha256=XnSePkDDgfbmEpu5uXK6spygxaqVt9emMubHYKIjSwc,244
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-311-darwin.so,sha256=RXy3TEHNhRnT155GmyOwcFM-gVktlGaICCyoTbi0IAc,126848
+qulab/fun.cpython-311-darwin.so,sha256=_o-zs9ZbzrQF7jkAceBocsxaqiLmkVdxeL3qAaCCHp0,126848
 qulab/typing.py,sha256=5xCLfrp1aZpKpDy4p2arbFszw2eK3hGUjZa-XSvC_-8,69
-qulab/version.py,sha256=LBVD6Y5IKVHVmwynNRJsCm7zBTye77uIsmOVQJQUroE,21
+qulab/version.py,sha256=Znn1LprC8WFThPHcZ2uVYHDtCMP4LIy30e8v1CDWFvU,21
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=tgDIkkeIoasQXAifJZ6NU8jDgpNgb2a-B0C4nF0evrE,559
 qulab/cli/config.py,sha256=SdNmWzweWAdyk8M2oKYhMxnkaJ0qIayPlsLGCNlVqME,3108
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
-qulab/executor/cli.py,sha256=owdDSaSuzTPQA5SlNCxX4nHWITU1BF0VZMj7tLqCZhM,5781
-qulab/executor/load.py,sha256=i2MKxE5kflAGLt3e9LjME59K7IO7s68EUApP9228LhQ,12125
+qulab/executor/cli.py,sha256=5rbAOnG8Me46qeWh9LbutE3zIcPD-MZVqmYoWUY4l3o,6674
+qulab/executor/load.py,sha256=OZmE_Pj2XcHzRDw5-1lF-ZDoMVqpaR-dWXf1K39ThXQ,12925
 qulab/executor/schedule.py,sha256=4D8o68Cx6vCkpSTMHzULTwuuq1tS8unc2n8WdBA9oB0,12013
-qulab/executor/storage.py,sha256=Ms4euSGrMnFJPwcs70sg5-ZOOm1B6kGULcZOipsFLk4,7242
+qulab/executor/storage.py,sha256=s1xrI4bPTnyM4Nj0CkPxr3NdmnSp18LKnwm-ZoxR-Q0,7191
 qulab/executor/transform.py,sha256=AazWdlkEoOBaUJpTYsT5J4f0RanzCEeo-ThwEg8BB4Y,1262
 qulab/executor/utils.py,sha256=RNDEo17M-n_tge7uLITHxmoNNYSTm9OES75wQygR8dM,4065
 qulab/monitor/__init__.py,sha256=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
@@ -93,9 +93,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.5.1.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.5.1.dist-info/METADATA,sha256=D1Hfbn_3O29SadX5FYrKdMC4KywT_izEWppHG1CSWbI,3698
-QuLab-2.5.1.dist-info/WHEEL,sha256=K10eKSN6_vzvMOgXxWbVOQNR7Orfl6gBTCpCI8bcYx4,114
-QuLab-2.5.1.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.5.1.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.5.1.dist-info/RECORD,,
+QuLab-2.5.3.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.5.3.dist-info/METADATA,sha256=3Q3eK40_NlhnO2IeI2Ok-tPG7aEkDMQWj88cKwErDR0,3698
+QuLab-2.5.3.dist-info/WHEEL,sha256=K10eKSN6_vzvMOgXxWbVOQNR7Orfl6gBTCpCI8bcYx4,114
+QuLab-2.5.3.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.5.3.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.5.3.dist-info/RECORD,,

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):
     """命令专属配置装饰器工厂"""
 
@@ -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/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):
@@ -360,8 +361,27 @@ def get_dependents(workflow: WorkflowType,
     ]
 
 
-def get_entries(workflow: WorkflowType, code_path: str | Path) -> WorkflowType:
+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()
     ]
+
+
+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/executor/storage.py

@@ -140,8 +140,7 @@ def revoke_result(workflow: str, base_path: str | Path):
     base_path = Path(base_path)
     path = get_head(workflow, base_path)
     if path is not None:
-        with open(base_path / 'objects' / path, "rb") as f:
-            result = pickle.load(f)
+        result = load_result(path, base_path)
         result.in_spec = False
         return save_result(workflow, result, base_path)
 

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.5.1"
+__version__ = "2.5.3"