perf: slim daw_engine bundle 409MB->170MB + fix engine khong chay tren Windows
- Thay librosa bang app/core/audio_features.py (numpy/scipy/soundfile):
load, beat_track, frames_to_time, spectral_centroid, rms, zero_crossing_rate,
time_stretch, pitch_shift, chroma_stft. A/B ngang librosa (BPM <1% sai lech,
pitch_shift chuan toi Hz). Loai bo llvmlite 171MB + scikit-learn + numba.
- Task layer 2 che do (app/tasks/worker.py): server giu celery; desktop slim
chay in-process thread + registry, giu nguyen API contract (.delay/.id/status
/tasks/{id}) nen frontend khong doi.
- engine.spec: excludes librosa/numba/llvmlite/sklearn/celery/redis/kombu/
billiard/amqp/msgpack/yaml/PIL/cairosvg/zstandard/...; scan scipy gioi han
scipy.signal; giu click (uvicorn.main import click).
- render_engine: scipy.signal thanh lazy import (giam cold start).
- tauri.conf.json: targets [nsis, msi] - NSIS tro lai (bundle nho) de
hooks.nsh cai VC++ Redistributable - sua bug daw_engine.exe khong chay
tren Windows (truoc day MSI-only khong chay hooks).
- build_linux.sh / build_macos.sh: build 1 lenh moi OS.
- Doc: DESKTOP_INSTALL_PLAN.md muc 5.1.
- Verify: 86 tests pass, engine dong goi upload/analyze/waveform/export OK.
This commit is contained in:
+77
-56
@@ -1,11 +1,11 @@
|
||||
# engine.spec — PyInstaller config cho daw_engine.exe (sidecar Python)
|
||||
# Chay: pyinstaller engine.spec --clean --noconfirm (tren Windows)
|
||||
# engine.spec — PyInstaller config cho daw_engine (sidecar Python)
|
||||
# Chay: pyinstaller engine.spec --clean --noconfirm (Windows/Linux/macOS)
|
||||
# -*- mode: python ; coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
from PyInstaller.utils.hooks import collect_dynamic_libs, collect_submodules, collect_data_files
|
||||
from PyInstaller.utils.hooks import collect_dynamic_libs, collect_data_files
|
||||
|
||||
# Native DLL cho pedalboard va soundfile
|
||||
# Native DLL cho pedalboard va soundfile (Windows .pyd/.dll, Linux .so)
|
||||
binaries = collect_dynamic_libs('pedalboard')
|
||||
binaries += collect_dynamic_libs('soundfile')
|
||||
|
||||
@@ -14,7 +14,7 @@ binaries += collect_dynamic_libs('soundfile')
|
||||
# duoc bundle qua collect_data_files('app').
|
||||
_SPEC_ROOT = os.path.abspath(SPECPATH)
|
||||
|
||||
# ⚠️ GOC ROOT CUA MOI LOI 'app\static does not exist' (gap 3 lan):
|
||||
# ⚠️ GOC ROOT CUA MOI LOI 'app\\static does not exist' (gap 3 lan):
|
||||
# lenh `pyinstaller engine.spec` (entry-point script) KHONG them CWD vao
|
||||
# sys.path (chi `python -m PyInstaller` moi them). collect_data_files('app')
|
||||
# import package qua sys.path -> khong thay 'app' -> tra ve [] AM THAM ->
|
||||
@@ -25,8 +25,8 @@ if _SPEC_ROOT not in _sys.path:
|
||||
_sys.path.insert(0, _SPEC_ROOT)
|
||||
|
||||
# Assets cua app: bundle QUA IMPORT SYSTEM (collect_data_files) — an toan nhat.
|
||||
# Loai tru storage (57MB soundfonts/uploads — vo ich trong onefile, config.py
|
||||
# da chuyen storage sang %APPDATA%\\SonicForgeDAW khi frozen) va __pycache__.
|
||||
# Loai tru storage (57MB soundfonts/uploads — vo ich, config.py da chuyen
|
||||
# storage sang %APPDATA%\\SonicForgeDAW khi frozen) va __pycache__.
|
||||
datas = collect_data_files('app', excludes=['**/storage/**', '**/__pycache__/**', '**/*.pyc'])
|
||||
# Fallback cuoi cung: neu collect_data_files van tra ve rong (phong moi truong
|
||||
# hop ky la), dung datas TINH absolute — tinh huong xau nhat van co du assets.
|
||||
@@ -41,66 +41,87 @@ datas += [
|
||||
(os.path.join(_SPEC_ROOT, 'md'), 'md'), # /ai-prompt-generator (doc, ngoai package app)
|
||||
]
|
||||
|
||||
# librosa 0.11 dùng lazy_loader.attach_stub -> lúc RUNTIME cần file .pyi
|
||||
# ton tai tren disk ('Cannot load imports from non-existent stub ...librosa\__init__.pyi').
|
||||
# PyInstaller mac dinh KHONG bundle .pyi -> phai collect explicit.
|
||||
datas += collect_data_files('librosa', includes=['**/*.pyi'])
|
||||
|
||||
# scipy >= 1.18 tach scipy.stats thanh nhieu module con (vd
|
||||
# _ansari_swilk_statistics) import lazy ben trong ham -> hook scipy cua
|
||||
# PyInstaller miss -> ModuleNotFoundError luc runtime. Giai phap TRIET DE:
|
||||
# scan FILESYSTEM toan bo site-packages/scipy (khong import, khong walk —
|
||||
# pkgutil.walk_packages BO QUA AM THAM subpackage import loi luc build,
|
||||
# da gap: may user mat ca cay scipy.sparse.csgraph._shortest_path).
|
||||
# Bat moi module .py + C-extension .pyd/.so -> hiddenimports day du.
|
||||
# ══════════════════════════════════════════════════════════════════════════
|
||||
# TOI UU BUNDLE (SonicForgeStudio 1.1): 409MB -> ~120MB
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
# 1. librosa/numba/llvmlite (~171MB) + scikit-learn (~17MB) da DUOC LOAI BO
|
||||
# khoi code (app/core/audio_features.py thay the, numpy/scipy/soundfile).
|
||||
# 2. celery/kombu/billiard/redis (~40MB) KHONG bundle — desktop chay task
|
||||
# eager dong bo, khong can broker (app/api/v1/tasks.py da lazy + fallback).
|
||||
# 3. scipy: KHONG con quet toan bo site-packages/scipy (truoc day bundle ca
|
||||
# scipy.stats/sparse/optimize/linalg ~48MB). Chi quet scipy.signal — goi
|
||||
# lazy-import noi bo cua no van duoc bat day du (scipy.signal.windows,
|
||||
# _savitzky_golay, _spectral_py... duoc import bang ten ben trong ham).
|
||||
# scipy.signal la goi DUY NHAT con duoc app dung (sub_tab_dsp,
|
||||
# render_engine, audio_features).
|
||||
# ══════════════════════════════════════════════════════════════════════════
|
||||
import importlib.util as _ilu
|
||||
import glob as _glob
|
||||
_scipy_spec = _ilu.find_spec('scipy')
|
||||
_scipy_dir = os.path.dirname(os.path.abspath(_scipy_spec.origin))
|
||||
_scipy_hidden = []
|
||||
for _ext in ('*.py', '*.pyd', '*.so'):
|
||||
for _f in _glob.glob(os.path.join(_scipy_dir, '**', _ext), recursive=True):
|
||||
_rel = os.path.relpath(_f, _scipy_dir)
|
||||
_base = os.path.basename(_rel).split('.')[0] # bo .cpython-312-x86_64... .so
|
||||
_pkg = os.path.dirname(_rel).replace(os.sep, '.')
|
||||
_mod = ('scipy.' + _pkg + '.' + _base) if _pkg else ('scipy.' + _base)
|
||||
if _mod not in _scipy_hidden:
|
||||
_scipy_hidden.append(_mod)
|
||||
# Cung co bang hiddenimport TINH: _morestats import module nay o top-level
|
||||
# (scipy 1.18+); collect_submodules du phong nhung neu miss (version khac
|
||||
# tren may user) thi dong nay van dam bao bundle co.
|
||||
if 'scipy.stats._ansari_swilk_statistics' not in _scipy_hidden:
|
||||
_scipy_hidden.append('scipy.stats._ansari_swilk_statistics')
|
||||
# scipy.sparse.csgraph cung lazy-import C-extension tu ben trong ham (vd
|
||||
# _shortest_path, _traversal, _matching) — hiddenimport tinh phong walk miss.
|
||||
for _m in ('scipy.sparse.csgraph._shortest_path', 'scipy.sparse.csgraph._traversal',
|
||||
'scipy.sparse.csgraph._matching', 'scipy.sparse.csgraph._min_spanning_tree'):
|
||||
if _m not in _scipy_hidden:
|
||||
_scipy_hidden.append(_m)
|
||||
|
||||
def _scan_pkg_modules(pkg_name: str):
|
||||
"""Scan filesystem cua 1 package con (khong import, khong walk) ->
|
||||
bat moi module .py/.pyd/.so -> hiddenimports day du, tranh lazy-import miss."""
|
||||
_spec = _ilu.find_spec(pkg_name)
|
||||
if _spec is None or _spec.origin is None:
|
||||
print(f"WARN: khong tim thay package '{pkg_name}' - bo qua scan")
|
||||
return []
|
||||
_pkg_dir = os.path.dirname(os.path.abspath(_spec.origin))
|
||||
_out = []
|
||||
for _ext in ('*.py', '*.pyd', '*.so'):
|
||||
for _f in _glob.glob(os.path.join(_pkg_dir, '**', _ext), recursive=True):
|
||||
_rel = os.path.relpath(_f, _pkg_dir)
|
||||
_base = os.path.basename(_rel).split('.')[0] # bo .cpython-312-x86_64... .so
|
||||
_sub = os.path.dirname(_rel).replace(os.sep, '.')
|
||||
_mod = (pkg_name + '.' + _sub + '.' + _base) if _sub else (pkg_name + '.' + _base)
|
||||
if _mod not in _out:
|
||||
_out.append(_mod)
|
||||
return _out
|
||||
|
||||
_scipy_signal_hidden = _scan_pkg_modules('scipy.signal')
|
||||
|
||||
# Uvicorn lazy-load loop/protocol theo ten (string) -> hiddenimport tinh.
|
||||
_hidden = [
|
||||
'uvicorn.logging',
|
||||
'uvicorn.loops',
|
||||
'uvicorn.loops.auto',
|
||||
'uvicorn.protocols',
|
||||
'uvicorn.protocols.http',
|
||||
'uvicorn.protocols.http.auto',
|
||||
'uvicorn.protocols.websockets',
|
||||
'uvicorn.protocols.websockets.auto',
|
||||
'pedalboard',
|
||||
'soundfile',
|
||||
'sf2utils',
|
||||
'mido.backends.rtmidi',
|
||||
] + _scipy_signal_hidden
|
||||
|
||||
# Khoa khong bundle: loai toan bo cay nang khong con duoc dung.
|
||||
_excludes = [
|
||||
'tkinter',
|
||||
# libs da thay the (audio_features.py)
|
||||
'librosa', 'numba', 'llvmlite', 'sklearn', 'scikit-learn',
|
||||
'joblib', 'threadpoolctl', 'audioread', 'lazy_loader', 'soxr',
|
||||
# celery/redis chi dung cho server (Docker), khong cho desktop
|
||||
'celery', 'kombu', 'billiard', 'vine', 'amqp', 'redis',
|
||||
'click_didyoumean', 'click_plugins', 'click_repl',
|
||||
# LUU Y: KHONG exclude 'click' — uvicorn.main import click (CLI parser)!
|
||||
'dateutil', 'pytz', 'tzdata', 'msgpack', 'yaml',
|
||||
# khong dung trong desktop
|
||||
'matplotlib', 'pandas', 'IPython', 'jupyter', 'pytest', 'setuptools',
|
||||
# keo vao nham boi hooks_contrib (app khong import bao gio)
|
||||
'PIL', 'Pillow', 'cairosvg', 'zstandard', 'imageio',
|
||||
]
|
||||
|
||||
a = Analysis(
|
||||
['desktop_engine.py'],
|
||||
pathex=[_SPEC_ROOT],
|
||||
binaries=binaries,
|
||||
datas=datas,
|
||||
hiddenimports=collect_submodules('celery.fixups') + _scipy_hidden + [
|
||||
'uvicorn.logging',
|
||||
'uvicorn.loops',
|
||||
'uvicorn.loops.auto',
|
||||
'uvicorn.protocols',
|
||||
'uvicorn.protocols.http',
|
||||
'uvicorn.protocols.http.auto',
|
||||
'uvicorn.protocols.websockets',
|
||||
'uvicorn.protocols.websockets.auto',
|
||||
'pedalboard',
|
||||
'soundfile',
|
||||
'sf2utils',
|
||||
'mido.backends.rtmidi',
|
||||
],
|
||||
hiddenimports=_hidden,
|
||||
hookspath=[],
|
||||
hooksconfig={},
|
||||
runtime_hooks=[],
|
||||
excludes=['tkinter'],
|
||||
excludes=_excludes,
|
||||
win_no_prefer_redirects=False,
|
||||
win_private_assemblies=False,
|
||||
cipher=None,
|
||||
|
||||
Reference in New Issue
Block a user