@optima-chat/comfy-cli 0.4.0 → 0.4.1
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 +92 -6
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/download.d.ts.map +1 -1
- package/dist/commands/download.js +43 -4
- package/dist/commands/download.js.map +1 -1
- package/dist/commands/edit.d.ts.map +1 -1
- package/dist/commands/edit.js +42 -4
- package/dist/commands/edit.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +49 -6
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/interrupt.d.ts.map +1 -1
- package/dist/commands/interrupt.js +29 -2
- package/dist/commands/interrupt.js.map +1 -1
- package/dist/commands/model.d.ts.map +1 -1
- package/dist/commands/model.js +36 -2
- package/dist/commands/model.js.map +1 -1
- package/dist/commands/node.d.ts.map +1 -1
- package/dist/commands/node.js +76 -4
- package/dist/commands/node.js.map +1 -1
- package/dist/commands/queue.d.ts.map +1 -1
- package/dist/commands/queue.js +83 -8
- package/dist/commands/queue.js.map +1 -1
- package/dist/commands/system.d.ts.map +1 -1
- package/dist/commands/system.js +40 -2
- package/dist/commands/system.js.map +1 -1
- package/dist/commands/video.d.ts.map +1 -1
- package/dist/commands/video.js +52 -7
- package/dist/commands/video.js.map +1 -1
- package/dist/commands/workflow.d.ts.map +1 -1
- package/dist/commands/workflow.js +100 -8
- package/dist/commands/workflow.js.map +1 -1
- package/dist/index.js +26 -2
- package/dist/index.js.map +1 -1
- package/dist/utils/helpText.d.ts +15 -0
- package/dist/utils/helpText.d.ts.map +1 -0
- package/dist/utils/helpText.js +37 -0
- package/dist/utils/helpText.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;AAOpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,QAqMrD"}
|
package/dist/commands/config.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { config, getConfig, setConfig, resetConfig } from '../services/config.js';
|
|
2
2
|
import { success, info } from '../utils/logger.js';
|
|
3
3
|
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
4
|
+
import { addEnhancedHelp } from '../utils/helpText.js';
|
|
4
5
|
import Table from 'cli-table3';
|
|
5
6
|
export function registerConfigCommand(program) {
|
|
6
7
|
const configCmd = program
|
|
7
8
|
.command('config')
|
|
8
9
|
.description('配置管理');
|
|
9
10
|
// comfy config set
|
|
10
|
-
configCmd
|
|
11
|
+
const setCmd = configCmd
|
|
11
12
|
.command('set')
|
|
12
|
-
.description('设置配置项')
|
|
13
|
+
.description('设置配置项 - 配置 ComfyUI 服务器地址和其他选项')
|
|
13
14
|
.argument('<key>', '配置键 (server, timeout, autoConnect, outputDir)')
|
|
14
15
|
.argument('<value>', '配置值')
|
|
15
16
|
.action((key, value, options) => {
|
|
@@ -45,10 +46,41 @@ export function registerConfigCommand(program) {
|
|
|
45
46
|
outputError('CONFIG_SET_FAILED', `设置失败: ${err}`, options);
|
|
46
47
|
}
|
|
47
48
|
});
|
|
49
|
+
// Add enhanced help for set command
|
|
50
|
+
addEnhancedHelp(setCmd, {
|
|
51
|
+
examples: [
|
|
52
|
+
'# 设置 ComfyUI 服务器地址（首次必需）',
|
|
53
|
+
'$ comfy config set server http://localhost:8188',
|
|
54
|
+
'',
|
|
55
|
+
'# 设置请求超时时间（毫秒）',
|
|
56
|
+
'$ comfy config set timeout 30000',
|
|
57
|
+
'',
|
|
58
|
+
'# 设置输出目录',
|
|
59
|
+
'$ comfy config set outputDir ./my-outputs',
|
|
60
|
+
],
|
|
61
|
+
outputJson: `{
|
|
62
|
+
"success": true,
|
|
63
|
+
"data": {
|
|
64
|
+
"message": "配置已更新",
|
|
65
|
+
"key": "server",
|
|
66
|
+
"value": "http://localhost:8188"
|
|
67
|
+
}
|
|
68
|
+
}`,
|
|
69
|
+
relatedCommands: [
|
|
70
|
+
{ command: 'config list', description: '查看当前配置' },
|
|
71
|
+
{ command: 'config reset --confirm', description: '重置为默认配置' },
|
|
72
|
+
],
|
|
73
|
+
notes: [
|
|
74
|
+
'可用配置键: server, timeout, autoConnect, outputDir',
|
|
75
|
+
'server: ComfyUI 服务器地址（必需）',
|
|
76
|
+
'timeout: 请求超时时间（毫秒，默认 30000）',
|
|
77
|
+
'outputDir: 下载输出文件的目录（默认 ./output）',
|
|
78
|
+
],
|
|
79
|
+
});
|
|
48
80
|
// comfy config list
|
|
49
|
-
configCmd
|
|
81
|
+
const listCmd = configCmd
|
|
50
82
|
.command('list')
|
|
51
|
-
.description('查看当前配置')
|
|
83
|
+
.description('查看当前配置 - 显示所有配置项和配置文件路径')
|
|
52
84
|
.action((options) => {
|
|
53
85
|
const pretty = isPrettyMode(options);
|
|
54
86
|
try {
|
|
@@ -73,10 +105,41 @@ export function registerConfigCommand(program) {
|
|
|
73
105
|
outputError('CONFIG_LIST_FAILED', `获取配置失败: ${err}`, options);
|
|
74
106
|
}
|
|
75
107
|
});
|
|
108
|
+
// Add enhanced help for list command
|
|
109
|
+
addEnhancedHelp(listCmd, {
|
|
110
|
+
examples: [
|
|
111
|
+
'# 查看当前配置',
|
|
112
|
+
'$ comfy config list',
|
|
113
|
+
'',
|
|
114
|
+
'# Pretty 模式',
|
|
115
|
+
'$ comfy config list --pretty',
|
|
116
|
+
],
|
|
117
|
+
outputJson: `{
|
|
118
|
+
"success": true,
|
|
119
|
+
"data": {
|
|
120
|
+
"config": {
|
|
121
|
+
"server": "http://localhost:8188",
|
|
122
|
+
"timeout": 30000,
|
|
123
|
+
"autoConnect": true,
|
|
124
|
+
"outputDir": "./output"
|
|
125
|
+
},
|
|
126
|
+
"config_path": "/Users/username/.comfy-cli/config.json"
|
|
127
|
+
}
|
|
128
|
+
}`,
|
|
129
|
+
relatedCommands: [
|
|
130
|
+
{ command: 'config set <key> <value>', description: '设置配置项' },
|
|
131
|
+
{ command: 'config reset --confirm', description: '重置配置' },
|
|
132
|
+
],
|
|
133
|
+
notes: [
|
|
134
|
+
'显示所有配置项的当前值',
|
|
135
|
+
'包含配置文件的完整路径',
|
|
136
|
+
'配置文件存储在用户主目录的 .comfy-cli 文件夹中',
|
|
137
|
+
],
|
|
138
|
+
});
|
|
76
139
|
// comfy config reset
|
|
77
|
-
configCmd
|
|
140
|
+
const resetCmd = configCmd
|
|
78
141
|
.command('reset')
|
|
79
|
-
.description('重置为默认配置')
|
|
142
|
+
.description('重置为默认配置 - 将所有配置恢复为默认值（需要确认）')
|
|
80
143
|
.option('--confirm', '确认重置')
|
|
81
144
|
.action((options) => {
|
|
82
145
|
const pretty = isPrettyMode(options);
|
|
@@ -98,5 +161,28 @@ export function registerConfigCommand(program) {
|
|
|
98
161
|
outputError('CONFIG_RESET_FAILED', `重置失败: ${err}`, options);
|
|
99
162
|
}
|
|
100
163
|
});
|
|
164
|
+
// Add enhanced help for reset command
|
|
165
|
+
addEnhancedHelp(resetCmd, {
|
|
166
|
+
examples: [
|
|
167
|
+
'# 重置配置为默认值（需要 --confirm）',
|
|
168
|
+
'$ comfy config reset --confirm',
|
|
169
|
+
],
|
|
170
|
+
outputJson: `{
|
|
171
|
+
"success": true,
|
|
172
|
+
"data": {
|
|
173
|
+
"message": "配置已重置为默认值"
|
|
174
|
+
}
|
|
175
|
+
}`,
|
|
176
|
+
relatedCommands: [
|
|
177
|
+
{ command: 'config list', description: '查看当前配置' },
|
|
178
|
+
{ command: 'config set <key> <value>', description: '设置配置项' },
|
|
179
|
+
],
|
|
180
|
+
notes: [
|
|
181
|
+
'必须使用 --confirm 选项才能执行',
|
|
182
|
+
'会清除所有自定义配置',
|
|
183
|
+
'默认值: server=http://localhost:8188, timeout=30000',
|
|
184
|
+
'此操作不可撤销',
|
|
185
|
+
],
|
|
186
|
+
});
|
|
101
187
|
}
|
|
102
188
|
//# sourceMappingURL=config.js.map
|
|
@@ -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,EAAS,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,MAAM,SAAS,GAAG,OAAO;SACtB,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,MAAM,CAAC,CAAC;IAEvB,mBAAmB;IACnB,SAAS;
|
|
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;AASpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QAyKvD"}
|
|
@@ -4,12 +4,13 @@ import ora from 'ora';
|
|
|
4
4
|
import { ComfyAPIClient } from '../services/api.js';
|
|
5
5
|
import { success, error } from '../utils/logger.js';
|
|
6
6
|
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
7
|
+
import { addEnhancedHelp } from '../utils/helpText.js';
|
|
7
8
|
export function registerDownloadCommand(program) {
|
|
8
|
-
program
|
|
9
|
+
const cmd = program
|
|
9
10
|
.command('download')
|
|
10
|
-
.description('下载生成的图像或视频')
|
|
11
|
-
.argument('<prompt_id>', 'Prompt ID')
|
|
12
|
-
.option('-o, --output <path>', '
|
|
11
|
+
.description('下载生成的图像或视频 - 根据 Prompt ID 下载 ComfyUI 生成的文件')
|
|
12
|
+
.argument('<prompt_id>', 'Prompt ID（从 generate/edit/video 命令获取）')
|
|
13
|
+
.option('-o, --output <path>', '输出文件路径或目录')
|
|
13
14
|
.action(async (promptId, options) => {
|
|
14
15
|
const pretty = isPrettyMode(options);
|
|
15
16
|
try {
|
|
@@ -126,5 +127,43 @@ export function registerDownloadCommand(program) {
|
|
|
126
127
|
outputError('DOWNLOAD_FAILED', `下载失败: ${err}`, options);
|
|
127
128
|
}
|
|
128
129
|
});
|
|
130
|
+
// Add enhanced help text
|
|
131
|
+
addEnhancedHelp(cmd, {
|
|
132
|
+
examples: [
|
|
133
|
+
'# 下载生成的图像（默认 JSON 输出）',
|
|
134
|
+
'$ comfy download abc-123-def',
|
|
135
|
+
'',
|
|
136
|
+
'# 指定输出路径',
|
|
137
|
+
'$ comfy download abc-123-def -o my-image.png',
|
|
138
|
+
'',
|
|
139
|
+
'# 指定输出目录（多文件时）',
|
|
140
|
+
'$ comfy download abc-123-def -o ./images/',
|
|
141
|
+
'',
|
|
142
|
+
'# Pretty 模式（显示下载进度）',
|
|
143
|
+
'$ comfy download abc-123-def --pretty',
|
|
144
|
+
],
|
|
145
|
+
outputJson: `{
|
|
146
|
+
"success": true,
|
|
147
|
+
"data": {
|
|
148
|
+
"prompt_id": "abc-123-def",
|
|
149
|
+
"files": [
|
|
150
|
+
"output/comfy-cli_00001_.png"
|
|
151
|
+
],
|
|
152
|
+
"total": 1
|
|
153
|
+
}
|
|
154
|
+
}`,
|
|
155
|
+
relatedCommands: [
|
|
156
|
+
{ command: 'generate <prompt>', description: '生成图像获取 prompt_id' },
|
|
157
|
+
{ command: 'workflow list', description: '查看历史 prompt_id' },
|
|
158
|
+
{ command: 'workflow get <id>', description: '查看工作流详情' },
|
|
159
|
+
],
|
|
160
|
+
notes: [
|
|
161
|
+
'Prompt ID 从 generate/edit/video 命令的输出中获取',
|
|
162
|
+
'默认保存到 ./output 目录',
|
|
163
|
+
'单文件时 -o 指定文件路径，多文件时 -o 指定目录',
|
|
164
|
+
'文件名保持 ComfyUI 原始命名',
|
|
165
|
+
'如果找不到文件，可能任务还在执行中',
|
|
166
|
+
],
|
|
167
|
+
});
|
|
129
168
|
}
|
|
130
169
|
//# sourceMappingURL=download.js.map
|
|
@@ -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;AAC1D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
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;AAC1D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,MAAM,GAAG,GAAG,OAAO;SAChB,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,4CAA4C,CAAC;SACzD,QAAQ,CAAC,aAAa,EAAE,uCAAuC,CAAC;SAChE,MAAM,CAAC,qBAAqB,EAAE,WAAW,CAAC;SAC1C,MAAM,CAAC,KAAK,EAAE,QAAgB,EAAE,OAAO,EAAE,EAAE;QAC1C,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAErC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YAEpC,WAAW;YACX,IAAI,KAAK,CAAC;YACV,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC;gBAC3C,KAAK,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACxB,WAAW,CAAC,iBAAiB,EAAE,cAAc,QAAQ,WAAW,EAAE,OAAO,CAAC,CAAC;gBAC7E,CAAC;gBAED,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,MAAM,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,WAAW,CAAC,iBAAiB,EAAE,cAAc,QAAQ,WAAW,EAAE,OAAO,CAAC,CAAC;gBAC7E,CAAC;YACH,CAAC;YAED,MAAM,eAAe,GAAa,EAAE,CAAC;YAErC,SAAS;YACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAEtB,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;oBAEzF,IAAI,CAAC;wBACH,OAAO;wBACP,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;wBAEpF,SAAS;wBACT,IAAI,UAAkB,CAAC;wBACvB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;4BACnB,YAAY;4BACZ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gCACvB,kBAAkB;gCAClB,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;4BAC9B,CAAC;iCAAM,CAAC;gCACN,iBAAiB;gCACjB,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;gCAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oCACxB,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gCACzC,CAAC;gCACD,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAC7C,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,oBAAoB;4BACpB,MAAM,SAAS,GAAG,UAAU,CAAC;4BAC7B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gCAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;4BAC/C,CAAC;4BACD,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;wBACnD,CAAC;wBAED,WAAW;wBACX,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;wBAC3C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;4BAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC/C,CAAC;wBAED,OAAO;wBACP,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;wBAErC,eAAe,CAAC,OAAO,CAAC,QAAQ,UAAU,EAAE,CAAC,CAAC;wBAC9C,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACnC,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,eAAe,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAC/C,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;oBACtB,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,qBAAqB;oBACrB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBAEpF,IAAI,UAAkB,CAAC;oBACvB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;wBACnB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BACvB,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;wBAC9B,CAAC;6BAAM,CAAC;4BACN,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;4BAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gCACxB,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;4BACzC,CAAC;4BACD,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;wBAC7C,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,MAAM,SAAS,GAAG,UAAU,CAAC;wBAC7B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;4BAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC/C,CAAC;wBACD,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACnD,CAAC;oBAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;oBAC3C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;wBAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/C,CAAC;oBAED,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;oBACrC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;YAED,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,CAAC,UAAU,KAAK,CAAC,MAAM,MAAM,CAAC,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC;oBACZ,SAAS,EAAE,QAAQ;oBACnB,KAAK,EAAE,eAAe;oBACtB,KAAK,EAAE,eAAe,CAAC,MAAM;iBAC9B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,WAAW,CAAC,iBAAiB,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,yBAAyB;IACzB,eAAe,CAAC,GAAG,EAAE;QACnB,QAAQ,EAAE;YACR,uBAAuB;YACvB,8BAA8B;YAC9B,EAAE;YACF,UAAU;YACV,8CAA8C;YAC9C,EAAE;YACF,gBAAgB;YAChB,2CAA2C;YAC3C,EAAE;YACF,qBAAqB;YACrB,uCAAuC;SACxC;QACD,UAAU,EAAE;;;;;;;;;EASd;QACE,eAAe,EAAE;YACf,EAAE,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,kBAAkB,EAAE;YACjE,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE;YAC3D,EAAE,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,SAAS,EAAE;SACzD;QACD,KAAK,EAAE;YACL,0CAA0C;YAC1C,mBAAmB;YACnB,6BAA6B;YAC7B,oBAAoB;YACpB,mBAAmB;SACpB;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -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;AAWpC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,QAyJnD"}
|
package/dist/commands/edit.js
CHANGED
|
@@ -5,15 +5,16 @@ import { ComfyAPIClient } from '../services/api.js';
|
|
|
5
5
|
import { loadWorkflow, getBuiltinWorkflowPath, replaceVariables } from '../utils/workflow.js';
|
|
6
6
|
import { success, info } from '../utils/logger.js';
|
|
7
7
|
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
8
|
+
import { addEnhancedHelp } from '../utils/helpText.js';
|
|
8
9
|
import { monitorProgress } from '../services/websocket.js';
|
|
9
10
|
export function registerEditCommand(program) {
|
|
10
|
-
program
|
|
11
|
+
const cmd = program
|
|
11
12
|
.command('edit')
|
|
12
|
-
.description('
|
|
13
|
+
.description('编辑图像（图生图）- 使用 FLUX 模型对现有图像进行编辑和修改')
|
|
13
14
|
.argument('<image>', '输入图像路径')
|
|
14
15
|
.argument('<prompt>', '编辑描述提示词')
|
|
15
|
-
.option('-o, --output <dir>', '输出目录', './output')
|
|
16
|
-
.option('--no-wait', '
|
|
16
|
+
.option('-o, --output <dir>', '输出目录 (默认: ./output)', './output')
|
|
17
|
+
.option('--no-wait', '提交任务后立即返回，不等待编辑完成')
|
|
17
18
|
.action(async (image, prompt, options) => {
|
|
18
19
|
const pretty = isPrettyMode(options);
|
|
19
20
|
try {
|
|
@@ -113,5 +114,42 @@ export function registerEditCommand(program) {
|
|
|
113
114
|
outputError('EDIT_FAILED', `编辑失败: ${err}`, options);
|
|
114
115
|
}
|
|
115
116
|
});
|
|
117
|
+
// Add enhanced help text
|
|
118
|
+
addEnhancedHelp(cmd, {
|
|
119
|
+
examples: [
|
|
120
|
+
'# 基础用法：编辑图像',
|
|
121
|
+
'$ comfy edit input.png "make it more colorful"',
|
|
122
|
+
'',
|
|
123
|
+
'# 添加元素到图像',
|
|
124
|
+
'$ comfy edit photo.jpg "add a rainbow in the sky"',
|
|
125
|
+
'',
|
|
126
|
+
'# 不等待完成（立即返回）',
|
|
127
|
+
'$ comfy edit image.png "remove background" --no-wait',
|
|
128
|
+
'',
|
|
129
|
+
'# Pretty 模式',
|
|
130
|
+
'$ comfy edit cat.png "add a hat" --pretty',
|
|
131
|
+
],
|
|
132
|
+
outputJson: `{
|
|
133
|
+
"success": true,
|
|
134
|
+
"data": {
|
|
135
|
+
"prompt_id": "abc-123-def",
|
|
136
|
+
"image": "input.png",
|
|
137
|
+
"prompt": "make it more colorful",
|
|
138
|
+
"status": "submitted_waiting"
|
|
139
|
+
}
|
|
140
|
+
}`,
|
|
141
|
+
relatedCommands: [
|
|
142
|
+
{ command: 'download <prompt_id>', description: '下载编辑后的图像' },
|
|
143
|
+
{ command: 'generate <prompt>', description: '从文本生成新图像' },
|
|
144
|
+
{ command: 'video <image>', description: '将图像转换为视频' },
|
|
145
|
+
],
|
|
146
|
+
notes: [
|
|
147
|
+
'图像会先上传到 ComfyUI 服务器',
|
|
148
|
+
'默认使用 FLUX 图生图模型',
|
|
149
|
+
'支持常见图像格式：PNG, JPG, JPEG',
|
|
150
|
+
'编辑完成后使用 "comfy download <prompt_id>" 下载结果',
|
|
151
|
+
'默认输出 JSON 格式，使用 --pretty 可显示上传和生成进度',
|
|
152
|
+
],
|
|
153
|
+
});
|
|
116
154
|
}
|
|
117
155
|
//# sourceMappingURL=edit.js.map
|
|
@@ -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,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;
|
|
1
|
+
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/commands/edit.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAUpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QAsIvD"}
|
|
@@ -4,15 +4,16 @@ import { loadWorkflow, getBuiltinWorkflowPath, replaceVariables } from '../utils
|
|
|
4
4
|
import { success, info } from '../utils/logger.js';
|
|
5
5
|
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
6
6
|
import { monitorProgress } from '../services/websocket.js';
|
|
7
|
+
import { addEnhancedHelp } from '../utils/helpText.js';
|
|
7
8
|
export function registerGenerateCommand(program) {
|
|
8
|
-
program
|
|
9
|
+
const cmd = program
|
|
9
10
|
.command('generate')
|
|
10
|
-
.description('
|
|
11
|
+
.description('生成图像（文生图）- 使用 FLUX 模型从文本生成高质量图像')
|
|
11
12
|
.argument('<prompt>', '图像描述提示词')
|
|
12
|
-
.option('-o, --output <dir>', '输出目录', './output')
|
|
13
|
-
.option('--width <number>', '图像宽度', '1024')
|
|
14
|
-
.option('--height <number>', '图像高度', '1024')
|
|
15
|
-
.option('--no-wait', '
|
|
13
|
+
.option('-o, --output <dir>', '输出目录 (默认: ./output)', './output')
|
|
14
|
+
.option('--width <number>', '图像宽度 (默认: 1024)', '1024')
|
|
15
|
+
.option('--height <number>', '图像高度 (默认: 1024)', '1024')
|
|
16
|
+
.option('--no-wait', '提交任务后立即返回，不等待生成完成')
|
|
16
17
|
.action(async (prompt, options) => {
|
|
17
18
|
const pretty = isPrettyMode(options);
|
|
18
19
|
try {
|
|
@@ -88,5 +89,47 @@ export function registerGenerateCommand(program) {
|
|
|
88
89
|
outputError('GENERATE_FAILED', `生成失败: ${err}`, options);
|
|
89
90
|
}
|
|
90
91
|
});
|
|
92
|
+
// Add enhanced help text
|
|
93
|
+
addEnhancedHelp(cmd, {
|
|
94
|
+
examples: [
|
|
95
|
+
'# 基础用法：生成图像（默认 JSON 输出）',
|
|
96
|
+
'$ comfy generate "a beautiful sunset over mountains"',
|
|
97
|
+
'',
|
|
98
|
+
'# 生成图像并等待完成',
|
|
99
|
+
'$ comfy generate "a cat wearing a hat"',
|
|
100
|
+
'',
|
|
101
|
+
'# 生成图像但不等待（立即返回 prompt_id）',
|
|
102
|
+
'$ comfy generate "a dog" --no-wait',
|
|
103
|
+
'',
|
|
104
|
+
'# 指定图像尺寸',
|
|
105
|
+
'$ comfy generate "a landscape" --width 1920 --height 1080',
|
|
106
|
+
'',
|
|
107
|
+
'# Pretty 模式（人类可读）',
|
|
108
|
+
'$ comfy generate "a sunset" --pretty',
|
|
109
|
+
],
|
|
110
|
+
outputJson: `{
|
|
111
|
+
"success": true,
|
|
112
|
+
"data": {
|
|
113
|
+
"prompt_id": "abc-123-def",
|
|
114
|
+
"prompt": "a beautiful sunset",
|
|
115
|
+
"width": 1024,
|
|
116
|
+
"height": 1024,
|
|
117
|
+
"status": "submitted_waiting"
|
|
118
|
+
}
|
|
119
|
+
}`,
|
|
120
|
+
relatedCommands: [
|
|
121
|
+
{ command: 'download <prompt_id>', description: '下载生成的图像' },
|
|
122
|
+
{ command: 'workflow list', description: '查看生成历史' },
|
|
123
|
+
{ command: 'queue status', description: '查看队列状态' },
|
|
124
|
+
{ command: 'edit <image> <prompt>', description: '编辑已有图像' },
|
|
125
|
+
],
|
|
126
|
+
notes: [
|
|
127
|
+
'默认使用 FLUX1-dev-fp8 模型，生成高质量图像',
|
|
128
|
+
'默认会等待生成完成，使用 --no-wait 可立即返回',
|
|
129
|
+
'生成完成后使用 "comfy download <prompt_id>" 下载图像',
|
|
130
|
+
'图像默认保存到 ./output 目录',
|
|
131
|
+
'默认输出 JSON 格式，使用 --pretty 可显示进度条',
|
|
132
|
+
],
|
|
133
|
+
});
|
|
91
134
|
}
|
|
92
135
|
//# sourceMappingURL=generate.js.map
|
|
@@ -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,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;
|
|
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;AAMpC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,QAiDxD"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { ComfyAPIClient } from '../services/api.js';
|
|
2
2
|
import { success } from '../utils/logger.js';
|
|
3
3
|
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
4
|
+
import { addEnhancedHelp } from '../utils/helpText.js';
|
|
4
5
|
export function registerInterruptCommand(program) {
|
|
5
|
-
program
|
|
6
|
+
const cmd = program
|
|
6
7
|
.command('interrupt')
|
|
7
|
-
.description('中断当前执行')
|
|
8
|
+
.description('中断当前执行 - 立即停止 ComfyUI 当前正在执行的任务')
|
|
8
9
|
.action(async (options) => {
|
|
9
10
|
const pretty = isPrettyMode(options);
|
|
10
11
|
try {
|
|
@@ -23,5 +24,31 @@ export function registerInterruptCommand(program) {
|
|
|
23
24
|
outputError('INTERRUPT_FAILED', `中断失败: ${err}`, options);
|
|
24
25
|
}
|
|
25
26
|
});
|
|
27
|
+
// Add enhanced help for interrupt command
|
|
28
|
+
addEnhancedHelp(cmd, {
|
|
29
|
+
examples: [
|
|
30
|
+
'# 中断当前执行的任务',
|
|
31
|
+
'$ comfy interrupt',
|
|
32
|
+
'',
|
|
33
|
+
'# Pretty 模式',
|
|
34
|
+
'$ comfy interrupt --pretty',
|
|
35
|
+
],
|
|
36
|
+
outputJson: `{
|
|
37
|
+
"success": true,
|
|
38
|
+
"data": {
|
|
39
|
+
"message": "已发送中断信号"
|
|
40
|
+
}
|
|
41
|
+
}`,
|
|
42
|
+
relatedCommands: [
|
|
43
|
+
{ command: 'queue status', description: '查看队列状态' },
|
|
44
|
+
{ command: 'queue clear --confirm', description: '清空等待队列' },
|
|
45
|
+
{ command: 'queue delete <id>', description: '删除队列中的任务' },
|
|
46
|
+
],
|
|
47
|
+
notes: [
|
|
48
|
+
'立即停止当前正在执行的任务',
|
|
49
|
+
'只影响正在执行的任务，不影响队列中等待的任务',
|
|
50
|
+
'若要清空队列，使用 queue clear 命令',
|
|
51
|
+
],
|
|
52
|
+
});
|
|
26
53
|
}
|
|
27
54
|
//# sourceMappingURL=interrupt.js.map
|
|
@@ -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,EAAS,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
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;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,UAAU,wBAAwB,CAAC,OAAgB;IACvD,MAAM,GAAG,GAAG,OAAO;SAChB,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,iCAAiC,CAAC;SAC9C,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;IAEL,0CAA0C;IAC1C,eAAe,CAAC,GAAG,EAAE;QACnB,QAAQ,EAAE;YACR,aAAa;YACb,mBAAmB;YACnB,EAAE;YACF,aAAa;YACb,4BAA4B;SAC7B;QACD,UAAU,EAAE;;;;;EAKd;QACE,eAAe,EAAE;YACf,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE;YAClD,EAAE,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,QAAQ,EAAE;YAC3D,EAAE,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,UAAU,EAAE;SAC1D;QACD,KAAK,EAAE;YACL,eAAe;YACf,wBAAwB;YACxB,0BAA0B;SAC3B;KACF,CAAC,CAAC;AACL,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;AAOpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAiFpD"}
|
package/dist/commands/model.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { ComfyAPIClient } from '../services/api.js';
|
|
2
2
|
import { info } from '../utils/logger.js';
|
|
3
3
|
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
4
|
+
import { addEnhancedHelp } from '../utils/helpText.js';
|
|
4
5
|
import Table from 'cli-table3';
|
|
5
6
|
export function registerModelCommand(program) {
|
|
6
7
|
const modelCmd = program
|
|
7
8
|
.command('model')
|
|
8
9
|
.description('模型管理');
|
|
9
10
|
// comfy model list
|
|
10
|
-
modelCmd
|
|
11
|
+
const listCmd = modelCmd
|
|
11
12
|
.command('list')
|
|
12
|
-
.description('列出可用模型')
|
|
13
|
+
.description('列出可用模型 - 查看 ComfyUI 服务器上已安装的所有模型')
|
|
13
14
|
.option('--type <type>', '模型类型 (checkpoints, loras, vae, etc.)')
|
|
14
15
|
.action(async (options) => {
|
|
15
16
|
const pretty = isPrettyMode(options);
|
|
@@ -44,5 +45,38 @@ export function registerModelCommand(program) {
|
|
|
44
45
|
outputError('MODEL_LIST_FAILED', `获取模型列表失败: ${err}`, options);
|
|
45
46
|
}
|
|
46
47
|
});
|
|
48
|
+
// Add enhanced help for list command
|
|
49
|
+
addEnhancedHelp(listCmd, {
|
|
50
|
+
examples: [
|
|
51
|
+
'# 列出所有模型（JSON 模式）',
|
|
52
|
+
'$ comfy model list',
|
|
53
|
+
'',
|
|
54
|
+
'# 列出指定类型的模型',
|
|
55
|
+
'$ comfy model list --type checkpoints',
|
|
56
|
+
'',
|
|
57
|
+
'# Pretty 模式',
|
|
58
|
+
'$ comfy model list --pretty',
|
|
59
|
+
],
|
|
60
|
+
outputJson: `{
|
|
61
|
+
"success": true,
|
|
62
|
+
"data": {
|
|
63
|
+
"models": [
|
|
64
|
+
"flux1-dev-kontext_fp8_scaled.safetensors",
|
|
65
|
+
"wan2.1_i2v_720p_14B_fp8_scaled.safetensors"
|
|
66
|
+
],
|
|
67
|
+
"total": 2,
|
|
68
|
+
"type": null
|
|
69
|
+
}
|
|
70
|
+
}`,
|
|
71
|
+
relatedCommands: [
|
|
72
|
+
{ command: 'node list', description: '列出所有节点类型' },
|
|
73
|
+
{ command: 'system stats', description: '查看系统信息' },
|
|
74
|
+
],
|
|
75
|
+
notes: [
|
|
76
|
+
'返回 ComfyUI 服务器上已安装的模型列表',
|
|
77
|
+
'可通过 --type 参数过滤特定类型',
|
|
78
|
+
'常见类型: checkpoints, loras, vae, upscale_models, embeddings',
|
|
79
|
+
],
|
|
80
|
+
});
|
|
47
81
|
}
|
|
48
82
|
//# sourceMappingURL=model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/commands/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAS,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,MAAM,UAAU,oBAAoB,CAAC,OAAgB;IACnD,MAAM,QAAQ,GAAG,OAAO;SACrB,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,MAAM,CAAC,CAAC;IAEvB,mBAAmB;IACnB,QAAQ;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/commands/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/commands/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/commands/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,QAwJnD"}
|