Extend Prompt Builder with sequence characters, outfits, and scene toggles.

Characters live on the sequence with per-scene on/off and outfit picks; Copy scene exports only the active tab; legacy saves still open.
This commit is contained in:
Towsty
2026-10-02 08:50:31 -05:00
parent 790c33fcf0
commit 7799529788
6 changed files with 569 additions and 147 deletions
+256 -63
View File
@@ -44,6 +44,89 @@
<p class="mt-1 text-[11px] text-zinc-500">Save key only — never copied into the prompt text.</p> <p class="mt-1 text-[11px] text-zinc-500">Save key only — never copied into the prompt text.</p>
</label> </label>
<div class="space-y-3">
<div class="flex flex-wrap items-center justify-between gap-2">
<div>
<span class="text-sm font-medium text-zinc-300">Characters</span>
<p class="text-[11px] text-zinc-500">Sequence-wide. Toggle and outfit per scene below.</p>
</div>
<button
type="button"
class="rounded-full border border-white/10 px-3 py-1 text-[11px] text-zinc-300 hover:border-amber-300/50 hover:text-white"
@click="addCharacter"
>
Add character
</button>
</div>
<div
v-for="(character, cIndex) in characters"
:key="character.id"
class="rounded-2xl border border-white/10 bg-zinc-950/40 p-3 space-y-3"
>
<div class="flex items-center justify-between gap-2">
<span class="text-[11px] uppercase tracking-wide text-zinc-500">Character {{ cIndex + 1 }}</span>
<div class="flex items-center gap-2">
<button type="button" class="text-[11px] text-zinc-500 hover:text-amber-200" @click="clearCharacter(cIndex)">Clear</button>
<button
v-if="characters.length > 1"
type="button"
class="text-[11px] text-zinc-500 hover:text-red-300"
@click="removeCharacter(cIndex)"
>
Remove
</button>
</div>
</div>
<input
v-model="character.name"
class="w-full rounded-xl border border-white/10 bg-zinc-950 px-3 py-2 text-sm outline-none ring-amber-300/40 placeholder:text-zinc-600 focus:ring-2"
maxlength="120"
placeholder="Name"
>
<textarea
v-model="character.description"
rows="2"
class="w-full rounded-xl border border-white/10 bg-zinc-950/70 px-3 py-2 text-sm outline-none ring-amber-300/40 placeholder:text-zinc-600 focus:ring-2"
placeholder="Description"
/>
<div class="space-y-2 border-t border-white/5 pt-3">
<div class="flex flex-wrap items-center justify-between gap-2">
<span class="text-[11px] font-medium uppercase tracking-wide text-zinc-500">Outfits</span>
<button
type="button"
class="text-[11px] text-zinc-400 hover:text-amber-200"
@click="addOutfit(cIndex)"
>
Add outfit
</button>
</div>
<p v-if="!character.outfits.length" class="text-[11px] text-zinc-600">No outfits yet.</p>
<div
v-for="(outfit, oIndex) in character.outfits"
:key="outfit.id"
class="rounded-xl border border-white/5 bg-zinc-950/50 p-2 space-y-2"
>
<div class="flex items-center justify-between gap-2">
<span class="text-[11px] text-zinc-500">Outfit {{ oIndex + 1 }}</span>
<button type="button" class="text-[11px] text-zinc-500 hover:text-red-300" @click="removeOutfit(cIndex, oIndex)">Remove</button>
</div>
<input
v-model="outfit.name"
class="w-full rounded-lg border border-white/10 bg-zinc-950 px-2.5 py-1.5 text-sm outline-none ring-amber-300/40 placeholder:text-zinc-600 focus:ring-2"
maxlength="120"
placeholder="Outfit name"
>
<textarea
v-model="outfit.description"
rows="2"
class="w-full rounded-lg border border-white/10 bg-zinc-950/70 px-2.5 py-1.5 text-sm outline-none ring-amber-300/40 placeholder:text-zinc-600 focus:ring-2"
placeholder="What they are wearing"
/>
</div>
</div>
</div>
</div>
<div class="flex flex-wrap items-center gap-2 border-b border-white/10 pb-2"> <div class="flex flex-wrap items-center gap-2 border-b border-white/10 pb-2">
<button <button
v-for="(scene, index) in scenes" v-for="(scene, index) in scenes"
@@ -107,47 +190,37 @@
</div> </div>
<div class="space-y-3"> <div class="space-y-3">
<div class="flex flex-wrap items-center justify-between gap-2"> <div>
<span class="text-sm font-medium text-zinc-300">Characters</span> <span class="text-sm font-medium text-zinc-300">In this scene</span>
<button <p class="text-[11px] text-zinc-500">Toggle who appears. Pick an outfit for each on character.</p>
type="button"
class="rounded-full border border-white/10 px-3 py-1 text-[11px] text-zinc-300 hover:border-amber-300/50 hover:text-white"
@click="addCharacter"
>
Add character
</button>
</div> </div>
<div <div
v-for="(character, cIndex) in activeScene.characters" v-for="character in characters"
:key="character.id" :key="'scene-'+character.id"
class="rounded-2xl border border-white/10 bg-zinc-950/40 p-3 space-y-2" class="rounded-2xl border border-white/10 bg-zinc-950/40 px-3 py-2.5 space-y-2"
> >
<div class="flex items-center justify-between gap-2"> <label class="flex items-center justify-between gap-3 text-sm text-zinc-200">
<span class="text-[11px] uppercase tracking-wide text-zinc-500">Character {{ cIndex + 1 }}</span> <span class="min-w-0 truncate">{{ character.name || 'Unnamed character' }}</span>
<div class="flex items-center gap-2"> <input
<button type="button" class="text-[11px] text-zinc-500 hover:text-amber-200" @click="clearCharacter(cIndex)">Clear</button> type="checkbox"
<button class="accent-amber-400"
v-if="activeScene.characters.length > 1" :checked="isCharacterOn(character.id)"
type="button" @change="setCharacterOn(character.id, ($event.target as HTMLInputElement).checked)"
class="text-[11px] text-zinc-500 hover:text-red-300" >
@click="removeCharacter(cIndex)" </label>
> <label v-if="isCharacterOn(character.id)" class="block text-[11px] text-zinc-500">
Remove Outfit
</button> <select
</div> class="mt-1 w-full rounded-xl border border-white/10 bg-zinc-950 px-3 py-2 text-sm text-zinc-200 outline-none ring-amber-300/40 focus:ring-2"
</div> :value="activeOutfitId(character.id) || ''"
<input @change="setCharacterOutfit(character.id, ($event.target as HTMLSelectElement).value)"
v-model="character.name" >
class="w-full rounded-xl border border-white/10 bg-zinc-950 px-3 py-2 text-sm outline-none ring-amber-300/40 placeholder:text-zinc-600 focus:ring-2" <option value="">None</option>
maxlength="120" <option v-for="outfit in character.outfits" :key="outfit.id" :value="outfit.id">
placeholder="Name" {{ outfit.name || 'Untitled outfit' }}
> </option>
<textarea </select>
v-model="character.description" </label>
rows="2"
class="w-full rounded-xl border border-white/10 bg-zinc-950/70 px-3 py-2 text-sm outline-none ring-amber-300/40 placeholder:text-zinc-600 focus:ring-2"
placeholder="Description"
/>
</div> </div>
</div> </div>
@@ -172,6 +245,14 @@
<p class="text-[11px] text-zinc-500">Assembled text ready to copy. Sequence name is omitted.</p> <p class="text-[11px] text-zinc-500">Assembled text ready to copy. Sequence name is omitted.</p>
</div> </div>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<button
type="button"
class="rounded-full border border-white/10 px-3 py-1.5 text-xs text-zinc-300 hover:border-amber-300/50 hover:text-white disabled:opacity-50"
:disabled="!activeSceneText"
@click="copyScene"
>
{{ copiedScene ? 'Scene copied' : 'Copy scene' }}
</button>
<button <button
type="button" type="button"
class="rounded-full border border-white/10 px-3 py-1.5 text-xs text-zinc-300 hover:border-amber-300/50 hover:text-white disabled:opacity-50" class="rounded-full border border-white/10 px-3 py-1.5 text-xs text-zinc-300 hover:border-amber-300/50 hover:text-white disabled:opacity-50"
@@ -219,6 +300,7 @@
<p class="truncate text-sm font-medium text-zinc-100">{{ sequence.name }}</p> <p class="truncate text-sm font-medium text-zinc-100">{{ sequence.name }}</p>
<p class="mt-0.5 text-[11px] text-zinc-500"> <p class="mt-0.5 text-[11px] text-zinc-500">
{{ sequence.scenes?.length || 0 }} scene{{ (sequence.scenes?.length || 0) === 1 ? '' : 's' }} {{ sequence.scenes?.length || 0 }} scene{{ (sequence.scenes?.length || 0) === 1 ? '' : 's' }}
· {{ sequence.characters?.length || 0 }} character{{ (sequence.characters?.length || 0) === 1 ? '' : 's' }}
</p> </p>
</div> </div>
<button <button
@@ -238,12 +320,20 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import type { PromptSequence, PromptSequenceScene } from '~/utils/promptSequences' import type {
PromptSequence,
PromptSequenceCharacter,
PromptSequenceScene
} from '~/utils/promptSequences'
import { import {
assembleSceneText,
assembleSequenceText, assembleSequenceText,
cloneSceneForNext, cloneSceneForNext,
emptyCharacter, emptyCharacter,
emptyScene emptyOutfit,
emptyScene,
ensureSceneStatesForCharacters,
normalizePromptSequence
} from '~/utils/promptSequences' } from '~/utils/promptSequences'
useHead({ title: 'Prompt Builder' }) useHead({ title: 'Prompt Builder' })
@@ -251,65 +341,149 @@ useHead({ title: 'Prompt Builder' })
const sequences = ref<PromptSequence[]>([]) const sequences = ref<PromptSequence[]>([])
const selectedId = ref('') const selectedId = ref('')
const name = ref('') const name = ref('')
const scenes = ref<PromptSequenceScene[]>([emptyScene(1)]) const characters = ref<PromptSequenceCharacter[]>([emptyCharacter()])
const scenes = ref<PromptSequenceScene[]>([emptyScene(1, characters.value)])
const activeIndex = ref(0) const activeIndex = ref(0)
const previewOpen = ref(true) const previewOpen = ref(true)
const busy = ref('') const busy = ref('')
const error = ref('') const error = ref('')
const notice = ref('') const notice = ref('')
const copied = ref(false) const copied = ref(false)
const copiedScene = ref(false)
let copyTimer: ReturnType<typeof setTimeout> | null = null let copyTimer: ReturnType<typeof setTimeout> | null = null
let copySceneTimer: ReturnType<typeof setTimeout> | null = null
const activeScene = computed(() => scenes.value[activeIndex.value] || null) const activeScene = computed(() => scenes.value[activeIndex.value] || null)
const previewText = computed(() => assembleSequenceText({ scenes: scenes.value })) const previewText = computed(() => assembleSequenceText({
characters: characters.value,
scenes: scenes.value
}))
const activeSceneText = computed(() => {
if (!activeScene.value) return ''
return assembleSceneText(activeScene.value, characters.value)
})
function startNew() { function startNew() {
selectedId.value = '' selectedId.value = ''
name.value = '' name.value = ''
scenes.value = [emptyScene(1)] characters.value = [emptyCharacter()]
scenes.value = [emptyScene(1, characters.value)]
activeIndex.value = 0 activeIndex.value = 0
error.value = '' error.value = ''
notice.value = '' notice.value = ''
} }
function select(sequence: PromptSequence) { function select(sequence: PromptSequence) {
selectedId.value = sequence.id const normalized = normalizePromptSequence(sequence) || sequence
name.value = sequence.name selectedId.value = normalized.id
scenes.value = (sequence.scenes?.length ? sequence.scenes : [emptyScene(1)]).map((scene, index) => ({ name.value = normalized.name
...emptyScene(index + 1), characters.value = (normalized.characters?.length ? normalized.characters : [emptyCharacter()]).map(character => ({
...emptyCharacter(),
...character,
outfits: (character.outfits || []).map(outfit => ({ ...emptyOutfit(), ...outfit }))
}))
scenes.value = (normalized.scenes?.length ? normalized.scenes : [emptyScene(1, characters.value)]).map((scene, index) => ({
...emptyScene(index + 1, characters.value),
...scene, ...scene,
characters: (scene.characters?.length ? scene.characters : [emptyCharacter()]).map(character => ({ characterStates: (scene.characterStates || []).map(state => ({
...emptyCharacter(), characterId: state.characterId,
...character on: state.on !== false,
outfitId: state.outfitId || null
})) }))
})) }))
ensureSceneStatesForCharacters(scenes.value, characters.value)
activeIndex.value = 0 activeIndex.value = 0
error.value = '' error.value = ''
notice.value = '' notice.value = ''
} }
function addNextScene() { function addNextScene() {
const previous = scenes.value[scenes.value.length - 1] || emptyScene(1) const previous = scenes.value[scenes.value.length - 1] || emptyScene(1, characters.value)
const next = cloneSceneForNext(previous, scenes.value.length + 1) const next = cloneSceneForNext(previous, scenes.value.length + 1)
scenes.value.push(next) scenes.value.push(next)
activeIndex.value = scenes.value.length - 1 activeIndex.value = scenes.value.length - 1
} }
function addCharacter() { function addCharacter() {
if (!activeScene.value) return const character = emptyCharacter()
activeScene.value.characters.push(emptyCharacter()) characters.value.push(character)
ensureSceneStatesForCharacters(scenes.value, characters.value, {
newCharacterId: character.id,
turnOnSceneIndex: activeIndex.value
})
} }
function clearCharacter(index: number) { function clearCharacter(index: number) {
const character = activeScene.value?.characters[index] const character = characters.value[index]
if (!character) return if (!character) return
character.name = '' character.name = ''
character.description = '' character.description = ''
character.outfits = []
for (const scene of scenes.value) {
const state = scene.characterStates.find(item => item.characterId === character.id)
if (state) state.outfitId = null
}
} }
function removeCharacter(index: number) { function removeCharacter(index: number) {
if (!activeScene.value || activeScene.value.characters.length <= 1) return if (characters.value.length <= 1) return
activeScene.value.characters.splice(index, 1) const [removed] = characters.value.splice(index, 1)
if (!removed) return
for (const scene of scenes.value) {
scene.characterStates = scene.characterStates.filter(state => state.characterId !== removed.id)
}
}
function addOutfit(characterIndex: number) {
const character = characters.value[characterIndex]
if (!character) return
character.outfits.push(emptyOutfit())
}
function removeOutfit(characterIndex: number, outfitIndex: number) {
const character = characters.value[characterIndex]
if (!character) return
const [removed] = character.outfits.splice(outfitIndex, 1)
if (!removed) return
for (const scene of scenes.value) {
const state = scene.characterStates.find(item => item.characterId === character.id)
if (state?.outfitId === removed.id) state.outfitId = null
}
}
function sceneState(characterId: string) {
return activeScene.value?.characterStates.find(state => state.characterId === characterId)
}
function isCharacterOn(characterId: string) {
const state = sceneState(characterId)
return state ? !!state.on : true
}
function setCharacterOn(characterId: string, on: boolean) {
const state = sceneState(characterId)
if (!state) {
activeScene.value?.characterStates.push({ characterId, on, outfitId: null })
return
}
state.on = on
}
function activeOutfitId(characterId: string) {
return sceneState(characterId)?.outfitId || ''
}
function setCharacterOutfit(characterId: string, outfitId: string) {
const state = sceneState(characterId)
if (!state) {
activeScene.value?.characterStates.push({
characterId,
on: true,
outfitId: outfitId || null
})
return
}
state.outfitId = outfitId || null
} }
async function loadSequences() { async function loadSequences() {
@@ -326,11 +500,16 @@ async function save() {
busy.value = 'save' busy.value = 'save'
error.value = '' error.value = ''
notice.value = '' notice.value = ''
const payload = {
name: nextName,
characters: characters.value,
scenes: scenes.value
}
try { try {
if (updateExisting && selectedId.value) { if (updateExisting && selectedId.value) {
const saved = await $fetch<{ sequence: PromptSequence; sequences: PromptSequence[] }>(`/api/prompt-sequences/${selectedId.value}`, { const saved = await $fetch<{ sequence: PromptSequence; sequences: PromptSequence[] }>(`/api/prompt-sequences/${selectedId.value}`, {
method: 'PATCH', method: 'PATCH',
body: { name: nextName, scenes: scenes.value } body: payload
}) })
sequences.value = saved.sequences sequences.value = saved.sequences
select(saved.sequence) select(saved.sequence)
@@ -338,7 +517,7 @@ async function save() {
} else { } else {
const saved = await $fetch<{ sequence: PromptSequence; sequences: PromptSequence[] }>('/api/prompt-sequences', { const saved = await $fetch<{ sequence: PromptSequence; sequences: PromptSequence[] }>('/api/prompt-sequences', {
method: 'POST', method: 'POST',
body: { name: nextName, scenes: scenes.value, overwrite: Boolean(existingByName) } body: { ...payload, overwrite: Boolean(existingByName) }
}) })
sequences.value = saved.sequences sequences.value = saved.sequences
select(saved.sequence) select(saved.sequence)
@@ -368,19 +547,32 @@ async function remove(sequence: PromptSequence) {
} }
} }
async function copyPreview() { async function writeClipboard(text: string, kind: 'all' | 'scene') {
const text = previewText.value
if (!text) return if (!text) return
try { try {
await navigator.clipboard.writeText(text) await navigator.clipboard.writeText(text)
copied.value = true if (kind === 'scene') {
if (copyTimer) clearTimeout(copyTimer) copiedScene.value = true
copyTimer = setTimeout(() => { copied.value = false }, 1500) if (copySceneTimer) clearTimeout(copySceneTimer)
copySceneTimer = setTimeout(() => { copiedScene.value = false }, 1500)
} else {
copied.value = true
if (copyTimer) clearTimeout(copyTimer)
copyTimer = setTimeout(() => { copied.value = false }, 1500)
}
} catch { } catch {
error.value = 'Could not copy to the clipboard' error.value = 'Could not copy to the clipboard'
} }
} }
async function copyPreview() {
await writeClipboard(previewText.value, 'all')
}
async function copyScene() {
await writeClipboard(activeSceneText.value, 'scene')
}
onMounted(async () => { onMounted(async () => {
try { try {
await loadSequences() await loadSequences()
@@ -391,5 +583,6 @@ onMounted(async () => {
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (copyTimer) clearTimeout(copyTimer) if (copyTimer) clearTimeout(copyTimer)
if (copySceneTimer) clearTimeout(copySceneTimer)
}) })
</script> </script>
+2
View File
@@ -4,11 +4,13 @@ export default defineEventHandler(async (event) => {
const { owner } = assertLibraryOwner(event) const { owner } = assertLibraryOwner(event)
const body = await readBody<{ const body = await readBody<{
name?: string name?: string
characters?: unknown
scenes?: unknown scenes?: unknown
overwrite?: boolean overwrite?: boolean
}>(event).catch(() => ({})) }>(event).catch(() => ({}))
const sequence = await savePromptSequence(owner, { const sequence = await savePromptSequence(owner, {
name: body?.name || '', name: body?.name || '',
characters: body?.characters,
scenes: body?.scenes, scenes: body?.scenes,
overwrite: body?.overwrite === true overwrite: body?.overwrite === true
}) })
+2 -1
View File
@@ -3,9 +3,10 @@ import { listPromptSequences, updatePromptSequence } from '~/server/utils/prompt
export default defineEventHandler(async (event) => { export default defineEventHandler(async (event) => {
const { owner } = assertLibraryOwner(event) const { owner } = assertLibraryOwner(event)
const id = String(getRouterParam(event, 'id') || '') const id = String(getRouterParam(event, 'id') || '')
const body = await readBody<{ name?: string; scenes?: unknown }>(event).catch(() => ({})) const body = await readBody<{ name?: string; characters?: unknown; scenes?: unknown }>(event).catch(() => ({}))
const sequence = await updatePromptSequence(owner, id, { const sequence = await updatePromptSequence(owner, id, {
name: body?.name, name: body?.name,
characters: body?.characters,
scenes: body?.scenes scenes: body?.scenes
}) })
return { return {
+26 -6
View File
@@ -4,9 +4,12 @@ import { ownerRoot } from '~/server/utils/library'
import { import {
normalizePromptSequence, normalizePromptSequence,
normalizePromptSequenceName, normalizePromptSequenceName,
normalizeCharacter,
normalizeScene, normalizeScene,
emptyCharacter,
emptyScene, emptyScene,
type PromptSequence, type PromptSequence,
type PromptSequenceCharacter,
type PromptSequenceScene type PromptSequenceScene
} from '~/utils/promptSequences' } from '~/utils/promptSequences'
@@ -54,9 +57,14 @@ function mutate<T>(owner: string, fn: (sequences: PromptSequence[]) => T): Promi
return run return run
} }
function normalizeScenesInput(raw: unknown): PromptSequenceScene[] { function normalizeCharactersInput(raw: unknown): PromptSequenceCharacter[] {
if (!Array.isArray(raw) || !raw.length) return [emptyScene(1)] if (!Array.isArray(raw) || !raw.length) return [emptyCharacter()]
return raw.map((scene, index) => normalizeScene(scene, index)) return raw.map(normalizeCharacter)
}
function normalizeScenesInput(raw: unknown, characters: PromptSequenceCharacter[]): PromptSequenceScene[] {
if (!Array.isArray(raw) || !raw.length) return [emptyScene(1, characters)]
return raw.map((scene, index) => normalizeScene(scene, index, characters))
} }
export function listPromptSequences(owner: string) { export function listPromptSequences(owner: string) {
@@ -72,12 +80,14 @@ export function getPromptSequence(owner: string, id: string) {
export async function savePromptSequence(owner: string, input: { export async function savePromptSequence(owner: string, input: {
name: string name: string
characters?: unknown
scenes?: unknown scenes?: unknown
overwrite?: boolean overwrite?: boolean
}) { }) {
const name = normalizePromptSequenceName(input.name) const name = normalizePromptSequenceName(input.name)
if (!name) throw createError({ statusCode: 400, statusMessage: 'A sequence name is required' }) if (!name) throw createError({ statusCode: 400, statusMessage: 'A sequence name is required' })
const scenes = normalizeScenesInput(input.scenes) const characters = normalizeCharactersInput(input.characters)
const scenes = normalizeScenesInput(input.scenes, characters)
const now = Date.now() const now = Date.now()
return mutate(owner, (sequences) => { return mutate(owner, (sequences) => {
const existing = sequences.find(item => item.name.toLowerCase() === name.toLowerCase()) const existing = sequences.find(item => item.name.toLowerCase() === name.toLowerCase())
@@ -85,6 +95,7 @@ export async function savePromptSequence(owner: string, input: {
throw createError({ statusCode: 409, statusMessage: `Overwrite sequence “${existing.name}”?` }) throw createError({ statusCode: 409, statusMessage: `Overwrite sequence “${existing.name}”?` })
} }
if (existing) { if (existing) {
existing.characters = characters
existing.scenes = scenes existing.scenes = scenes
existing.updatedAt = now existing.updatedAt = now
return existing return existing
@@ -92,6 +103,7 @@ export async function savePromptSequence(owner: string, input: {
const created: PromptSequence = { const created: PromptSequence = {
id: crypto.randomUUID(), id: crypto.randomUUID(),
name, name,
characters,
scenes, scenes,
createdAt: now, createdAt: now,
updatedAt: now updatedAt: now
@@ -103,6 +115,7 @@ export async function savePromptSequence(owner: string, input: {
export async function updatePromptSequence(owner: string, id: string, input: { export async function updatePromptSequence(owner: string, id: string, input: {
name?: string name?: string
characters?: unknown
scenes?: unknown scenes?: unknown
}) { }) {
const wanted = String(id || '').trim() const wanted = String(id || '').trim()
@@ -117,8 +130,15 @@ export async function updatePromptSequence(owner: string, id: string, input: {
if (clash) throw createError({ statusCode: 409, statusMessage: `A sequence named “${clash.name}” already exists` }) if (clash) throw createError({ statusCode: 409, statusMessage: `A sequence named “${clash.name}” already exists` })
existing.name = name existing.name = name
} }
if (input.scenes !== undefined) { if (input.characters !== undefined || input.scenes !== undefined) {
existing.scenes = normalizeScenesInput(input.scenes) const characters = input.characters !== undefined
? normalizeCharactersInput(input.characters)
: existing.characters
const scenes = input.scenes !== undefined
? normalizeScenesInput(input.scenes, characters)
: existing.scenes.map((scene, index) => normalizeScene(scene, index, characters))
existing.characters = characters
existing.scenes = scenes
} }
existing.updatedAt = Date.now() existing.updatedAt = Date.now()
return existing return existing
+89 -43
View File
@@ -20,15 +20,23 @@ const {
assembleSequenceText, assembleSequenceText,
formatCharacterLine, formatCharacterLine,
emptyScene, emptyScene,
cloneSceneForNext emptyCharacter,
emptyOutfit,
cloneSceneForNext,
normalizePromptSequence,
ensureSceneStatesForCharacters
} = await import(pathToFileURL(tmp).href) } = await import(pathToFileURL(tmp).href)
unlinkSync(tmp) unlinkSync(tmp)
test('formatCharacterLine covers name/description cases', () => { test('formatCharacterLine covers name/description and outfit', () => {
assert.equal(formatCharacterLine({ name: 'Ada', description: 'tall' }), 'Ada: tall') assert.equal(formatCharacterLine({ name: 'Ada', description: 'tall' }), 'Ada: tall')
assert.equal(formatCharacterLine({ name: 'Ada', description: '' }), 'Ada') assert.equal(formatCharacterLine({ name: 'Ada', description: '' }), 'Ada')
assert.equal(formatCharacterLine({ name: '', description: 'tall' }), 'tall') assert.equal(formatCharacterLine({ name: '', description: 'tall' }), 'tall')
assert.equal(formatCharacterLine({ name: '', description: '' }), '') assert.equal(formatCharacterLine({ name: '', description: '' }), '')
assert.equal(
formatCharacterLine({ name: 'Ada', description: 'tall' }, { name: 'Work', description: 'blue jacket' }),
'Ada: tall. Outfit: blue jacket'
)
}) })
test('assembleSceneText joins non-empty boxes with a single blank line', () => { test('assembleSceneText joins non-empty boxes with a single blank line', () => {
@@ -45,6 +53,43 @@ test('assembleSceneText joins non-empty boxes with a single blank line', () => {
assert.equal(text, 'oil paint\n\nnight\n\nAda: tall\nBo: hat\n\nwalks') assert.equal(text, 'oil paint\n\nnight\n\nAda: tall\nBo: hat\n\nwalks')
}) })
test('off characters and active outfits affect assembly', () => {
const ada = { ...emptyCharacter(), id: 'c1', name: 'Ada', description: 'tall', outfits: [
{ ...emptyOutfit(), id: 'o1', name: 'Day', description: 'red dress' },
{ ...emptyOutfit(), id: 'o2', name: 'Night', description: 'black coat' }
] }
const bo = { ...emptyCharacter(), id: 'c2', name: 'Bo', description: 'hat', outfits: [] }
const scene1 = {
style: 's1',
settings: '',
prompt: 'p1',
characterStates: [
{ characterId: 'c1', on: true, outfitId: 'o1' },
{ characterId: 'c2', on: true, outfitId: null }
]
}
const scene2 = {
style: 's2',
settings: '',
prompt: 'p2',
characterStates: [
{ characterId: 'c1', on: false, outfitId: 'o1' },
{ characterId: 'c2', on: true, outfitId: null }
]
}
assert.equal(
assembleSceneText(scene1, [ada, bo]),
's1\n\nAda: tall. Outfit: red dress\nBo: hat\n\np1'
)
assert.equal(
assembleSceneText(scene2, [ada, bo]),
's2\n\nBo: hat\n\np2'
)
const full = assembleSequenceText({ characters: [ada, bo], scenes: [scene1, scene2] })
assert.equal(full, 's1\n\nAda: tall. Outfit: red dress\nBo: hat\n\np1\n\n\ns2\n\nBo: hat\n\np2')
assert.ok(!full.includes('not present'))
})
test('assembleSequenceText uses double blank line between scenes and skips empties', () => { test('assembleSequenceText uses double blank line between scenes and skips empties', () => {
const text = assembleSequenceText({ const text = assembleSequenceText({
name: 'ignored', name: 'ignored',
@@ -58,58 +103,59 @@ test('assembleSequenceText uses double blank line between scenes and skips empti
assert.ok(!text.includes('ignored')) assert.ok(!text.includes('ignored'))
}) })
test('example shape is two jobs for desktop Batch', () => { test('legacy sequences migrate to sequence characters all on with no outfits', () => {
const text = assembleSequenceText({ const legacy = normalizePromptSequence({
id: 'seq1',
name: 'Old',
scenes: [ scenes: [
{ {
style: 'style scene 1', id: 'sc1',
settings: 'settings scene 1', title: 'Scene 1',
characters: [ style: 'a',
{ name: 'Character one', description: 'desc' }, settings: '',
{ name: 'Character two', description: 'desc' } prompt: 'p',
], characters: [{ id: 'x', name: 'Ada', description: 'tall' }]
prompt: 'prompt scene 1'
}, },
{ {
style: 'style scene 2', id: 'sc2',
settings: 'settings scene 2', title: 'Scene 2',
characters: [{ name: 'Character one', description: 'desc' }], style: 'b',
prompt: 'prompt scene 2' settings: '',
prompt: 'q',
characters: [{ id: 'x', name: 'Ada', description: 'tall' }]
} }
] ],
createdAt: 1,
updatedAt: 1
}) })
assert.equal( assert.equal(legacy.characters.length, 1)
text, assert.equal(legacy.characters[0].name, 'Ada')
[ assert.deepEqual(legacy.characters[0].outfits, [])
'style scene 1', assert.equal(legacy.scenes[0].characterStates[0].on, true)
'', assert.equal(legacy.scenes[0].characterStates[0].outfitId, null)
'settings scene 1', assert.equal(legacy.scenes[1].characterStates[0].on, true)
'',
'Character one: desc',
'Character two: desc',
'',
'prompt scene 1',
'',
'',
'style scene 2',
'',
'settings scene 2',
'',
'Character one: desc',
'',
'prompt scene 2'
].join('\n')
)
}) })
test('cloneSceneForNext copies fields with new ids', () => { test('cloneSceneForNext copies toggles and outfit choices', () => {
const first = emptyScene(1) const chars = [emptyCharacter()]
const first = emptyScene(1, chars)
first.style = 'a' first.style = 'a'
first.characters[0].name = 'Ada' first.characterStates[0].on = false
first.characterStates[0].outfitId = 'o9'
const next = cloneSceneForNext(first, 2) const next = cloneSceneForNext(first, 2)
assert.equal(next.title, 'Scene 2') assert.equal(next.title, 'Scene 2')
assert.equal(next.style, 'a') assert.equal(next.style, 'a')
assert.equal(next.characters[0].name, 'Ada') assert.equal(next.characterStates[0].on, false)
assert.equal(next.characterStates[0].outfitId, 'o9')
assert.notEqual(next.id, first.id) assert.notEqual(next.id, first.id)
assert.notEqual(next.characters[0].id, first.characters[0].id) })
test('ensureSceneStatesForCharacters turns new character on only for current scene', () => {
const a = emptyCharacter()
const scenes = [emptyScene(1, [a]), emptyScene(2, [a])]
const b = emptyCharacter()
const list = [a, b]
ensureSceneStatesForCharacters(scenes, list, { newCharacterId: b.id, turnOnSceneIndex: 1 })
assert.equal(scenes[0].characterStates.find(s => s.characterId === b.id).on, false)
assert.equal(scenes[1].characterStates.find(s => s.characterId === b.id).on, true)
}) })
+194 -34
View File
@@ -1,7 +1,21 @@
export type PromptSequenceOutfit = {
id: string
name: string
description: string
}
export type PromptSequenceCharacter = { export type PromptSequenceCharacter = {
id: string id: string
name: string name: string
description: string description: string
outfits: PromptSequenceOutfit[]
}
export type PromptSequenceCharacterState = {
characterId: string
on: boolean
/** Active outfit id for this scene, or null/'' for none. */
outfitId: string | null
} }
export type PromptSequenceScene = { export type PromptSequenceScene = {
@@ -9,13 +23,14 @@ export type PromptSequenceScene = {
title: string title: string
style: string style: string
settings: string settings: string
characters: PromptSequenceCharacter[] characterStates: PromptSequenceCharacterState[]
prompt: string prompt: string
} }
export type PromptSequence = { export type PromptSequence = {
id: string id: string
name: string name: string
characters: PromptSequenceCharacter[]
scenes: PromptSequenceScene[] scenes: PromptSequenceScene[]
createdAt: number createdAt: number
updatedAt: number updatedAt: number
@@ -32,17 +47,25 @@ export function newId() {
return `ps-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}` return `ps-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`
} }
export function emptyCharacter(): PromptSequenceCharacter { export function emptyOutfit(): PromptSequenceOutfit {
return { id: newId(), name: '', description: '' } return { id: newId(), name: '', description: '' }
} }
export function emptyScene(index = 1): PromptSequenceScene { export function emptyCharacter(): PromptSequenceCharacter {
return { id: newId(), name: '', description: '', outfits: [] }
}
export function defaultCharacterState(characterId: string, on = true): PromptSequenceCharacterState {
return { characterId, on, outfitId: null }
}
export function emptyScene(index = 1, characters: PromptSequenceCharacter[] = []): PromptSequenceScene {
return { return {
id: newId(), id: newId(),
title: `Scene ${Math.max(1, index)}`, title: `Scene ${Math.max(1, index)}`,
style: '', style: '',
settings: '', settings: '',
characters: [emptyCharacter()], characterStates: characters.map(character => defaultCharacterState(character.id, true)),
prompt: '' prompt: ''
} }
} }
@@ -53,34 +76,77 @@ export function cloneSceneForNext(previous: PromptSequenceScene, nextIndex: numb
title: `Scene ${nextIndex}`, title: `Scene ${nextIndex}`,
style: previous.style, style: previous.style,
settings: previous.settings, settings: previous.settings,
characters: (previous.characters || []).map(character => ({ characterStates: (previous.characterStates || []).map(state => ({
id: newId(), characterId: state.characterId,
name: character.name, on: !!state.on,
description: character.description outfitId: state.outfitId || null
})), })),
prompt: previous.prompt prompt: previous.prompt
} }
} }
/** Character line: "Name: description", or name-only, or description-only. */ function outfitPromptText(outfit?: { name?: string; description?: string } | null) {
export function formatCharacterLine(character: { name?: string; description?: string }) { if (!outfit) return ''
const name = String(character?.name || '').trim() return String(outfit.description || '').trim() || String(outfit.name || '').trim()
const description = String(character?.description || '').trim()
if (!name && !description) return ''
if (name && description) return `${name}: ${description}`
return name || description
} }
export function assembleSceneText(scene: { /**
style?: string * Character line when on:
settings?: string * - with outfit: "Name: description. Outfit: outfit description"
characters?: Array<{ name?: string; description?: string }> * - without: "Name: description" (or name-only / description-only)
prompt?: string */
}) { export function formatCharacterLine(
const characterBlock = (scene.characters || []) character: { name?: string; description?: string },
.map(formatCharacterLine) outfit?: { name?: string; description?: string } | null
) {
const name = String(character?.name || '').trim()
const description = String(character?.description || '').trim()
let base = ''
if (name && description) base = `${name}: ${description}`
else base = name || description
if (!base) return ''
const outfitText = outfitPromptText(outfit)
if (!outfitText) return base
return `${base}. Outfit: ${outfitText}`
}
export function resolveSceneCharacterLines(
scene: { characterStates?: PromptSequenceCharacterState[] },
characters: PromptSequenceCharacter[] = []
) {
const states = scene.characterStates || []
const stateById = new Map(states.map(state => [state.characterId, state]))
return characters
.map((character) => {
const state = stateById.get(character.id)
// Missing state (legacy) => on
if (state && !state.on) return ''
const outfitId = state?.outfitId || null
const outfit = outfitId
? (character.outfits || []).find(item => item.id === outfitId) || null
: null
return formatCharacterLine(character, outfit)
})
.filter(Boolean) .filter(Boolean)
.join('\n') }
export function assembleSceneText(
scene: {
style?: string
settings?: string
prompt?: string
characterStates?: PromptSequenceCharacterState[]
/** Legacy per-scene characters (migration / old tests). */
characters?: Array<{ name?: string; description?: string }>
},
sequenceCharacters?: PromptSequenceCharacter[]
) {
const characterBlock = sequenceCharacters?.length
? resolveSceneCharacterLines(scene, sequenceCharacters).join('\n')
: (scene.characters || [])
.map(character => formatCharacterLine(character))
.filter(Boolean)
.join('\n')
const parts = [ const parts = [
String(scene.style || '').trim(), String(scene.style || '').trim(),
String(scene.settings || '').trim(), String(scene.settings || '').trim(),
@@ -96,15 +162,18 @@ export function assembleSceneText(scene: {
* Sequence name is never included. * Sequence name is never included.
*/ */
export function assembleSequenceText(sequence: { export function assembleSequenceText(sequence: {
characters?: PromptSequenceCharacter[]
scenes?: Array<{ scenes?: Array<{
style?: string style?: string
settings?: string settings?: string
characters?: Array<{ name?: string; description?: string }>
prompt?: string prompt?: string
characterStates?: PromptSequenceCharacterState[]
characters?: Array<{ name?: string; description?: string }>
}> }>
}) { }) {
const characters = sequence.characters || []
return (sequence.scenes || []) return (sequence.scenes || [])
.map(assembleSceneText) .map(scene => assembleSceneText(scene, characters.length ? characters : undefined))
.filter(Boolean) .filter(Boolean)
.join('\n\n\n') .join('\n\n\n')
} }
@@ -122,7 +191,7 @@ export function normalizePromptSequenceTitle(raw: unknown, fallback: string) {
return title || fallback return title || fallback
} }
export function normalizeCharacter(raw: unknown): PromptSequenceCharacter { export function normalizeOutfit(raw: unknown): PromptSequenceOutfit {
const rec = (raw && typeof raw === 'object' ? raw : {}) as Record<string, unknown> const rec = (raw && typeof raw === 'object' ? raw : {}) as Record<string, unknown>
return { return {
id: String(rec.id || '').trim() || newId(), id: String(rec.id || '').trim() || newId(),
@@ -131,17 +200,79 @@ export function normalizeCharacter(raw: unknown): PromptSequenceCharacter {
} }
} }
export function normalizeScene(raw: unknown, index: number): PromptSequenceScene { export function normalizeCharacter(raw: unknown): PromptSequenceCharacter {
const rec = (raw && typeof raw === 'object' ? raw : {}) as Record<string, unknown>
const outfits = Array.isArray(rec.outfits) ? rec.outfits.map(normalizeOutfit) : []
return {
id: String(rec.id || '').trim() || newId(),
name: String(rec.name || '').trim().slice(0, 120),
description: normalizePromptSequenceField(rec.description).trim(),
outfits
}
}
export function normalizeCharacterState(raw: unknown, fallbackCharacterId = ''): PromptSequenceCharacterState {
const rec = (raw && typeof raw === 'object' ? raw : {}) as Record<string, unknown>
const characterId = String(rec.characterId || fallbackCharacterId || '').trim()
const outfitRaw = rec.outfitId
const outfitId = outfitRaw == null || outfitRaw === '' ? null : String(outfitRaw).trim() || null
return {
characterId,
on: rec.on === undefined ? true : !!rec.on,
outfitId
}
}
function liftLegacyCharacters(scenesRaw: unknown[]): PromptSequenceCharacter[] {
const byId = new Map<string, PromptSequenceCharacter>()
for (const scene of scenesRaw) {
if (!scene || typeof scene !== 'object') continue
const chars = (scene as Record<string, unknown>).characters
if (!Array.isArray(chars)) continue
for (const character of chars) {
const normalized = normalizeCharacter(character)
if (!byId.has(normalized.id)) byId.set(normalized.id, normalized)
}
}
return [...byId.values()]
}
function syncCharacterStates(
statesRaw: unknown,
characters: PromptSequenceCharacter[],
defaultOn = true
): PromptSequenceCharacterState[] {
const incoming = Array.isArray(statesRaw)
? statesRaw.map(state => normalizeCharacterState(state)).filter(state => state.characterId)
: []
const byId = new Map(incoming.map(state => [state.characterId, state]))
return characters.map((character) => {
const existing = byId.get(character.id)
if (existing) {
const outfitOk = existing.outfitId
&& character.outfits.some(outfit => outfit.id === existing.outfitId)
return {
characterId: character.id,
on: existing.on,
outfitId: outfitOk ? existing.outfitId : null
}
}
return defaultCharacterState(character.id, defaultOn)
})
}
export function normalizeScene(
raw: unknown,
index: number,
characters: PromptSequenceCharacter[] = []
): PromptSequenceScene {
const rec = (raw && typeof raw === 'object' ? raw : {}) as Record<string, unknown> const rec = (raw && typeof raw === 'object' ? raw : {}) as Record<string, unknown>
const characters = Array.isArray(rec.characters)
? rec.characters.map(normalizeCharacter)
: [emptyCharacter()]
return { return {
id: String(rec.id || '').trim() || newId(), id: String(rec.id || '').trim() || newId(),
title: normalizePromptSequenceTitle(rec.title, `Scene ${index + 1}`), title: normalizePromptSequenceTitle(rec.title, `Scene ${index + 1}`),
style: normalizePromptSequenceField(rec.style), style: normalizePromptSequenceField(rec.style),
settings: normalizePromptSequenceField(rec.settings), settings: normalizePromptSequenceField(rec.settings),
characters: characters.length ? characters : [emptyCharacter()], characterStates: syncCharacterStates(rec.characterStates, characters, true),
prompt: normalizePromptSequenceField(rec.prompt) prompt: normalizePromptSequenceField(rec.prompt)
} }
} }
@@ -152,13 +283,42 @@ export function normalizePromptSequence(raw: unknown): PromptSequence | null {
const name = normalizePromptSequenceName(rec.name) const name = normalizePromptSequenceName(rec.name)
if (!name) return null if (!name) return null
const scenesRaw = Array.isArray(rec.scenes) ? rec.scenes : [] const scenesRaw = Array.isArray(rec.scenes) ? rec.scenes : []
const scenes = scenesRaw.map((scene, index) => normalizeScene(scene, index)) let characters = Array.isArray(rec.characters)
? rec.characters.map(normalizeCharacter)
: liftLegacyCharacters(scenesRaw)
if (!characters.length) characters = [emptyCharacter()]
const scenes = scenesRaw.length
? scenesRaw.map((scene, index) => normalizeScene(scene, index, characters))
: [emptyScene(1, characters)]
const createdAt = Number(rec.createdAt) || Date.now() const createdAt = Number(rec.createdAt) || Date.now()
return { return {
id: String(rec.id || '').trim() || newId(), id: String(rec.id || '').trim() || newId(),
name, name,
scenes: scenes.length ? scenes : [emptyScene(1)], characters,
scenes,
createdAt, createdAt,
updatedAt: Number(rec.updatedAt) || createdAt updatedAt: Number(rec.updatedAt) || createdAt
} }
} }
/** Ensure every scene has a state row for every sequence character. */
export function ensureSceneStatesForCharacters(
scenes: PromptSequenceScene[],
characters: PromptSequenceCharacter[],
opts?: { newCharacterId?: string; turnOnSceneIndex?: number }
) {
const newId = opts?.newCharacterId
const turnOnIndex = opts?.turnOnSceneIndex
for (let i = 0; i < scenes.length; i++) {
const scene = scenes[i]
const byId = new Map(scene.characterStates.map(state => [state.characterId, state]))
scene.characterStates = characters.map((character) => {
const existing = byId.get(character.id)
if (existing) return existing
const on = newId && character.id === newId
? i === turnOnIndex
: true
return defaultCharacterState(character.id, on)
})
}
}