QuLab 2.11.1__py3-none-any.whl → 2.11.3__py3-none-any.whl

qulab/executor/cli.py

@@ -6,10 +6,12 @@ import sys
 from pathlib import Path
 
 import click
+import rich
 from loguru import logger
 
 from ..cli.config import get_config_value, log_options
 from ..cli.decorators import async_command
+from ..utils import combined_env
 from .load import (WorkflowType, find_unreferenced_workflows, get_entries,
                    load_workflow, make_graph)
 from .registry import Registry, set_config_api
@@ -20,12 +22,14 @@ from .utils import workflow_template
 
 
 @logger.catch(reraise=True)
-def run_script(script_path):
-    """Run a script in a new terminal."""
+def run_script(script_path, extra_paths=None):
+    """Run a script in a new process, inheriting current PYTHONPATH plus any extra paths."""
     import subprocess
     import sys
 
-    proc = subprocess.Popen([sys.executable, script_path])
+    # Launch the new process with the modified environment
+    proc = subprocess.Popen([sys.executable, script_path],
+                            env=combined_env(extra_paths))
     proc.communicate()
 
 
@@ -160,7 +164,7 @@ def get(key, api):
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config, api.delete_config,
                        api.export_config, api.clear_config)
-    click.echo(reg.get(key))
+    rich.print(reg.get(key))
 
 
 @click.command()
@@ -171,7 +175,7 @@ def get(key, api):
               help='The modlule name of the api.')
 @click.option('--format',
               '-f',
-              default='json',
+              default='pickle',
               help='The format of the config.')
 @log_options('export')
 def export(file, api, format):
@@ -209,7 +213,7 @@ def export(file, api, format):
               help='The modlule name of the api.')
 @click.option('--format',
               '-f',
-              default='json',
+              default='pickle',
               help='The format of the config.')
 @log_options('load')
 def load(file, api, format):

qulab/utils.py

@@ -1,3 +1,4 @@
+import os
 import shlex
 import subprocess
 import sys
@@ -6,36 +7,56 @@ import time
 import click
 
 
-def run_detached(executable_path):
+def combined_env(extra_paths=None):
+    env = os.environ.copy()
+
+    # Build a combined PYTHONPATH: current interpreter's sys.path entries + extra_paths
+    paths = [p for p in sys.path if p]
+    if extra_paths:
+        if isinstance(extra_paths, str):
+            extra_paths = [extra_paths]
+        paths.extend(extra_paths)
+
+    # Prepend to any existing PYTHONPATH in the environment
+    existing = env.get('PYTHONPATH', '')
+    combined = os.pathsep.join(paths + ([existing] if existing else []))
+    env['PYTHONPATH'] = combined
+    return env
+
+
+def run_detached(executable_path, env=None):
     """
     启动可执行文件并完全分离（优先用 tmux/screen），无需额外终端窗口
     支持 Windows、Linux 和 macOS
     """
+    if env is None:
+        env = combined_env()
     try:
         if sys.platform == 'win32' or not _unix_detach_with_tmux_or_screen(
-                executable_path):
+                executable_path, env):
             # 回退到带终端窗口的方案
-            run_detached_with_terminal(executable_path)
+            run_detached_with_terminal(executable_path, env)
 
     except Exception as e:
         click.echo(f"启动失败: {e}")
         sys.exit(1)
 
 
-def _windows_start(executable_path):
+def _windows_start(executable_path, env):
     """Windows 弹窗启动方案"""
     subprocess.Popen(f'start cmd /k "{executable_path}"',
                      shell=True,
+                     env=env,
                      creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
 
 
-def _unix_detach_with_tmux_or_screen(executable_path):
+def _unix_detach_with_tmux_or_screen(executable_path, env):
     """Unix 后台分离方案（无窗口）"""
     safe_path = shlex.quote(executable_path)
     session_name = f"qulab_{int(time.time())}"
 
     # 尝试 tmux
-    if _check_command_exists("tmux"):
+    if _check_command_exists("tmux", env):
         command = [
             "tmux",
             "new-session",
@@ -48,15 +69,18 @@ def _unix_detach_with_tmux_or_screen(executable_path):
             "wait-for",
             "finished"  # 防止进程立即退出
         ]
-        subprocess.Popen(" ".join(command), shell=True, start_new_session=True)
+        subprocess.Popen(" ".join(command),
+                         shell=True,
+                         env=env,
+                         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"):
+    elif _check_command_exists("screen", env):
         command = ["screen", "-dmS", session_name, executable_path]
-        subprocess.Popen(command, start_new_session=True)
+        subprocess.Popen(command, env=env, start_new_session=True)
         click.echo(f"已启动 screen 会话: {session_name}")
         click.echo(f"你可以使用 `screen -r {session_name}` 来查看输出")
         return True
@@ -64,27 +88,38 @@ def _unix_detach_with_tmux_or_screen(executable_path):
     return False
 
 
-def run_detached_with_terminal(executable_path):
+def run_detached_with_terminal(executable_path, env=None):
     """回退到带终端窗口的方案"""
+    if env is None:
+        env = combined_env()
+
     if sys.platform == 'win32':
-        _windows_start(executable_path)
+        _windows_start(executable_path, env)
     elif sys.platform == 'darwin':
+        # executable_path=shlex.quote(executable_path)
+        print(executable_path)
         script = f'tell app "Terminal" to do script "{executable_path}"'
-        subprocess.Popen(["osascript", "-e", script], start_new_session=True)
+        subprocess.Popen(["osascript", "-e", script],
+                         env=env,
+                         start_new_session=True)
     else:
         try:
             subprocess.Popen(
                 ["gnome-terminal", "--", "sh", "-c", executable_path],
+                env=env,
                 start_new_session=True)
         except FileNotFoundError:
             subprocess.Popen(["xterm", "-e", executable_path],
+                             env=env,
                              start_new_session=True)
 
 
-def _check_command_exists(cmd):
+def _check_command_exists(cmd, env):
     """检查命令行工具是否存在"""
     try:
-        subprocess.check_output(["which", cmd], stderr=subprocess.DEVNULL)
+        subprocess.check_output(["which", cmd],
+                                env=env,
+                                stderr=subprocess.DEVNULL)
         return True
     except:
         return False

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.11.1"
+__version__ = "2.11.3"

{qulab-2.11.1.dist-info → qulab-2.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuLab
-Version: 2.11.1
+Version: 2.11.3
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>
@@ -47,6 +47,7 @@ Requires-Dist: SQLAlchemy>=2.0.19
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: wath>=1.1.6
 Requires-Dist: waveforms>=1.9.4
+Requires-Dist: rich>=14.0.0
 Provides-Extra: full
 Requires-Dist: uvloop>=0.19.0; extra == "full"
 Dynamic: license-file

{qulab-2.11.1.dist-info → qulab-2.11.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 qulab/__init__.py,sha256=hmf6R3jiM5NtJY1mSptogYnH5DMTR2dTzlXykqLxQzg,2027
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
-qulab/utils.py,sha256=BdLdlfjpe6m6gSeONYmpAKTTqxDaYHNk4exlz8kZxTg,2982
-qulab/version.py,sha256=L1NLbAiqOvyeykqIP0sEpfnHOltZ_nm9qsrW3nkEmTk,22
+qulab/utils.py,sha256=w5oSw9Ypux6l0oB-MzlQvT40iX_rzQ5wXcwzr7CIVf8,4107
+qulab/version.py,sha256=TBqc-ot-JVCYjkMyPJlutWympLhMMuKgQ12zpTcCJvw,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=Ezop5CEOvvEMDaPmfGXF0JH-CifKuDMk9yLglpUK9Zs,781
 qulab/cli/config.py,sha256=tZPSBLbf2x_Brb2UBuA1bsni8nC8WOPPGyWIi8m7j1I,5459
 qulab/cli/decorators.py,sha256=oImteZVnDPPWdyhJ4kzf2KYGJLON7VsKGBvZadWLQZo,621
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/analyze.py,sha256=4Hau5LrKUdpweh7W94tcG4ahgxucHOevbM0hm57T7zE,5649
-qulab/executor/cli.py,sha256=FZQY249VVSoMZm3lZGaVTAvgULKjMeC97YUe4hqi5Y0,17608
+qulab/executor/cli.py,sha256=gBh0Qlb-2zNI_NWFZXUirQLWizSOCe4AMDsVm05nPqU,17848
 qulab/executor/load.py,sha256=eMlzOrrn8GpbP3J3uY5JJ8iO7tL5B1DWP1z2qiGyNhU,20385
 qulab/executor/registry.py,sha256=gym9F5FIDY5eV-cSCZsP99wC4l-6jkx9VMjJMaPOLaQ,4730
 qulab/executor/schedule.py,sha256=7gAJFwj13j1niGjVa1fSzwOS22eNFEN1hdrN3dfTY6A,21410
@@ -96,9 +96,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.11.1.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.11.1.dist-info/METADATA,sha256=NhaeCv-fsilTHypKCMhtX0vuBVH3nCCtE-4k4Ri8zKk,3868
-qulab-2.11.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-qulab-2.11.1.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.11.1.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.11.1.dist-info/RECORD,,
+qulab-2.11.3.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.11.3.dist-info/METADATA,sha256=a4CvL-wBrnNJwrewATY748vOK5fZKie1LLfLWoVMwRw,3896
+qulab-2.11.3.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+qulab-2.11.3.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.11.3.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.11.3.dist-info/RECORD,,