genlab 0.1.1 → 0.1.2

package/dist/cli.mjs

@@ -18,7 +18,7 @@ import { execFile } from "node:child_process";
 import { parseEnv, promisify } from "node:util";
 import * as p from "@clack/prompts";
 // package.json
-var version = "0.1.1";
+var version = "0.1.2";
 // src/errors.ts
 /** 面向使用者的预期错误：只输出 message，不带堆栈。 */
 var CliError = class extends Error {
@@ -656,42 +656,10 @@ async function claimAssetDir(project, location) {
 		throw error;
 	}
 }
-// src/generation/state.ts
-/** 一个 kie 任务对应的版本里，积分只记在结果序号 0 上，避免重复计量。 */
-function creditsFor(version, credits) {
-	return (version.resultIndex ?? 0) === 0 ? credits : null;
-}
-function failVersion(record, number, reason, task = {
-	credits: null,
-	kieRecord: null
-}) {
-	const version = record.versions.find((item) => item.number === number);
-	if (!version || version.state !== "generating") return;
-	version.state = "failed";
-	version.failReason = reason;
-	version.credits = creditsFor(version, task.credits);
-	version.kieRecord = task.kieRecord;
-	version.updatedAt = now();
-	if (record.currentVersion === number) {
-		const next = nextCurrentAfterFailure(record.versions, version);
-		if (next != null) record.currentVersion = next;
-	}
-}
-function fulfillVersion(record, number, product, task) {
-	const version = record.versions.find((item) => item.number === number);
-	if (!version || version.state !== "generating") return;
-	Object.assign(version, product, {
-		state: "ready",
-		failReason: null,
-		credits: creditsFor(version, task.credits),
-		kieRecord: task.kieRecord,
-		updatedAt: now()
-	});
-}
 // src/generation/submit.ts
 /**
-* 发起生成：先按模型的 schema 完成校验，再落记录（版本壳为生成中），最后上传文件、
-* 向 kie 下单并回填任务编号。下单失败的版本直接标失败，可重试。
+* 发起生成：按模型的 schema 校验，上传文件并向 kie 下单，拿到任务编号后才写进记录。
+* 记录里生成中的版本因此都有任务编号；下单失败直接报错，不留下版本。
 */
 const defaultDeps$1 = {
 	upload: uploadKieFile,
@@ -699,13 +667,30 @@ const defaultDeps$1 = {
 };
 /** 一次生成最多并列几个 kie 任务。 */
 const MAX_TASKS = 10;
-/** 新建素材并发起第一次生成；返回新版本号。 */
+/** 新建素材并发起第一次生成；新素材的当前版本取版本号最靠前的版本。 */
 async function createAsset(project, location, options, deps = defaultDeps$1) {
 	const plan = await planGeneration(options, null);
+	const references = await inspectReferences(project.root, plan.input);
 	await claimAssetDir(project, location);
-	let created;
 	try {
-		created = await writeNewAsset(project, location, plan);
+		const orders = await placeOrders(plan.model.model, plan.input, null, plan.tasks, deps);
+		const record = {
+			schema: 1,
+			id: randomUUID(),
+			kind: plan.model.kind,
+			currentVersion: 0,
+			createdAt: now(),
+			generations: [],
+			versions: []
+		};
+		const id = nextGenerationId(record.generations);
+		const versions = appendGeneration(record, id, plan, await copyReferences(location.dir, id, references), orders);
+		record.currentVersion = versions[0];
+		await writeFile(assetFile(location.dir), `${JSON.stringify(record, null, 2)}\n`, { flag: "wx" });
+		return {
+			versions,
+			errors: orders.errors
+		};
 	} catch (error) {
 		await rm(location.dir, {
 			recursive: true,
@@ -713,8 +698,6 @@ async function createAsset(project, location, options, deps = defaultDeps$1) {
 		});
 		throw error;
 	}
-	await dispatch(location.dir, created.generation, created.versions, deps);
-	return created.versions;
 }
 /**
 * 在已有素材里发起生成。from 指定时沿用该版本的模型与 input（重新生成），`-p` 给出的
@@ -745,27 +728,30 @@ async function editVersion(project, location, sourceVersion, options, deps = def
 		model: options.model ?? findGeneration(record, source.generation)?.model
 	}, sourceVersion), deps);
 }
-/** 原地重试失败的版本：沿用它那次生成的输入发一个新任务，版本号不变。 */
+/** 原地重试失败的版本：沿用它那次生成的输入下一个新任务，下单成功后版本才回到生成中。 */
 async function retryVersion(location, number, deps = defaultDeps$1) {
 	const record = await readAsset(location.dir);
 	const version = findVersion(record, number);
 	const generation = findGeneration(record, version.generation);
 	if (version.state !== "failed") throw new CliError("只有失败的版本可以重试");
 	if (!generation) throw new CliError(`v${number} 不是生成产物，无法重试`);
+	const orders = await placeOrders(generation.model, absoluteTemplate(location.dir, generation.input), sourceFile(location, record, generation.sourceVersion), 1, deps);
 	await updateAsset(location.dir, (latest) => {
 		Object.assign(findVersion(latest, number), {
 			state: "generating",
 			resultIndex: 0,
-			failReason: null,
-			taskId: null,
-			kieRequest: null,
+			taskId: orders.taskIds[0],
+			kieRequest: orders.request,
 			kieRecord: null,
+			failReason: null,
 			credits: null,
 			updatedAt: now()
 		});
 	});
-	await dispatch(location.dir, generation, [number], deps);
-	return [number];
+	return {
+		versions: [number],
+		errors: []
+	};
 }
 /**
 * 解析 `-p` 并与沿用的 input 合并，按模型 schema 校验（值类型就地转换）。
@@ -805,30 +791,19 @@ function isLocalFile(text) {
 async function appendAndDispatch(project, location, record, plan, deps) {
 	if (plan.model.kind !== record.kind) throw new CliError(`模型 ${plan.model.model} 生成 ${plan.model.kind}，与素材类型 ${record.kind} 不符`);
 	const references = await inspectReferences(project.root, plan.input);
-	const { generation, versions } = await updateAsset(location.dir, async (latest) => {
-		const id = nextGenerationId(latest.generations);
-		return appendGeneration(latest, id, plan, await copyReferences(location.dir, id, references));
-	});
-	await dispatch(location.dir, generation, versions, deps);
-	return versions;
-}
-/** 写入新素材的记录与参考输入副本；新素材的当前版本取版本号最靠前的版本壳。 */
-async function writeNewAsset(project, location, plan) {
-	const references = await inspectReferences(project.root, plan.input);
-	const record = {
-		schema: 1,
-		id: randomUUID(),
-		kind: plan.model.kind,
-		currentVersion: 0,
-		createdAt: now(),
-		generations: [],
-		versions: []
+	const orders = await placeOrders(plan.model.model, plan.input, sourceFile(location, record, plan.sourceVersion), plan.tasks, deps);
+	return {
+		versions: await updateAsset(location.dir, async (latest) => {
+			const id = nextGenerationId(latest.generations);
+			return appendGeneration(latest, id, plan, await copyReferences(location.dir, id, references), orders);
+		}),
+		errors: orders.errors
 	};
-	const id = nextGenerationId(record.generations);
-	const appended = appendGeneration(record, id, plan, await copyReferences(location.dir, id, references));
-	record.currentVersion = appended.versions[0];
-	await writeFile(assetFile(location.dir), `${JSON.stringify(record, null, 2)}\n`, { flag: "wx" });
-	return appended;
+}
+/** 源版本产物的绝对路径；没有源版本时为 null。 */
+function sourceFile(location, record, sourceVersion) {
+	const file = sourceVersion == null ? null : findVersion(record, sourceVersion).file;
+	return file ? path.join(location.dir, file) : null;
 }
 /** input 引用的本机文件：识别类型；位于库内某个版本产物时记下出处。 */
 async function inspectReferences(root, input) {
@@ -877,21 +852,12 @@ async function copyReferences(dir, generationId, references) {
 	}
 	return records;
 }
-/** 追加一次生成与它的版本壳（每个任务一个，就地修改 record）；返回新版本号。 */
-function appendGeneration(record, id, plan, references) {
+/** 追加一次生成与它的版本（每个 kie 接受的任务一个，就地修改 record）；返回新版本号。 */
+function appendGeneration(record, id, plan, references, orders) {
 	const timestamp = now();
 	const copies = new Map(references.map((reference) => [reference.source, reference.file]));
-	const generation = {
-		id,
-		model: plan.model.model,
-		input: mapStrings(plan.input, (text) => isLocalFile(text) && copies.has(text.slice(1)) ? `@${copies.get(text.slice(1))}` : text),
-		references: references.map(({ source: _source, ...reference }) => reference),
-		sourceVersion: plan.sourceVersion,
-		createdAt: timestamp
-	};
 	const base = nextVersionNumber(record.versions);
-	const versions = [];
-	for (let position = 0; position < plan.tasks; position++) {
+	const versions = orders.taskIds.map((taskId, position) => {
 		const number = base + position;
 		record.versions.push({
 			number,
@@ -901,8 +867,8 @@ function appendGeneration(record, id, plan, references) {
 			position,
 			resultIndex: 0,
 			sourceVersion: plan.sourceVersion,
-			taskId: null,
-			kieRequest: null,
+			taskId,
+			kieRequest: orders.request,
 			kieRecord: null,
 			failReason: null,
 			credits: null,
@@ -916,60 +882,42 @@ function appendGeneration(record, id, plan, references) {
 			createdAt: timestamp,
 			updatedAt: timestamp
 		});
-		versions.push(number);
-	}
-	record.generations.push(generation);
-	return {
-		generation,
-		versions
-	};
+		return number;
+	});
+	record.generations.push({
+		id,
+		model: plan.model.model,
+		input: mapStrings(plan.input, (text) => isLocalFile(text) && copies.has(text.slice(1)) ? `@${copies.get(text.slice(1))}` : text),
+		references: references.map(({ source: _source, ...reference }) => reference),
+		sourceVersion: plan.sourceVersion,
+		createdAt: timestamp
+	});
+	return versions;
 }
 /**
-* 上传 input 引用的文件与源版本换取临时地址（每次下单都重新上传，不保存），每个版本壳
-* 各下一单并回填任务编号。上传或下单失败的版本标失败。
+* 上传 input 引用的文件与源版本换取临时地址（每次下单都重新上传，不保存），再下 count
+* 个任务。全部下单失败时报错；部分失败时返回成功的任务与失败原因。
 */
-async function dispatch(dir, generation, versions, deps) {
-	let task;
-	try {
-		const record = await readAsset(dir);
-		const sourceFile = generation.sourceVersion != null ? findVersion(record, generation.sourceVersion).file : null;
-		const files = new Map(filePaths(generation.input).map((file) => [`@${file}`, path.join(dir, file)]));
-		if (sourceFile && usesSource(generation.input)) files.set(SOURCE_TOKEN, path.join(dir, sourceFile));
-		const urls = new Map(await Promise.all([...files].map(async ([token, file]) => [token, await deps.upload(file)])));
-		task = {
-			model: generation.model,
-			input: resolveTokens(generation.input, (token) => urls.get(token))
-		};
-	} catch (error) {
-		await failVersions(dir, versions, error.message);
-		return;
+async function placeOrders(model, input, source, count, deps) {
+	const files = new Map(filePaths(input).map((file) => [`@${file}`, file]));
+	if (usesSource(input)) {
+		if (!source) throw new CliError("源版本没有产物文件");
+		files.set(SOURCE_TOKEN, source);
 	}
-	await Promise.all(versions.map(async (number) => {
-		let taskId;
-		try {
-			taskId = await deps.createTask(task);
-		} catch (error) {
-			await failVersions(dir, [number], error.message, task);
-			return;
-		}
-		await updateAsset(dir, (record) => {
-			const version = record.versions.find((item) => item.number === number);
-			if (version?.state === "generating") {
-				version.taskId = taskId;
-				version.kieRequest = task;
-				version.updatedAt = now();
-			}
-		});
-	}));
-}
-async function failVersions(dir, numbers, reason, task = null) {
-	await updateAsset(dir, (record) => {
-		for (const number of numbers) {
-			const version = record.versions.find((item) => item.number === number);
-			if (version) version.kieRequest = task;
-			failVersion(record, number, reason);
-		}
-	});
+	const urls = new Map(await Promise.all([...files].map(async ([token, file]) => [token, await deps.upload(file)])));
+	const request = {
+		model,
+		input: resolveTokens(input, (token) => urls.get(token))
+	};
+	const results = await Promise.allSettled(Array.from({ length: count }, () => deps.createTask(request)));
+	const taskIds = results.flatMap((result) => result.status === "fulfilled" ? [result.value] : []);
+	const errors = [...new Set(results.flatMap((result) => result.status === "rejected" ? [result.reason.message] : []))];
+	if (taskIds.length === 0) throw new CliError(errors[0] ?? "下单失败");
+	return {
+		request,
+		taskIds,
+		errors
+	};
 }
 // src/kie/record.ts
 /**
@@ -1022,6 +970,38 @@ function parseResults(resultJson) {
 	}));
 	return [];
 }
+// src/generation/state.ts
+/** 一个 kie 任务对应的版本里，积分只记在结果序号 0 上，避免重复计量。 */
+function creditsFor(version, credits) {
+	return (version.resultIndex ?? 0) === 0 ? credits : null;
+}
+function failVersion(record, number, reason, task = {
+	credits: null,
+	kieRecord: null
+}) {
+	const version = record.versions.find((item) => item.number === number);
+	if (!version || version.state !== "generating") return;
+	version.state = "failed";
+	version.failReason = reason;
+	version.credits = creditsFor(version, task.credits);
+	version.kieRecord = task.kieRecord;
+	version.updatedAt = now();
+	if (record.currentVersion === number) {
+		const next = nextCurrentAfterFailure(record.versions, version);
+		if (next != null) record.currentVersion = next;
+	}
+}
+function fulfillVersion(record, number, product, task) {
+	const version = record.versions.find((item) => item.number === number);
+	if (!version || version.state !== "generating") return;
+	Object.assign(version, product, {
+		state: "ready",
+		failReason: null,
+		credits: creditsFor(version, task.credits),
+		kieRecord: task.kieRecord,
+		updatedAt: now()
+	});
+}
 // src/generation/sync.ts
 /**
 * 向 kie 求证并收取产物：按任务分组，一次 recordInfo 推进同一任务的全部版本。
@@ -1032,8 +1012,6 @@ const defaultDeps = {
 	getRecord: getKieRecord,
 	download: downloadFile
 };
-/** 提交到一半中断（有记录、没任务编号）的版本，超过这个时长按失败处理，可重试。 */
-const STUCK_DISPATCH_MS = 6e5;
 const POLL_INTERVAL_MS = 5e3;
 /** 同步一批素材里所有生成中的版本；返回过程中遇到的问题（不中断其余任务）。 */
 async function syncAssets(assetDirs, deps = defaultDeps) {
@@ -1065,12 +1043,7 @@ async function allSettled(targets) {
 }
 async function syncAsset(dir, deps) {
 	const record = await readAsset(dir);
-	const generating = record.versions.filter((version) => version.state === "generating");
-	const stuck = generating.filter((version) => !version.taskId && Date.now() - Date.parse(version.updatedAt) > STUCK_DISPATCH_MS);
-	if (stuck.length > 0) await updateAsset(dir, (latest) => {
-		for (const version of stuck) if (!latest.versions.find((item) => item.number === version.number)?.taskId) failVersion(latest, version.number, "提交中断，可重试");
-	});
-	const taskIds = [...new Set(generating.map((version) => version.taskId).filter((taskId) => taskId != null))];
+	const taskIds = [...new Set(record.versions.filter((version) => version.state === "generating").map((version) => version.taskId).filter((taskId) => taskId != null))];
 	const warnings = [];
 	for (const taskId of taskIds) try {
 		await syncTask(dir, record, taskId, deps);
@@ -1421,8 +1394,9 @@ function toGenerateOptions(args) {
 		count: args.count
 	};
 }
-/** 按需等待新版本完成，再输出这些版本的状态。 */
-async function finish(project, location, versions, options) {
+/** 部分下单失败的原因作为警告输出；按需等待新版本完成，再输出这些版本的状态。 */
+async function finish(project, location, { versions, errors }, options) {
+	errors.forEach((error) => warn(`部分任务下单失败：${error}`));
 	if (options.wait) {
 		const { warnings } = await waitForVersions([{
 			dir: location.dir,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "genlab",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "给本地 agent 用的 AI 媒体生成命令行工具（kie.ai），产物与完整生成记录保存在本机",
   "author": "WBBB",
   "license": "MIT",