feat: 同步最新生图与身份能力
This commit is contained in:
1 parent
65e8f9c3ba
commit
be06caaa9f
18 files changed
+583
-69
No files matched your search
@@ -61,6 +61,7 @@ const {
|
||||
limit,
|
||||
promptConcurrency,
|
||||
promptForce,
|
||||
batchModule,
|
||||
generatePrompt,
|
||||
generatePrompts,
|
||||
blocked,
|
||||
@@ -345,6 +346,21 @@ const rules = { concurrency: integerRule('批量并发'), limit: integerRule('
|
||||
v-model:force="promptForce"
|
||||
@generate="generatePrompts"
|
||||
/>
|
||||
<div class="mt-5 flex flex-wrap items-center gap-3">
|
||||
<span class="text-xs text-muted">批处理范围</span>
|
||||
<NSelect
|
||||
v-model:value="batchModule"
|
||||
class="w-40"
|
||||
aria-label="形态批处理范围"
|
||||
:options="[
|
||||
{ label: String('全部类型'), value: 'all' },
|
||||
{ label: String('仅人物'), value: 'character' },
|
||||
{ label: String('仅场景'), value: 'scene' },
|
||||
{ label: String('仅道具'), value: 'prop' }
|
||||
]"
|
||||
/>
|
||||
<span class="text-xs text-muted">同时应用于批量提示词与批量生图。</span>
|
||||
</div>
|
||||
<div class="panel mt-5 p-5">
|
||||
<div class="flex flex-wrap items-center justify-between gap-4">
|
||||
<p class="text-sm">
|
||||
|
||||
@@ -6,7 +6,8 @@ import type {
|
||||
FormPromptResult,
|
||||
ImageBatchResult,
|
||||
SubjectFormAsset,
|
||||
SubjectImage
|
||||
SubjectImage,
|
||||
SubjectImageGenerationPreview
|
||||
} from './types'
|
||||
|
||||
/** 对正式 SubjectForm 数据库 ID 编码,不接受按名称拼出的路径。 */
|
||||
@@ -33,6 +34,9 @@ export const subjectImagesApi = {
|
||||
listForms: (projectId: string, signal?: AbortSignal) =>
|
||||
request<SubjectFormAsset[]>(`/projects/${encodeURIComponent(projectId)}/subject-forms`, { signal }),
|
||||
listImages: (formId: string, signal?: AbortSignal) => request<SubjectImage[]>(formPath(formId), { signal }),
|
||||
/** 解析正式 Prompt、参考图顺序与后端生成配置,不创建图片任务。 */
|
||||
preview: (formId: string) =>
|
||||
request<SubjectImageGenerationPreview>(`${formPath(formId)}/preview`, { method: 'POST', body: {} }),
|
||||
generate: (formId: string, input: GenerateFormImageInput) =>
|
||||
request<SubjectImage | null>(formPath(formId), { method: 'POST', body: input, timeoutMs: 0 }),
|
||||
generateProject: (projectId: string, input: GenerateProjectImagesInput) =>
|
||||
|
||||
@@ -2,11 +2,13 @@
|
||||
import AppForm from '../../../components/ui/AppForm.vue'
|
||||
import { NFormItem } from 'naive-ui'
|
||||
import { sizeRules } from '../../../lib/form-rules'
|
||||
import { NAlert, NButton, NCheckbox, NCollapse, NCollapseItem, NInput, NInputNumber } from 'naive-ui'
|
||||
import { NAlert, NButton, NCheckbox, NCollapse, NCollapseItem, NInput, NInputNumber, NTag } from 'naive-ui'
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { AppDialog } from '../../../components/ui'
|
||||
import { errorMessage } from '../../../lib/http'
|
||||
import { subjectImagesApi } from '../api'
|
||||
import { primaryImage, validImageSize } from '../model'
|
||||
import type { GenerateFormImageInput, SubjectFormAsset } from '../types'
|
||||
import type { GenerateFormImageInput, SubjectFormAsset, SubjectImageGenerationPreview } from '../types'
|
||||
|
||||
/** 单形态生成确认:尺寸与自定义 Prompt 只用于本次请求。 */
|
||||
const props = defineProps<{ form: SubjectFormAsset | null; disabled: boolean }>()
|
||||
@@ -17,6 +19,9 @@ const width = ref<number | ''>('')
|
||||
const height = ref<number | ''>('')
|
||||
const setPrimary = ref(false)
|
||||
const acknowledged = ref(false)
|
||||
const preview = ref<SubjectImageGenerationPreview | null>(null)
|
||||
const previewError = ref('')
|
||||
const previewPending = ref(false)
|
||||
const dimensionsValid = computed(() => validImageSize(width.value, height.value))
|
||||
|
||||
/** 每次打开重新建立表单,避免把另一形态的 Prompt 或尺寸带入请求。 */
|
||||
@@ -27,11 +32,31 @@ watch(
|
||||
width.value = ''
|
||||
height.value = ''
|
||||
acknowledged.value = false
|
||||
preview.value = null
|
||||
previewError.value = ''
|
||||
previewPending.value = false
|
||||
setPrimary.value = props.form ? !primaryImage(props.form.images) : false
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
/** 预览由后端按当前正式配置编译,不提交图片生成任务。 */
|
||||
async function loadPreview() {
|
||||
if (!props.form || previewPending.value) return
|
||||
previewPending.value = true
|
||||
previewError.value = ''
|
||||
try {
|
||||
const result = await subjectImagesApi.preview(props.form.id)
|
||||
if (!result || result.subjectFormId !== props.form.id) throw new Error('预览结果与当前形态不匹配。')
|
||||
preview.value = result
|
||||
} catch (cause) {
|
||||
preview.value = null
|
||||
previewError.value = errorMessage(cause)
|
||||
} finally {
|
||||
previewPending.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 完成前置确认后只发出一次明确的生图请求,不触发整条生产流程。 */
|
||||
function submit() {
|
||||
if (!props.form || props.disabled || !dimensionsValid.value || !acknowledged.value) return
|
||||
@@ -68,6 +93,33 @@ const rules = { ...sizeRules(() => formModel.value) }
|
||||
人物、场景、道具均会引用已锁定身份的当前母版,保持身份、空间骨架或物件结构;身份未锁定或没有母版时不会继承该图片。更换母版不会自动更新已有形态图。
|
||||
身份母版与此处的“形态主参考图”是两种不同用途的图片。
|
||||
</p>
|
||||
<div class="flex flex-wrap items-center gap-3">
|
||||
<NButton :loading="previewPending" :disabled="!form" @click="loadPreview">预览实际生成输入</NButton>
|
||||
<span class="text-xs text-muted">只读取后端编译结果,不调用图片模型。</span>
|
||||
</div>
|
||||
<NAlert v-if="previewError" type="error" :show-icon="false">{{ previewError }}</NAlert>
|
||||
<div v-if="preview" class="panel p-4 text-xs leading-6">
|
||||
<div class="flex flex-wrap items-center gap-2">
|
||||
<strong>{{ preview.provider }} / {{ preview.model }}</strong>
|
||||
<NTag size="small" :bordered="false">{{ preview.references.length }} 张参考图</NTag>
|
||||
</div>
|
||||
<ul v-if="preview.references.length" class="mt-3 space-y-1 text-muted">
|
||||
<li v-for="item in preview.references" :key="`${item.imageNumber}:${item.imageId}`">
|
||||
图 {{ item.imageNumber }} · {{ item.role }} · <code>{{ item.imageId }}</code>
|
||||
</li>
|
||||
</ul>
|
||||
<p v-else class="mt-3 text-muted">本次没有图片参考。</p>
|
||||
<NCollapse class="mt-3" :default-expanded-names="['prompt']">
|
||||
<NCollapseItem name="prompt" title="最终 Provider Prompt">
|
||||
<p class="mt-3 whitespace-pre-wrap">{{ preview.providerPrompt }}</p>
|
||||
</NCollapseItem>
|
||||
<NCollapseItem name="config" title="生成配置">
|
||||
<pre class="mt-3 whitespace-pre-wrap">{{
|
||||
JSON.stringify(preview.generationConfig, null, 2)
|
||||
}}</pre>
|
||||
</NCollapseItem>
|
||||
</NCollapse>
|
||||
</div>
|
||||
<NFormItem
|
||||
class="block"
|
||||
path="prompt"
|
||||
|
||||
@@ -56,6 +56,8 @@ export interface GenerateFormImageInput {
|
||||
export interface GenerateProjectImagesInput {
|
||||
concurrency: number
|
||||
force: boolean
|
||||
/** 可按主体模块缩小批处理范围;省略时处理全部模块。 */
|
||||
module?: SubjectModule
|
||||
/** 仅限制本次真正生图的数量,留空表示不限制。 */
|
||||
limit?: number
|
||||
}
|
||||
@@ -83,6 +85,24 @@ export type FormPromptResult = Omit<SubjectFormAsset, 'subject' | 'images'> & {
|
||||
export interface GenerateFormPromptsInput {
|
||||
concurrency: number
|
||||
force: boolean
|
||||
module?: SubjectModule
|
||||
}
|
||||
|
||||
export type SubjectModule = 'character' | 'scene' | 'prop'
|
||||
|
||||
/** 形态生图前的无费用实际输入预览。 */
|
||||
export interface SubjectImageGenerationPreview {
|
||||
subjectFormId: string
|
||||
provider: string
|
||||
model: string
|
||||
generationConfig: Record<string, unknown>
|
||||
references: Array<{
|
||||
imageNumber: number
|
||||
role: string
|
||||
imageId: string
|
||||
imageUrl: string
|
||||
}>
|
||||
providerPrompt: string
|
||||
}
|
||||
|
||||
/** 长请求的回执按项目隔离,在会话内切换页面后仍可查看。 */
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { computed, ref } from 'vue'
|
||||
import { useQuery } from '../../composables/useQuery'
|
||||
import { usePolling } from '../../composables/usePolling'
|
||||
import { ApiError } from '../../lib/http'
|
||||
import { useProjectContext } from '../projects/context'
|
||||
import { getOperation, runOperation } from '../workflows/operations'
|
||||
import { workflowCheckpoints } from '../workflows/selectors'
|
||||
import { subjectImagesApi } from './api'
|
||||
import { getImageSession, hasRunningImages } from './model'
|
||||
import type { GenerateFormImageInput } from './types'
|
||||
import type { GenerateFormImageInput, SubjectModule } from './types'
|
||||
|
||||
/** 形态图库统一读取数据库记录并管理单图/批量长请求,不调用生产流程。 */
|
||||
export function useSubjectImages() {
|
||||
@@ -17,28 +17,33 @@ export function useSubjectImages() {
|
||||
const limit = ref<number | ''>('')
|
||||
const promptConcurrency = ref(3)
|
||||
const promptForce = ref(false)
|
||||
const query = useQuery(id, async (projectId, signal) => {
|
||||
if (!projectId) return []
|
||||
try {
|
||||
const forms = await subjectImagesApi.listForms(projectId, signal)
|
||||
if (
|
||||
forms.some(
|
||||
form =>
|
||||
form.subject.projectId !== projectId ||
|
||||
form.images.some(image => image.subjectFormId !== form.id)
|
||||
const batchModule = ref<'all' | SubjectModule>('all')
|
||||
const query = usePolling(
|
||||
id,
|
||||
async (projectId, signal) => {
|
||||
if (!projectId) return []
|
||||
try {
|
||||
const forms = await subjectImagesApi.listForms(projectId, signal)
|
||||
if (
|
||||
forms.some(
|
||||
form =>
|
||||
form.subject.projectId !== projectId ||
|
||||
form.images.some(image => image.subjectFormId !== form.id)
|
||||
)
|
||||
)
|
||||
)
|
||||
throw new Error('形态图库返回了不匹配的项目或图片,请刷新后重试。')
|
||||
return forms
|
||||
} catch (error) {
|
||||
if (error instanceof ApiError && error.status === 404)
|
||||
throw new Error(
|
||||
'后端尚未提供形态图库查询,请更新后端 dev 并重启服务(GET /projects/:id/subject-forms)。',
|
||||
{ cause: error }
|
||||
)
|
||||
throw error
|
||||
}
|
||||
})
|
||||
throw new Error('形态图库返回了不匹配的项目或图片,请刷新后重试。')
|
||||
return forms
|
||||
} catch (error) {
|
||||
if (error instanceof ApiError && error.status === 404)
|
||||
throw new Error(
|
||||
'后端尚未提供形态图库查询,请更新后端 dev 并重启服务(GET /projects/:id/subject-forms)。',
|
||||
{ cause: error }
|
||||
)
|
||||
throw error
|
||||
}
|
||||
},
|
||||
false
|
||||
)
|
||||
const forms = computed(() => query.data.value ?? [])
|
||||
const operation = computed(() => getOperation(id.value))
|
||||
const session = computed(() => getImageSession(id.value))
|
||||
@@ -87,7 +92,11 @@ export function useSubjectImages() {
|
||||
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 input = {
|
||||
concurrency: promptConcurrency.value,
|
||||
force: promptForce.value,
|
||||
...(batchModule.value === 'all' ? {} : { module: batchModule.value })
|
||||
}
|
||||
const target = getImageSession(projectId)
|
||||
target.promptReceipt = null
|
||||
await runOperation(projectId, '批量生成形态正式提示词', async () => {
|
||||
@@ -120,7 +129,8 @@ export function useSubjectImages() {
|
||||
const input = {
|
||||
concurrency: concurrency.value,
|
||||
force: force.value,
|
||||
...(limit.value === '' ? {} : { limit: limit.value })
|
||||
...(limit.value === '' ? {} : { limit: limit.value }),
|
||||
...(batchModule.value === 'all' ? {} : { module: batchModule.value })
|
||||
}
|
||||
const target = getImageSession(projectId)
|
||||
target.receipt = null
|
||||
@@ -145,6 +155,7 @@ export function useSubjectImages() {
|
||||
limit,
|
||||
promptConcurrency,
|
||||
promptForce,
|
||||
batchModule,
|
||||
promptValid,
|
||||
concurrencyValid,
|
||||
generatePrompt,
|
||||
|
||||
Reference in new issue
Block a user