feat: 对齐后端能力并补齐形态提示词与生产诊断
This commit is contained in:
1 parent
7d8074f90e
commit
f71d2bf0a4
30 files changed
+1707
-66
No files matched your search
@@ -13,6 +13,8 @@ import { coverImage, hasRunningImages, isPrimaryIdentityStale, primaryImage } fr
|
||||
import type { GenerateFormImageInput, SubjectFormAsset } from './types'
|
||||
import GenerateImageDialog from './components/GenerateImageDialog.vue'
|
||||
import ImageGalleryDialog from './components/ImageGalleryDialog.vue'
|
||||
import FormPromptDialog from './components/FormPromptDialog.vue'
|
||||
import FormPromptBatch from './components/FormPromptBatch.vue'
|
||||
|
||||
/** 形态图库以正式数据库为准,自动显示已在后端生成的图片。 */
|
||||
const route = useRoute()
|
||||
@@ -25,6 +27,12 @@ const {
|
||||
session,
|
||||
concurrency,
|
||||
force,
|
||||
limit,
|
||||
promptConcurrency,
|
||||
promptForce,
|
||||
concurrencyValid,
|
||||
generatePrompt,
|
||||
generatePrompts,
|
||||
blocked,
|
||||
running,
|
||||
batchValid,
|
||||
@@ -40,6 +48,12 @@ watch(
|
||||
if (receipt) toolsOpen.value = true
|
||||
}
|
||||
)
|
||||
watch(
|
||||
() => session.value.promptReceipt,
|
||||
receipt => {
|
||||
if (receipt) toolsOpen.value = true
|
||||
}
|
||||
)
|
||||
const search = ref('')
|
||||
const module = ref('all')
|
||||
const onlyMissing = ref(false)
|
||||
@@ -48,6 +62,9 @@ const generateOpen = ref(false)
|
||||
const galleryOpen = ref(false)
|
||||
const generateId = ref('')
|
||||
const galleryId = ref('')
|
||||
const promptOpen = ref(false)
|
||||
const promptId = ref('')
|
||||
const promptForm = computed(() => forms.value.find(form => form.id === promptId.value) ?? null)
|
||||
const generateForm = computed(() => forms.value.find(form => form.id === generateId.value) ?? null)
|
||||
const galleryForm = computed(() => forms.value.find(form => form.id === galleryId.value) ?? null)
|
||||
const completeCount = computed(() => forms.value.filter(form => primaryImage(form.images)).length)
|
||||
@@ -70,6 +87,12 @@ watch(
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
/** 打开指定正式形态的提示词管理。 */
|
||||
function openPrompt(form: SubjectFormAsset) {
|
||||
promptId.value = form.id
|
||||
promptOpen.value = true
|
||||
}
|
||||
|
||||
/** 打开指定正式形态的生图表单。 */
|
||||
function openGenerate(form: SubjectFormAsset) {
|
||||
generateId.value = form.id
|
||||
@@ -111,7 +134,7 @@ function resetFilters() {
|
||||
><WorkspaceTools
|
||||
v-model:open="toolsOpen"
|
||||
title="形态生图配置与回执"
|
||||
:has-receipt="!!session.receipt"
|
||||
:has-receipt="!!session.receipt || !!session.promptReceipt"
|
||||
><div class="flex flex-wrap items-end justify-between gap-4">
|
||||
<div>
|
||||
<h2 class="text-lg font-semibold">形态图片</h2>
|
||||
@@ -124,18 +147,27 @@ function resetFilters() {
|
||||
/></RouterLink>
|
||||
</div>
|
||||
<NAlert type="info" :show-icon="false" class="mt-5 text-xs">
|
||||
Character 形态图会记录生成时使用的 Identity
|
||||
Anchor。更换演员母版后,旧主图会标记为“身份母版已变更”,且后端会阻止它继续进入分镜首帧;请基于当前母版重新生成候选并确认新的主参考图。
|
||||
人物、场景、道具形态图均可继承已锁定 Identity
|
||||
的母版,并记录本次引用来源。母版变化后可筛选过期图,重新生成候选并人工确认新的主参考图;不要直接沿用旧资产进入下游。
|
||||
<RouterLink :to="`/projects/${id}/subject-identity`" class="text-button ml-2"
|
||||
>管理主体身份 →</RouterLink
|
||||
></NAlert
|
||||
>
|
||||
<FormPromptBatch
|
||||
:forms="forms"
|
||||
:disabled="blocked"
|
||||
:pending="operation.pending"
|
||||
:receipt="session.promptReceipt"
|
||||
v-model:concurrency="promptConcurrency"
|
||||
v-model:force="promptForce"
|
||||
@generate="generatePrompts"
|
||||
/>
|
||||
<div class="panel mt-5 p-5">
|
||||
<div class="flex flex-wrap items-center justify-between gap-4">
|
||||
<p class="text-sm">
|
||||
<strong>{{ completeCount }}</strong> / {{ forms.length }} 个形态已有主图
|
||||
<span v-if="staleForms.length" class="ml-3 text-xs text-danger">
|
||||
{{ staleForms.length }} 个人物形态主图已过期
|
||||
{{ staleForms.length }} 个形态主图已过期
|
||||
</span>
|
||||
<span class="ml-3 text-xs text-muted">Seedream · 后端配置</span>
|
||||
</p>
|
||||
@@ -147,14 +179,14 @@ function resetFilters() {
|
||||
<NAlert v-if="staleForms.length" type="error" :show-icon="false" class="mt-4"
|
||||
><div class="flex flex-wrap items-center justify-between gap-3">
|
||||
<span class="flex items-center gap-2 text-xs">
|
||||
<AlertTriangle :size="14" />检测到 {{ staleForms.length }} 个 Character Form
|
||||
仍在使用旧 Identity Anchor。
|
||||
<AlertTriangle :size="14" />检测到 {{ staleForms.length }} 个形态 仍在使用旧
|
||||
Identity Anchor。
|
||||
</span>
|
||||
<ConfirmAction
|
||||
label="重新生成过期形态"
|
||||
:disabled="blocked || !batchValid || !staleForms.length"
|
||||
:disabled="blocked || !concurrencyValid || !staleForms.length"
|
||||
acknowledgement
|
||||
description="只为身份母版已经变化的 Character Form 调用 Seedream,各新增一张基于当前 Anchor 的候选图;不会自动替换旧主图,生成后请人工确认并设置新的主参考图。"
|
||||
description="只为身份母版已经变化的形态调用 Seedream,各新增一张基于当前已锁定母版的候选图;不会自动替换旧主图,生成后请人工确认并设置新的主参考图。"
|
||||
@confirm="generateStale"
|
||||
/></div
|
||||
></NAlert>
|
||||
@@ -173,6 +205,17 @@ function resetFilters() {
|
||||
:step="1"
|
||||
></NInputNumber>
|
||||
</label>
|
||||
<label class="w-36"
|
||||
><span class="field-label">本批上限(可选)</span
|
||||
><NInputNumber
|
||||
:disabled="operation.pending"
|
||||
:value="typeof limit === 'number' ? limit : null"
|
||||
@update:value="limit = $event ?? ''"
|
||||
:min="1"
|
||||
:step="1"
|
||||
placeholder="不限制"
|
||||
:input-props="{ 'aria-label': '生图本批上限' }"
|
||||
/></label>
|
||||
<NCheckbox
|
||||
v-model:checked="force"
|
||||
:disabled="operation.pending"
|
||||
@@ -191,9 +234,11 @@ function resetFilters() {
|
||||
@confirm="generateProject"
|
||||
/>
|
||||
</div>
|
||||
<p v-if="!batchValid" class="mt-2 text-xs text-danger">并发必须是正整数。</p>
|
||||
<p v-if="!batchValid" class="mt-2 text-xs text-danger">
|
||||
并发和填写的数量上限必须是正整数。
|
||||
</p>
|
||||
<p class="mt-3 text-xs leading-6 text-muted">
|
||||
作用于整个项目,不受下方筛选影响。批量使用后端默认尺寸与形态提示词,不会启动视频生成。
|
||||
作用于整个项目,不受下方筛选影响。上限只限制本次真正生图数量,其余显示为“待后续处理”,不计入跳过。默认使用后端尺寸与正式提示词,不会启动视频生成。
|
||||
</p></NCollapseItem
|
||||
></NCollapse
|
||||
>
|
||||
@@ -210,6 +255,9 @@ function resetFilters() {
|
||||
{{ session.receipt.result.targetCount }} · 生成 {{ session.receipt.result.generated }} ·
|
||||
跳过 {{ session.receipt.result.skipped }} · 失败
|
||||
{{ session.receipt.result.failed }}
|
||||
<span v-if="session.receipt.result.remaining !== undefined">
|
||||
· 待后续处理 {{ session.receipt.result.remaining }}</span
|
||||
>
|
||||
</p>
|
||||
<NAlert
|
||||
v-if="session.receipt.result.failed"
|
||||
@@ -221,7 +269,7 @@ function resetFilters() {
|
||||
部分形态生图失败。已生成的图片保留;先查看失败原因,再按形态重新生图。
|
||||
</NAlert>
|
||||
<NAlert
|
||||
v-else-if="session.receipt.title === '刷新过期人物形态图'"
|
||||
v-else-if="session.receipt.title === '刷新过期形态图'"
|
||||
type="info"
|
||||
:show-icon="false"
|
||||
class="mt-3 text-xs"
|
||||
@@ -322,13 +370,14 @@ function resetFilters() {
|
||||
:show-icon="false"
|
||||
class="mt-3 text-xs leading-6"
|
||||
>
|
||||
当前主图由旧演员母版生成,后续分镜已禁止继续引用。请基于当前 Identity Anchor
|
||||
当前主图未能匹配最新已锁定母版。请基于当前 Identity Anchor
|
||||
重新生成候选图,并在确认后设置为新的主参考图。
|
||||
</NAlert>
|
||||
<p v-if="form.images[0]?.status === 'failed'" class="mt-2 line-clamp-2 text-xs text-danger">
|
||||
{{ form.images[0].error }}
|
||||
</p>
|
||||
<div class="mt-4 flex flex-wrap items-center justify-between gap-2">
|
||||
<NButton text size="small" @click="openPrompt(form)">提示词与生成</NButton>
|
||||
<NButton @click="openGallery(form)" text size="small">查看图片与记录</NButton>
|
||||
<NButton :disabled="blocked" @click="openGenerate(form)"
|
||||
><ImagePlus :size="14" />
|
||||
@@ -357,7 +406,11 @@ function resetFilters() {
|
||||
<RouterLink v-else :to="`/projects/${id}/breakdown`" class="button button-secondary"
|
||||
>前往剧本拆解</RouterLink
|
||||
> </EmptyState
|
||||
><GenerateImageDialog
|
||||
><FormPromptDialog
|
||||
v-model:open="promptOpen"
|
||||
:form="promptForm"
|
||||
:disabled="blocked || !promptForm"
|
||||
@generate="generatePrompt" /><GenerateImageDialog
|
||||
v-model:open="generateOpen"
|
||||
:form="generateForm"
|
||||
:disabled="blocked || !generateForm"
|
||||
|
||||
@@ -2,6 +2,8 @@ import { request } from '../../lib/http'
|
||||
import type {
|
||||
GenerateFormImageInput,
|
||||
GenerateProjectImagesInput,
|
||||
GenerateFormPromptsInput,
|
||||
FormPromptResult,
|
||||
ImageBatchResult,
|
||||
SubjectFormAsset,
|
||||
SubjectImage
|
||||
@@ -14,6 +16,20 @@ function formPath(id: string) {
|
||||
|
||||
/** 形态图库 API:读取与生成分离,生成不自动重试,不设置客户端短超时。 */
|
||||
export const subjectImagesApi = {
|
||||
/** 生成并保存正式生图提示词;force 仅覆盖提示词,不生成或替换图片。 */
|
||||
generatePrompt: (formId: string, force: boolean) =>
|
||||
request<FormPromptResult | null>(`/subject-forms/${encodeURIComponent(formId)}/generation-prompt`, {
|
||||
method: 'POST',
|
||||
body: { force },
|
||||
timeoutMs: 0
|
||||
}),
|
||||
/** 批量增强全项目形态,不受当前列表筛选影响。 */
|
||||
generatePrompts: (projectId: string, input: GenerateFormPromptsInput) =>
|
||||
request<ImageBatchResult>(`/projects/${encodeURIComponent(projectId)}/subject-forms/generation-prompts`, {
|
||||
method: 'POST',
|
||||
body: input,
|
||||
timeoutMs: 0
|
||||
}),
|
||||
listForms: (projectId: string, signal?: AbortSignal) =>
|
||||
request<SubjectFormAsset[]>(`/projects/${encodeURIComponent(projectId)}/subject-forms`, { signal }),
|
||||
listImages: (formId: string, signal?: AbortSignal) => request<SubjectImage[]>(formPath(formId), { signal }),
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import { NAlert, NButton, NCheckbox, NInputNumber } from 'naive-ui'
|
||||
import { downloadText } from '../../../lib/format'
|
||||
import ConfirmAction from '../../workflows/ConfirmAction.vue'
|
||||
import type { ImageSession, SubjectFormAsset } from '../types'
|
||||
|
||||
/** 提示词批处理独立于图片批处理,避免覆盖开关和结果回执混用。 */
|
||||
const props = defineProps<{
|
||||
forms: SubjectFormAsset[]
|
||||
disabled: boolean
|
||||
pending: boolean
|
||||
receipt?: ImageSession['promptReceipt']
|
||||
}>()
|
||||
const concurrency = defineModel<number>('concurrency', { required: true })
|
||||
const force = defineModel<boolean>('force', { required: true })
|
||||
const emit = defineEmits<{ generate: [] }>()
|
||||
const complete = computed(() => props.forms.filter(form => form.generationPrompt?.trim()).length)
|
||||
const valid = computed(() => Number.isSafeInteger(concurrency.value) && concurrency.value > 0)
|
||||
|
||||
/** 保存真实后端回执,包含失败的正式形态 ID。 */
|
||||
function exportReceipt() {
|
||||
downloadText('form-prompts-receipt.json', JSON.stringify(props.receipt, null, 2), 'application/json')
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<section class="panel mt-5 p-5" aria-label="形态提示词批量管理">
|
||||
<h3 class="font-semibold">形态生图提示词</h3>
|
||||
<p class="mt-2 text-xs leading-6 text-muted">
|
||||
正式提示词 {{ complete }} /
|
||||
{{ forms.length }}。结合项目视觉风格生成,只保存文本,不自动生图。批量面向全项目,不受搜索筛选影响。
|
||||
</p>
|
||||
<div class="mt-4 flex flex-wrap items-end gap-4">
|
||||
<label class="w-28"
|
||||
><span class="field-label">提示词并发</span>
|
||||
<NInputNumber
|
||||
:disabled="pending"
|
||||
:value="concurrency"
|
||||
@update:value="concurrency = $event ?? 0"
|
||||
:min="1"
|
||||
:step="1"
|
||||
:input-props="{ 'aria-label': '提示词并发' }"
|
||||
/>
|
||||
</label>
|
||||
<NCheckbox v-model:checked="force" :disabled="pending" class="control-row-checkbox text-xs"
|
||||
>覆盖已有正式提示词</NCheckbox
|
||||
>
|
||||
<ConfirmAction
|
||||
:label="force ? '重生成全部形态提示词' : '补齐形态提示词'"
|
||||
:disabled="disabled || !valid || !forms.length || (!force && complete === forms.length)"
|
||||
acknowledgement
|
||||
:description="
|
||||
force
|
||||
? '调用文本模型重新生成全项目形态的正式提示词,覆盖原有文本;已有图片和主图不变。'
|
||||
: '调用文本模型补齐缺少正式提示词的形态,已有正式提示词跳过;不会自动生成图片。'
|
||||
"
|
||||
@confirm="emit('generate')"
|
||||
/>
|
||||
</div>
|
||||
<p v-if="!valid" class="mt-2 text-xs text-danger">提示词并发必须是正整数。</p>
|
||||
<section v-if="receipt" class="surface-inset mt-4 p-4" aria-label="提示词批量回执">
|
||||
<div class="flex flex-wrap items-center justify-between gap-3">
|
||||
<h4>{{ receipt.title }}</h4>
|
||||
<NButton text @click="exportReceipt">导出提示词回执</NButton>
|
||||
</div>
|
||||
<p class="mt-3 text-xs">
|
||||
总数 {{ receipt.result.total }} · 目标 {{ receipt.result.targetCount }} · 生成
|
||||
{{ receipt.result.generated }} · 跳过 {{ receipt.result.skipped }} · 失败 {{ receipt.result.failed }}
|
||||
</p>
|
||||
<NAlert v-if="receipt.result.failed" type="error" :show-icon="false" class="mt-3"
|
||||
>部分提示词生成失败,已保存结果保留。可按下方形态 ID 定位并重试。</NAlert
|
||||
>
|
||||
<ul class="mt-3 space-y-2 text-xs text-danger">
|
||||
<li v-for="failure in receipt.result.failures" :key="failure.subjectFormId">
|
||||
<code>{{ failure.subjectFormId }}</code
|
||||
>:{{ failure.error }}
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
</section>
|
||||
</template>
|
||||
@@ -0,0 +1,60 @@
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import { NAlert, NButton } from 'naive-ui'
|
||||
import { AppDialog } from '../../../components/ui'
|
||||
import { downloadText } from '../../../lib/format'
|
||||
import ConfirmAction from '../../workflows/ConfirmAction.vue'
|
||||
import type { SubjectFormAsset } from '../types'
|
||||
|
||||
/** 只管理后端正式提示词;原始外观只读,不提供后端尚不支持的手工保存接口。 */
|
||||
const props = defineProps<{ form: SubjectFormAsset | null; disabled: boolean }>()
|
||||
const open = defineModel<boolean>('open', { default: false })
|
||||
const emit = defineEmits<{ generate: [formId: string, force: boolean] }>()
|
||||
const hasPrompt = computed(() => !!props.form?.generationPrompt?.trim())
|
||||
|
||||
/** 固定本次正式 Form ID,重生成只覆盖提示词,不替换历史图片。 */
|
||||
function generate() {
|
||||
if (!props.disabled && props.form) emit('generate', props.form.id, hasPrompt.value)
|
||||
}
|
||||
|
||||
/** 导出数据库已保存的提示词,不把原始外观伪装成最终 Prompt。 */
|
||||
function exportPrompt() {
|
||||
if (props.form?.generationPrompt) downloadText(`form-${props.form.id}-prompt.txt`, props.form.generationPrompt)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<AppDialog
|
||||
v-model:open="open"
|
||||
title="形态正式提示词"
|
||||
:description="`${form?.subject.name || ''} · ${form?.name || ''}`"
|
||||
>
|
||||
<NAlert type="info" :show-icon="false" class="mt-5 text-xs">
|
||||
结合形态描述与项目视觉风格生成并保存
|
||||
generationPrompt。只调用文本模型,不生成图片;覆盖不会修改已有图片的实际提示词或主图。
|
||||
</NAlert>
|
||||
<section class="surface-inset mt-5 p-4">
|
||||
<h3 class="text-sm font-medium">原始外观素材</h3>
|
||||
<p class="mt-3 whitespace-pre-wrap break-words text-xs leading-6 text-muted">
|
||||
{{ form?.appearancePrompt || form?.description || '暂无原始外观素材' }}
|
||||
</p>
|
||||
</section>
|
||||
<section class="surface-inset mt-4 p-4">
|
||||
<h3 class="text-sm font-medium">正式生图提示词</h3>
|
||||
<p class="mt-3 whitespace-pre-wrap break-words text-sm leading-6">
|
||||
{{ form?.generationPrompt || '尚未生成。可先在这里生成检查,也可由生图接口自动补齐。' }}
|
||||
</p>
|
||||
</section>
|
||||
<div class="mt-5 flex flex-wrap items-center gap-3">
|
||||
<ConfirmAction
|
||||
:key="form?.id"
|
||||
:label="hasPrompt ? '重新生成正式提示词' : '生成正式提示词'"
|
||||
:disabled="disabled || !form"
|
||||
acknowledgement
|
||||
:description="`为 ${form?.subject.name || ''} · ${form?.name || ''} ${hasPrompt ? '覆盖已有' : '补齐'}正式提示词。会调用文本模型,已有图片保持不变。`"
|
||||
@confirm="generate"
|
||||
/>
|
||||
<NButton :disabled="!hasPrompt" @click="exportPrompt">导出提示词</NButton>
|
||||
</div>
|
||||
</AppDialog>
|
||||
</template>
|
||||
@@ -15,9 +15,6 @@ const height = ref<number | ''>('')
|
||||
const setPrimary = ref(false)
|
||||
const acknowledged = ref(false)
|
||||
const dimensionsValid = computed(() => validImageSize(width.value, height.value))
|
||||
const hasPrompt = computed(
|
||||
() => !!(prompt.value.trim() || (props.form?.generationPrompt ?? props.form?.appearancePrompt ?? '').trim())
|
||||
)
|
||||
|
||||
/** 每次打开重新建立表单,避免把另一形态的 Prompt 或尺寸带入请求。 */
|
||||
watch(
|
||||
@@ -34,7 +31,7 @@ watch(
|
||||
|
||||
/** 完成前置确认后只发出一次明确的生图请求,不触发整条生产流程。 */
|
||||
function submit() {
|
||||
if (!props.form || props.disabled || !dimensionsValid.value || !hasPrompt.value || !acknowledged.value) return
|
||||
if (!props.form || props.disabled || !dimensionsValid.value || !acknowledged.value) return
|
||||
emit('generate', props.form.id, {
|
||||
provider: 'seedream',
|
||||
setPrimary: setPrimary.value,
|
||||
@@ -56,17 +53,13 @@ function submit() {
|
||||
>使用后端配置的 Seedream 模型,可能产生费用。每次新增一张图片,不删除历史结果。</NAlert
|
||||
>
|
||||
<p class="text-xs leading-6 text-muted">
|
||||
{{
|
||||
form?.subject.module === 'character' || form?.subject.module === 'scene'
|
||||
? '后端会自动引用此人物/场景当前的身份母版,保持身份或空间结构;没有母版时仍可按文本生成。更换母版不会自动更新已有形态图。'
|
||||
: '当前道具形态生图暂不自动引用身份母版。'
|
||||
}}
|
||||
人物、场景、道具均会引用已锁定身份的当前母版,保持身份、空间骨架或物件结构;身份未锁定或没有母版时不会继承该图片。更换母版不会自动更新已有形态图。
|
||||
身份母版与此处的“形态主参考图”是两种不同用途的图片。
|
||||
</p>
|
||||
<label class="block"
|
||||
><span class="field-label">自定义提示词(可选,仅用于本次)</span
|
||||
><NInput
|
||||
placeholder="留空使用已保存的 generationPrompt,其次使用 appearancePrompt"
|
||||
placeholder="留空使用正式 generationPrompt;缺失时后端先自动生成正式提示词"
|
||||
:input-props="{ id: 'image-prompt' }"
|
||||
class="min-h-28"
|
||||
v-model:value="prompt"
|
||||
@@ -76,7 +69,9 @@ function submit() {
|
||||
</label>
|
||||
<NCollapse v-if="form?.generationPrompt || form?.appearancePrompt" class="text-xs"
|
||||
><NCollapseItem name="details"
|
||||
><template #header>查看后端默认提示词</template>
|
||||
><template #header>{{
|
||||
form?.generationPrompt ? '查看正式生图提示词' : '查看原始外观素材(不是最终提示词)'
|
||||
}}</template>
|
||||
<p class="mt-3 whitespace-pre-wrap leading-6">
|
||||
{{ form.generationPrompt ?? form.appearancePrompt }}
|
||||
</p></NCollapseItem
|
||||
@@ -107,7 +102,9 @@ function submit() {
|
||||
</div>
|
||||
<p class="text-xs text-muted">宽高同时留空时使用后端默认 2K;自定义尺寸须满足模型限制。</p>
|
||||
<p v-if="!dimensionsValid" class="text-xs text-danger" role="alert">宽高需要同时填写正整数,或同时留空。</p>
|
||||
<p v-if="!hasPrompt" class="text-xs text-danger" role="alert">当前形态没有可用提示词,请填写本次提示词。</p>
|
||||
<p v-if="!form?.generationPrompt" class="text-xs leading-6 text-muted">
|
||||
未填写自定义提示词时,后端先调用文本模型补齐正式提示词,再生图;可能产生两类模型费用。原始外观素材不会直接作为最终生图提示词。
|
||||
</p>
|
||||
<NCheckbox v-model:checked="setPrimary" class="flex gap-2 text-sm">生成成功后设为此形态主参考图</NCheckbox>
|
||||
<p v-if="setPrimary && form && primaryImage(form.images)" class="text-xs text-muted">
|
||||
会替换当前主图标记,旧图片保留。已有视频提示词不会自动更新。
|
||||
@@ -121,7 +118,7 @@ function submit() {
|
||||
<div class="dialog-footer">
|
||||
<NButton @click="open = false">取消</NButton
|
||||
><NButton
|
||||
:disabled="disabled || !acknowledged || !dimensionsValid || !hasPrompt"
|
||||
:disabled="disabled || !form || !acknowledged || !dimensionsValid"
|
||||
type="primary"
|
||||
attr-type="submit"
|
||||
>
|
||||
|
||||
@@ -66,9 +66,8 @@ describe('形态图片选择与操作', () => {
|
||||
form.subject.module = module
|
||||
wrapper = mount(GenerateImageDialog, { attachTo: document.body, props: { open: true, form, disabled: false } })
|
||||
await flushPromises()
|
||||
expect(document.body.textContent).toContain(
|
||||
module === 'prop' ? '道具形态生图暂不自动引用' : '后端会自动引用此人物/场景当前的身份母版'
|
||||
)
|
||||
expect(document.body.textContent).toContain('母版')
|
||||
expect(document.body.textContent).not.toContain('道具形态生图暂不自动引用')
|
||||
})
|
||||
it('已有主图优先于新候选图和失败记录,无主图才回退到成功候选图', () => {
|
||||
const form = formFixture()
|
||||
|
||||
@@ -21,7 +21,7 @@ export function coverImage(form: SubjectFormAsset): SubjectImage | undefined {
|
||||
|
||||
/** 当前主体正在使用的 Identity Anchor ID。 */
|
||||
export function currentIdentityAnchorId(form: SubjectFormAsset): string | undefined {
|
||||
return form.subject.identity?.images[0]?.id
|
||||
return form.subject.identity?.isLocked ? form.subject.identity.images[0]?.id : undefined
|
||||
}
|
||||
|
||||
/** 读取形态图生成时实际使用的 Identity Anchor ID。 */
|
||||
|
||||
@@ -0,0 +1,188 @@
|
||||
import { defineComponent } from 'vue'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import { projectContextKey } from '../projects/context'
|
||||
import { testProjectContext } from '../../testing/project-context'
|
||||
import { getOperation } from '../workflows/operations'
|
||||
import { formFixture, imageFixture } from './testing/fixtures'
|
||||
import { currentIdentityAnchorId, getImageSession, isPrimaryIdentityStale } from './model'
|
||||
import { useSubjectImages } from './useSubjectImages'
|
||||
import FormPromptDialog from './components/FormPromptDialog.vue'
|
||||
import GenerateImageDialog from './components/GenerateImageDialog.vue'
|
||||
|
||||
let wrapper: VueWrapper | undefined
|
||||
const projectId = 'capability-test'
|
||||
/** 从实际挂载的确认弹窗查找操作按钮。 */
|
||||
function find(label: string) {
|
||||
return [...document.querySelectorAll('button')].find(item => item.textContent?.trim() === label)!
|
||||
}
|
||||
afterEach(() => {
|
||||
wrapper?.unmount()
|
||||
wrapper = undefined
|
||||
document.body.innerHTML = ''
|
||||
vi.unstubAllGlobals()
|
||||
Object.assign(getOperation(projectId), { pending: false, error: '', notice: '', label: '' })
|
||||
Object.assign(getImageSession(projectId), { receipt: null, promptReceipt: null })
|
||||
})
|
||||
|
||||
async function setup() {
|
||||
let service!: ReturnType<typeof useSubjectImages>
|
||||
const context = testProjectContext()
|
||||
const form = formFixture(projectId)
|
||||
const fetcher = vi.fn<typeof fetch>().mockImplementation(async (url, init) => {
|
||||
const path = String(url)
|
||||
let data: unknown = [form]
|
||||
if (init?.method === 'POST') {
|
||||
if (path.endsWith('/generation-prompts'))
|
||||
data = {
|
||||
total: 2,
|
||||
targetCount: 2,
|
||||
generated: 1,
|
||||
skipped: 0,
|
||||
failed: 1,
|
||||
failures: [{ subjectFormId: 'form-failed', error: '模型拒绝' }]
|
||||
}
|
||||
else if (path.endsWith('/generation-prompt')) {
|
||||
form.generationPrompt = '正式提示词'
|
||||
data = { id: form.id, subjectId: form.subjectId, generationPrompt: form.generationPrompt }
|
||||
} else if (path.includes('/subject-forms/')) data = imageFixture()
|
||||
else
|
||||
data = {
|
||||
total: 3,
|
||||
targetCount: 1,
|
||||
generated: 1,
|
||||
skipped: 0,
|
||||
failed: 0,
|
||||
failures: [],
|
||||
eligibleCount: 3,
|
||||
remaining: 2
|
||||
}
|
||||
}
|
||||
return new Response(JSON.stringify({ data }))
|
||||
})
|
||||
vi.stubGlobal('fetch', fetcher)
|
||||
wrapper = mount(
|
||||
defineComponent({
|
||||
setup() {
|
||||
service = useSubjectImages()
|
||||
return () => null
|
||||
}
|
||||
}),
|
||||
{ global: { provide: { [projectContextKey as symbol]: context } } }
|
||||
)
|
||||
await flushPromises()
|
||||
return {
|
||||
service,
|
||||
context,
|
||||
form,
|
||||
fetcher,
|
||||
posts: () => fetcher.mock.calls.filter(([, init]) => init?.method === 'POST')
|
||||
}
|
||||
}
|
||||
|
||||
describe('形态正式提示词与批量配置', () => {
|
||||
it('单个使用正式形态 ID 和 force,生成提示词不会调用图片接口', async () => {
|
||||
const { service, posts } = await setup()
|
||||
await service.generatePrompt('unknown-form', false)
|
||||
expect(posts()).toHaveLength(0)
|
||||
await service.generatePrompt('form-db-1', false)
|
||||
expect(posts()).toHaveLength(1)
|
||||
expect(posts()[0]?.[0]).toBe('/api/subject-forms/form-db-1/generation-prompt')
|
||||
expect(JSON.parse(String(posts()[0]?.[1]?.body))).toEqual({ force: false })
|
||||
expect(service.forms.value[0]?.generationPrompt).toBe('正式提示词')
|
||||
await service.generatePrompt('form-db-1', true)
|
||||
expect(JSON.parse(String(posts()[1]?.[1]?.body))).toEqual({ force: true })
|
||||
})
|
||||
it('提示词接口返回空正文时显示失败,不误报保存成功', async () => {
|
||||
const { service, fetcher } = await setup()
|
||||
fetcher.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ data: { id: 'form-db-1', subjectId: 'subject-db-1', generationPrompt: '' } }))
|
||||
)
|
||||
await service.generatePrompt('form-db-1', false)
|
||||
expect(getOperation(projectId).error).toContain('未确认正式提示词已保存')
|
||||
})
|
||||
it('批量提示词保留部分失败回执,不覆盖图片回执且不传图片上限', async () => {
|
||||
const { service, posts } = await setup()
|
||||
service.limit.value = 1
|
||||
service.promptConcurrency.value = 4
|
||||
service.promptForce.value = true
|
||||
await service.generatePrompts()
|
||||
expect(posts()[0]?.[0]).toBe('/api/projects/capability-test/subject-forms/generation-prompts')
|
||||
expect(JSON.parse(String(posts()[0]?.[1]?.body))).toEqual({ concurrency: 4, force: true })
|
||||
expect(service.session.value.promptReceipt?.result.failures[0]?.error).toBe('模型拒绝')
|
||||
expect(service.session.value.receipt).toBeNull()
|
||||
})
|
||||
it('图片数量上限可选,非法上限和并发阻止提交', async () => {
|
||||
const { service, posts } = await setup()
|
||||
for (const limit of [0, -1, 1.5]) {
|
||||
service.limit.value = limit
|
||||
await service.generateProject()
|
||||
}
|
||||
expect(posts()).toHaveLength(0)
|
||||
service.limit.value = 1
|
||||
await service.generateProject()
|
||||
expect(JSON.parse(String(posts()[0]?.[1]?.body))).toEqual({
|
||||
provider: 'seedream',
|
||||
concurrency: 2,
|
||||
force: false,
|
||||
limit: 1
|
||||
})
|
||||
expect(service.session.value.receipt?.result.remaining).toBe(2)
|
||||
service.limit.value = ''
|
||||
await service.generateProject()
|
||||
expect(JSON.parse(String(posts()[1]?.[1]?.body))).not.toHaveProperty('limit')
|
||||
service.promptConcurrency.value = 0
|
||||
await service.generatePrompts()
|
||||
expect(posts()).toHaveLength(2)
|
||||
})
|
||||
it.each(['draft', 'generating', 'need_review', 'failed'] as const)('%s 剧本不能生成提示词和图片', async status => {
|
||||
const { service, context, posts } = await setup()
|
||||
context.data.value!.project.status = status
|
||||
await service.generatePrompt('form-db-1', true)
|
||||
await service.generatePrompts()
|
||||
await service.generateProject()
|
||||
expect(posts()).toHaveLength(0)
|
||||
})
|
||||
it.each(['character', 'scene', 'prop'])('%s 已锁定母版才参与过期判断,刷新只新增候选', async module => {
|
||||
const { service, form, posts } = await setup()
|
||||
form.subject.module = module
|
||||
form.subject.identity = { id: 'identity', isLocked: false, images: [{ id: 'anchor-new' }] }
|
||||
expect(currentIdentityAnchorId(form)).toBeUndefined()
|
||||
expect(isPrimaryIdentityStale(form)).toBe(false)
|
||||
form.subject.identity.isLocked = true
|
||||
expect(isPrimaryIdentityStale(form)).toBe(true)
|
||||
await service.query.refresh()
|
||||
await service.generateStale()
|
||||
expect(JSON.parse(String(posts()[0]?.[1]?.body))).toEqual({ provider: 'seedream', setPrimary: false })
|
||||
})
|
||||
it('正式提示词确认必须勾选,未确认不发送事件', async () => {
|
||||
const form = formFixture()
|
||||
wrapper = mount(FormPromptDialog, { attachTo: document.body, props: { open: true, disabled: false, form } })
|
||||
await flushPromises()
|
||||
find('生成正式提示词').click()
|
||||
await flushPromises()
|
||||
expect(find('确认生成正式提示词').disabled).toBe(true)
|
||||
expect(wrapper.emitted('generate')).toBeUndefined()
|
||||
document.querySelector<HTMLElement>('.app-dialog [role="checkbox"]')!.click()
|
||||
await flushPromises()
|
||||
find('确认生成正式提示词').click()
|
||||
await flushPromises()
|
||||
expect(wrapper.emitted('generate')).toEqual([['form-db-1', false]])
|
||||
})
|
||||
it('缺少正式和原始提示词仍可确认生图,由后端补齐而非前端编造', async () => {
|
||||
const form = formFixture()
|
||||
form.appearancePrompt = null
|
||||
form.generationPrompt = null
|
||||
wrapper = mount(GenerateImageDialog, { attachTo: document.body, props: { open: true, disabled: false, form } })
|
||||
await flushPromises()
|
||||
document.querySelector<HTMLElement>('#confirm-image-cost')!.click()
|
||||
await flushPromises()
|
||||
const submit = [...document.querySelectorAll('button')].find(
|
||||
item => item.textContent?.trim() === '确认生成图片'
|
||||
)!
|
||||
expect(submit.disabled).toBe(false)
|
||||
submit.click()
|
||||
await flushPromises()
|
||||
expect(wrapper.emitted('generate')).toEqual([['form-db-1', { provider: 'seedream', setPrimary: false }]])
|
||||
})
|
||||
})
|
||||
@@ -63,6 +63,8 @@ export interface GenerateProjectImagesInput {
|
||||
provider: 'seedream'
|
||||
concurrency: number
|
||||
force: boolean
|
||||
/** 仅限制本次真正生图的数量,留空表示不限制。 */
|
||||
limit?: number
|
||||
}
|
||||
|
||||
/** HTTP 200 也可能包含部分失败;此响应不返回成功图片列表。 */
|
||||
@@ -73,9 +75,23 @@ export interface ImageBatchResult {
|
||||
skipped: number
|
||||
failed: number
|
||||
failures: { subjectFormId: string; error: string }[]
|
||||
/** 新后端返回符合条件及因数量限制尚未执行的形态数。 */
|
||||
eligibleCount?: number
|
||||
remaining?: number
|
||||
}
|
||||
|
||||
/** 正式提示词生成只返回形态字段,不包含图库列表的 images 关联。 */
|
||||
export type FormPromptResult = Pick<SubjectFormAsset, 'id' | 'subjectId' | 'generationPrompt'>
|
||||
|
||||
/** 项目提示词增强的批量参数,与图片生成的 force、limit 独立。 */
|
||||
export interface GenerateFormPromptsInput {
|
||||
concurrency: number
|
||||
force: boolean
|
||||
}
|
||||
|
||||
/** 长请求的回执按项目隔离,在会话内切换页面后仍可查看。 */
|
||||
export interface ImageSession {
|
||||
receipt: { title: string; result: ImageBatchResult } | null
|
||||
/** 提示词回执独立保存,避免覆盖最近一次生图回执。 */
|
||||
promptReceipt?: { title: string; result: ImageBatchResult } | null
|
||||
}
|
||||
@@ -14,6 +14,9 @@ export function useSubjectImages() {
|
||||
const id = computed(() => context.project.value?.id ?? '')
|
||||
const concurrency = ref(2)
|
||||
const force = ref(false)
|
||||
const limit = ref<number | ''>('')
|
||||
const promptConcurrency = ref(3)
|
||||
const promptForce = ref(false)
|
||||
const query = usePolling(id, async (projectId, signal) => {
|
||||
if (!projectId) return []
|
||||
try {
|
||||
@@ -54,9 +57,48 @@ export function useSubjectImages() {
|
||||
query.data.value === null ||
|
||||
running.value ||
|
||||
breakdownRunning.value ||
|
||||
context.project.value?.status === 'generating'
|
||||
context.project.value?.status !== 'completed'
|
||||
)
|
||||
const batchValid = computed(() => Number.isSafeInteger(concurrency.value) && concurrency.value > 0)
|
||||
const concurrencyValid = computed(() => Number.isSafeInteger(concurrency.value) && concurrency.value > 0)
|
||||
const batchValid = computed(
|
||||
() => concurrencyValid.value && (limit.value === '' || (Number.isSafeInteger(limit.value) && limit.value > 0))
|
||||
)
|
||||
const promptValid = computed(() => Number.isSafeInteger(promptConcurrency.value) && promptConcurrency.value > 0)
|
||||
|
||||
/** 单个提示词保存后重读正式形态,不把详情响应误用作图库列表。 */
|
||||
async function generatePrompt(formId: string, overwrite: boolean) {
|
||||
if (blocked.value) return
|
||||
const form = forms.value.find(item => item.id === formId)
|
||||
if (!form) return
|
||||
const projectId = id.value
|
||||
await runOperation(projectId, `生成 ${form.subject.name} · ${form.name} 正式提示词`, async () => {
|
||||
const result = await subjectImagesApi.generatePrompt(formId, overwrite)
|
||||
if (
|
||||
!result ||
|
||||
result.id !== formId ||
|
||||
result.subjectId !== form.subjectId ||
|
||||
!result.generationPrompt?.trim()
|
||||
)
|
||||
throw new Error('接口未确认正式提示词已保存,请先刷新形态记录核对。')
|
||||
})
|
||||
await query.refresh()
|
||||
}
|
||||
|
||||
/** 批量只生成提示词,完整保留部分失败诊断;不自动进入生图。 */
|
||||
async function generatePrompts() {
|
||||
if (blocked.value || !promptValid.value || !forms.value.length) return
|
||||
const projectId = id.value
|
||||
const input = { concurrency: promptConcurrency.value, force: promptForce.value }
|
||||
const target = getImageSession(projectId)
|
||||
target.promptReceipt = null
|
||||
await runOperation(projectId, '批量生成形态正式提示词', async () => {
|
||||
target.promptReceipt = {
|
||||
title: input.force ? '重生成全部形态提示词' : '补齐形态提示词',
|
||||
result: await subjectImagesApi.generatePrompts(projectId, input)
|
||||
}
|
||||
})
|
||||
await query.refresh()
|
||||
}
|
||||
|
||||
/** 捕获正式 Form ID,生成后重新读取图片;刷新失败也不自动重发有费用的请求。 */
|
||||
async function generate(formId: string, input: GenerateFormImageInput) {
|
||||
@@ -76,7 +118,12 @@ export function useSubjectImages() {
|
||||
async function generateProject() {
|
||||
if (blocked.value || !batchValid.value || !forms.value.length) return
|
||||
const projectId = id.value
|
||||
const input = { provider: 'seedream' as const, concurrency: concurrency.value, force: force.value }
|
||||
const input = {
|
||||
provider: 'seedream' as const,
|
||||
concurrency: concurrency.value,
|
||||
force: force.value,
|
||||
...(limit.value === '' ? {} : { limit: limit.value })
|
||||
}
|
||||
const target = getImageSession(projectId)
|
||||
target.receipt = null
|
||||
await runOperation(projectId, '批量生成项目形态图片', async () => {
|
||||
@@ -89,25 +136,26 @@ export function useSubjectImages() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 只刷新 Identity Anchor 已变化的 Character Form。
|
||||
* 用户已经明确确认“刷新过期形态”,因此成功的新图直接切换为当前 Primary;旧图仍保留为历史记录。
|
||||
* 只刷新 Identity Anchor 已变化的形态,覆盖人物、场景与道具。
|
||||
* 与确认文案一致:仅生成候选,用户验图后再显式切换主图。
|
||||
*/
|
||||
async function generateStale() {
|
||||
if (blocked.value || !batchValid.value || !staleForms.value.length) return
|
||||
if (blocked.value || !concurrencyValid.value || !staleForms.value.length) return
|
||||
const projectId = id.value
|
||||
const targets = [...staleForms.value]
|
||||
const total = forms.value.length
|
||||
const receipt = getImageSession(projectId)
|
||||
receipt.receipt = null
|
||||
|
||||
await runOperation(projectId, '刷新过期人物形态图', async () => {
|
||||
await runOperation(projectId, '刷新过期形态图', async () => {
|
||||
const results = await runWithConcurrency(targets, concurrency.value, async form => {
|
||||
try {
|
||||
const image = await subjectImagesApi.generate(form.id, {
|
||||
provider: 'seedream',
|
||||
setPrimary: true
|
||||
setPrimary: false
|
||||
})
|
||||
if (!image || image.subjectFormId !== form.id || image.status !== 'completed' || !image.imageUrl) {
|
||||
throw new Error(image?.error || '接口未返回已完成的主参考图')
|
||||
throw new Error(image?.error || '接口未返回已完成的候选图')
|
||||
}
|
||||
return { subjectFormId: form.id, success: true as const }
|
||||
} catch (error) {
|
||||
@@ -123,12 +171,12 @@ export function useSubjectImages() {
|
||||
.map(item => ({ subjectFormId: item.subjectFormId, error: item.error }))
|
||||
|
||||
receipt.receipt = {
|
||||
title: '刷新过期人物形态图',
|
||||
title: '刷新过期形态图',
|
||||
result: {
|
||||
total: forms.value.length,
|
||||
total,
|
||||
targetCount: targets.length,
|
||||
generated: results.filter(item => item.success).length,
|
||||
skipped: forms.value.length - targets.length,
|
||||
skipped: total - targets.length,
|
||||
failed: failures.length,
|
||||
failures
|
||||
}
|
||||
@@ -146,6 +194,13 @@ export function useSubjectImages() {
|
||||
session,
|
||||
concurrency,
|
||||
force,
|
||||
limit,
|
||||
promptConcurrency,
|
||||
promptForce,
|
||||
promptValid,
|
||||
concurrencyValid,
|
||||
generatePrompt,
|
||||
generatePrompts,
|
||||
blocked,
|
||||
running,
|
||||
batchValid,
|
||||
|
||||
Reference in new issue
Block a user