QuLab 2.12.0__tar.gz → 2.12.1__tar.gz

{qulab-2.12.0 → qulab-2.12.1}/PKG-INFO

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

{qulab-2.12.0 → qulab-2.12.1}/QuLab.egg-info/PKG-INFO

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

{qulab-2.12.0 → qulab-2.12.1}/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-2.12.0 → qulab-2.12.1}/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-2.12.0 → qulab-2.12.1}/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-2.12.1/qulab/version.py

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

qulab-2.12.0/qulab/version.py

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