shipmyagent 1.0.231 → 1.0.239
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/extensions/voice/Index.d.ts.map +1 -1
- package/bin/extensions/voice/Index.js +325 -48
- package/bin/extensions/voice/Index.js.map +1 -1
- package/bin/extensions/voice/runtime/ConfigStore.d.ts.map +1 -1
- package/bin/extensions/voice/runtime/ConfigStore.js +22 -3
- package/bin/extensions/voice/runtime/ConfigStore.js.map +1 -1
- package/bin/extensions/voice/runtime/DependencyInstaller.d.ts.map +1 -0
- package/bin/extensions/voice/runtime/DependencyInstaller.js +309 -0
- package/bin/extensions/voice/runtime/DependencyInstaller.js.map +1 -0
- package/bin/extensions/voice/runtime/Installer.d.ts.map +1 -1
- package/bin/extensions/voice/runtime/Installer.js +72 -1
- package/bin/extensions/voice/runtime/Installer.js.map +1 -1
- package/bin/extensions/voice/runtime/Transcriber.d.ts.map +1 -1
- package/bin/extensions/voice/runtime/Transcriber.js +56 -6
- package/bin/extensions/voice/runtime/Transcriber.js.map +1 -1
- package/bin/main/extension/ExtensionCommand.d.ts.map +1 -1
- package/bin/main/extension/ExtensionCommand.js +175 -7
- package/bin/main/extension/ExtensionCommand.js.map +1 -1
- package/bin/main/extension/Manager.d.ts.map +1 -1
- package/bin/main/extension/Manager.js +11 -5
- package/bin/main/extension/Manager.js.map +1 -1
- package/bin/main/server/constants/ShipSchema.d.ts.map +1 -1
- package/bin/main/server/constants/ShipSchema.js +1 -0
- package/bin/main/server/constants/ShipSchema.js.map +1 -1
- package/bin/main/service/ServiceCommand.d.ts.map +1 -1
- package/bin/main/service/ServiceCommand.js +40 -4
- package/bin/main/service/ServiceCommand.js.map +1 -1
- package/bin/main/types/Voice.d.ts.map +1 -1
- package/bin/services/chat/channels/qq/QQ.d.ts.map +1 -1
- package/bin/services/chat/channels/qq/QQ.js +89 -6
- package/bin/services/chat/channels/qq/QQ.js.map +1 -1
- package/bin/services/chat/channels/qq/VoiceInput.d.ts.map +1 -0
- package/bin/services/chat/channels/qq/VoiceInput.js +326 -0
- package/bin/services/chat/channels/qq/VoiceInput.js.map +1 -0
- package/bin/services/chat/types/QqVoice.d.ts.map +1 -0
- package/bin/services/chat/types/QqVoice.js +9 -0
- package/bin/services/chat/types/QqVoice.js.map +1 -0
- package/package.json +1 -1
- package/test/chat/qq-voice-input.test.mjs +141 -0
- package/test/voice/extension-action-auto-start.test.mjs +168 -0
- package/test/voice/voice-dependency-installer.test.mjs +58 -0
- package/test/voice/voice-service-config.test.mjs +97 -0
|
@@ -0,0 +1,309 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Voice 转写依赖安装器。
|
|
3
|
+
*
|
|
4
|
+
* 关键点(中文)
|
|
5
|
+
* - 统一管理 `sma voice init` 的 Python 依赖安装逻辑。
|
|
6
|
+
* - 根据模型自动推导 runner(funasr / transformers-whisper)并执行 `python -m pip install`。
|
|
7
|
+
* - 返回结构化安装结果,供 CLI/日志/测试复用。
|
|
8
|
+
*/
|
|
9
|
+
import { execFile as execFileCb } from "node:child_process";
|
|
10
|
+
import os from "node:os";
|
|
11
|
+
import path from "node:path";
|
|
12
|
+
import { promisify } from "node:util";
|
|
13
|
+
import fs from "fs-extra";
|
|
14
|
+
const execFileAsync = promisify(execFileCb);
|
|
15
|
+
const DEFAULT_PYTHON_BIN = "python3";
|
|
16
|
+
const DEFAULT_PIP_TIMEOUT_MS = 300_000;
|
|
17
|
+
const OUTPUT_TAIL_LIMIT = 1200;
|
|
18
|
+
const DEFAULT_VENV_DIR = path.join(os.homedir(), ".ship", "venvs", "voice");
|
|
19
|
+
function normalizePythonBin(input) {
|
|
20
|
+
const text = String(input || "").trim();
|
|
21
|
+
return text || DEFAULT_PYTHON_BIN;
|
|
22
|
+
}
|
|
23
|
+
function normalizeTimeoutMs(value) {
|
|
24
|
+
if (!Number.isFinite(value))
|
|
25
|
+
return DEFAULT_PIP_TIMEOUT_MS;
|
|
26
|
+
const ms = Math.floor(Number(value));
|
|
27
|
+
if (ms < 5_000)
|
|
28
|
+
return 5_000;
|
|
29
|
+
if (ms > 1_800_000)
|
|
30
|
+
return 1_800_000;
|
|
31
|
+
return ms;
|
|
32
|
+
}
|
|
33
|
+
function normalizeVenvDir(input) {
|
|
34
|
+
const text = String(input || "").trim();
|
|
35
|
+
if (!text)
|
|
36
|
+
return DEFAULT_VENV_DIR;
|
|
37
|
+
return path.resolve(text);
|
|
38
|
+
}
|
|
39
|
+
function tailText(value) {
|
|
40
|
+
const text = String(value || "").trim();
|
|
41
|
+
if (!text)
|
|
42
|
+
return undefined;
|
|
43
|
+
if (text.length <= OUTPUT_TAIL_LIMIT)
|
|
44
|
+
return text;
|
|
45
|
+
return text.slice(text.length - OUTPUT_TAIL_LIMIT);
|
|
46
|
+
}
|
|
47
|
+
function resolveVenvPythonBin(venvDir) {
|
|
48
|
+
return path.join(venvDir, "bin", "python");
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* 判断是否为 PEP 668(externally-managed-environment)错误。
|
|
52
|
+
*/
|
|
53
|
+
export function isPep668InstallError(text) {
|
|
54
|
+
const msg = String(text || "").toLowerCase();
|
|
55
|
+
if (!msg)
|
|
56
|
+
return false;
|
|
57
|
+
return (msg.includes("externally-managed-environment") ||
|
|
58
|
+
msg.includes("this environment is externally managed") ||
|
|
59
|
+
msg.includes("pep 668") ||
|
|
60
|
+
msg.includes("--break-system-packages"));
|
|
61
|
+
}
|
|
62
|
+
function dedupeRunners(runners) {
|
|
63
|
+
const seen = new Set();
|
|
64
|
+
const out = [];
|
|
65
|
+
for (const runner of runners) {
|
|
66
|
+
if (seen.has(runner))
|
|
67
|
+
continue;
|
|
68
|
+
seen.add(runner);
|
|
69
|
+
out.push(runner);
|
|
70
|
+
}
|
|
71
|
+
return out;
|
|
72
|
+
}
|
|
73
|
+
function getRunnerPackages(runner) {
|
|
74
|
+
if (runner === "funasr") {
|
|
75
|
+
// 关键点(中文):FunASR 在常见语音模型推理路径会依赖 torch/torchaudio。
|
|
76
|
+
// 仅安装 funasr 会在转写阶段触发 `ModuleNotFoundError: torch`。
|
|
77
|
+
return ["funasr", "torch", "torchaudio"];
|
|
78
|
+
}
|
|
79
|
+
return ["transformers", "torch", "torchaudio"];
|
|
80
|
+
}
|
|
81
|
+
async function checkRunnerPackagesInstalled(params) {
|
|
82
|
+
const args = ["-m", "pip", "show", ...params.packages];
|
|
83
|
+
const command = [params.pythonBin, ...args].join(" ");
|
|
84
|
+
try {
|
|
85
|
+
await execFileAsync(params.pythonBin, args, {
|
|
86
|
+
timeout: params.timeoutMs,
|
|
87
|
+
maxBuffer: 8 * 1024 * 1024,
|
|
88
|
+
});
|
|
89
|
+
return {
|
|
90
|
+
installed: true,
|
|
91
|
+
args,
|
|
92
|
+
command,
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
catch {
|
|
96
|
+
return {
|
|
97
|
+
installed: false,
|
|
98
|
+
args,
|
|
99
|
+
command,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
async function installRunnerWithPython(params) {
|
|
104
|
+
const packages = getRunnerPackages(params.runner);
|
|
105
|
+
const checkStartedAt = Date.now();
|
|
106
|
+
const checkResult = await checkRunnerPackagesInstalled({
|
|
107
|
+
pythonBin: params.pythonBin,
|
|
108
|
+
packages,
|
|
109
|
+
timeoutMs: params.timeoutMs,
|
|
110
|
+
});
|
|
111
|
+
if (checkResult.installed) {
|
|
112
|
+
return {
|
|
113
|
+
success: true,
|
|
114
|
+
item: {
|
|
115
|
+
runner: params.runner,
|
|
116
|
+
pythonBin: params.pythonBin,
|
|
117
|
+
args: checkResult.args,
|
|
118
|
+
packages,
|
|
119
|
+
command: checkResult.command,
|
|
120
|
+
elapsedMs: Date.now() - checkStartedAt,
|
|
121
|
+
skipped: true,
|
|
122
|
+
skipReason: "already-installed",
|
|
123
|
+
},
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
const args = [
|
|
127
|
+
"-m",
|
|
128
|
+
"pip",
|
|
129
|
+
"install",
|
|
130
|
+
...(params.upgrade ? ["-U"] : []),
|
|
131
|
+
...packages,
|
|
132
|
+
];
|
|
133
|
+
const command = [params.pythonBin, ...args].join(" ");
|
|
134
|
+
const startedAt = Date.now();
|
|
135
|
+
try {
|
|
136
|
+
const { stdout, stderr } = await execFileAsync(params.pythonBin, args, {
|
|
137
|
+
timeout: params.timeoutMs,
|
|
138
|
+
maxBuffer: 8 * 1024 * 1024,
|
|
139
|
+
});
|
|
140
|
+
return {
|
|
141
|
+
success: true,
|
|
142
|
+
item: {
|
|
143
|
+
runner: params.runner,
|
|
144
|
+
pythonBin: params.pythonBin,
|
|
145
|
+
args,
|
|
146
|
+
packages,
|
|
147
|
+
command,
|
|
148
|
+
elapsedMs: Date.now() - startedAt,
|
|
149
|
+
...(tailText(String(stdout || ""))
|
|
150
|
+
? { stdoutTail: tailText(String(stdout || "")) }
|
|
151
|
+
: {}),
|
|
152
|
+
...(tailText(String(stderr || ""))
|
|
153
|
+
? { stderrTail: tailText(String(stderr || "")) }
|
|
154
|
+
: {}),
|
|
155
|
+
},
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
catch (error) {
|
|
159
|
+
const errorLike = error;
|
|
160
|
+
const stdoutTail = tailText(String(errorLike.stdout || ""));
|
|
161
|
+
const stderrTail = tailText(String(errorLike.stderr || ""));
|
|
162
|
+
const reason = stderrTail || stdoutTail || String(errorLike.message || error);
|
|
163
|
+
return {
|
|
164
|
+
success: false,
|
|
165
|
+
failure: {
|
|
166
|
+
runner: params.runner,
|
|
167
|
+
command,
|
|
168
|
+
reason,
|
|
169
|
+
},
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
async function installAllRunnersWithPython(params) {
|
|
174
|
+
const items = [];
|
|
175
|
+
for (const runner of params.runners) {
|
|
176
|
+
const attempt = await installRunnerWithPython({
|
|
177
|
+
pythonBin: params.pythonBin,
|
|
178
|
+
runner,
|
|
179
|
+
upgrade: params.upgrade,
|
|
180
|
+
timeoutMs: params.timeoutMs,
|
|
181
|
+
});
|
|
182
|
+
if (!attempt.success) {
|
|
183
|
+
return {
|
|
184
|
+
success: false,
|
|
185
|
+
failure: attempt.failure,
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
items.push(attempt.item);
|
|
189
|
+
}
|
|
190
|
+
return {
|
|
191
|
+
success: true,
|
|
192
|
+
items,
|
|
193
|
+
};
|
|
194
|
+
}
|
|
195
|
+
function formatRunnerInstallFailure(failure) {
|
|
196
|
+
return `Failed to install voice dependencies for runner "${failure.runner}" via "${failure.command}": ${failure.reason}`;
|
|
197
|
+
}
|
|
198
|
+
async function ensureVoiceVirtualEnvPython(params) {
|
|
199
|
+
await fs.ensureDir(path.dirname(params.venvDir));
|
|
200
|
+
const createArgs = ["-m", "venv", params.venvDir];
|
|
201
|
+
const createCommand = [params.basePythonBin, ...createArgs].join(" ");
|
|
202
|
+
try {
|
|
203
|
+
await execFileAsync(params.basePythonBin, createArgs, {
|
|
204
|
+
timeout: params.timeoutMs,
|
|
205
|
+
maxBuffer: 8 * 1024 * 1024,
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
catch (error) {
|
|
209
|
+
const errorLike = error;
|
|
210
|
+
const stdoutTail = tailText(String(errorLike.stdout || ""));
|
|
211
|
+
const stderrTail = tailText(String(errorLike.stderr || ""));
|
|
212
|
+
const reason = stderrTail || stdoutTail || String(errorLike.message || error);
|
|
213
|
+
throw new Error(`Failed to create voice virtual environment via "${createCommand}": ${reason}`);
|
|
214
|
+
}
|
|
215
|
+
const venvPythonBin = resolveVenvPythonBin(params.venvDir);
|
|
216
|
+
const upgradePipArgs = ["-m", "pip", "install", "-U", "pip"];
|
|
217
|
+
const upgradePipCommand = [venvPythonBin, ...upgradePipArgs].join(" ");
|
|
218
|
+
try {
|
|
219
|
+
await execFileAsync(venvPythonBin, upgradePipArgs, {
|
|
220
|
+
timeout: params.timeoutMs,
|
|
221
|
+
maxBuffer: 8 * 1024 * 1024,
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
catch (error) {
|
|
225
|
+
const errorLike = error;
|
|
226
|
+
const stdoutTail = tailText(String(errorLike.stdout || ""));
|
|
227
|
+
const stderrTail = tailText(String(errorLike.stderr || ""));
|
|
228
|
+
const reason = stderrTail || stdoutTail || String(errorLike.message || error);
|
|
229
|
+
throw new Error(`Failed to upgrade pip in voice virtual environment via "${upgradePipCommand}": ${reason}`);
|
|
230
|
+
}
|
|
231
|
+
return venvPythonBin;
|
|
232
|
+
}
|
|
233
|
+
/**
|
|
234
|
+
* 根据模型推导推荐 runner。
|
|
235
|
+
*/
|
|
236
|
+
export function resolveVoiceRunnerByModel(modelId) {
|
|
237
|
+
if (modelId === "whisper-large-v3-turbo")
|
|
238
|
+
return "transformers-whisper";
|
|
239
|
+
return "funasr";
|
|
240
|
+
}
|
|
241
|
+
/**
|
|
242
|
+
* 根据模型列表推导去重后的 runner 列表。
|
|
243
|
+
*/
|
|
244
|
+
export function resolveVoiceRunnersByModels(modelIds) {
|
|
245
|
+
return dedupeRunners(modelIds.map((modelId) => resolveVoiceRunnerByModel(modelId)));
|
|
246
|
+
}
|
|
247
|
+
/**
|
|
248
|
+
* 根据模型推导推荐转写策略。
|
|
249
|
+
*/
|
|
250
|
+
export function resolveVoiceStrategyByModel(modelId) {
|
|
251
|
+
if (modelId === "whisper-large-v3-turbo")
|
|
252
|
+
return "transformers-whisper";
|
|
253
|
+
return "funasr";
|
|
254
|
+
}
|
|
255
|
+
/**
|
|
256
|
+
* 安装 Voice 转写依赖。
|
|
257
|
+
*
|
|
258
|
+
* 关键点(中文)
|
|
259
|
+
* - 逐个 runner 执行 pip 安装,任一失败即抛错。
|
|
260
|
+
* - 错误信息携带 stderr/stdout 尾部,便于用户快速定位。
|
|
261
|
+
*/
|
|
262
|
+
export async function installVoiceTranscribeDependencies(input) {
|
|
263
|
+
const basePythonBin = normalizePythonBin(input.pythonBin);
|
|
264
|
+
const timeoutMs = normalizeTimeoutMs(input.timeoutMs);
|
|
265
|
+
const upgrade = input.upgrade !== false;
|
|
266
|
+
const runners = dedupeRunners(input.runners || []);
|
|
267
|
+
const firstAttempt = await installAllRunnersWithPython({
|
|
268
|
+
pythonBin: basePythonBin,
|
|
269
|
+
runners,
|
|
270
|
+
upgrade,
|
|
271
|
+
timeoutMs,
|
|
272
|
+
});
|
|
273
|
+
if (firstAttempt.success) {
|
|
274
|
+
return {
|
|
275
|
+
pythonBin: basePythonBin,
|
|
276
|
+
runners,
|
|
277
|
+
items: firstAttempt.items,
|
|
278
|
+
usedVirtualEnv: false,
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
if (!isPep668InstallError(firstAttempt.failure.reason)) {
|
|
282
|
+
throw new Error(formatRunnerInstallFailure(firstAttempt.failure));
|
|
283
|
+
}
|
|
284
|
+
// 关键点(中文):命中 PEP 668 时自动回退到独立 venv,避免要求用户手工排障。
|
|
285
|
+
const venvDir = normalizeVenvDir(input.venvDir);
|
|
286
|
+
const venvPythonBin = await ensureVoiceVirtualEnvPython({
|
|
287
|
+
basePythonBin,
|
|
288
|
+
venvDir,
|
|
289
|
+
timeoutMs,
|
|
290
|
+
});
|
|
291
|
+
const venvAttempt = await installAllRunnersWithPython({
|
|
292
|
+
pythonBin: venvPythonBin,
|
|
293
|
+
runners,
|
|
294
|
+
upgrade,
|
|
295
|
+
timeoutMs,
|
|
296
|
+
});
|
|
297
|
+
if (!venvAttempt.success) {
|
|
298
|
+
throw new Error(formatRunnerInstallFailure(venvAttempt.failure));
|
|
299
|
+
}
|
|
300
|
+
return {
|
|
301
|
+
pythonBin: venvPythonBin,
|
|
302
|
+
runners,
|
|
303
|
+
items: venvAttempt.items,
|
|
304
|
+
usedVirtualEnv: true,
|
|
305
|
+
venvDir,
|
|
306
|
+
basePythonBin,
|
|
307
|
+
};
|
|
308
|
+
}
|
|
309
|
+
//# sourceMappingURL=DependencyInstaller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DependencyInstaller.js","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/DependencyInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Installer.d.ts","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/Installer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"Installer.d.ts","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/Installer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAUhF;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B;;OAEG;IACH,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,KAAK,EACD,UAAU,GACV,MAAM,GACN,gBAAgB,GAChB,eAAe,GACf,UAAU,CAAC;IACf;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAsB,iCAAiC,CAAC,KAAK,EAAE;IAC7D,OAAO,EAAE,YAAY,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC;IACV;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC;CACnC,CAAC,CAoCD;AA8FD;;;;;;GAMG;AACH,wBAAsB,gCAAgC,CAAC,KAAK,EAAE;IAC5D,KAAK,EAAE,qBAAqB,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;CAC9D,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAiFnC"}
|
|
@@ -4,6 +4,45 @@ import fsExtra from "fs-extra";
|
|
|
4
4
|
import { Readable } from "node:stream";
|
|
5
5
|
import { pipeline } from "node:stream/promises";
|
|
6
6
|
const HUGGINGFACE_HOST = "https://huggingface.co";
|
|
7
|
+
/**
|
|
8
|
+
* 判断模型在本地是否已安装。
|
|
9
|
+
*
|
|
10
|
+
* 关键点(中文)
|
|
11
|
+
* - 优先识别安装清单 `shipmyagent.voice.install.json`。
|
|
12
|
+
* - 若无清单但目录非空,也视为已存在模型,避免重复下载。
|
|
13
|
+
*/
|
|
14
|
+
export async function detectLocalVoiceModelInstallState(input) {
|
|
15
|
+
const modelDir = path.resolve(input.modelsRootDir, input.modelId);
|
|
16
|
+
const manifestPath = path.join(modelDir, "shipmyagent.voice.install.json");
|
|
17
|
+
const hasManifest = await fsExtra.pathExists(manifestPath);
|
|
18
|
+
if (hasManifest) {
|
|
19
|
+
return {
|
|
20
|
+
modelDir,
|
|
21
|
+
installed: true,
|
|
22
|
+
source: "manifest",
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
const hasModelDir = await fsExtra.pathExists(modelDir);
|
|
26
|
+
if (!hasModelDir) {
|
|
27
|
+
return {
|
|
28
|
+
modelDir,
|
|
29
|
+
installed: false,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
const entries = await fsExtra.readdir(modelDir).catch(() => []);
|
|
33
|
+
const hasPersistedFiles = entries.some((entry) => !String(entry).endsWith(".downloading"));
|
|
34
|
+
if (!hasPersistedFiles) {
|
|
35
|
+
return {
|
|
36
|
+
modelDir,
|
|
37
|
+
installed: false,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
return {
|
|
41
|
+
modelDir,
|
|
42
|
+
installed: true,
|
|
43
|
+
source: "directory",
|
|
44
|
+
};
|
|
45
|
+
}
|
|
7
46
|
function encodePathSegments(input) {
|
|
8
47
|
return input
|
|
9
48
|
.split("/")
|
|
@@ -91,15 +130,35 @@ export async function installVoiceModelFromHuggingFace(input) {
|
|
|
91
130
|
repoId: input.model.huggingfaceRepo,
|
|
92
131
|
hfToken: input.hfToken,
|
|
93
132
|
});
|
|
133
|
+
input.onProgress?.({
|
|
134
|
+
stage: "discover",
|
|
135
|
+
totalFiles: files.length,
|
|
136
|
+
});
|
|
94
137
|
let downloadedFiles = 0;
|
|
95
138
|
let skippedFiles = 0;
|
|
96
|
-
|
|
139
|
+
const downloadedFilePaths = [];
|
|
140
|
+
const skippedFilePaths = [];
|
|
141
|
+
for (let i = 0; i < files.length; i += 1) {
|
|
142
|
+
const filePath = files[i];
|
|
97
143
|
const targetPath = resolveSafeTargetPath(modelDir, filePath);
|
|
98
144
|
const exists = await fsExtra.pathExists(targetPath);
|
|
99
145
|
if (exists && input.force !== true) {
|
|
100
146
|
skippedFiles += 1;
|
|
147
|
+
skippedFilePaths.push(filePath);
|
|
148
|
+
input.onProgress?.({
|
|
149
|
+
stage: "skip",
|
|
150
|
+
filePath,
|
|
151
|
+
index: i + 1,
|
|
152
|
+
totalFiles: files.length,
|
|
153
|
+
});
|
|
101
154
|
continue;
|
|
102
155
|
}
|
|
156
|
+
input.onProgress?.({
|
|
157
|
+
stage: "download_start",
|
|
158
|
+
filePath,
|
|
159
|
+
index: i + 1,
|
|
160
|
+
totalFiles: files.length,
|
|
161
|
+
});
|
|
103
162
|
await downloadModelFile({
|
|
104
163
|
repoId: input.model.huggingfaceRepo,
|
|
105
164
|
revision: input.model.revision,
|
|
@@ -108,6 +167,13 @@ export async function installVoiceModelFromHuggingFace(input) {
|
|
|
108
167
|
hfToken: input.hfToken,
|
|
109
168
|
});
|
|
110
169
|
downloadedFiles += 1;
|
|
170
|
+
downloadedFilePaths.push(filePath);
|
|
171
|
+
input.onProgress?.({
|
|
172
|
+
stage: "download_done",
|
|
173
|
+
filePath,
|
|
174
|
+
index: i + 1,
|
|
175
|
+
totalFiles: files.length,
|
|
176
|
+
});
|
|
111
177
|
}
|
|
112
178
|
await fsExtra.writeJson(path.join(modelDir, "shipmyagent.voice.install.json"), {
|
|
113
179
|
modelId: input.model.id,
|
|
@@ -118,10 +184,15 @@ export async function installVoiceModelFromHuggingFace(input) {
|
|
|
118
184
|
downloadedFiles,
|
|
119
185
|
skippedFiles,
|
|
120
186
|
}, { spaces: 2 });
|
|
187
|
+
input.onProgress?.({
|
|
188
|
+
stage: "manifest",
|
|
189
|
+
});
|
|
121
190
|
return {
|
|
122
191
|
modelDir,
|
|
123
192
|
downloadedFiles,
|
|
124
193
|
skippedFiles,
|
|
194
|
+
downloadedFilePaths,
|
|
195
|
+
skippedFilePaths,
|
|
125
196
|
repoId: input.model.huggingfaceRepo,
|
|
126
197
|
revision: input.model.revision,
|
|
127
198
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Installer.js","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/Installer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"Installer.js","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/Installer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transcriber.d.ts","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/Transcriber.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,YAAY,EACZ,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAOvE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IACxB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,aAAa,CAAC;IACxB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,QAAQ,GAAG,sBAAsB,GAAG,SAAS,CAAC;CACvD;
|
|
1
|
+
{"version":3,"file":"Transcriber.d.ts","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/Transcriber.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,YAAY,EACZ,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAOvE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IACxB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,aAAa,CAAC;IACxB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,QAAQ,GAAG,sBAAsB,GAAG,SAAS,CAAC;CACvD;AAsRD;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CAoFhC"}
|
|
@@ -20,6 +20,10 @@ function normalizeTimeoutMs(value) {
|
|
|
20
20
|
return 600_000;
|
|
21
21
|
return Math.floor(ms);
|
|
22
22
|
}
|
|
23
|
+
function normalizePythonBin(value) {
|
|
24
|
+
const text = String(value || "").trim();
|
|
25
|
+
return text || "python3";
|
|
26
|
+
}
|
|
23
27
|
function normalizeStrategy(strategy) {
|
|
24
28
|
if (strategy === "funasr")
|
|
25
29
|
return "funasr";
|
|
@@ -48,6 +52,30 @@ function pickLastNonEmptyLine(value) {
|
|
|
48
52
|
function shellEscapeSingle(value) {
|
|
49
53
|
return `'${String(value).replace(/'/g, `'"'"'`)}'`;
|
|
50
54
|
}
|
|
55
|
+
/**
|
|
56
|
+
* 为 python 执行构建环境变量。
|
|
57
|
+
*
|
|
58
|
+
* 关键点(中文)
|
|
59
|
+
* - 当 `pythonBin` 指向 venv 内解释器时,把其 `bin` 目录前置到 PATH,
|
|
60
|
+
* 以便 python 子进程内调用 `pip`(FunASR 远程代码会用到)能正确命中同一 venv。
|
|
61
|
+
*/
|
|
62
|
+
function buildPythonExecEnv(pythonBin) {
|
|
63
|
+
const env = { ...process.env };
|
|
64
|
+
const raw = String(pythonBin || "").trim();
|
|
65
|
+
if (!raw || (!raw.includes("/") && !raw.includes("\\"))) {
|
|
66
|
+
return env;
|
|
67
|
+
}
|
|
68
|
+
const pythonDir = path.dirname(path.resolve(raw));
|
|
69
|
+
const currentPath = String(env.PATH || "");
|
|
70
|
+
const segments = currentPath
|
|
71
|
+
.split(path.delimiter)
|
|
72
|
+
.map((item) => item.trim())
|
|
73
|
+
.filter(Boolean);
|
|
74
|
+
if (!segments.includes(pythonDir)) {
|
|
75
|
+
env.PATH = [pythonDir, ...segments].join(path.delimiter);
|
|
76
|
+
}
|
|
77
|
+
return env;
|
|
78
|
+
}
|
|
51
79
|
function renderCommandTemplate(template, values) {
|
|
52
80
|
return template.replace(/\{(audioPath|modelDir|modelId|language)\}/g, (_, key) => {
|
|
53
81
|
const value = values[key] || "";
|
|
@@ -70,14 +98,31 @@ async function runCustomCommand(params) {
|
|
|
70
98
|
throw new Error("voice custom command produced empty transcript");
|
|
71
99
|
}
|
|
72
100
|
async function runPythonInline(params) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
101
|
+
let stdout = "";
|
|
102
|
+
let stderr = "";
|
|
103
|
+
try {
|
|
104
|
+
const output = await execFileAsync(params.pythonBin, ["-c", params.script, ...params.args], {
|
|
105
|
+
timeout: params.timeoutMs,
|
|
106
|
+
maxBuffer: 8 * 1024 * 1024,
|
|
107
|
+
env: buildPythonExecEnv(params.pythonBin),
|
|
108
|
+
});
|
|
109
|
+
stdout = String(output.stdout || "");
|
|
110
|
+
stderr = String(output.stderr || "");
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
const errorLike = error;
|
|
114
|
+
stdout = String(errorLike.stdout || "");
|
|
115
|
+
stderr = String(errorLike.stderr || "");
|
|
116
|
+
const err = pickLastNonEmptyLine(stderr) || pickLastNonEmptyLine(stdout);
|
|
117
|
+
if (err) {
|
|
118
|
+
throw new Error(`python runner failed: ${err}`);
|
|
119
|
+
}
|
|
120
|
+
throw new Error(`python runner failed: ${String(errorLike.message || error)}`);
|
|
121
|
+
}
|
|
122
|
+
const text = pickLastNonEmptyLine(stdout);
|
|
78
123
|
if (text)
|
|
79
124
|
return text;
|
|
80
|
-
const err = pickLastNonEmptyLine(
|
|
125
|
+
const err = pickLastNonEmptyLine(stderr);
|
|
81
126
|
if (err) {
|
|
82
127
|
throw new Error(`python runner produced no transcript: ${err}`);
|
|
83
128
|
}
|
|
@@ -119,6 +164,7 @@ const TRANSFORMERS_WHISPER_INLINE_SCRIPT = [
|
|
|
119
164
|
].join("\n");
|
|
120
165
|
async function runFunasrRunner(params) {
|
|
121
166
|
return runPythonInline({
|
|
167
|
+
pythonBin: params.pythonBin,
|
|
122
168
|
script: FUNASR_INLINE_SCRIPT,
|
|
123
169
|
args: [params.modelDir, params.audioPath],
|
|
124
170
|
timeoutMs: params.timeoutMs,
|
|
@@ -126,6 +172,7 @@ async function runFunasrRunner(params) {
|
|
|
126
172
|
}
|
|
127
173
|
async function runTransformersWhisperRunner(params) {
|
|
128
174
|
return runPythonInline({
|
|
175
|
+
pythonBin: params.pythonBin,
|
|
129
176
|
script: TRANSFORMERS_WHISPER_INLINE_SCRIPT,
|
|
130
177
|
args: [params.modelDir, params.audioPath, params.language],
|
|
131
178
|
timeoutMs: params.timeoutMs,
|
|
@@ -172,6 +219,7 @@ async function resolveVoiceConfig(input) {
|
|
|
172
219
|
audioPath,
|
|
173
220
|
timeoutMs: normalizeTimeoutMs(config.transcribe?.timeoutMs),
|
|
174
221
|
language: normalizeLanguage(input.language || config.transcribe?.language),
|
|
222
|
+
pythonBin: normalizePythonBin(config.transcribe?.pythonBin),
|
|
175
223
|
};
|
|
176
224
|
}
|
|
177
225
|
function resolveAutoRunnerOrder(modelId) {
|
|
@@ -213,6 +261,7 @@ export async function transcribeVoiceAudio(input) {
|
|
|
213
261
|
}
|
|
214
262
|
else if (runner === "funasr") {
|
|
215
263
|
text = await runFunasrRunner({
|
|
264
|
+
pythonBin: resolved.pythonBin,
|
|
216
265
|
modelDir: resolved.modelDir,
|
|
217
266
|
audioPath: resolved.audioPath,
|
|
218
267
|
timeoutMs: resolved.timeoutMs,
|
|
@@ -220,6 +269,7 @@ export async function transcribeVoiceAudio(input) {
|
|
|
220
269
|
}
|
|
221
270
|
else {
|
|
222
271
|
text = await runTransformersWhisperRunner({
|
|
272
|
+
pythonBin: resolved.pythonBin,
|
|
223
273
|
modelDir: resolved.modelDir,
|
|
224
274
|
audioPath: resolved.audioPath,
|
|
225
275
|
language: resolved.language,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transcriber.js","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/Transcriber.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Transcriber.js","sourceRoot":"","sources":["../../../../src/extensions/voice/runtime/Transcriber.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtensionCommand.d.ts","sourceRoot":"","sources":["../../../src/main/extension/ExtensionCommand.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ExtensionCommand.d.ts","sourceRoot":"","sources":["../../../src/main/extension/ExtensionCommand.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6YzC;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAWlE"}
|