feat: 凭据走 xop env + 首次启动写 ~/.xtype-engine 模板
影响: XType.app 现在真正独立运行 —— 任何用户首次启动都立刻可用 apple 端侧, 凭据经 xop run --secret 在 build/启动时注入到子进程 env,不落磁盘不进 ~/ssw.ini。 改动: - LLMConfig.load() 优先读 env (LLM_KEY/LLM_URL/LLM_MODEL),fallback ~/ssw.ini - pickEngine() 首次启动 ~/.xtype-engine 缺失 → 写模板 + 提醒日志,默认 apple - build.sh dual / apple-llm 模式 xop run 多带 llm_key/llm_url/llm_model 三件套 - build.sh 顶部注释区分 build-time xop / runtime ~/.xtype-engine / 独立 .app 设计: 不以 ~/ssw.ini 为主路径(它是个意外 —— 凭据应统一走 xop); apple 作为无凭据兜底,保证任何用户的首次启动可用。 Co-Authored-By: Claude Code <[email protected]>
This commit is contained in:
1 parent
87915bf7e3
commit
e1eee03ed7
2 files changed
+57
-24
No files matched your search
+25
-20
@@ -3,27 +3,25 @@
|
||||
# 红线: 必须用固定 Apple Development 证书签名 —— ad-hoc(-s -) 每次重编译身份都变,
|
||||
# TCC 会当成新 app,麦克风/语音/辅助功能授权全部作废
|
||||
#
|
||||
# 用法:
|
||||
# src/build.sh 编译+签名+安装,默认启动 apple-llm(端侧+LLM 精修)
|
||||
# src/build.sh apple 纯端侧(无 LLM,最低延迟)
|
||||
# src/build.sh apple-llm 端侧识别 + LLM 异步精修(默认;需 ~/ssw.ini [llm-api])
|
||||
# src/build.sh xunfei 讯飞识别(端点 ~1s)
|
||||
# src/build.sh dual apple + xunfei 并行 + LLM 精修(xunfei 覆盖后)
|
||||
# 用法(编译+签名+安装,启动方式):
|
||||
# src/build.sh 编译 + 安装 + 启动 apple-llm(默认;env 有 LLM_* 则精修,否则回退 apple)
|
||||
# src/build.sh apple 编译 + 安装 + 启动 apple(纯端侧,无 LLM,最低延迟)
|
||||
# src/build.sh apple-llm 编译 + 安装 + 启动 apple-llm
|
||||
# src/build.sh xunfei 编译 + 安装 + 启动 xunfei(xop run 注入讯飞三件套)
|
||||
# src/build.sh dual 编译 + 安装 + 启动 dual(xop run 注入讯飞+LLM)
|
||||
#
|
||||
# 引擎持久切换(两种启动方式之外):
|
||||
# echo apple > ~/.xtype-engine
|
||||
# echo apple-llm > ~/.xtype-engine
|
||||
# echo xunfei > ~/.xtype-engine
|
||||
# echo dual > ~/.xtype-engine
|
||||
# 凭据(运行时 env 由 build.sh 一次性经 xop run 注入,**不**落磁盘、不进 argv/日志):
|
||||
# xop set xf_xt_APPID # 讯飞 APPID
|
||||
# xop set xf_xt_APISecret # 讯飞 APISecret
|
||||
# xop set xf_xt_APIKey # 讯飞 APIKey
|
||||
# xop set llm_key / llm_url / llm_model # LLM 凭据(已入库,无需再 set)
|
||||
#
|
||||
# 凭据(讯飞,一次性,只需跑一次,xop 从 TTY 读值):
|
||||
# xop set xf_xt_APPID # APPID
|
||||
# xop set xf_xt_APISecret # APISecret
|
||||
# xop set xf_xt_APIKey # APIKey
|
||||
# 引擎持久切换(独立于凭据):
|
||||
# ~/.xtype-engine 写入 apple | apple-llm | xunfei | dual 之一即可
|
||||
# 首次启动 ~/.xtype-engine 不存在 → 自动写模板 + 提醒,默认 apple
|
||||
#
|
||||
# LLM(apple-llm/dual 需要,否则静默回退到 apple 原文):
|
||||
# ~/ssw.ini → [llm-api] key=… base-url=… model=…
|
||||
# (apple-llm 无 ini 也照常工作,只是不精修)
|
||||
# 运行时独立: ./XType.app 也可直接 `open /Applications/XType.app` 启动,按 ~/.xtype-engine 选引擎;
|
||||
# 无 xop / 无 ini 的用户只剩 apple 能用(其余要 LLM_*/XUNFEI_* env)。
|
||||
set -e
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
@@ -63,6 +61,9 @@ case "$MODE" in
|
||||
--secret XUNFEI_APPID=xf_xt_APPID \
|
||||
--secret XUNFEI_API_SECRET=xf_xt_APISecret \
|
||||
--secret XUNFEI_API_KEY=xf_xt_APIKey \
|
||||
--secret LLM_KEY=llm_key \
|
||||
--secret LLM_URL=llm_url \
|
||||
--secret LLM_MODEL=llm_model \
|
||||
-- open "$APP"
|
||||
;;
|
||||
apple)
|
||||
@@ -74,7 +75,11 @@ case "$MODE" in
|
||||
current="$( [ -f ~/.xtype-engine ] && tr -d '[:space:]' < ~/.xtype-engine || echo '' )"
|
||||
[ -n "$current" ] && [ "$current" != "apple-llm" ] && echo apple-llm > ~/.xtype-engine
|
||||
[ -z "$current" ] && echo apple-llm > ~/.xtype-engine
|
||||
open "$APP"
|
||||
xop run \
|
||||
--secret LLM_KEY=llm_key \
|
||||
--secret LLM_URL=llm_url \
|
||||
--secret LLM_MODEL=llm_model \
|
||||
-- open "$APP"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -83,4 +88,4 @@ cat /tmp/xtype.log
|
||||
echo
|
||||
echo "installed: $APP (pid $(pgrep -f XType)) engine=$MODE"
|
||||
[ "$MODE" = "xunfei" ] || [ "$MODE" = "dual" ] && echo "vault used: xf_xt_APPID / xf_xt_APISecret / xf_xt_APIKey (no values in logs/argv)"
|
||||
[ "$MODE" = "apple-llm" ] && grep -q '\[llm-api\]' ~/ssw.ini 2>/dev/null && echo "llm: ~/ssw.ini [llm-api] 已配 → LLM 异步精修生效;否则回退 apple 原文"
|
||||
[ "$MODE" = "dual" ] || [ "$MODE" = "apple-llm" ] && echo "llm vault used: llm_key / llm_url / llm_model → env LLM_KEY/LLM_URL/LLM_MODEL (no values in logs/argv; ~/ssw.ini 仍可作 fallback)"
|
||||
+32
-4
@@ -49,11 +49,19 @@ struct LLMConfig {
|
||||
let baseURL: String // 例如 https://api.openai.com/v1
|
||||
let model: String // 例如 gpt-4o-mini
|
||||
static func load() -> LLMConfig? {
|
||||
// 优先读 env(xop run --secret 注入),env 没有再回退 ~/ssw.ini
|
||||
let env = ProcessInfo.processInfo.environment
|
||||
if let k = env["LLM_KEY"], !k.isEmpty,
|
||||
let u = env["LLM_URL"], !u.isEmpty,
|
||||
let m = env["LLM_MODEL"], !m.isEmpty {
|
||||
log("llm: env LLM_KEY/LLM_URL/LLM_MODEL (xop 注入,不落盘)")
|
||||
return LLMConfig(key: k, baseURL: u, model: m)
|
||||
}
|
||||
let s = loadINI(llmIniPath)["llm-api"] ?? [:]
|
||||
guard let k = s["key"], !k.isEmpty,
|
||||
let u = s["base-url"], !u.isEmpty,
|
||||
let m = s["model"], !m.isEmpty else {
|
||||
log("llm: ~/ssw.ini [llm-api] 缺失或字段不全,跳过 LLM 清洗")
|
||||
log("llm: env 缺失且 ~/ssw.ini [llm-api] 缺失或字段不全,跳过 LLM 清洗")
|
||||
return nil
|
||||
}
|
||||
log("llm: 加载 [llm-api] model=\(m) base=\(u.prefix(30))…")
|
||||
@@ -87,8 +95,28 @@ protocol ASREngine {
|
||||
}
|
||||
|
||||
func pickEngine() -> ASREngine {
|
||||
let raw = (try? String(contentsOfFile: engineConfigPath, encoding: .utf8))?
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines) ?? "apple-llm"
|
||||
let raw: String
|
||||
if !FileManager.default.fileExists(atPath: engineConfigPath) {
|
||||
// 首次启动: 写一份模板 + 提醒,默认 apple(无需凭据,保底能用)
|
||||
let tmpl = """
|
||||
# XType 引擎选择 — 取消注释任一行或填一个值,留空/注释全开 = apple 端侧
|
||||
# apple Apple 端侧 SFSpeechRecognizer(无需凭据,zh-CN,流式,~1s)
|
||||
# apple-llm apple + LLM 异步精修(凭据 xop 注入或 ~/ssw.ini [llm-api])
|
||||
# xunfei 讯飞 IAT v2 WebSocket 流式(凭据 xop 注入;env 空则启动报错)
|
||||
# dual apple + xunfei 并行 + LLM 精修(apple 先贴,讯飞覆盖,LLM 再覆盖)
|
||||
#
|
||||
# 凭据注入(可选): build 时 xop run --secret XUNFEI_APPID=xf_xt_APPID ...
|
||||
# build 时 xop run --secret LLM_KEY=llm_key ...
|
||||
#
|
||||
apple
|
||||
"""
|
||||
try? tmpl.write(toFile: engineConfigPath, atomically: true, encoding: .utf8)
|
||||
log("first launch: ~/.xtype-engine missing, wrote template (uncomment/select one of apple/apple-llm/xunfei/dual);defaulting to apple")
|
||||
raw = "apple"
|
||||
} else {
|
||||
raw = (try? String(contentsOfFile: engineConfigPath, encoding: .utf8))?
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines) ?? "apple"
|
||||
}
|
||||
switch raw {
|
||||
case "xunfei":
|
||||
log("engine: xunfei (require XUNFEI_APPID/API_SECRET/API_KEY in env)")
|
||||
@@ -97,7 +125,7 @@ func pickEngine() -> ASREngine {
|
||||
log("engine: dual (apple first, xunfei overwrite later, llm refine)")
|
||||
return DualEngine()
|
||||
case "apple-llm", "llm":
|
||||
log("engine: apple + LLM refine (~/ssw.ini [llm-api] required, no INI → silent fallback to apple)")
|
||||
log("engine: apple + LLM refine (env LLM_KEY/LLM_URL/LLM_MODEL preferred, else ~/ssw.ini [llm-api];缺失 → silent fallback to apple)")
|
||||
return AppleLLMEngine()
|
||||
default:
|
||||
log("engine: apple (on-device, no LLM)")
|
||||
|
||||
Reference in new issue
Block a user