QuLab 2.6.1__cp312-cp312-macosx_10_13_universal2.whl → 2.6.2__cp312-cp312-macosx_10_13_universal2.whl

{QuLab-2.6.1.dist-info → QuLab-2.6.2.dist-info}/METADATA

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

{QuLab-2.6.1.dist-info → QuLab-2.6.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 qulab/__init__.py,sha256=tKRZe2WafDGcwbu7ddlMaePerN842aRbxcrECsu5pas,286
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-312-darwin.so,sha256=A0l5Gnwe4GSKgijWzaoILHCqBeYuw_XYwd061uuYY3E,126864
+qulab/fun.cpython-312-darwin.so,sha256=9N82f5OtiXpzAUcnR_CUckwGPIrkpTisYYAL17zH9QI,126864
 qulab/typing.py,sha256=5xCLfrp1aZpKpDy4p2arbFszw2eK3hGUjZa-XSvC_-8,69
-qulab/version.py,sha256=CxIX_WubB9c4uEWgzV2lPv0dBsuUamxzVZLp62HT2u4,21
+qulab/version.py,sha256=sQMuYaw_409lWyUHUBi5qsAZncFg7IE4n-dlpxOTlds,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=MjwXe_ZEolVzNkGYq6G4cp-iHI0TiAlNkSuX2p0ZZQk,6760
+qulab/executor/cli.py,sha256=gQ7kYrppxxCWtyhTRs2kUq916P1zUb6JTqBglDqU80s,7943
 qulab/executor/load.py,sha256=_XxHHSgQTxaOo6zhY9UZnqPu_wiG8BT6FyBaeH67lvo,17856
 qulab/executor/schedule.py,sha256=RkhDjwsxXT2RmO6ZTcP7LGsY4M4KY6Acmykq_kQ_wcc,13992
 qulab/executor/storage.py,sha256=2Kvv7Nk98OLF6ux2PkfTTcZnHDG3g6TKpIb9e7yVbz0,8694
@@ -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.6.1.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.6.1.dist-info/METADATA,sha256=cccOr38VtvBcqweogYFASdwU5zRzc5YcEmq1HnK6Qh4,3698
-QuLab-2.6.1.dist-info/WHEEL,sha256=iDXcyuxg-66TzzqHGH-kgw_HJdaJE_1RHznrvPNCSNs,115
-QuLab-2.6.1.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.6.1.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.6.1.dist-info/RECORD,,
+QuLab-2.6.2.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.6.2.dist-info/METADATA,sha256=Mr5Cg21YMmIhvJpqyBTLHIxmk_9-ngrrGRGvpUqbx9M,3698
+QuLab-2.6.2.dist-info/WHEEL,sha256=iDXcyuxg-66TzzqHGH-kgw_HJdaJE_1RHznrvPNCSNs,115
+QuLab-2.6.2.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.6.2.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.6.2.dist-info/RECORD,,

qulab/executor/cli.py

@@ -12,6 +12,7 @@ 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 .schedule import CalibrationFailedError
 from .transform import set_config_api
 from .utils import workflow_template
 
@@ -135,16 +136,20 @@ def get(key, api):
               '-n',
               is_flag=True,
               help='Do not run dependents.')
+@click.option('--retry', '-r', default=1, type=int, help='Retry times.')
 @click.option('--update', '-u', is_flag=True)
 @log_options
 @command_option('run')
-def run(workflow, code, data, api, plot, no_dependents, update):
+def run(workflow, code, data, api, plot, no_dependents, retry, update):
     """
     Run a workflow.
     """
     logger.info(
-        f'[CMD]: run {workflow} --code {code} --data {data} --api {api}{" --plot" if plot else ""}{" --no-dependents" if no_dependents else ""}{" --update " if update else ""}'
-    )
+        f'[CMD]: run {workflow} --code {code} --data {data} --api {api}'
+        f'{" --plot" if plot else ""}'
+        f'{" --no-dependents" if no_dependents else ""}'
+        f' --retry {retry}'
+        f'{" --update " if update else ""}')
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config, api.export_config)
@@ -159,42 +164,56 @@ def run(workflow, code, data, api, plot, no_dependents, update):
     wf = load_workflow(workflow, code)
     check_toplogy(wf, code)
 
-    if no_dependents:
-        if hasattr(wf, 'entries'):
-            for entry in get_entries(wf, code):
-                run_workflow(entry, code, data, plot=plot, update=update)
-        else:
-            run_workflow(wf, code, data, plot=plot, update=update)
-    else:
-        if hasattr(wf, 'entries'):
-            for entry in get_entries(wf, code):
-                maintain_workflow(entry,
-                                  code,
-                                  data,
-                                  run=True,
-                                  plot=plot,
-                                  update=update)
-        else:
-            maintain_workflow(wf,
-                              code,
-                              data,
-                              run=True,
-                              plot=plot,
-                              update=update)
+    for i in range(retry):
+        try:
+            if no_dependents:
+                if hasattr(wf, 'entries'):
+                    for entry in get_entries(wf, code):
+                        run_workflow(entry,
+                                     code,
+                                     data,
+                                     plot=plot,
+                                     update=update)
+                else:
+                    run_workflow(wf, code, data, plot=plot, update=update)
+            else:
+                if hasattr(wf, 'entries'):
+                    for entry in get_entries(wf, code):
+                        maintain_workflow(entry,
+                                          code,
+                                          data,
+                                          run=True,
+                                          plot=plot,
+                                          update=update)
+                else:
+                    maintain_workflow(wf,
+                                      code,
+                                      data,
+                                      run=True,
+                                      plot=plot,
+                                      update=update)
+            break
+        except CalibrationFailedError as e:
+            if i == retry - 1:
+                raise e
+            logger.warning(f'Calibration failed, retrying ({i + 1}/{retry})')
+            continue
 
 
 @click.command()
 @click.argument('workflow')
+@click.option('--retry', '-r', default=1, type=int, help='Retry times.')
 @click.option('--plot', '-p', is_flag=True, help='Plot the result.')
 @log_options
 @command_option('maintain')
-def maintain(workflow, code, data, api, plot):
+def maintain(workflow, code, data, api, retry, plot):
     """
     Maintain a workflow.
     """
     logger.info(
-        f'[CMD]: maintain {workflow} --code {code} --data {data} --api {api}{" --plot" if plot else ""}'
-    )
+        f'[CMD]: maintain {workflow} --code {code} --data {data} --api {api}'
+        f' --retry {retry}'
+        f'{" --plot" if plot else ""}')
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config, api.export_config)
@@ -209,8 +228,15 @@ def maintain(workflow, code, data, api, plot):
     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)
-    else:
-        maintain_workflow(wf, code, data, run=False, plot=plot)
+    for i in range(retry):
+        try:
+            if hasattr(wf, 'entries'):
+                for entry in get_entries(wf, code):
+                    maintain_workflow(entry, code, data, run=False, plot=plot)
+            else:
+                maintain_workflow(wf, code, data, run=False, plot=plot)
+        except CalibrationFailedError as e:
+            if i == retry - 1:
+                raise e
+            logger.warning(f'Calibration failed, retrying ({i + 1}/{retry})')
+            continue

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.6.1"
+__version__ = "2.6.2"