python-script-launcher 0.0.10__py3-none-any.whl → 0.0.12__py3-none-any.whl

python_script_launcher/__main__.py

@@ -66,14 +66,20 @@ def cmd_run(args):
 LAUNCHER_FILES = ["app.py", "client.py", "tasks.py"]
 STATIC_DIR = "static"
 SHIM_PKG = "python_script_launcher"
+# Files placed inside the staged `python_script_launcher/` package so the
+# frozen exe supports both `from python_script_launcher import task` and
+# `from python_script_launcher.tasks import task`.
+SHIM_SUBMODULES = ("tasks.py",)
 SHIM_INIT = (
-    '"'*3 + "Compatibility shim generated by launcher build.\n\n"
-    "Allows user scripts to write ``from python_script_launcher import task``\n"
-    "even after being packaged into a standalone exe. All names are forwarded\n"
-    "from the top-level ``tasks`` module that ships alongside the launcher.\n"
+    '"'*3 + "Runtime shim generated by launcher build.\n\n"
+    "Re-exports the public API from ``python_script_launcher.tasks`` so both\n"
+    "    from python_script_launcher import task\n"
+    "    from python_script_launcher.tasks import task\n"
+    "work inside a frozen exe. The submodule is copied verbatim from the\n"
+    "installed launcher package.\n"
     + '"'*3 + "\n"
-    "from tasks import *  # noqa: F401,F403\n"
-    "from tasks import task, run_cli, collect_tasks, TaskSpec, TaskParam  # noqa: F401\n"
+    "from .tasks import *  # noqa: F401,F403\n"
+    "from .tasks import task, run_cli, collect_tasks, TaskSpec, TaskParam  # noqa: F401\n"
 )
 
 
@@ -89,12 +95,17 @@ def _stage_project(scripts_src: Path) -> Path:
     static_src = PACKAGE_DIR / STATIC_DIR
     if static_src.exists():
         shutil.copytree(static_src, tmp / STATIC_DIR)
-    # Generate a lightweight `python_script_launcher` package shim so user
-    # scripts using `from python_script_launcher import task` keep working
-    # inside the frozen exe. The exe ships `tasks.py` at its root, and the
-    # shim just re-exports its public names.
+    # Stage a real `python_script_launcher/` package next to the top-level
+    # runtime files. Copying `tasks.py` in as a submodule (plus a small
+    # re-export shim in __init__.py) makes both `from python_script_launcher
+    # import task` and `from python_script_launcher.tasks import task` work
+    # inside the frozen exe, matching what the wheel install exposes.
     shim_dir = tmp / SHIM_PKG
     shim_dir.mkdir(parents=True, exist_ok=True)
+    for name in SHIM_SUBMODULES:
+        src = PACKAGE_DIR / name
+        if src.exists():
+            shutil.copy2(src, shim_dir / name)
     (shim_dir / "__init__.py").write_text(SHIM_INIT, encoding="utf-8", newline="\n")
     # Copy user scripts into <tmp>/scripts so both scan_scripts and
     # PyInstaller's --add-data pick them up.

python_script_launcher/app.py

@@ -42,13 +42,35 @@ def _default_root():
     return p.parent if p.name == "scripts" else p
 
 
+# The launcher package always ships a `static/` folder next to app.py
+# (repo root during development, python_script_launcher/ after wheel
+# install). Remember it so `run --scripts <dir>` and `build --scripts
+# <dir>` can serve the frontend even when <dir> has no static/ of its own.
+_LAUNCHER_DIR = Path(__file__).parent.resolve()
+
+
 def _default_static(root: Path):
+    """Resolve the default static directory.
+
+    Search order:
+        1. sys._MEIPASS/static (PyInstaller frozen bundle),
+        2. <launcher package>/static (source repo or wheel install),
+        3. <user scripts root>/static (lets users override the UI).
+
+    Returns the first existing candidate, falling back to the last one
+    for backward compatibility when nothing is on disk yet.
+    """
+    candidates = []
     if getattr(sys, "frozen", False):
-        meipass = Path(sys._MEIPASS)
-        static = meipass / "static"
-        if static.exists():
-            return static
-    return root / "static"
+        meipass = getattr(sys, "_MEIPASS", "")
+        if meipass:
+            candidates.append(Path(meipass) / "static")
+    candidates.append(_LAUNCHER_DIR / "static")
+    candidates.append(root / "static")
+    for c in candidates:
+        if c.exists():
+            return c
+    return candidates[-1]
 
 
 DEFAULT_ROOT = _default_root()
@@ -622,6 +644,7 @@ def create_app(
             candidates.append(Path(sys._MEIPASS) / "static" / "index.html")
         candidates.extend([
             static / "index.html",
+            _LAUNCHER_DIR / "static" / "index.html",
             project_root / "static" / "index.html",
         ])
         for f in candidates:

python_script_launcher/make_exe.py

@@ -21,6 +21,7 @@ import os
 import shutil
 import subprocess
 import sys
+import tempfile
 from importlib.metadata import distributions
 from pathlib import Path
 
@@ -37,6 +38,14 @@ SKIP_PACKAGES = {
     "python-script-launcher",
 }
 
+# Files copied into the on-the-fly `python_script_launcher/` package so user
+# scripts can `from python_script_launcher.tasks import task` inside the
+# frozen exe (mirrors publish.py's wheel layout).
+_STAGE_PACKAGE_FILES = (
+    "app.py", "client.py", "tasks.py", "__init__.py", "__main__.py",
+)
+_STAGE_PACKAGE_NAME = "python_script_launcher"
+
 
 def _norm(name: str) -> str:
     return (name or "").strip().lower().replace("_", "-")
@@ -75,6 +84,23 @@ def _clean_target(name: str, dist_dir: Path, build_dir: Path, project: Path,
             shutil.rmtree(p, ignore_errors=True)
 
 
+def _stage_launcher_package(project: Path) -> Path:
+    """Materialize a temporary `python_script_launcher/` package next to the
+    top-level source files so PyInstaller can pick it up via `--paths`.
+
+    Returns the *root* directory to add to PyInstaller search paths; the
+    caller is responsible for removing it once the build is done.
+    """
+    stage_root = Path(tempfile.mkdtemp(prefix="psl-exe-"))
+    pkg_dir = stage_root / _STAGE_PACKAGE_NAME
+    pkg_dir.mkdir(parents=True, exist_ok=True)
+    for name in _STAGE_PACKAGE_FILES:
+        src = project / name
+        if src.exists():
+            shutil.copy2(src, pkg_dir / name)
+    return stage_root
+
+
 def build_exe(entry, name, *, project=None, dist=None, static=None,
               noconsole=False, onefile=False, clean=False):
     """Build a single PyInstaller exe.
@@ -128,31 +154,50 @@ def build_exe(entry, name, *, project=None, dist=None, static=None,
     if scripts_dir.exists():
         cmd += ["--add-data", f"{scripts_dir}{os.pathsep}scripts"]
 
-    # Make `tasks` and the compatibility `python_script_launcher` shim
-    # importable from user scripts inside the frozen exe. `--paths` lets
-    # PyInstaller resolve them at build time; hidden-imports pull them into
-    # the frozen PYZ.
-    cmd += ["--paths", str(project)]
-    if (project / "tasks.py").exists():
-        cmd += ["--hidden-import", "tasks"]
+    # Make both `tasks` (top-level) and `python_script_launcher.tasks`
+    # (wheel-style dotted import) usable from user scripts inside the exe.
+    # - `--paths <project>` lets `from tasks import task` resolve.
+    # - We also stage a temporary `python_script_launcher/` package that
+    #   mirrors publish.py wheel layout and add its parent to `--paths`, so
+    #   `from python_script_launcher.tasks import task` resolves the same
+    #   way it does when installed from the wheel.
+    # If the caller already staged a python_script_launcher/ package into
+    # `project` (e.g. via __main__.cmd_build), reuse it verbatim so we do
+    # not end up with two competing copies of the same package on --paths.
     if (project / "python_script_launcher" / "__init__.py").exists():
-        cmd += ["--hidden-import", "python_script_launcher"]
-
-    for pkg in get_installed_packages():
-        cmd += ["--collect-all", pkg]
-
-    if icon_arg:
-        cmd += ["--icon", icon_arg]
-
-    entry_path = Path(entry)
-    if not entry_path.is_absolute():
-        entry_path = (project / entry_path).resolve()
-    cmd.append(str(entry_path))
-
-    print(f"  entry: {entry_path}")
-    subprocess.run(cmd, check=True, cwd=str(project))
-    out = f"{dist_dir}/{name}.exe" if onefile else f"{dist_dir}/{name}/{name}.exe"
-    print(f"  [OK] {name} -> {out}\n")
+        stage_root = None
+    else:
+        stage_root = _stage_launcher_package(project)
+    try:
+        cmd += ["--paths", str(project)]
+        if stage_root is not None:
+            cmd += ["--paths", str(stage_root)]
+        if (project / "tasks.py").exists():
+            cmd += ["--hidden-import", "tasks"]
+        cmd += [
+            "--hidden-import", _STAGE_PACKAGE_NAME,
+            "--hidden-import", f"{_STAGE_PACKAGE_NAME}.tasks",
+            "--collect-submodules", _STAGE_PACKAGE_NAME,
+        ]
+
+        for pkg in get_installed_packages():
+            cmd += ["--collect-all", pkg]
+
+        if icon_arg:
+            cmd += ["--icon", icon_arg]
+
+        entry_path = Path(entry)
+        if not entry_path.is_absolute():
+            entry_path = (project / entry_path).resolve()
+        cmd.append(str(entry_path))
+
+        print(f"  entry: {entry_path}")
+        subprocess.run(cmd, check=True, cwd=str(project))
+        out = f"{dist_dir}/{name}.exe" if onefile else f"{dist_dir}/{name}/{name}.exe"
+        print(f"  [OK] {name} -> {out}\n")
+    finally:
+        if stage_root is not None:
+            shutil.rmtree(stage_root, ignore_errors=True)
 
 
 def main():
@@ -186,4 +231,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()

python_script_launcher/scripts/multi.py

@@ -1,4 +1,4 @@
-"""多任务示例: 用 @task 注册多个可运行函数, 无需 __main__ guard."""
+"""Multi-task demo using the wheel-style dotted import."""
 from tasks import task
 
 
@@ -21,4 +21,4 @@ def multiline(times: int = 3):
     for i in range(times):
         print(f"line {i}", flush=True)
         time.sleep(0.05)
-    print("done")
+    print("done")

{python_script_launcher-0.0.10.dist-info → python_script_launcher-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-script-launcher
-Version: 0.0.10
+Version: 0.0.12
 Summary: Package Python scripts into standalone exe (Web + desktop client).
 License-Expression: MIT
 Keywords: pyinstaller,packaging,exe,launcher,scripts

{python_script_launcher-0.0.10.dist-info → python_script_launcher-0.0.12.dist-info}/RECORD

@@ -1,16 +1,16 @@
 python_script_launcher/__init__.py,sha256=XeqJdWwu4-26nBlxeu2urarg3chsKMYYAWKgbUQnUyo,1750
-python_script_launcher/__main__.py,sha256=PiKbURpPYHkB8ZQ7YCSYPKh_YUi6R2FKJEjBDXdgm_c,6824
-python_script_launcher/app.py,sha256=3MBCyOtO5pFAcwyrkRkzg5a-GmPOOQ-jiRDEC261YZ4,24252
+python_script_launcher/__main__.py,sha256=siqi1bFNpbuK2ed-fvJ-E1EcLg9KCurFN8dP3fvP7V8,7349
+python_script_launcher/app.py,sha256=Qr5GAhqiHaKs3eZUkJvsyMInDIPGcJb0m8pJ-D1zuUY,25211
 python_script_launcher/client.py,sha256=pULe9xHv4OuXFAdiFAEHp4uxO8x4D_myyNX6ofqElMg,2964
-python_script_launcher/make_exe.py,sha256=zBLgUOOlhCzDOGVmmM0wnjpZK-a9jK0EGlVbgiNy6eI,6849
+python_script_launcher/make_exe.py,sha256=4K8gHnfg7FGgD1WvHaxwp9yk1MhpWGtJOXHYpZgc0Ws,8826
 python_script_launcher/tasks.py,sha256=0f6P88vlUXscnIxXNL5pEQpmr6x-kavAHvDB9Z1qowE,5755
 python_script_launcher/scripts/file_status.py,sha256=D22FwHlsNnJkHz7ICyM3L2xK3vhNaMRl-aJEERrEG8s,1063
 python_script_launcher/scripts/hello.py,sha256=df5gR95rta5J0sDORI0wncCTBS0wGrTX07pEcR9R4_A,517
-python_script_launcher/scripts/multi.py,sha256=5TBxkaxF1xXtLhRkdQK1p4H5DD-mxwlptkQOpX8V9WE,617
+python_script_launcher/scripts/multi.py,sha256=2HApGhrdt8Xs1WZ9HY7yHXAlabqc1KRC6CHqTUhjWy0,590
 python_script_launcher/scripts/test_modules.py,sha256=AFzAAC2NlYSVcPucNgChguLMEj8m1pmCIB3LIDthOf8,618
 python_script_launcher/static/index.html,sha256=_HTLklrRge6A09l2kb5ucFI4rrm2KMIEgU9xXbPJzT8,15000
-python_script_launcher-0.0.10.dist-info/METADATA,sha256=VhJNZXLM-ohC2PCGVgCgF4516pmUOpzVOaRtC-Bgt2M,6378
-python_script_launcher-0.0.10.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-python_script_launcher-0.0.10.dist-info/entry_points.txt,sha256=13ENRmw4BsgWGLDCr_y1dKB91ed1j6rEyks6JDFzOns,66
-python_script_launcher-0.0.10.dist-info/top_level.txt,sha256=Ap6WryIb1YRnr_QVCmfGjdEVLDNA3dQcTl_-gxX11qk,23
-python_script_launcher-0.0.10.dist-info/RECORD,,
+python_script_launcher-0.0.12.dist-info/METADATA,sha256=qBK3LK0GmI_r9v9Qnpxc3_J4KUDMVATVl2KaKjuRHd4,6378
+python_script_launcher-0.0.12.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_script_launcher-0.0.12.dist-info/entry_points.txt,sha256=13ENRmw4BsgWGLDCr_y1dKB91ed1j6rEyks6JDFzOns,66
+python_script_launcher-0.0.12.dist-info/top_level.txt,sha256=Ap6WryIb1YRnr_QVCmfGjdEVLDNA3dQcTl_-gxX11qk,23
+python_script_launcher-0.0.12.dist-info/RECORD,,