QuLab 2.7.16__cp311-cp311-macosx_10_9_universal2.whl → 2.7.18__cp311-cp311-macosx_10_9_universal2.whl

qulab/executor/load.py

@@ -17,6 +17,7 @@ from .template import (TemplateKeyError, TemplateTypeError, decode_mapping,
 class SetConfigWorkflow():
     __timeout__ = None
     __mtime__ = 0
+    __source__ = ''
 
     def __init__(self, key):
         self.key = key
@@ -80,6 +81,16 @@ class SetConfigWorkflow():
 WorkflowType = ModuleType | SetConfigWorkflow
 
 
+def get_source(workflow: WorkflowType, code_path: str | Path) -> str:
+    if isinstance(code_path, str):
+        code_path = Path(code_path)
+    try:
+        with open(code_path / workflow.__workflow_id__, 'r') as f:
+            return f.read()
+    except:
+        return ''
+
+
 def can_call_without_args(func):
     if not callable(func):
         return False
@@ -411,6 +422,8 @@ def load_workflow(workflow: str | tuple[str, dict],
             w.__workflow_id__ = str(Path(w.__file__).relative_to(base_path))
     else:
         raise TypeError(f"Invalid workflow: {workflow}")
+    
+    w.__source__ = get_source(w, base_path)
 
     return w
 

qulab/executor/schedule.py

@@ -38,7 +38,7 @@ def get_cache(session_id, key) -> Report:
         return None
     if isinstance(index, tuple):
         base_path, path = index
-        return load_report(base_path, path)
+        return load_report(path, base_path)
     elif isinstance(index, Report):
         return index
     else:
@@ -70,16 +70,6 @@ def veryfy_analyzed_report(report: Report, script: str, method: str):
         )
 
 
-def get_source(workflow: WorkflowType, code_path: str | Path) -> str:
-    if isinstance(code_path, str):
-        code_path = Path(code_path)
-    try:
-        with open(code_path / workflow.__workflow_id__, 'r') as f:
-            return f.read()
-    except:
-        return ''
-
-
 def check_state(workflow: WorkflowType, code_path: str | Path,
                 state_path: str | Path) -> bool:
     """
@@ -160,8 +150,7 @@ def call_check(workflow: WorkflowType, session_id: str, state_path: Path):
                     heads=get_heads(state_path),
                     previous_path=get_head(workflow.__workflow_id__,
                                            state_path),
-                    script_path=save_item(get_source(workflow, state_path),
-                                          state_path))
+                    script_path=save_item(workflow.__source__, state_path))
 
     save_report(workflow.__workflow_id__, report, state_path)
 
@@ -187,8 +176,7 @@ def call_calibrate(workflow: WorkflowType, session_id: str, state_path: Path):
                     heads=get_heads(state_path),
                     previous_path=get_head(workflow.__workflow_id__,
                                            state_path),
-                    script_path=save_item(get_source(workflow, state_path),
-                                          state_path))
+                    script_path=save_item(workflow.__source__, state_path))
 
     save_report(workflow.__workflow_id__, report, state_path)
 
@@ -286,8 +274,7 @@ def check_data(workflow: WorkflowType, state_path: str | Path, plot: bool,
                         heads=get_heads(state_path),
                         previous_path=get_head(workflow.__workflow_id__,
                                                state_path),
-                        script_path=save_item(get_source(workflow, state_path),
-                                              state_path))
+                        script_path=save_item(workflow.__source__, state_path))
         report.in_spec = False
         report.bad_data = False
         return report

qulab/utils.py

@@ -1,31 +1,95 @@
+import shlex
 import subprocess
 import sys
+import time
 
+import click
 
-def run_detached_with_terminal(executable_path):
+
+def run_detached(executable_path):
     """
-    启动可执行文件并在新终端窗口中保持运行，Python退出后进程仍存在。
-    适用于Windows、Linux和macOS。
+    启动可执行文件并完全分离（优先用 tmux/screen），无需额外终端窗口
+    支持 Windows、Linux 和 macOS
     """
     try:
-        if sys.platform == 'win32':
-            # Windows：使用start命令启动新cmd窗口
-            cmd = f'start cmd /k "{executable_path}"'
-            subprocess.Popen(cmd, shell=True)
-        elif sys.platform == 'darwin':
-            # macOS：通过AppleScript在Terminal中执行命令
-            escaped_path = executable_path.replace('"', r'\"')
-            script = f'tell application "Terminal" to do script "{escaped_path}"'
-            subprocess.Popen(['osascript', '-e', script],
-                             start_new_session=True)
-        else:
-            # Linux：尝试gnome-terminal或xterm
-            try:
-                subprocess.Popen(['gnome-terminal', '--', executable_path],
-                                 start_new_session=True)
-            except FileNotFoundError:
-                subprocess.Popen(['xterm', '-e', executable_path],
-                                 start_new_session=True)
+        if sys.platform == 'win32' or not _unix_detach_with_tmux_or_screen(
+                executable_path):
+            # 回退到带终端窗口的方案
+            run_detached_with_terminal(executable_path)
+
     except Exception as e:
-        print(f"启动失败: {e}")
+        click.echo(f"启动失败: {e}")
         sys.exit(1)
+
+
+def _windows_start(executable_path):
+    """Windows 弹窗启动方案"""
+    subprocess.Popen(f'start cmd /k "{executable_path}"',
+                     shell=True,
+                     creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
+
+
+def _unix_detach_with_tmux_or_screen(executable_path):
+    """Unix 后台分离方案（无窗口）"""
+    safe_path = shlex.quote(executable_path)
+    session_name = f"qulab_{int(time.time())}"
+
+    # 尝试 tmux
+    if _check_command_exists("tmux"):
+        command = [
+            "tmux",
+            "new-session",
+            "-d",
+            "-s",
+            session_name,
+            safe_path + " ; tmux wait-for -S finished",  # 等待命令结束
+            ";",
+            "tmux",
+            "wait-for",
+            "finished"  # 防止进程立即退出
+        ]
+        subprocess.Popen(" ".join(command), shell=True, start_new_session=True)
+        click.echo(f"已启动 tmux 会话: {session_name}")
+        click.echo(f"你可以使用 `tmux attach -t {session_name}` 来查看输出")
+        return True
+
+    # 尝试 screen
+    elif _check_command_exists("screen"):
+        command = ["screen", "-dmS", session_name, safe_path]
+        subprocess.Popen(command, start_new_session=True)
+        click.echo(f"已启动 screen 会话: {session_name}")
+        click.echo(f"你可以使用 `screen -r {session_name}` 来查看输出")
+        return True
+
+    return False
+
+
+def run_detached_with_terminal(executable_path):
+    """回退到带终端窗口的方案"""
+    safe_path = shlex.quote(executable_path)
+    if sys.platform == 'win32':
+        _windows_start(executable_path)
+    elif sys.platform == 'darwin':
+        script = f'tell app "Terminal" to do script "{safe_path}"'
+        subprocess.Popen(["osascript", "-e", script], start_new_session=True)
+    else:
+        try:
+            subprocess.Popen(["gnome-terminal", "--", "sh", "-c", safe_path],
+                             start_new_session=True)
+        except FileNotFoundError:
+            subprocess.Popen(["xterm", "-e", safe_path],
+                             start_new_session=True)
+
+
+def _check_command_exists(cmd):
+    """检查命令行工具是否存在"""
+    try:
+        subprocess.check_output(["which", cmd], stderr=subprocess.DEVNULL)
+        return True
+    except:
+        return False
+
+
+# 示例用法
+if __name__ == '__main__':
+    run_detached("/path/to/your/program")

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.7.16"
+__version__ = "2.7.18"

{qulab-2.7.16.dist-info → qulab-2.7.18.dist-info}/METADATA

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

{qulab-2.7.16.dist-info → qulab-2.7.18.dist-info}/RECORD

@@ -1,17 +1,17 @@
 qulab/__init__.py,sha256=KJcUcZ5qXY6wlAoirzK_B-dgtDjsLmOE671v3gcXO_c,286
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-311-darwin.so,sha256=JCQ2rLFk2ELyIg15WQ6Z6a7-hAof91FLK5kLUjoRxzQ,126848
+qulab/fun.cpython-311-darwin.so,sha256=Rsl184j7u3zHHDK_068KUZjr9o-xUAh521kwLtSMK0g,126848
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
-qulab/utils.py,sha256=JIXMSmZU0uYfKG_tzawpK7vRNPRir_hJE8JlqkVLX2o,1260
-qulab/version.py,sha256=FfSt311ISmWzNzgm6bVcGXURtNc74jJ8EU8zuODbm0g,22
+qulab/utils.py,sha256=_0gm0sHwwIhk0tYRCLu4oNaS6Tt8meGWt6byu7Kk95Y,2993
+qulab/version.py,sha256=xLneP_cqIForMj5AICyQrp13un8yGC7zOY4cjyKywXk,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=tgDIkkeIoasQXAifJZ6NU8jDgpNgb2a-B0C4nF0evrE,559
 qulab/cli/config.py,sha256=Ei7eSYnbwPPlluDnm8YmWONYiI4g7WtvlZGQdr1Z6vo,3688
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/cli.py,sha256=z8W1RivKdABQSOGy2viNUvG73QvOBpE9gSKjw45vSVA,9794
-qulab/executor/load.py,sha256=_Zn4wtGGD8pBZwOfbJaaFVAr8riY2Bkhi67lX9Jy-hA,17427
-qulab/executor/schedule.py,sha256=9pTOVWzKiDc7ip8iuB_47poJcYOvoBI9eQwTrDTA3p0,19044
+qulab/executor/load.py,sha256=omD2aklKZnHOosahI-Vs6sQkGdn4U9PgnDIAbrEOhi0,17786
+qulab/executor/schedule.py,sha256=0BV5LGxhqdIlGwW6-o5_5mljAtdtL1La8EDNBFi8pzU,18585
 qulab/executor/storage.py,sha256=gI6g28BmKKEZ_Pl-hFwvpiOj3mF8Su-yjj3hfMXs1VY,11630
 qulab/executor/template.py,sha256=1c7xd0U82fLaqb8O0NQIVVd7aRLuCZNT11-heFw2n9Q,7540
 qulab/executor/transform.py,sha256=BDx0c4nqTHMAOLVqju0Ydd91uxNm6EpVIfssjZse0bI,2284
@@ -97,9 +97,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.7.16.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.7.16.dist-info/METADATA,sha256=K-ApF5W09-9zYNdNKbUYx9dMa4C1vGko8TEL7FeLu2o,3699
-qulab-2.7.16.dist-info/WHEEL,sha256=3QhfJdMl2SQHlMx8m8VZoG83oHO8482SzgXD2zX_lT4,114
-qulab-2.7.16.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.7.16.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.7.16.dist-info/RECORD,,
+qulab-2.7.18.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.7.18.dist-info/METADATA,sha256=rp74Kor5oIm4kmZLnVjpvrmHiNu5K113K9vjiSBmkPU,3699
+qulab-2.7.18.dist-info/WHEEL,sha256=HdQtkse3c2zEdjkI-KgXULFWgn0ui7rmMwJpV_Mja6w,114
+qulab-2.7.18.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.7.18.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.7.18.dist-info/RECORD,,

{qulab-2.7.16.dist-info → qulab-2.7.18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_10_9_universal2