QuLab 2.11.16__py3-none-any.whl → 2.12.1__py3-none-any.whl

qulab/cli/commands.py

@@ -1,7 +1,7 @@
 import click
 
-from ..executor.cli import (boot, create, export, get, load, maintain, delete,
-                            reproduce, run, set)
+from ..executor.cli import (boot, create, delete, export, get, load, maintain,
+                            reboot, reproduce, run, set)
 from ..monitor.__main__ import main as monitor
 from ..scan.server import server
 from ..sys.net.cli import dht
@@ -39,3 +39,4 @@ reg.add_command(delete)
 reg.add_command(load)
 reg.add_command(export)
 cli.add_command(boot)
+cli.add_command(reboot)

qulab/executor/cli.py

@@ -24,7 +24,7 @@ from .utils import workflow_template
 
 
 @logger.catch(reraise=True)
-def run_script(script_path, extra_paths=None):
+def run_script(script_path, args=(), extra_paths=None):
     """Run a script in a new process, inheriting current PYTHONPATH plus any extra paths.
     
     Args:
@@ -35,7 +35,7 @@ def run_script(script_path, extra_paths=None):
     import sys
 
     # Launch the new process with the modified environment
-    proc = subprocess.Popen([sys.executable, script_path],
+    proc = subprocess.Popen([sys.executable, script_path, *args],
                             env=combined_env(extra_paths))
     proc.communicate()
 
@@ -370,6 +370,23 @@ def boot(bootstrap):
         run_script(bootstrap)
 
 
+@click.command()
+@click.option('--bootstrap',
+              '-b',
+              default=lambda: get_config_value("bootstrap", Path),
+              help='The path of the bootstrap.')
+def reboot(bootstrap):
+    """Reboot the executor.
+    
+    Reboots the executor to reset the state and start fresh.
+    
+    Args:
+        bootstrap: Path to the bootstrap script
+    """
+    if bootstrap is not None:
+        run_script(bootstrap, args=('--reboot',))
+
+
 def parse_dynamic_option_value(value):
     """解析动态参数值"""
     try:

qulab/utils.py

@@ -24,33 +24,36 @@ def combined_env(extra_paths=None):
     return env
 
 
-def run_detached(script, env=None):
+def run_detached(script, env=None, cwd=None):
     """
     启动可执行文件并完全分离（优先用 tmux/screen），无需额外终端窗口
     支持 Windows、Linux 和 macOS
     """
     if env is None:
         env = combined_env()
+    if cwd is None:
+        cwd = os.getcwd()
     try:
         if sys.platform == 'win32' or not _unix_detach_with_tmux_or_screen(
-                script, env):
+                script, env, cwd):
             # 回退到带终端窗口的方案
-            run_detached_with_terminal(script, env)
+            run_detached_with_terminal(script, env, cwd)
 
     except Exception as e:
         click.echo(f"启动失败: {e}")
         sys.exit(1)
 
 
-def _windows_start(script, env):
+def _windows_start(script, env, cwd):
     """Windows 弹窗启动方案"""
     subprocess.Popen(f'start cmd /k "{script}"',
                      shell=True,
                      env=env,
+                     cwd=cwd,
                      creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
 
 
-def _unix_detach_with_tmux_or_screen(script, env):
+def _unix_detach_with_tmux_or_screen(script, env, cwd):
     """Unix 后台分离方案（无窗口）"""
     safe_path = shlex.quote(script)
     session_name = f"qulab_{int(time.time())}"
@@ -63,7 +66,7 @@ def _unix_detach_with_tmux_or_screen(script, env):
             "-d",
             "-s",
             session_name,
-            script + " ; tmux wait-for -S finished",  # 等待命令结束
+            f"cd {shlex.quote(cwd)} && {script} ; tmux wait-for -S finished",  # 等待命令结束
             ";",
             "tmux",
             "wait-for",
@@ -72,6 +75,7 @@ def _unix_detach_with_tmux_or_screen(script, env):
         subprocess.Popen(" ".join(command),
                          shell=True,
                          env=env,
+                         cwd=cwd,
                          start_new_session=True)
         click.echo(f"已启动 tmux 会话: {session_name}")
         click.echo(f"你可以使用 `tmux attach -t {session_name}` 来查看输出")
@@ -79,8 +83,11 @@ def _unix_detach_with_tmux_or_screen(script, env):
 
     # 尝试 screen
     elif _check_command_exists("screen", env):
-        command = ["screen", "-dmS", session_name, script]
-        subprocess.Popen(command, env=env, start_new_session=True)
+        command = [
+            "screen", "-dmS", session_name, "sh", "-c",
+            f"cd {shlex.quote(cwd)} && {script}"
+        ]
+        subprocess.Popen(command, env=env, cwd=cwd, start_new_session=True)
         click.echo(f"已启动 screen 会话: {session_name}")
         click.echo(f"你可以使用 `screen -r {session_name}` 来查看输出")
         return True
@@ -88,29 +95,37 @@ def _unix_detach_with_tmux_or_screen(script, env):
     return False
 
 
-def run_detached_with_terminal(script, env=None):
+def run_detached_with_terminal(script, env=None, cwd=None):
     """回退到带终端窗口的方案"""
     if env is None:
         env = combined_env()
+    if cwd is None:
+        cwd = os.getcwd()
 
     if sys.platform == 'win32':
-        _windows_start(script, env)
+        _windows_start(script, env, cwd)
     elif sys.platform == 'darwin':
         # script=shlex.quote(script)
-        script = f'tell app "Terminal" to do script "{script}"'
-        subprocess.Popen(["osascript", "-e", script],
+        terminal_script = f'tell app "Terminal" to do script "cd {shlex.quote(cwd)} && {script}"'
+        subprocess.Popen(["osascript", "-e", terminal_script],
                          env=env,
+                         cwd=cwd,
                          start_new_session=True)
     else:
         try:
+            subprocess.Popen([
+                "gnome-terminal", "--", "sh", "-c",
+                f"cd {shlex.quote(cwd)} && {script}"
+            ],
+                             env=env,
+                             cwd=cwd,
+                             start_new_session=True)
+        except FileNotFoundError:
             subprocess.Popen(
-                ["gnome-terminal", "--", "sh", "-c", script],
+                ["xterm", "-e", f"sh -c 'cd {shlex.quote(cwd)} && {script}'"],
                 env=env,
+                cwd=cwd,
                 start_new_session=True)
-        except FileNotFoundError:
-            subprocess.Popen(["xterm", "-e", script],
-                             env=env,
-                             start_new_session=True)
 
 
 def _check_command_exists(cmd, env):

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.11.16"
+__version__ = "2.12.1"

qulab/visualization/plot_layout.py

@@ -54,6 +54,85 @@ def complete_layout(layout):
     return layout
 
 
+def read_xlsx_to_dict(filepath: str,
+                      key_col: int = 0,
+                      value_col: int = 4,
+                      sheet_name: str = 0) -> dict:
+    """
+    读取 .xlsx 文件，将第 key_col 列和第 value_col 列的值分别作为 key、value，返回一个字典。
+
+    :param filepath: Excel 文件路径
+    :param key_col: 用作字典键的列索引（0 表示第一列）
+    :param value_col: 用作字典值的列索引（0 表示第一列）
+    :param sheet_name: 要读取的 sheet 名称或索引，默认第一个 sheet
+    :return: { key: value, ... } 形式的字典
+    """
+    import pandas as pd
+
+    # 读取整个表格
+    # df = pd.read_excel(filepath, sheet_name=sheet_name, header=None)
+    df = pd.read_excel(filepath, sheet_name=sheet_name)
+
+    # 提取指定列，生成键值对并返回字典
+    keys = df.iloc[:, key_col]
+    values = df.iloc[:, value_col]
+    return dict(zip(keys, values))
+
+
+def load_layout_from_xlsx(qubit_info, coupler_info, pad_info):
+    """
+    从 .xlsx 文件中加载布局信息。
+
+    :param qubit_info: 量子比特信息文件路径
+    :param coupler_info: 耦合器信息文件路径
+    :param pad_info: 垫片信息文件路径
+    :return: 布局信息
+    """
+    import pandas as pd
+
+    _qubits = {}
+
+    qubit_pad = read_xlsx_to_dict(qubit_info, value_col=4)
+    coupler_pad = read_xlsx_to_dict(coupler_info, value_col=3)
+    pads = {
+        v: k
+        for k, v in qubit_pad.items()
+    } | {
+        v: k
+        for k, v in coupler_pad.items()
+    }
+    pad_info = read_xlsx_to_dict(pad_info, value_col=2)
+
+    lyt = {'qubits': {}, 'couplers': {}, 'feedlines': {}}
+
+    for pad, script in pad_info.items():
+        info = eval(script)
+        match info['style']:
+            case 'Q':
+                qubit = pads[pad]
+                lyt['qubits'][qubit] = {'pos': info['qb'], 'pad': pad}
+                _qubits[info['qb']] = qubit
+            case 'C':
+                coupler = pads[pad]
+                if 'cpl' in info:
+                    pos = tuple(info['cpl'])
+                else:
+                    pos = tuple(info['qb'])
+                lyt['couplers'][coupler] = {'qubits': pos, 'pad': pad}
+            case 'TL':
+                l = info['tl']
+                if f"T{l}" in lyt['feedlines']:
+                    lyt['feedlines'][f"T{l}"]['pads'].append(pad)
+                else:
+                    lyt['feedlines'][f"T{l}"] = {'pads': [pad]}
+
+    for coupler in lyt['couplers']:
+        qubits = lyt['couplers'][coupler]['qubits']
+        lyt['couplers'][coupler]['qubits'] = [_qubits[p] for p in qubits]
+
+    return complete_layout(lyt)
+
+
 def get_shared_coupler(layout, q1, q2):
     for c in layout['qubits'][q1]['couplers']:
         if q2 in layout['couplers'][c]['qubits']:

{qulab-2.11.16.dist-info → qulab-2.12.1.dist-info}/METADATA

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

{qulab-2.11.16.dist-info → qulab-2.12.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 qulab/__init__.py,sha256=ijh3NWuSCU_KWRrPfddX4vfPcYPmvKs64vSTl9qd-SU,2178
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
-qulab/utils.py,sha256=B_8QdY9OMY7WU-F200v93BDJXJpQcKAHihnOXeEvv_w,3966
-qulab/version.py,sha256=z1ogNWpE3sfhj8z_vJdEtWVUcmSF3lOrnReD_efKPwM,23
+qulab/utils.py,sha256=0mOSj6bGMgT5BhPgQQzekx5aVBuidxXE3kLumJJaLgc,4531
+qulab/version.py,sha256=xzXXyb4Cc2u5EWdM4fbKSvettwA_bB9v3W1WNfmB8aI,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qulab/cli/commands.py,sha256=ywKmwbGNBCVASx8OsgrRttaLz9ogwY38ZdKj7I-tdJ4,813
+qulab/cli/commands.py,sha256=dr9vlQaTrsXw2Fqra713XquS4m3am_XNHt0BWC7J3yo,845
 qulab/cli/config.py,sha256=Z-lePcDMeeQmwFpdfQHqZuaXTPhWUHN5KrlSqrya73Y,6324
 qulab/cli/decorators.py,sha256=oImteZVnDPPWdyhJ4kzf2KYGJLON7VsKGBvZadWLQZo,621
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/analyze.py,sha256=VYTfiOYJe5gDbtGA4wOkrQhhu55iIrRVByx-gBLUUm4,5672
-qulab/executor/cli.py,sha256=fTB7V8xNCvpU8EMa__ysBvRCzruP-QFbXOyLpeTPx0E,25711
+qulab/executor/cli.py,sha256=I63KA59Hr4SIVKAXyEAMDPdgANFx88e8F85wRqUai4g,26196
 qulab/executor/load.py,sha256=eMlzOrrn8GpbP3J3uY5JJ8iO7tL5B1DWP1z2qiGyNhU,20385
 qulab/executor/registry.py,sha256=yWO6nJ1nMVve_HF5xzSd7QmZEIjoGvD_Txg73_f30gE,9279
 qulab/executor/schedule.py,sha256=cDFM_tIMvxHLxb-tBA6fEPF9u-4LcgnQDxbaquZIQKc,21727
@@ -91,14 +91,14 @@ qulab/visualization/__init__.py,sha256=26cuHt3QIJXUb3VaMxlJx3IQTOUVJFKlYBZr7WMP5
 qulab/visualization/__main__.py,sha256=9zKK3yZFy0leU40ou6BpRC1Fsetfc1gjjFzIZYIwP6Y,1639
 qulab/visualization/_autoplot.py,sha256=2ECb2USU3_MSwo2d8qzMMO4DK9OU1bA6RYr7FCss1D0,14369
 qulab/visualization/plot_circ.py,sha256=Lxi-Nnik9MBtsNur0iyp9DTdy_IMALRsHBg2hZbPkGc,8769
-qulab/visualization/plot_layout.py,sha256=mRHinWX1Iq1qpcZ1OKrtcRoqJuv_a8d2qXrj23MeEjQ,17793
+qulab/visualization/plot_layout.py,sha256=Q8yOGYQ-oOle1W7cN4am9ABI8T-Xtk3W6BEX5bFSeWg,20464
 qulab/visualization/plot_seq.py,sha256=UWTS6p9nfX_7B8ehcYo6UnSTUCjkBsNU9jiOeW2calY,6751
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
 qulab/visualization/rot3d.py,sha256=CuLfG1jw1032HNNZxzC0OWtNzKsbj2e2WRYhMWDgvMQ,1321
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-qulab-2.11.16.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.11.16.dist-info/METADATA,sha256=XXJq2QfRxVsTyN5Szli0eQEIF-xEvr_4U0zsofxCMtc,3945
-qulab-2.11.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qulab-2.11.16.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.11.16.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.11.16.dist-info/RECORD,,
+qulab-2.12.1.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.12.1.dist-info/METADATA,sha256=3RqnUNugl7OdALKYsY5VQYPdOJgQ5HIlb_2ovOsVCqg,3944
+qulab-2.12.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qulab-2.12.1.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.12.1.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.12.1.dist-info/RECORD,,