Skip to content

Make videos on the computer you already own. FreeVideo runs MiniMax H3 in as little as 8 GB of VRAM and 16 GB of RAM, and adapts its acceleration path to your hardware.

Studio: show a reused or older prompt in sections as numbered shots and a sound paragraph

Bowen Xue042ee462f02e
diff --git a/web/prompt_enhance.js b/web/prompt_enhance.js
index 9b152de..c30ca31 100644
--- a/web/prompt_enhance.js
+++ b/web/prompt_enhance.js
@@ -14,11 +14,23 @@ export class PromptVersions {
edit(text, restart = false) {
this.value.edits = (this.value.edits || 0) + 1;
if (restart && this.value.selected === 'rewritten') {
- Object.assign(this.value, {original: text, rewritten: '', model: '', selected: 'original', context: '', useOriginal: false});
+ Object.assign(this.value, {original: text, originalModel: '', rewritten: '', model: '', selected: 'original', context: '', useOriginal: false});
return;
}
this.value[this.value.selected] = text;
- if (this.value.selected === 'original') this.value.context = '';
+ if (this.value.selected === 'original') { this.value.context = ''; if (restart) this.value.originalModel = ''; }
+ }
+ // Text put in the box from elsewhere starts a new scene. `model` is the H3 text it shows in short, sent as written
+ // until the box is cleared or replaced.
+ adopt(text, model = '') {
+ // A version saved in sections before the box showed it in short (an older workflow) keeps its place.
+ if (model && model !== text && model === this.text()) {
+ this.value[this.value.selected] = text;
+ this.value[this.value.selected === 'rewritten' ? 'model' : 'originalModel'] = model;
+ return;
+ }
+ this.edit(text, true);
+ this.value.originalModel = model === text ? '' : model;
}
key(context) { return JSON.stringify({text: this.value.original, ...context}); }
// `model` is the rewrite as the model wrote it, kept when the box shows it in a shorter form.
@@ -410,7 +422,12 @@ export function createPromptEnhancer({node, input, editor, api, context, setText
if (error?.message === 'cancelled' || cancelling || disposed) { show(errorText({message: 'cancelled'})); return false; }
useOriginal(error);
}
- }, sync() { if (input.value !== versions.text()) changed(); }, dispose() {
+ }, sync(model = '') {
+ // The box was filled from elsewhere (a reused prompt, the node on the canvas): a new scene, not an edit.
+ if (input.value === versions.text() && !model) return;
+ if (waiting) { waiting = false; show(''); }
+ versions.adopt(input.value, model); replacing = false; save(); render();
+ }, dispose() {
disposed = true; modelListeners.clear(); prestart.dispose(); cancelJob().catch(() => {}); input.removeEventListener('input', changed);
input.removeEventListener('beforeinput', replace);
input.removeEventListener('focus', onFocus);
diff --git a/web/prompt_sections.js b/web/prompt_sections.js
index e42a419..6fd0407 100644
--- a/web/prompt_sections.js
+++ b/web/prompt_sections.js
@@ -101,7 +101,10 @@ export function modelText(shown, rewrite) {
.map(([name, body]) => `${name}: ${body}`).join('\n\n');
}
-// The prompt widget's text for the request: a rewrite the box shows in short goes back in the model's sections.
+// The prompt widget's text for the request: text the box shows in short (a rewrite, or H3 text put in the box from
+// elsewhere) goes back in the model's sections while the widget still holds what the box last recorded.
export function requestText(text, versions) {
- return versions?.selected === 'rewritten' && versions.model ? modelText(text, versions.model) : text;
+ const side = versions?.selected === 'rewritten' ? 'rewritten' : 'original';
+ const model = side === 'rewritten' ? versions?.model : versions?.originalModel;
+ return model && versions[side] === text ? modelText(text, model) : text;
}
diff --git a/web/studio.js b/web/studio.js
index 5985f34..2976063 100644
--- a/web/studio.js
+++ b/web/studio.js
@@ -34,7 +34,7 @@ import { continuationUpscale, createSamplingEffort, effortFor, effortsFrom, pass
import { resultActions, previewBadge, icon, actionsUnavailable } from './result_actions.js';
import { framesOf } from './result_reuse.js';
import { createPromptEnhancer } from './prompt_enhance.js';
-import { shownRewrite } from './prompt_sections.js';
+import { requestText, shownRewrite } from './prompt_sections.js';
import { createRequestAssets, enabledLoras, referenceFiles } from './request_assets.js';
import { promptDraftTrouble, rememberPromptDraft, restorePromptDraft, savePromptDraft, trackPromptDraft, watchPromptDraftTrouble } from './prompt_draft.js';
import { canvasDimensions, imageSizeSelection } from './studio_size.js';
@@ -835,7 +835,17 @@ export function openStudio(node, {extendFrom = null} = {}) {
requestAssets = createRequestAssets({t, api, request: () => requestAssetsQuery?.()});
cleanup.push(() => requestAssets.dispose());
let requestAssetsQuery = null;
- const promptChanged = e => { if (String(e.detail) === String(node.id)) { if (prompt.value !== shown(value(node, 'text'))) prompt.value = shown(value(node, 'text')); prompt.disabled = linked(node, 'text'); mention.disabled = prompt.disabled; placeholder(); castOverlay.refresh(); references.refresh(); announceCast(); enhancer.sync(); } };
+ // H3 text put in the box from elsewhere (a reused prompt, an older workflow) shows in the same readable form as a
+ // rewrite; the enhancer keeps the model's words and sends them as written until the box is cleared or replaced.
+ const showPrompt = () => {
+ const text = value(node, 'text');
+ const readable = untouched() || linked(node, 'text') ? null : shownRewrite(text, t('en', 'zh'));
+ if (readable !== null) set(node, 'text', readable);
+ if (prompt.value !== shown(value(node, 'text'))) prompt.value = shown(value(node, 'text'));
+ enhancer.sync(readable === null ? '' : text);
+ };
+ showPrompt();
+ const promptChanged = e => { if (String(e.detail) === String(node.id)) { prompt.disabled = linked(node, 'text'); showPrompt(); mention.disabled = prompt.disabled; placeholder(); castOverlay.refresh(); references.refresh(); announceCast(); } };
window.addEventListener('freevideo-reference-prompt', promptChanged);
cleanup.push(() => window.removeEventListener('freevideo-reference-prompt', promptChanged));
const promptSection = section(t('Describe your scene', '描述画面'));
@@ -1445,7 +1455,7 @@ export function openStudio(node, {extendFrom = null} = {}) {
const reuse = {
now: saved => {
const sizeLocked = dimensionsLinked || Boolean(extension.source), lengthLocked = linked(node, 'seconds') || Boolean(extension.source);
- return {text: prompt.disabled ? saved.text : prompt.value, width: sizeLocked ? saved.width : Number(value(node, 'width')),
+ return {text: prompt.disabled ? saved.text : requestText(prompt.value, node.properties?.freevideo_prompt_versions), width: sizeLocked ? saved.width : Number(value(node, 'width')),
height: sizeLocked ? saved.height : Number(value(node, 'height')),
frames: lengthLocked ? saved.frames : framesOf(seconds.value), seconds: Number(seconds.value)};
},
@@ -2167,7 +2177,7 @@ export function openStudio(node, {extendFrom = null} = {}) {
}
twoPass.checked = Boolean(source) || value(node, 'two_pass') !== false;
previewFirst.checked = !source && value(node, 'preview') === true;
- prompt.value = shown(value(node, 'text')); placeholder(); enhancer.sync();
+ showPrompt(); placeholder();
// The media panel and the @ list read whether a video is being continued.
if (mediaNode) window.dispatchEvent(new CustomEvent('freevideo-media', {detail: mediaNode.id}));
syncSamplingSteps(); syncCanvasSize(); seconds.dispatchEvent(new Event('input'));