@optima-chat/comfy-cli 0.3.2 → 0.4.0
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/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +37 -22
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/download.d.ts.map +1 -1
- package/dist/commands/download.js +76 -29
- package/dist/commands/download.js.map +1 -1
- package/dist/commands/edit.d.ts.map +1 -1
- package/dist/commands/edit.js +31 -19
- package/dist/commands/edit.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +18 -9
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/interrupt.d.ts.map +1 -1
- package/dist/commands/interrupt.js +13 -5
- package/dist/commands/interrupt.js.map +1 -1
- package/dist/commands/model.d.ts.map +1 -1
- package/dist/commands/model.js +13 -9
- package/dist/commands/model.js.map +1 -1
- package/dist/commands/node.d.ts.map +1 -1
- package/dist/commands/node.js +20 -14
- package/dist/commands/node.js.map +1 -1
- package/dist/commands/queue.d.ts.map +1 -1
- package/dist/commands/queue.js +44 -17
- package/dist/commands/queue.js.map +1 -1
- package/dist/commands/system.d.ts.map +1 -1
- package/dist/commands/system.js +8 -8
- package/dist/commands/system.js.map +1 -1
- package/dist/commands/video.d.ts.map +1 -1
- package/dist/commands/video.js +34 -18
- package/dist/commands/video.js.map +1 -1
- package/dist/commands/workflow.d.ts.map +1 -1
- package/dist/commands/workflow.js +41 -26
- package/dist/commands/workflow.js.map +1 -1
- package/dist/index.js +10 -1
- package/dist/index.js.map +1 -1
- package/dist/utils/output.d.ts +54 -0
- package/dist/utils/output.d.ts.map +1 -0
- package/dist/utils/output.js +76 -0
- package/dist/utils/output.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,QA6GrD"}
|
package/dist/commands/config.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { config, getConfig, setConfig, resetConfig } from '../services/config.js';
|
|
2
|
-
import { success,
|
|
2
|
+
import { success, info } from '../utils/logger.js';
|
|
3
|
+
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
3
4
|
import Table from 'cli-table3';
|
|
4
5
|
export function registerConfigCommand(program) {
|
|
5
6
|
const configCmd = program
|
|
@@ -11,45 +12,48 @@ export function registerConfigCommand(program) {
|
|
|
11
12
|
.description('设置配置项')
|
|
12
13
|
.argument('<key>', '配置键 (server, timeout, autoConnect, outputDir)')
|
|
13
14
|
.argument('<value>', '配置值')
|
|
14
|
-
.action((key, value) => {
|
|
15
|
+
.action((key, value, options) => {
|
|
16
|
+
const pretty = isPrettyMode(options);
|
|
15
17
|
try {
|
|
16
18
|
if (!['server', 'timeout', 'autoConnect', 'outputDir'].includes(key)) {
|
|
17
|
-
|
|
18
|
-
info('可用配置: server, timeout, autoConnect, outputDir');
|
|
19
|
-
process.exit(1);
|
|
19
|
+
outputError('INVALID_CONFIG_KEY', `无效的配置键: ${key}`, options);
|
|
20
20
|
}
|
|
21
21
|
let parsedValue = value;
|
|
22
22
|
// 类型转换
|
|
23
23
|
if (key === 'timeout') {
|
|
24
24
|
parsedValue = parseInt(value);
|
|
25
25
|
if (isNaN(parsedValue)) {
|
|
26
|
-
|
|
27
|
-
process.exit(1);
|
|
26
|
+
outputError('INVALID_VALUE', 'timeout 必须是数字', options);
|
|
28
27
|
}
|
|
29
28
|
}
|
|
30
29
|
else if (key === 'autoConnect') {
|
|
31
30
|
parsedValue = value === 'true';
|
|
32
31
|
}
|
|
33
32
|
setConfig(key, parsedValue);
|
|
34
|
-
|
|
33
|
+
if (pretty) {
|
|
34
|
+
success(`已设置 ${key} = ${parsedValue}`);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
outputSuccess({
|
|
38
|
+
message: '配置已更新',
|
|
39
|
+
key,
|
|
40
|
+
value: parsedValue,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
35
43
|
}
|
|
36
44
|
catch (err) {
|
|
37
|
-
|
|
38
|
-
process.exit(1);
|
|
45
|
+
outputError('CONFIG_SET_FAILED', `设置失败: ${err}`, options);
|
|
39
46
|
}
|
|
40
47
|
});
|
|
41
48
|
// comfy config list
|
|
42
49
|
configCmd
|
|
43
50
|
.command('list')
|
|
44
51
|
.description('查看当前配置')
|
|
45
|
-
.option('--json', '输出 JSON 格式')
|
|
46
52
|
.action((options) => {
|
|
53
|
+
const pretty = isPrettyMode(options);
|
|
47
54
|
try {
|
|
48
55
|
const cfg = getConfig();
|
|
49
|
-
if (
|
|
50
|
-
console.log(JSON.stringify(cfg, null, 2));
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
56
|
+
if (pretty) {
|
|
53
57
|
const table = new Table({
|
|
54
58
|
head: ['配置项', '值'],
|
|
55
59
|
colWidths: [20, 60],
|
|
@@ -58,10 +62,15 @@ export function registerConfigCommand(program) {
|
|
|
58
62
|
console.log(table.toString());
|
|
59
63
|
info(`配置文件位置: ${config.path}`);
|
|
60
64
|
}
|
|
65
|
+
else {
|
|
66
|
+
outputSuccess({
|
|
67
|
+
config: cfg,
|
|
68
|
+
config_path: config.path,
|
|
69
|
+
});
|
|
70
|
+
}
|
|
61
71
|
}
|
|
62
72
|
catch (err) {
|
|
63
|
-
|
|
64
|
-
process.exit(1);
|
|
73
|
+
outputError('CONFIG_LIST_FAILED', `获取配置失败: ${err}`, options);
|
|
65
74
|
}
|
|
66
75
|
});
|
|
67
76
|
// comfy config reset
|
|
@@ -70,17 +79,23 @@ export function registerConfigCommand(program) {
|
|
|
70
79
|
.description('重置为默认配置')
|
|
71
80
|
.option('--confirm', '确认重置')
|
|
72
81
|
.action((options) => {
|
|
82
|
+
const pretty = isPrettyMode(options);
|
|
73
83
|
try {
|
|
74
84
|
if (!options.confirm) {
|
|
75
|
-
|
|
76
|
-
process.exit(1);
|
|
85
|
+
outputError('CONFIRM_REQUIRED', '请使用 --confirm 确认重置操作', options);
|
|
77
86
|
}
|
|
78
87
|
resetConfig();
|
|
79
|
-
|
|
88
|
+
if (pretty) {
|
|
89
|
+
success('配置已重置为默认值');
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
outputSuccess({
|
|
93
|
+
message: '配置已重置为默认值',
|
|
94
|
+
});
|
|
95
|
+
}
|
|
80
96
|
}
|
|
81
97
|
catch (err) {
|
|
82
|
-
|
|
83
|
-
process.exit(1);
|
|
98
|
+
outputError('CONFIG_RESET_FAILED', `重置失败: ${err}`, options);
|
|
84
99
|
}
|
|
85
100
|
});
|
|
86
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAe,MAAM,uBAAuB,CAAC;AAC/F,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/commands/download.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/commands/download.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QAkIvD"}
|
|
@@ -3,46 +3,92 @@ import * as fs from 'fs';
|
|
|
3
3
|
import ora from 'ora';
|
|
4
4
|
import { ComfyAPIClient } from '../services/api.js';
|
|
5
5
|
import { success, error } from '../utils/logger.js';
|
|
6
|
+
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
6
7
|
export function registerDownloadCommand(program) {
|
|
7
8
|
program
|
|
8
9
|
.command('download')
|
|
9
10
|
.description('下载生成的图像或视频')
|
|
10
11
|
.argument('<prompt_id>', 'Prompt ID')
|
|
11
12
|
.option('-o, --output <path>', '输出文件路径')
|
|
12
|
-
.option('--json', '输出 JSON 格式的文件信息')
|
|
13
13
|
.action(async (promptId, options) => {
|
|
14
|
+
const pretty = isPrettyMode(options);
|
|
14
15
|
try {
|
|
15
16
|
const client = new ComfyAPIClient();
|
|
16
17
|
// 获取输出文件列表
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
18
|
+
let files;
|
|
19
|
+
if (pretty) {
|
|
20
|
+
const spinner = ora('正在获取输出文件...').start();
|
|
21
|
+
files = await client.getOutputFiles(promptId);
|
|
22
|
+
if (files.length === 0) {
|
|
23
|
+
spinner.fail('未找到输出文件');
|
|
24
|
+
outputError('NO_OUTPUT_FILES', `Prompt ID: ${promptId} 没有生成任何文件`, options);
|
|
25
|
+
}
|
|
26
|
+
spinner.succeed(`找到 ${files.length} 个文件`);
|
|
23
27
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
+
else {
|
|
29
|
+
files = await client.getOutputFiles(promptId);
|
|
30
|
+
if (files.length === 0) {
|
|
31
|
+
outputError('NO_OUTPUT_FILES', `Prompt ID: ${promptId} 没有生成任何文件`, options);
|
|
32
|
+
}
|
|
28
33
|
}
|
|
34
|
+
const downloadedFiles = [];
|
|
29
35
|
// 下载所有文件
|
|
30
36
|
for (let i = 0; i < files.length; i++) {
|
|
31
37
|
const file = files[i];
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
38
|
+
if (pretty) {
|
|
39
|
+
const downloadSpinner = ora(`正在下载 (${i + 1}/${files.length}): ${file.filename}`).start();
|
|
40
|
+
try {
|
|
41
|
+
// 下载文件
|
|
42
|
+
const buffer = await client.downloadImage(file.filename, file.subfolder, file.type);
|
|
43
|
+
// 确定输出路径
|
|
44
|
+
let outputPath;
|
|
45
|
+
if (options.output) {
|
|
46
|
+
// 如果指定了输出路径
|
|
47
|
+
if (files.length === 1) {
|
|
48
|
+
// 只有一个文件，直接使用指定路径
|
|
49
|
+
outputPath = options.output;
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
// 多个文件，将指定路径作为目录
|
|
53
|
+
const dir = options.output;
|
|
54
|
+
if (!fs.existsSync(dir)) {
|
|
55
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
56
|
+
}
|
|
57
|
+
outputPath = path.join(dir, file.filename);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
// 默认保存到 ./output 目录
|
|
62
|
+
const outputDir = './output';
|
|
63
|
+
if (!fs.existsSync(outputDir)) {
|
|
64
|
+
fs.mkdirSync(outputDir, { recursive: true });
|
|
65
|
+
}
|
|
66
|
+
outputPath = path.join(outputDir, file.filename);
|
|
67
|
+
}
|
|
68
|
+
// 确保输出目录存在
|
|
69
|
+
const outputDir = path.dirname(outputPath);
|
|
70
|
+
if (!fs.existsSync(outputDir)) {
|
|
71
|
+
fs.mkdirSync(outputDir, { recursive: true });
|
|
72
|
+
}
|
|
73
|
+
// 保存文件
|
|
74
|
+
fs.writeFileSync(outputPath, buffer);
|
|
75
|
+
downloadSpinner.succeed(`已下载: ${outputPath}`);
|
|
76
|
+
downloadedFiles.push(outputPath);
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
downloadSpinner.fail(`下载失败: ${file.filename}`);
|
|
80
|
+
error(`错误: ${err}`);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
// JSON 模式：直接下载，不显示进度
|
|
35
85
|
const buffer = await client.downloadImage(file.filename, file.subfolder, file.type);
|
|
36
|
-
// 确定输出路径
|
|
37
86
|
let outputPath;
|
|
38
87
|
if (options.output) {
|
|
39
|
-
// 如果指定了输出路径
|
|
40
88
|
if (files.length === 1) {
|
|
41
|
-
// 只有一个文件，直接使用指定路径
|
|
42
89
|
outputPath = options.output;
|
|
43
90
|
}
|
|
44
91
|
else {
|
|
45
|
-
// 多个文件，将指定路径作为目录
|
|
46
92
|
const dir = options.output;
|
|
47
93
|
if (!fs.existsSync(dir)) {
|
|
48
94
|
fs.mkdirSync(dir, { recursive: true });
|
|
@@ -51,32 +97,33 @@ export function registerDownloadCommand(program) {
|
|
|
51
97
|
}
|
|
52
98
|
}
|
|
53
99
|
else {
|
|
54
|
-
// 默认保存到 ./output 目录
|
|
55
100
|
const outputDir = './output';
|
|
56
101
|
if (!fs.existsSync(outputDir)) {
|
|
57
102
|
fs.mkdirSync(outputDir, { recursive: true });
|
|
58
103
|
}
|
|
59
104
|
outputPath = path.join(outputDir, file.filename);
|
|
60
105
|
}
|
|
61
|
-
// 确保输出目录存在
|
|
62
106
|
const outputDir = path.dirname(outputPath);
|
|
63
107
|
if (!fs.existsSync(outputDir)) {
|
|
64
108
|
fs.mkdirSync(outputDir, { recursive: true });
|
|
65
109
|
}
|
|
66
|
-
// 保存文件
|
|
67
110
|
fs.writeFileSync(outputPath, buffer);
|
|
68
|
-
|
|
69
|
-
}
|
|
70
|
-
catch (err) {
|
|
71
|
-
downloadSpinner.fail(`下载失败: ${file.filename}`);
|
|
72
|
-
error(`错误: ${err}`);
|
|
111
|
+
downloadedFiles.push(outputPath);
|
|
73
112
|
}
|
|
74
113
|
}
|
|
75
|
-
|
|
114
|
+
if (pretty) {
|
|
115
|
+
success(`完成！共下载 ${files.length} 个文件`);
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
outputSuccess({
|
|
119
|
+
prompt_id: promptId,
|
|
120
|
+
files: downloadedFiles,
|
|
121
|
+
total: downloadedFiles.length,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
76
124
|
}
|
|
77
125
|
catch (err) {
|
|
78
|
-
|
|
79
|
-
process.exit(1);
|
|
126
|
+
outputError('DOWNLOAD_FAILED', `下载失败: ${err}`, options);
|
|
80
127
|
}
|
|
81
128
|
});
|
|
82
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../src/commands/download.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAQ,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../src/commands/download.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/commands/edit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/commands/edit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,QAmHnD"}
|
package/dist/commands/edit.js
CHANGED
|
@@ -3,7 +3,8 @@ import * as fs from 'fs';
|
|
|
3
3
|
import ora from 'ora';
|
|
4
4
|
import { ComfyAPIClient } from '../services/api.js';
|
|
5
5
|
import { loadWorkflow, getBuiltinWorkflowPath, replaceVariables } from '../utils/workflow.js';
|
|
6
|
-
import { success,
|
|
6
|
+
import { success, info } from '../utils/logger.js';
|
|
7
|
+
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
7
8
|
import { monitorProgress } from '../services/websocket.js';
|
|
8
9
|
export function registerEditCommand(program) {
|
|
9
10
|
program
|
|
@@ -13,29 +14,36 @@ export function registerEditCommand(program) {
|
|
|
13
14
|
.argument('<prompt>', '编辑描述提示词')
|
|
14
15
|
.option('-o, --output <dir>', '输出目录', './output')
|
|
15
16
|
.option('--no-wait', '提交任务后立即返回（不等待完成）')
|
|
16
|
-
.option('--json', '输出 JSON 格式')
|
|
17
17
|
.action(async (image, prompt, options) => {
|
|
18
|
+
const pretty = isPrettyMode(options);
|
|
18
19
|
try {
|
|
19
20
|
// 检查图像文件是否存在
|
|
20
21
|
const imagePath = path.resolve(image);
|
|
21
22
|
if (!fs.existsSync(imagePath)) {
|
|
22
|
-
|
|
23
|
-
|
|
23
|
+
outputError('IMAGE_NOT_FOUND', `图像文件不存在: ${imagePath}`, options);
|
|
24
|
+
}
|
|
25
|
+
if (pretty) {
|
|
26
|
+
info(`正在编辑图像: "${path.basename(image)}"`);
|
|
27
|
+
info(`提示词: "${prompt}"`);
|
|
24
28
|
}
|
|
25
|
-
info(`正在编辑图像: "${path.basename(image)}"`);
|
|
26
|
-
info(`提示词: "${prompt}"`);
|
|
27
29
|
// 先上传图像
|
|
28
|
-
const uploadSpinner = ora('正在上传图像...').start();
|
|
29
30
|
const client = new ComfyAPIClient();
|
|
30
31
|
let uploadResult;
|
|
31
|
-
|
|
32
|
+
if (pretty) {
|
|
33
|
+
const uploadSpinner = ora('正在上传图像...').start();
|
|
34
|
+
try {
|
|
35
|
+
const imageBuffer = fs.readFileSync(imagePath);
|
|
36
|
+
uploadResult = await client.uploadImage(imageBuffer, path.basename(imagePath));
|
|
37
|
+
uploadSpinner.succeed('图像上传完成');
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
uploadSpinner.fail('图像上传失败');
|
|
41
|
+
throw err;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
32
45
|
const imageBuffer = fs.readFileSync(imagePath);
|
|
33
46
|
uploadResult = await client.uploadImage(imageBuffer, path.basename(imagePath));
|
|
34
|
-
uploadSpinner.succeed('图像上传完成');
|
|
35
|
-
}
|
|
36
|
-
catch (err) {
|
|
37
|
-
uploadSpinner.fail('图像上传失败');
|
|
38
|
-
throw err;
|
|
39
47
|
}
|
|
40
48
|
// 加载内置 workflow
|
|
41
49
|
const workflowPath = getBuiltinWorkflowPath('flux_image_to_image.json');
|
|
@@ -61,10 +69,7 @@ export function registerEditCommand(program) {
|
|
|
61
69
|
const processedWorkflow = replaceVariables(workflow, params);
|
|
62
70
|
// 提交到 ComfyUI
|
|
63
71
|
const result = await client.submitWorkflow(processedWorkflow);
|
|
64
|
-
if (
|
|
65
|
-
console.log(JSON.stringify(result, null, 2));
|
|
66
|
-
}
|
|
67
|
-
else {
|
|
72
|
+
if (pretty) {
|
|
68
73
|
success(`图像编辑任务已提交`);
|
|
69
74
|
info(`Prompt ID: ${result.prompt_id}`);
|
|
70
75
|
// 默认等待完成，除非指定了 --no-wait
|
|
@@ -95,10 +100,17 @@ export function registerEditCommand(program) {
|
|
|
95
100
|
info(`使用 'comfy download ${result.prompt_id}' 下载结果`);
|
|
96
101
|
}
|
|
97
102
|
}
|
|
103
|
+
else {
|
|
104
|
+
outputSuccess({
|
|
105
|
+
prompt_id: result.prompt_id,
|
|
106
|
+
image: path.basename(image),
|
|
107
|
+
prompt,
|
|
108
|
+
status: options.wait !== false ? 'submitted_waiting' : 'submitted',
|
|
109
|
+
});
|
|
110
|
+
}
|
|
98
111
|
}
|
|
99
112
|
catch (err) {
|
|
100
|
-
|
|
101
|
-
process.exit(1);
|
|
113
|
+
outputError('EDIT_FAILED', `编辑失败: ${err}`, options);
|
|
102
114
|
}
|
|
103
115
|
});
|
|
104
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/commands/edit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/commands/edit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,OAAO,EAAS,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,WAAW,CAAC;SACxB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC;SAC7B,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC;SAC/B,MAAM,CAAC,oBAAoB,EAAE,MAAM,EAAE,UAAU,CAAC;SAChD,MAAM,CAAC,WAAW,EAAE,kBAAkB,CAAC;SACvC,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,MAAc,EAAE,OAAO,EAAE,EAAE;QACvD,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAErC,IAAI,CAAC;YACH,aAAa;YACb,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,WAAW,CAAC,iBAAiB,EAAE,YAAY,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;YACnE,CAAC;YAED,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC;YAC3B,CAAC;YAED,QAAQ;YACR,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,IAAI,YAAY,CAAC;YAEjB,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,aAAa,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,CAAC;gBAC/C,IAAI,CAAC;oBACH,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAC/C,YAAY,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;oBAC/E,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAClC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC7B,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAC/C,YAAY,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;YACjF,CAAC;YAED,gBAAgB;YAChB,MAAM,YAAY,GAAG,sBAAsB,CAAC,0BAA0B,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;YAE5C,OAAO;YACP,MAAM,MAAM,GAAG;gBACb,MAAM;gBACN,WAAW,EAAE,YAAY,CAAC,IAAI;gBAC9B,OAAO,EAAE,GAAG,EAAG,QAAQ;gBACvB,KAAK,EAAE,EAAE,EAAG,QAAQ;gBACpB,SAAS,EAAE,GAAG,EAAG,QAAQ;gBACzB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAG,OAAO;gBACnD,eAAe,EAAE,gBAAgB;gBACjC,KAAK,EAAE,0CAA0C;gBACjD,YAAY,EAAE,oBAAoB;gBAClC,aAAa,EAAE,qCAAqC;gBACpD,SAAS,EAAE,gBAAgB;gBAC3B,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,QAAQ;gBACnB,QAAQ,EAAE,GAAG;aACd,CAAC;YAEF,OAAO;YACP,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAE7D,cAAc;YACd,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;YAE9D,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,CAAC,WAAW,CAAC,CAAC;gBACrB,IAAI,CAAC,cAAc,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;gBAEvC,yBAAyB;gBACzB,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;oBAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,CAAC;oBAEjD,IAAI,CAAC;wBACH,MAAM,eAAe,CACnB,MAAM,CAAC,SAAS,EAChB,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;4BAC1B,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gCACd,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;gCACpD,OAAO,CAAC,IAAI,GAAG,QAAQ,OAAO,MAAM,OAAO,IAAI,KAAK,GAAG,CAAC;gCACxD,OAAO,CAAC,MAAM,EAAE,CAAC;4BACnB,CAAC;iCAAM,CAAC;gCACN,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC;gCACvB,OAAO,CAAC,MAAM,EAAE,CAAC;4BACnB,CAAC;wBACH,CAAC,EACD,GAAG,EAAE;4BACH,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;wBAC7B,CAAC,CACF,CAAC;wBACF,IAAI,CAAC,sBAAsB,MAAM,CAAC,SAAS,QAAQ,CAAC,CAAC;oBACvD,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;wBAC/C,IAAI,CAAC,sBAAsB,MAAM,CAAC,SAAS,QAAQ,CAAC,CAAC;oBACvD,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,sBAAsB,MAAM,CAAC,SAAS,QAAQ,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC;oBACZ,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;oBAC3B,MAAM;oBACN,MAAM,EAAE,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW;iBACnE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,WAAW,CAAC,aAAa,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACtD,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QA2FvD"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import ora from 'ora';
|
|
2
2
|
import { ComfyAPIClient } from '../services/api.js';
|
|
3
3
|
import { loadWorkflow, getBuiltinWorkflowPath, replaceVariables } from '../utils/workflow.js';
|
|
4
|
-
import { success,
|
|
4
|
+
import { success, info } from '../utils/logger.js';
|
|
5
|
+
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
5
6
|
import { monitorProgress } from '../services/websocket.js';
|
|
6
7
|
export function registerGenerateCommand(program) {
|
|
7
8
|
program
|
|
@@ -12,10 +13,12 @@ export function registerGenerateCommand(program) {
|
|
|
12
13
|
.option('--width <number>', '图像宽度', '1024')
|
|
13
14
|
.option('--height <number>', '图像高度', '1024')
|
|
14
15
|
.option('--no-wait', '提交任务后立即返回（不等待完成）')
|
|
15
|
-
.option('--json', '输出 JSON 格式')
|
|
16
16
|
.action(async (prompt, options) => {
|
|
17
|
+
const pretty = isPrettyMode(options);
|
|
17
18
|
try {
|
|
18
|
-
|
|
19
|
+
if (pretty) {
|
|
20
|
+
info(`正在生成图像: "${prompt}"`);
|
|
21
|
+
}
|
|
19
22
|
// 加载内置 workflow
|
|
20
23
|
const workflowPath = getBuiltinWorkflowPath('flux_text_to_image.json');
|
|
21
24
|
const workflow = loadWorkflow(workflowPath);
|
|
@@ -39,10 +42,7 @@ export function registerGenerateCommand(program) {
|
|
|
39
42
|
// 提交到 ComfyUI
|
|
40
43
|
const client = new ComfyAPIClient();
|
|
41
44
|
const result = await client.submitWorkflow(processedWorkflow);
|
|
42
|
-
if (
|
|
43
|
-
console.log(JSON.stringify(result, null, 2));
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
45
|
+
if (pretty) {
|
|
46
46
|
success(`图像生成任务已提交`);
|
|
47
47
|
info(`Prompt ID: ${result.prompt_id}`);
|
|
48
48
|
// 默认等待完成，除非指定了 --no-wait
|
|
@@ -73,10 +73,19 @@ export function registerGenerateCommand(program) {
|
|
|
73
73
|
info(`使用 'comfy download ${result.prompt_id}' 下载结果`);
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
|
+
else {
|
|
77
|
+
// JSON 模式：输出简洁的结果
|
|
78
|
+
outputSuccess({
|
|
79
|
+
prompt_id: result.prompt_id,
|
|
80
|
+
prompt,
|
|
81
|
+
width: params.width,
|
|
82
|
+
height: params.height,
|
|
83
|
+
status: options.wait !== false ? 'submitted_waiting' : 'submitted',
|
|
84
|
+
});
|
|
85
|
+
}
|
|
76
86
|
}
|
|
77
87
|
catch (err) {
|
|
78
|
-
|
|
79
|
-
process.exit(1);
|
|
88
|
+
outputError('GENERATE_FAILED', `生成失败: ${err}`, options);
|
|
80
89
|
}
|
|
81
90
|
});
|
|
82
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interrupt.d.ts","sourceRoot":"","sources":["../../src/commands/interrupt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"interrupt.d.ts","sourceRoot":"","sources":["../../src/commands/interrupt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,QAsBxD"}
|
|
@@ -1,18 +1,26 @@
|
|
|
1
1
|
import { ComfyAPIClient } from '../services/api.js';
|
|
2
|
-
import {
|
|
2
|
+
import { success } from '../utils/logger.js';
|
|
3
|
+
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
3
4
|
export function registerInterruptCommand(program) {
|
|
4
5
|
program
|
|
5
6
|
.command('interrupt')
|
|
6
7
|
.description('中断当前执行')
|
|
7
|
-
.action(async () => {
|
|
8
|
+
.action(async (options) => {
|
|
9
|
+
const pretty = isPrettyMode(options);
|
|
8
10
|
try {
|
|
9
11
|
const client = new ComfyAPIClient();
|
|
10
12
|
await client.interrupt();
|
|
11
|
-
|
|
13
|
+
if (pretty) {
|
|
14
|
+
success('已发送中断信号');
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
outputSuccess({
|
|
18
|
+
message: '已发送中断信号',
|
|
19
|
+
});
|
|
20
|
+
}
|
|
12
21
|
}
|
|
13
22
|
catch (err) {
|
|
14
|
-
|
|
15
|
-
process.exit(1);
|
|
23
|
+
outputError('INTERRUPT_FAILED', `中断失败: ${err}`, options);
|
|
16
24
|
}
|
|
17
25
|
});
|
|
18
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interrupt.js","sourceRoot":"","sources":["../../src/commands/interrupt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,
|
|
1
|
+
{"version":3,"file":"interrupt.js","sourceRoot":"","sources":["../../src/commands/interrupt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAS,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE9E,MAAM,UAAU,wBAAwB,CAAC,OAAgB;IACvD,OAAO;SACJ,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,QAAQ,CAAC;SACrB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAErC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;YAEzB,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,CAAC,SAAS,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC;oBACZ,OAAO,EAAE,SAAS;iBACnB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,WAAW,CAAC,kBAAkB,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/commands/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/commands/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QA+CpD"}
|
package/dist/commands/model.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ComfyAPIClient } from '../services/api.js';
|
|
2
|
-
import {
|
|
2
|
+
import { info } from '../utils/logger.js';
|
|
3
|
+
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
3
4
|
import Table from 'cli-table3';
|
|
4
5
|
export function registerModelCommand(program) {
|
|
5
6
|
const modelCmd = program
|
|
@@ -10,16 +11,13 @@ export function registerModelCommand(program) {
|
|
|
10
11
|
.command('list')
|
|
11
12
|
.description('列出可用模型')
|
|
12
13
|
.option('--type <type>', '模型类型 (checkpoints, loras, vae, etc.)')
|
|
13
|
-
.option('--json', '输出 JSON 格式')
|
|
14
14
|
.action(async (options) => {
|
|
15
|
+
const pretty = isPrettyMode(options);
|
|
15
16
|
try {
|
|
16
17
|
const client = new ComfyAPIClient();
|
|
17
18
|
const models = await client.listModels(options.type);
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
const modelList = Array.isArray(models) ? models : Object.values(models).flat();
|
|
19
|
+
const modelList = Array.isArray(models) ? models : Object.values(models).flat();
|
|
20
|
+
if (pretty) {
|
|
23
21
|
if (modelList.length === 0) {
|
|
24
22
|
info('未找到模型');
|
|
25
23
|
return;
|
|
@@ -34,10 +32,16 @@ export function registerModelCommand(program) {
|
|
|
34
32
|
console.log(table.toString());
|
|
35
33
|
info(`共 ${modelList.length} 个模型${options.type ? ` (${options.type})` : ''}`);
|
|
36
34
|
}
|
|
35
|
+
else {
|
|
36
|
+
outputSuccess({
|
|
37
|
+
models: modelList,
|
|
38
|
+
total: modelList.length,
|
|
39
|
+
type: options.type || null,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
37
42
|
}
|
|
38
43
|
catch (err) {
|
|
39
|
-
|
|
40
|
-
process.exit(1);
|
|
44
|
+
outputError('MODEL_LIST_FAILED', `获取模型列表失败: ${err}`, options);
|
|
41
45
|
}
|
|
42
46
|
});
|
|
43
47
|
}
|