fix(local-tool): Linux AppImage bundled Python + udev 單次密碼

Linux AppImage 掃不到 Kneron 裝置的根因是 Wails app 端三個 locator
完全沒讀 AppRun 已 export 的 VISIONA_BUNDLE_LIB_DIR,導致:

- locateBundleDataDir 找不到 models.json → seed user data dir 失敗
- locateBundledPythonAssets 找不到 python tarball + wheels
  → ensurePythonRuntime(Auto) fallback 到 system Python
  → system Python 缺 numpy / kp / pyusb → bridge scan silent fail
  → "No Kneron devices detected"

修復:

1. 三個 locator 優先讀 VISIONA_BUNDLE_LIB_DIR / VISIONA_BUNDLE_BIN_DIR
   (AppRun 已 export),AppImage 佈局 usr/lib/visiona-local/{data,python,wheels}
   一次到位

2. AppRun 加 VISIONA_PYTHON_MODE=bundled — Linux AppImage 強制走內嵌
   Python,避免 system Python 環境差異(符合 R4「完全離線內嵌」決策)

3. InstallUdevRule 合併 pkexec:cp + reload-rules + trigger 用
   pkexec sh -c 一次提權,使用者只需輸入 1 次密碼(原本 3 次)

4. build-appimage.sh 加硬檢查:
   - python tarball 缺失 → 自動 make vendor-python-linux,仍缺就 exit 1
   - wheels 數量 < 4 → 自動 make vendor-wheels-linux,仍不足就 exit 1
   - 驗證關鍵 wheel(numpy / opencv / pyusb / kp)存在,少任一 exit 1

5. Makefile payload-linux 同步加硬檢查(python tarball 必存在,
   wheels ≥ 4 個)

6. 參照 edge-ai-platform POC 補齊 visiona-local/wheels/linux/ 的
   KneronPLUS-2.0.0-py3-none-any.whl(POC 已驗過可用)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
jim800121chen 2026-04-18 23:15:52 +08:00
parent 4e3dc3e504
commit 6c21beb7b6
4 changed files with 99 additions and 21 deletions

View File

@ -446,9 +446,19 @@ payload-linux: build-server-linux vendor-python-linux vendor-wheels-linux vendor
@cp vendor/ffmpeg/linux/LICENSE.txt payload/linux/bin/ffmpeg-LICENSE.txt 2>/dev/null || true
@if [ -d server/data ]; then cp -R server/data/. payload/linux/data/; fi
@if [ -d server/scripts ]; then cp -R server/scripts/. payload/linux/scripts/; fi
@cp vendor/python/linux/python.tar.gz payload/linux/python/ 2>/dev/null || echo "!! WARN: python tarball 缺失"
@if [ ! -f vendor/python/linux/python.tar.gz ]; then \
echo "!! ERROR: vendor/python/linux/python.tar.gz 不存在vendor-python-linux 應該已先跑過 !!"; \
exit 1; \
fi
@cp vendor/python/linux/python.tar.gz payload/linux/python/
@cp vendor/wheels/linux/*.whl payload/linux/wheels/ 2>/dev/null || true
@echo "==> Linux payload 完成:"
@wheel_count=$$(ls -1 payload/linux/wheels/*.whl 2>/dev/null | wc -l); \
if [ "$$wheel_count" -lt 4 ]; then \
echo "!! ERROR: payload/linux/wheels 只找到 $$wheel_count 個 wheel預期至少 4 個numpy / opencv / pyusb / kp"; \
echo " 請檢查 vendor/wheels/linux/ 並重跑 make vendor-wheels-linux"; \
exit 1; \
fi
@echo "==> Linux payload 完成:包含 $$(ls payload/linux/wheels/*.whl 2>/dev/null | wc -l) 個 wheel + python tarball"
@du -sh payload/linux 2>/dev/null || true
@echo ""
@echo "payload/linux 結構:"

View File

@ -76,18 +76,54 @@ if [ -f "$PAYLOAD_LINUX/bin/ffmpeg-LICENSE.txt" ]; then
cp "$PAYLOAD_LINUX/bin/ffmpeg-LICENSE.txt" "$APPDIR/usr/share/doc/visiona-local/ffmpeg-LICENSE.txt"
fi
echo "==> 檢查 Python runtime + wheelsbundled Python 必備,缺就自動補)"
# Python tarball
if [ ! -f "$PAYLOAD_LINUX/python/python.tar.gz" ]; then
echo "⚠️ payload/linux/python/python.tar.gz 不存在嘗試自動補make vendor-python-linux + payload-linux"
(cd "$PROJECT_ROOT" && make vendor-python-linux payload-linux)
fi
if [ ! -f "$PAYLOAD_LINUX/python/python.tar.gz" ]; then
echo "❌ python tarball 仍缺失:$PAYLOAD_LINUX/python/python.tar.gz"
echo " AppImage 必須內嵌 Python runtimeLinux 強制 bundled mode無此檔無法 build。"
echo " 請手動執行make vendor-python-linux"
exit 1
fi
# Wheels至少要有 numpy / opencv / pyusb / kp 4 個關鍵 wheelbridge scan 才能跑)
wheel_count=$(ls -1 "$PAYLOAD_LINUX/wheels/"*.whl 2>/dev/null | wc -l)
if [ "$wheel_count" -lt 4 ]; then
echo "⚠️ payload/linux/wheels 只找到 $wheel_count 個 wheel預期至少 4嘗試自動補make vendor-wheels-linux + payload-linux"
(cd "$PROJECT_ROOT" && make vendor-wheels-linux payload-linux)
wheel_count=$(ls -1 "$PAYLOAD_LINUX/wheels/"*.whl 2>/dev/null | wc -l)
fi
if [ "$wheel_count" -lt 4 ]; then
echo "❌ wheels 數量仍不足:$PAYLOAD_LINUX/wheels/ 只有 $wheel_count 個 .whl預期至少 4numpy / opencv / pyusb / kp"
echo " 請檢查 vendor/wheels/linux/ 或 visiona-local/wheels/linux/ 是否有 KneronPLUS wheel"
exit 1
fi
# 驗證關鍵 wheel 名稱存在(避免只下載到其他 wheel 卻缺 kp 等)
missing=()
for pkg in numpy opencv pyusb kp; do
if ! ls "$PAYLOAD_LINUX/wheels/"*${pkg}*.whl >/dev/null 2>&1; then
missing+=("$pkg")
fi
done
if [ ${#missing[@]} -gt 0 ]; then
echo "❌ 缺少關鍵 wheel${missing[*]}"
echo " 目前 wheels 目錄內容:"
ls -1 "$PAYLOAD_LINUX/wheels/" 2>/dev/null | sed 's/^/ /'
echo " kp wheel 需手動放到 visiona-local/wheels/linux/KneronPLUS SDK 非公開套件)"
exit 1
fi
echo "==> ✅ python tarball + $wheel_count 個 wheel 齊備"
echo "==> 複製資料、腳本、Python runtime、wheels"
[ -d "$PAYLOAD_LINUX/data" ] && cp -R "$PAYLOAD_LINUX/data/." "$APPDIR/usr/lib/visiona-local/data/" || true
[ -d "$PAYLOAD_LINUX/scripts" ] && cp -R "$PAYLOAD_LINUX/scripts/." "$APPDIR/usr/lib/visiona-local/scripts/" || true
[ -f "$PAYLOAD_LINUX/python/python.tar.gz" ] && \
cp "$PAYLOAD_LINUX/python/python.tar.gz" "$APPDIR/usr/lib/visiona-local/python/" || \
echo "⚠️ python tarball 不存在"
if ls "$PAYLOAD_LINUX/wheels/"*.whl >/dev/null 2>&1; then
cp "$PAYLOAD_LINUX/wheels/"*.whl "$APPDIR/usr/lib/visiona-local/wheels/"
else
echo "⚠️ wheels 目錄為空"
fi
cp "$PAYLOAD_LINUX/python/python.tar.gz" "$APPDIR/usr/lib/visiona-local/python/"
cp "$PAYLOAD_LINUX/wheels/"*.whl "$APPDIR/usr/lib/visiona-local/wheels/"
# 複製 udev rule 到 lib 供 Wails app 首次啟動時使用
if [ -f "$PROJECT_ROOT/installer/linux/99-kneron.rules" ]; then
@ -133,6 +169,10 @@ export LD_LIBRARY_PATH="${HERE}/usr/lib:${LD_LIBRARY_PATH:-}"
export VISIONA_BUNDLE_BIN_DIR="${HERE}/usr/bin"
export VISIONA_BUNDLE_LIB_DIR="${HERE}/usr/lib/visiona-local"
# Linux AppImage 強制走 bundled Python內嵌 python-build-standalone + wheels
# 避免 system Python 缺 numpy / kp / pyusb 導致 bridge scan 失敗。
export VISIONA_PYTHON_MODE=bundled
exec "${HERE}/usr/bin/visiona-local" "$@"
APPRUN
chmod +x "$APPDIR/AppRun"

View File

@ -281,20 +281,22 @@ func (h *SystemHandler) InstallUdevRule(c *gin.Context) {
}
defer os.Remove(tmpRule)
// 用 pkexec 提權複製(會彈 Linux 圖形化密碼對話框)
cpCmd := exec.Command("pkexec", "cp", tmpRule, "/etc/udev/rules.d/99-kneron.rules")
// 用 pkexec 一次提權執行三個動作cp + reload-rules + trigger使用者只要輸入一次密碼。
// 用 sh -c 包起來而不是呼叫 3 次 pkexec原本每次都彈密碼框
// tmpRule 路徑和 /etc/udev/rules.d/99-kneron.rules 都是固定值,無 shell injection 風險。
script := fmt.Sprintf(
"cp %q /etc/udev/rules.d/99-kneron.rules && udevadm control --reload-rules && udevadm trigger",
tmpRule,
)
cpCmd := exec.Command("pkexec", "sh", "-c", script)
if out, err := cpCmd.CombinedOutput(); err != nil {
c.JSON(500, gin.H{"success": false, "error": gin.H{
"code": "UDEV_INSTALL_FAILED",
"message": fmt.Sprintf("pkexec cp failed: %v (%s)", err, strings.TrimSpace(string(out))),
"message": fmt.Sprintf("pkexec install failed: %v (%s)", err, strings.TrimSpace(string(out))),
}})
return
}
// reload udev每個指令單獨 pkexec避免 shell injection
_ = exec.Command("pkexec", "udevadm", "control", "--reload-rules").Run()
_ = exec.Command("pkexec", "udevadm", "trigger").Run()
c.JSON(200, gin.H{"success": true, "data": gin.H{
"message": "udev rule installed. Please unplug and replug your Kneron device.",
}})

View File

@ -1016,6 +1016,14 @@ func (a *App) ensureBundledPython() (string, error) {
// locateBundledPythonAssets 找 python tarball 與 wheels 目錄。
// 順序macOS bundle → 開發模式 payload/darwin → 上一層。
func locateBundledPythonAssets() (tarball, wheelsDir string, err error) {
// 0. Linux AppImageAppRun 已 export VISIONA_BUNDLE_LIB_DIR
if libDir := os.Getenv("VISIONA_BUNDLE_LIB_DIR"); libDir != "" {
t := filepath.Join(libDir, "python", "python.tar.gz")
w := filepath.Join(libDir, "wheels")
if fileExists(t) && dirExists(w) {
return t, w, nil
}
}
// 1. macOS .app bundleContents/Resources/python + Resources/wheels
if exe, e := os.Executable(); e == nil {
exeDir := filepath.Dir(exe)
@ -1059,6 +1067,14 @@ func locateBundledPythonAssets() (tarball, wheelsDir string, err error) {
// 2. Windows / Linux 打包後:與 Wails 執行檔同目錄下的 bin/
// 3. 開發模式payload/darwin/bin相對 cwd
func locateBundleBinDir() (string, error) {
// Linux AppImageAppRun 已 export VISIONA_BUNDLE_BIN_DIR=<mount>/usr/bin
if binDir := os.Getenv("VISIONA_BUNDLE_BIN_DIR"); binDir != "" {
if dirExists(binDir) {
abs, _ := filepath.Abs(binDir)
return abs, nil
}
}
if exe, err := os.Executable(); err == nil {
exeDir := filepath.Dir(exe)
if runtime.GOOS == "darwin" {
@ -1102,10 +1118,20 @@ func locateBundleBinDir() (string, error) {
// locateBundleDataDir 找 installer 打包的 data 目錄(含 models.json + nef/ 預置模型)。
//
// 順序:
// 1. macOS .app bundleContents/Resources/data
// 2. Windows / Linux 打包後:與 Wails 執行檔同目錄下的 data/
// 3. 開發模式:<repo>/server/data相對 cwd或往上一層 / 兩層)
// 1. Linux AppImageVISIONA_BUNDLE_LIB_DIR/dataAppRun 注入)
// 2. macOS .app bundleContents/Resources/data
// 3. Windows / Linux非 AppImage與 Wails 執行檔同目錄下的 data/
// 4. 開發模式:<repo>/server/data相對 cwd或往上一層 / 兩層)
func locateBundleDataDir() (string, error) {
// Linux AppImageAppRun 已 export VISIONA_BUNDLE_LIB_DIR=<mount>/usr/lib/visiona-local
if libDir := os.Getenv("VISIONA_BUNDLE_LIB_DIR"); libDir != "" {
d := filepath.Join(libDir, "data")
if dirExists(d) {
abs, _ := filepath.Abs(d)
return abs, nil
}
}
if exe, err := os.Executable(); err == nil {
exeDir := filepath.Dir(exe)
if runtime.GOOS == "darwin" {