QuLab 2.7.17__cp310-cp310-win_amd64.whl → 2.7.19__cp310-cp310-win_amd64.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
@@ -309,6 +310,8 @@ def load_workflow_from_file(file_name: str,
     module = module_from_spec(spec)
     spec.loader.exec_module(module)
     module.__mtime__ = (base_path / path).stat().st_mtime
+    source_code = (base_path / path).read_text()
+    module.__source__ = source_code
 
     if hasattr(module, 'entries'):
         verify_entries(module, base_path)
@@ -336,11 +339,11 @@ def load_workflow_from_template(template_path: str,
     path = Path(template_path)
 
     with open(base_path / path) as f:
-        content = f.read()
+        template = f.read()
 
     mtime = max((base_path / template_path).stat().st_mtime, mtime)
 
-    content, hash_str = inject_mapping(content, mapping, str(path))
+    content, hash_str = inject_mapping(template, mapping, str(path))
 
     if target_path is None:
         if path.stem == 'template':
@@ -354,22 +357,19 @@ def load_workflow_from_template(template_path: str,
         path = target_path
 
     file = base_path / path
-    if not file.exists():
+    if not file.exists() or file.stat().st_mtime < mtime:
         file.parent.mkdir(parents=True, exist_ok=True)
         with open(file, 'w') as f:
             f.write(content)
-    else:
-        if file.stat().st_mtime < mtime:
-            with open(file, 'w') as f:
-                f.write(content)
-        else:
-            if file.read_text() != content:
-                logger.warning(
-                    f"`{file}` already exists and is different from the new one generated from template `{template_path}`"
-                )
+    elif file.read_text() != content:
+        logger.warning(
+            f"`{file}` already exists and is different from the new one generated from template `{template_path}`"
+        )
 
     module = load_workflow_from_file(str(path), base_path, package)
     module.__mtime__ = max(mtime, module.__mtime__)
+    if module.__source__ == content:
+        module.__source__ = template, mapping, str(template_path)
 
     return module
 

qulab/executor/schedule.py

@@ -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/executor/storage.py

@@ -36,6 +36,20 @@ class Report():
     config_path: Path | None = field(default=None, repr=False)
     script_path: Path | None = field(default=None, repr=False)
 
+    def __getstate__(self):
+        state = self.__dict__.copy()
+        state.pop('base_path')
+        for k in ['path', 'previous_path', 'config_path', 'script_path']:
+            if state[k] is not None:
+                state[k] = str(state[k])
+        return state
+    
+    def __setstate__(self, state):
+        for k in ['path', 'previous_path', 'config_path', 'script_path']:
+            if state[k] is not None:
+                state[k] = Path(state[k])
+        self.__dict__.update(state)
+
     @property
     def previous(self):
         if self.previous_path is not None and self.base_path is not None:
@@ -84,7 +98,9 @@ class Report():
     @property
     def script(self):
         if self.script_path is not None and self.base_path is not None:
-            return load_item(self.script_path, self.base_path)
+            source = load_item(self.script_path, self.base_path)
+            if isinstance(source, str):
+                return source
         else:
             return None
 

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.17"
+__version__ = "2.7.19"

{qulab-2.7.17.dist-info → qulab-2.7.19.dist-info}/METADATA

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

{qulab-2.7.17.dist-info → qulab-2.7.19.dist-info}/RECORD

@@ -1,18 +1,18 @@
 qulab/__init__.py,sha256=RZme5maBSMZpP6ckXymqZpo2sRYttwEpTYCIzIvys1c,292
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp310-win_amd64.pyd,sha256=aW3Q6amEbw2lCPp67AN5jrmGUDfppFKpLSKf-12PKeM,31744
+qulab/fun.cp310-win_amd64.pyd,sha256=oUlIAuuUIquUS0LoxQs8OWRxq6VIKkj4u_GIR_CtalU,31744
 qulab/typing.py,sha256=PRtwbCHWY2ROKK8GHq4Bo8llXrIGo6xC73DrQf7S9os,71
-qulab/utils.py,sha256=UyZNPIyvis5t2MJBkXXLO5EmYP3mQZbt87zmYAHgoyk,1291
-qulab/version.py,sha256=PehmFwZNf5Rm2Y2666_iNgcOM1EyacdqNZMNt-3-wKg,22
+qulab/utils.py,sha256=kSy_tQRLDdlMwk7XhGhg75JadNHbDkau5vYcfOlJG_4,3088
+qulab/version.py,sha256=l3aREioriZeXEjFmLR4Dbu7Nj408gevOUOElKwDjjD4,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
 qulab/cli/config.py,sha256=7h3k0K8FYHhI6LVWt8BoDdKrX2ApFDBAUAUuXhHwst4,3799
 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=yiFSDMdboVjQzgPMl2nq5ts23whrsw7XxadIooy-zx0,19044
-qulab/executor/storage.py,sha256=gI6g28BmKKEZ_Pl-hFwvpiOj3mF8Su-yjj3hfMXs1VY,11630
+qulab/executor/load.py,sha256=YndvzagvWR8Sg6WHZ-gP-Of0FrFOyh_E_a3VXsjDf1Q,17502
+qulab/executor/schedule.py,sha256=0BV5LGxhqdIlGwW6-o5_5mljAtdtL1La8EDNBFi8pzU,18585
+qulab/executor/storage.py,sha256=jFUXYcBFyH2vVzrSzmXtyLtEgIMRczfk27Yb95pV5JM,12217
 qulab/executor/template.py,sha256=bKMoOBPfa3XMgTfGHQK6pDTswH1vcIjnopaWE3UKpP0,7726
 qulab/executor/transform.py,sha256=BDx0c4nqTHMAOLVqju0Ydd91uxNm6EpVIfssjZse0bI,2284
 qulab/executor/utils.py,sha256=l_b0y2kMwYKyyXeFtoblPYwKNU-wiFQ9PMo9QlWl9wE,6213
@@ -97,9 +97,9 @@ qulab/visualization/plot_seq.py,sha256=Uo1-dB1YE9IN_A9tuaOs9ZG3S5dKDQ_l98iD2Wbxp
 qulab/visualization/qdat.py,sha256=HubXFu4nfcA7iUzghJGle1C86G6221hicLR0b-GqhKQ,5887
 qulab/visualization/rot3d.py,sha256=jGHJcqj1lEWBUV-W4GUGONGacqjrYvuFoFCwPse5h1Y,757
 qulab/visualization/widgets.py,sha256=HcYwdhDtLreJiYaZuN3LfofjJmZcLwjMfP5aasebgDo,3266
-qulab-2.7.17.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-qulab-2.7.17.dist-info/METADATA,sha256=nYTpeWgGuq2cvV9u5Be4OfVWCceSiTGo4MvxP1jJVvY,3804
-qulab-2.7.17.dist-info/WHEEL,sha256=gMSPBFjPynvgFG2ofmeEoM1Uf9iH_GsJd2JBy-bxpiQ,101
-qulab-2.7.17.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.7.17.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.7.17.dist-info/RECORD,,
+qulab-2.7.19.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+qulab-2.7.19.dist-info/METADATA,sha256=De5Wd5mlNaRcr3jnjjS0R2O-_6tfd3Jj-4slwKIXmIc,3804
+qulab-2.7.19.dist-info/WHEEL,sha256=H5gvOYEhGgVYizXMDNmO6CnZIviGx48geV3Lbzu7OZg,101
+qulab-2.7.19.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.7.19.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.7.19.dist-info/RECORD,,

{qulab-2.7.17.dist-info → qulab-2.7.19.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: cp310-cp310-win_amd64