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.
LoRA trigger words in creation, Agent and chain prompts
Bowen Xuee5fc6d613e4b
diff --git a/freevideo_engine/agent/jobs.py b/freevideo_engine/agent/jobs.pyindex 47eff87..4384f12 100644--- a/freevideo_engine/agent/jobs.py+++ b/freevideo_engine/agent/jobs.py@@ -1434,6 +1434,7 @@ class Jobs:return assetsassets = resolve()graph = specs.comfy_prompt(spec, node, prompt=prompt, assets=assets)+ prompt = graph[node]['inputs']['text']with self.lock:row['inputs'] = dict(media=assets, prompt_chars=len(prompt))if row.get('_cancel'):diff --git a/freevideo_engine/agent/routes.py b/freevideo_engine/agent/routes.pyindex e7dd090..0034678 100644--- a/freevideo_engine/agent/routes.py+++ b/freevideo_engine/agent/routes.py@@ -171,6 +171,7 @@ def features(continuation, vlm):def capabilities(port, jobs):+ from ..lora_triggers import list_triggersfrom .. import __version__from ..desktop_runtime import source_releasefrom ..comfy_assets import EXTENSIONS@@ -217,6 +218,7 @@ def capabilities(port, jobs):aspects=sorted(specs.ASPECTS), native_megapixels=.98,tasks=GUIDE['tasks'], media_extensions={k: sorted(v) for k, v in EXTENSIONS.items()},loras=sorted(n for n in port.folders.get_filename_list('loras') if n.lower().endswith('.safetensors')),+ lora_trigger_words=list_triggers(port.folders),vlm=vlm, queue=dict(running=len(running), pending=len(pending),agent_active=len(jobs.active())),docs=dict(guide=PREFIX + '/guide', schema=PREFIX + '/schema', openapi=PREFIX + '/openapi.json'))diff --git a/freevideo_engine/agent/spec.py b/freevideo_engine/agent/spec.pyindex d44e60d..96ab196 100644--- a/freevideo_engine/agent/spec.py+++ b/freevideo_engine/agent/spec.py@@ -243,6 +243,8 @@ def normalize(value, *, port=None):def comfy_prompt(spec, node, *, prompt, assets, refine_from=''):"""The ComfyUI API-format graph for one generate job; media are files in ComfyUI input."""+ from ..lora_triggers import apply_triggers+ prompt = apply_triggers(prompt, spec.get('loras', []))inputs = dict(text=prompt, width=spec['width'], height=spec['height'], seconds=spec['seconds'],seed=spec['seed'], two_pass=spec['two_pass'], base_steps=spec['base_steps'],refine_steps=spec['refine_steps'], force_regenerate=spec['force_regenerate'],@@ -258,7 +260,8 @@ def comfy_prompt(spec, node, *, prompt, assets, refine_from=''):inputs['media'] = [node + 'm', 0]if spec.get('loras'):graph[node + 'l'] = {'class_type': 'FreeVideoLoRAStack',- 'inputs': {'adapters': json.dumps([dict(r, enabled=True) for r in spec['loras']])},+ 'inputs': {'adapters': json.dumps([dict(r, enabled=True) for r in spec['loras']+ if r.get('enabled', True)])},'_meta': {'title': 'FreeVideo · LoRAs'}}inputs['loras'] = [node + 'l', 0]return graphdiff --git a/freevideo_engine/chain_runner.py b/freevideo_engine/chain_runner.pyindex fbbb0b1..f48c478 100644--- a/freevideo_engine/chain_runner.py+++ b/freevideo_engine/chain_runner.py@@ -183,7 +183,9 @@ class ChainRunner:return 1def create(self, payload):+ from .lora_triggers import apply_chain_triggersrecord = store.validate(payload)+ apply_chain_triggers(record)with self.lock:# Before anything is written or queued: a refused chain leaves every record and file as it was.short = [row['inputs']['frames'] for row in record['blocks']diff --git a/freevideo_engine/comfy_chain.py b/freevideo_engine/comfy_chain.pyindex c770c38..18ceae9 100644--- a/freevideo_engine/comfy_chain.py+++ b/freevideo_engine/comfy_chain.py@@ -1,4 +1,5 @@"""Local ComfyUI queue adapter and optional background-chain routes."""+import asyncioimport jsonimport loggingimport math@@ -271,7 +272,7 @@ def register(host_factory=None):return response({'error': 'Continuing a video is not available in this version'}, 409)if missing:return response({'error': 'Extending backwards or filling a gap is not available in this version'}, 409)- return response({'chain': runner.create(value)})+ return response({'chain': await asyncio.to_thread(runner.create, value)})except ChainBusy as failure:return response({'error': str(failure)}, 409)except ChainTooLong as failure:diff --git a/freevideo_engine/comfy_upload.py b/freevideo_engine/comfy_upload.pyindex e8edcaa..36feabc 100644--- a/freevideo_engine/comfy_upload.py+++ b/freevideo_engine/comfy_upload.py@@ -1,4 +1,5 @@"""Stream browser media to ComfyUI input without buffering a clip in RAM."""+import asynciofrom pathlib import Path, PureWindowsPathimport uuid@@ -57,4 +58,26 @@ def register():return web.json_response({'error': str(error)}, status=400)return web.json_response(result)+ from .lora_triggers import get_trigger, set_trigger++ @server.routes.get('/freevideo/lora/triggers')+ async def lora_triggers(request):+ try:+ result = await asyncio.to_thread(get_trigger, request.query.get('name'), folders=folder_paths)+ except (OSError, ValueError) as error:+ return web.json_response({'error': str(error)}, status=400)+ return web.json_response(result, headers={'Cache-Control': 'no-store'})++ @server.routes.post('/freevideo/lora/triggers')+ async def save_lora_triggers(request):+ try:+ value = await request.json()+ if not isinstance(value, dict):+ raise ValueError('A JSON object is required')+ result = await asyncio.to_thread(set_trigger, value.get('name'), value.get('words'),+ folders=folder_paths)+ except (OSError, ValueError, TypeError) as error:+ return web.json_response({'error': str(error)}, status=400)+ return web.json_response(result, headers={'Cache-Control': 'no-store'})+server._freevideo_upload_registered = Truediff --git a/freevideo_engine/lora_triggers.py b/freevideo_engine/lora_triggers.pynew file mode 100644index 0000000..c29e4e4--- /dev/null+++ b/freevideo_engine/lora_triggers.py@@ -0,0 +1,226 @@+"""User-entered LoRA triggers, identified by content rather than library location.++All functions here perform synchronous file I/O. HTTP callers use to_thread;+Agent graph construction and chain creation already run on worker threads.+"""+import hashlib+import json+import os+from pathlib import Path+import re+import tempfile+import threading++from .comfy_assets import resolve_loras+from .launcher_settings import Store+from .long_paths import io_path+from .model_repair import valid_name+from .paths import data_root++MAX_WORDS = 300+CHUNK_BYTES = 1024 * 1024+TRIGGERS_FILE = 'lora-triggers.json'+CACHE_FILE = 'lora-fingerprints.json'+_SHA256 = re.compile(r'[0-9a-f]{64}')+_LOCK = threading.RLock()+++def settings_directory():+ # Alongside durable launcher preferences, outside model and runtime folders.+ return Store(data_root()).primary.parent+++def _read(path):+ try:+ def invalid_number(value):+ raise ValueError('Invalid JSON number')+ value = json.loads(io_path(path).read_text(encoding='utf-8'), parse_constant=invalid_number)+ return value if isinstance(value, dict) else {}+ except (OSError, ValueError):+ return {}+++def _write(path, value):+ path = io_path(path)+ path.parent.mkdir(parents=True, exist_ok=True)+ temporary = None+ try:+ with tempfile.NamedTemporaryFile(mode='w', encoding='utf-8', dir=path.parent,+ prefix=path.name + '.', suffix='.tmp', delete=False) as stream:+ temporary = Path(stream.name)+ json.dump(value, stream, ensure_ascii=False, allow_nan=False)+ stream.flush()+ os.fsync(stream.fileno())+ os.replace(temporary, path)+ finally:+ if temporary is not None:+ temporary.unlink(missing_ok=True)+++def _valid_name(name):+ return (valid_name(name) and '..' not in name+ and not any(c in name for c in (':', '\x00', '\r', '\n'))+ and name.lower().endswith('.safetensors'))+++def resolve_name(name, folders=None):+ if not _valid_name(name):+ raise ValueError('Select an existing LoRA filename without path separators or ..')+ if folders is None:+ import folder_paths as folders+ # Reuse the stack's library membership and safetensors validation.+ rows = resolve_loras(json.dumps([dict(name=name)]), folders.get_filename_list('loras'),+ lambda n: folders.get_full_path_or_raise('loras', n))+ path = io_path(rows[0]['path'])+ if not path.is_file():+ raise ValueError('Select an existing LoRA file')+ return path+++def _hash_file(path):+ digest = hashlib.sha256()+ with path.open('rb') as stream:+ while chunk := stream.read(CHUNK_BYTES):+ digest.update(chunk)+ return digest.hexdigest()+++def fingerprint(path, directory=None):+ """Full SHA-256; persistent cache identity is resolved path, size and mtime_ns."""+ path = io_path(Path(path).resolve())+ directory = settings_directory() if directory is None else Path(directory)+ with _LOCK:+ info = path.stat()+ cache = _read(directory / CACHE_FILE).get('files', {})+ cache = cache if isinstance(cache, dict) else {}+ key = str(path)+ row = cache.get(key)+ if (isinstance(row, dict) and type(row.get('size')) is int+ and type(row.get('mtime_ns')) is int+ and (row['size'], row['mtime_ns']) == (info.st_size, info.st_mtime_ns)+ and isinstance(row.get('sha256'), str) and _SHA256.fullmatch(row['sha256'])):+ return row['sha256']+ digest = _hash_file(path)+ after = path.stat()+ if (info.st_size, info.st_mtime_ns) != (after.st_size, after.st_mtime_ns):+ raise ValueError('LoRA changed while reading; try again')+ cache[key] = dict(size=info.st_size, mtime_ns=info.st_mtime_ns, sha256=digest)+ _write(directory / CACHE_FILE, dict(version=1, files=cache))+ return digest+++def _entries(directory):+ rows = _read(directory / TRIGGERS_FILE).get('triggers', {})+ if not isinstance(rows, dict):+ return {}+ return {key: dict(words=row['words'].strip(), source='user', name=row.get('name', ''))+ for key, row in rows.items()+ if isinstance(key, str) and _SHA256.fullmatch(key) and isinstance(row, dict)+ and isinstance(row.get('words'), str) and 0 < len(row['words'].strip()) <= MAX_WORDS+ and row.get('source') == 'user' and isinstance(row.get('name', ''), str)}+++def get_trigger(name, *, folders=None):+ with _LOCK:+ path = resolve_name(name, folders)+ directory = settings_directory()+ digest = fingerprint(path, directory)+ rows = _entries(directory)+ row = rows.get(digest)+ if row is not None and row['name'] != name:+ row['name'] = name+ _write(directory / TRIGGERS_FILE, dict(version=1, triggers=rows))+ return dict(name=name, words=row['words'] if row else '', source='user' if row else '')+++def set_trigger(name, words, *, folders=None):+ if not isinstance(words, str):+ raise ValueError('Trigger words must be a string')+ words = words.strip()+ if len(words) > MAX_WORDS:+ raise ValueError('Trigger words must be at most 300 characters')+ with _LOCK:+ path = resolve_name(name, folders)+ directory = settings_directory()+ digest = fingerprint(path, directory)+ rows = _entries(directory)+ if words:+ rows[digest] = dict(name=name, words=words, source='user')+ else:+ rows.pop(digest, None)+ _write(directory / TRIGGERS_FILE, dict(version=1, triggers=rows))+ return dict(name=name, words=words, source='user' if words else '')+++def get_trigger_words(name, *, folders=None):+ # No saved triggers means no model-file reads when listing or submitting LoRAs.+ # Subfolder names admitted by existing workflows cannot have an API entry.+ with _LOCK:+ if not _valid_name(name) or not _entries(settings_directory()):+ return ''+ return get_trigger(name, folders=folders)['words']+++def prepend_words(prompt, words):+ if not words or words.casefold() in prompt.casefold():+ return prompt+ return words + ', ' + prompt if prompt else words+++def apply_triggers(prompt, loras, *, folders=None):+ for row in loras:+ if row.get('enabled', True) and row.get('strength', 1.) != 0:+ prompt = prepend_words(prompt, get_trigger_words(row['name'], folders=folders))+ return prompt+++def list_triggers(folders):+ """Installed LoRA names that have trigger words saved, as {name: words}."""+ found = {}+ for name in sorted(folders.get_filename_list('loras')):+ if name.lower().endswith('.safetensors'):+ words = get_trigger_words(name, folders=folders)+ if words:+ found[name] = words+ return found+++def _stack_rows(graph, link, seen=None):+ """Follow only the selected generator's LoRA input and chained previous stacks."""+ seen = set() if seen is None else seen+ if (not isinstance(link, list) or len(link) != 2 or type(link[0]) not in (str, int)+ or link[0] in seen or link[0] not in graph):+ return []+ seen.add(link[0])+ node = graph[link[0]]+ if not isinstance(node, dict) or not isinstance(node.get('inputs'), dict):+ return []+ inputs = node['inputs']+ rows = _stack_rows(graph, inputs.get('previous'), seen)+ if node.get('class_type') == 'FreeVideoLoRAStack':+ serialized = inputs.get('adapters', '[]')+ if not isinstance(serialized, str) or len(serialized) > 128 * 1024:+ raise ValueError('Invalid LoRA selection')+ selected = json.loads(serialized)+ if not isinstance(selected, list) or any(not isinstance(row, dict) for row in selected):+ raise ValueError('Invalid LoRA selection')+ rows.extend(selected)+ elif node.get('class_type') == 'FreeVideoLoRA' and inputs.get('lora') != 'None':+ rows.append(dict(name=inputs.get('lora'), strength=inputs.get('strength', 1.)))+ return rows+++def apply_chain_triggers(record, *, folders=None):+ """Supplement a validated chain before its snapshot and block texts are saved."""+ graph = record['snapshot']['prompt']+ inputs = graph[record['node']]['inputs']+ rows = _stack_rows(graph, inputs.get('loras'))+ # Resolve once per chain, then supplement each independently supplied block.+ words = [get_trigger_words(row.get('name'), folders=folders) for row in rows+ if row.get('enabled', True) and row.get('strength', 1.) != 0]+ for item in [inputs, *(block['inputs'] for block in record['blocks'])]:+ if isinstance(item.get('text'), str):+ for phrase in words:+ item['text'] = prepend_words(item['text'], phrase)+ if any(len(block['inputs']['text']) > 20000 for block in record['blocks']):+ raise ValueError('Block text including LoRA triggers must be at most 20000 characters')diff --git a/web/health.js b/web/health.jsindex 536d6e4..0398774 100644--- a/web/health.js+++ b/web/health.js@@ -15,7 +15,7 @@ const launchVisit = query.get('freevideo') === 'launch';// Every script this folder ships; a test keeps the list in step with web/*.js.export const MODULES = ['agent_activity.js', 'agent_connect.js', 'agent_session.js', 'autopilot.js', 'autopilot_chat.js', 'autopilot_conversations.js', 'browser_extension.js', 'chain_support.js', 'capability_view.js', 'compatibility.js', 'error_panel.js', 'first_run_guide.js', 'fonts.js', 'freevideo.js', 'generation_progress.js','editor.js', 'editor_actions.js', 'editor_adjust.js', 'editor_adjust_picture.js', 'editor_picture_fields.js', 'editor_picture_session.js', 'editor_preview_picture.js', 'editor_entry.js', 'editor_export_dialog.js', 'editor_first_frame.js', 'editor_media_references.js', 'editor_references.js', 'editor_genbar.js', 'editor_geometry.js', 'editor_library.js', 'editor_menu.js', 'editor_model.js', 'editor_frame.js', 'editor_player.js', 'editor_room.js', 'editor_select.js', 'editor_state.js', 'editor_store.js', 'editor_tracks.js', 'editor_generation.js', 'editor_transport.js', 'editor_transport_model.js', 'editor_audio.js', 'editor_audio_model.js', 'editor_audio_notes.js', 'editor_audio_replace.js', 'editor_audio_rules.js', 'editor_speed.js', 'editor_speed_model.js',- 'editor_loader.js', 'editor_text_coverage.js', 'editor_text.js', 'editor_text_model.js', 'editor_text_layout.js', 'editor_notes.js', 'editor_icons.js', 'dialog_keys.js', 'frame_sizes.js', 'health.js', 'image_commands.js', 'image_editor.js', 'image_editor_engine.js', 'image_generation.js', 'launcher.js', 'length_plan.js', 'library.js', 'motion.js', 'output_download.js', 'port_notice.js', 'preview_scene.js',+ 'editor_loader.js', 'editor_text_coverage.js', 'editor_text.js', 'editor_text_model.js', 'editor_text_layout.js', 'editor_notes.js', 'editor_icons.js', 'dialog_keys.js', 'frame_sizes.js', 'health.js', 'image_commands.js', 'image_editor.js', 'image_editor_engine.js', 'image_generation.js', 'launcher.js', 'length_plan.js', 'lora_triggers.js', 'library.js', 'motion.js', 'output_download.js', 'port_notice.js', 'preview_scene.js','progress_connection.js', 'prompt_draft.js', 'prompt_enhance.js', 'prompt_references.js', 'report_issue.js', 'studio_recent.js','result_actions.js', 'sampling_effort.js', 'setup.js', 'share.js', 'share_layout.js', 'studio.js', 'studio_chain.js', 'studio_extend.js', 'studio_length.js', 'first_frame_row.js', 'optional_inputs.js', 'studio_queue.js', 'studio_size.js','toolbar_position.js', 'updates.js', 'view_navigation.js', 'wordmark.js'];diff --git a/web/lora_triggers.js b/web/lora_triggers.jsnew file mode 100644index 0000000..663350f--- /dev/null+++ b/web/lora_triggers.js@@ -0,0 +1,45 @@+// Records are saved on the generation node: {name, words, added}. A phrase+// already written by the user has added=false, so it is never removed or+// reinserted after a manual edit. A missing table entry means lookup is pending.+function removeInsertion(prompt, words) {+ const index = prompt.indexOf(words);+ if (index < 0) return prompt;+ const before = prompt.slice(0, index), after = prompt.slice(index + words.length);+ const following = after.match(/^\s*,\s*/);+ if (following) return before + after.slice(following[0].length);+ const preceding = before.match(/,\s*$/);+ return (preceding ? before.slice(0, -preceding[0].length) : before) + after;+}++export function reconcileLoraTriggers(prompt, records, rows, wordsByName) {+ prompt = String(prompt ?? '');+ const names = [...new Set(rows.filter(row => row.enabled !== false && row.name).map(row => row.name))];+ const active = new Set(names);+ const previous = new Map((Array.isArray(records) ? records : [])+ .filter(row => row && typeof row.name === 'string' && typeof row.words === 'string' && row.words)+ .map(row => [row.name, {...row}]));+ const words = name => Object.hasOwn(wordsByName, name) ? String(wordsByName[name] ?? '').trim() : undefined;+ const retained = new Map([...previous].filter(([name, row]) => active.has(name)+ && (words(name) === undefined || words(name) === row.words)));+ const needed = new Set(names.map(name => words(name) ?? retained.get(name)?.words).filter(Boolean));+ const removed = new Set();+ for (const old of previous.values()) {+ if (old.added && !retained.has(old.name) && !needed.has(old.words) && !removed.has(old.words)) {+ prompt = removeInsertion(prompt, old.words); removed.add(old.words);+ }+ }+ // Shared phrases have joint ownership, including when one model replaces+ // another with the same phrase. Remove them only after the last owner leaves.+ const owned = new Set([...previous.values()].filter(row => row.added && prompt.includes(row.words)).map(row => row.words));+ const next = [], prefix = [];+ for (const name of names) {+ if (retained.has(name)) { next.push(retained.get(name)); continue; }+ const phrase = words(name);+ if (!phrase) continue;+ const present = [...prefix, prompt].join(', ').toLowerCase().includes(phrase.toLowerCase());+ const added = !present || owned.has(phrase);+ if (!present) { prefix.push(phrase); owned.add(phrase); }+ next.push({name, words: phrase, added});+ }+ return {prompt: [...prefix, ...(prompt ? [prompt] : [])].join(', '), records: next};+}diff --git a/web/studio.css b/web/studio.cssindex b20eb02..f599276 100644--- a/web/studio.css+++ b/web/studio.css@@ -127,6 +127,8 @@.fv-lora-list{display:flex;flex-direction:column;gap:8px;margin:12px 0}.fv-lora-row{display:grid;grid-template-columns:18px minmax(0,1fr) 64px 30px;align-items:center;gap:7px}.fv-lora-row select{min-width:0!important;max-width:100%!important;width:100%!important}.fv-lora-row input[type=number]{width:64px!important;padding:6px!important;font-variant-numeric:tabular-nums}.fv-lora-row input[type=checkbox]{accent-color:var(--fv-accent);width:15px;min-height:15px}.fv-lora-row[data-enabled=false]{opacity:.45}.fv-lora-order{grid-column:2/5;display:flex;gap:5px;justify-content:flex-end}+.fv-lora-row .fv-lora-trigger{grid-column:2/5;grid-row:2;width:100%;min-width:0;min-height:28px;height:28px;box-sizing:border-box;border:1px solid var(--fv-border);border-radius:var(--fv-r-sm);padding:4px 8px;background:var(--fv-card);color:var(--fv-ink);font:inherit;font-size:var(--fv-micro)}+.fv-lora-trigger::placeholder{color:var(--fv-disabled)}.fv-studio .fv-lora-row button,.fv-lora-panel .fv-lora-row button{min-height:28px;padding:3px 7px}.fv-lora-note{font-size:var(--fv-micro);color:var(--fv-muted);text-align:center;margin:10px 0 0}.fv-lora-add{display:flex;justify-content:center;gap:8px}.fv-studio .fv-error{color:var(--fv-danger)}.fv-studio .fv-legacy{font-size:var(--fv-micro);color:var(--fv-muted);padding:12px 0}/* The workspace fills the window. On wide windows the settings column widens a little and thediff --git a/web/studio.js b/web/studio.jsindex 8d9db68..23b978a 100644--- a/web/studio.js+++ b/web/studio.js@@ -18,6 +18,7 @@ import { createRecentVideos } from './studio_recent.js';import { createAgentActivity } from './agent_activity.js';import { createStudioQueue, randomSeed } from './studio_queue.js';import { attachReferencePicker, referenceItems, syncReferencePrompt, referenceInputs } from './prompt_references.js';+import { reconcileLoraTriggers } from './lora_triggers.js';import { createSamplingEffort } from './sampling_effort.js';import { resultActions, previewBadge, icon } from './result_actions.js';import { createPromptEnhancer } from './prompt_enhance.js';@@ -60,6 +61,63 @@ function view(file, type = 'input') {}const number = (n, divisor = 1, unit = 's') => Number.isFinite(n) && n >= 0 ? `${(n / divisor).toFixed(1)} ${unit}` : '—';+const LORA_TRIGGERS = 'freevideo_lora_triggers';+// Node and creation panels share lookups and serialize saves for each filename.+const loraTriggers = new Map();+function triggerEntry(name) {+ if (!loraTriggers.has(name)) loraTriggers.set(name, {version: 0});+ return loraTriggers.get(name);+}+// The server's own wording is technical; the panel always says the same plain sentence.+const triggerReadError = () => new Error(t('Could not read trigger words.', '无法读取触发词。'));+const triggerSaveError = () => new Error(t('Could not save. Try again.', '没有保存,请再试一次。'));+async function triggerResponse(response, fail) {+ let result = null;+ try { result = await response.json(); } catch { /* not JSON: same sentence */ }+ if (!response.ok || typeof result?.words !== 'string') throw fail();+ return result;+}+function announceTriggers(name) {+ window.dispatchEvent(new CustomEvent('freevideo-lora-triggers', {detail: name}));+}+function loadTriggers(name) {+ const entry = triggerEntry(name);+ if (entry.data && Date.now() - entry.updated < 60000) return Promise.resolve(entry.data);+ if (entry.loading) return entry.loading;+ const version = entry.version;+ entry.loading = (async () => {+ // The first read of a large file hashes it once on the server; keep asking while that finishes.+ let result;+ for (let attempt = 0; ; attempt++) {+ try {+ result = await triggerResponse(await api.fetchApi('/freevideo/lora/triggers?' + new URLSearchParams({name}),+ {cache: 'no-store', signal: AbortSignal.timeout(6500)}), triggerReadError);+ break;+ } catch (error) {+ if (error?.name === 'TimeoutError' && attempt < 9) continue;+ throw triggerReadError();+ }+ }+ if (entry.version === version) { entry.data = result; entry.updated = Date.now(); announceTriggers(name); }+ return result;+ })().finally(() => { entry.loading = null; });+ return entry.loading;+}+function saveTriggers(name, words) {+ const entry = triggerEntry(name), version = ++entry.version;+ entry.saving = (entry.saving || Promise.resolve()).catch(() => {}).then(async () => {+ let result;+ try {+ result = await triggerResponse(await api.fetchApi('/freevideo/lora/triggers', {+ method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({name, words: words.trim()}),+ }), triggerSaveError);+ } catch { throw triggerSaveError(); }+ if (entry.version === version) { entry.data = result; entry.updated = Date.now(); announceTriggers(name); }+ return result;+ });+ return entry.saving;+}+export const loraWarning = () => t('FreeVideo needs no acceleration LoRA.','FreeVideo无需添加加速LoRA');@@ -78,16 +136,59 @@ export function promptGuide() {return note;}-export function loraPanel(node, panel) {+export function loraPanel(node, panel, {promptNode = null} = {}) {const list = el('div', null, 'fv-lora-list'), note = el('p', '', 'fv-lora-note');const actions = el('div', null, 'fv-lora-add'); panel.append(list, actions, note);- let names = [], disposed = false;+ let names = [], disposed = false, rendering = false, renderAgain = false;+ const drafts = new Map(), errors = new Map(), saves = new Map();const read = () => { const rows = JSON.parse(value(node, 'adapters') || '[]'); if (!Array.isArray(rows) || rows.length > 32) throw new Error(t('Use at most 32 LoRAs', '最多使用 32 个 LoRA')); return rows; };- const write = rows => { set(node, 'adapters', JSON.stringify(rows)); window.dispatchEvent(new CustomEvent('freevideo-loras', {detail: node.id})); };+ function syncPrompt(rows) {+ const targets = new Set([promptNode, ...(node.graph?._nodes || []).filter(target =>+ (target.type === 'FreeVideoGenerate' || target.comfyClass === 'FreeVideoGenerate') && upstream(target, 'loras') === node)].filter(Boolean));+ const words = Object.fromEntries(rows.filter(row => triggerEntry(row.name).data)+ .map(row => [row.name, triggerEntry(row.name).data.words]));+ for (const target of targets) {+ if (!widget(target, 'text')) continue;+ const saved = target.properties?.[LORA_TRIGGERS];+ const previous = Array.isArray(saved) ? saved : [];+ const next = reconcileLoraTriggers(value(target, 'text'), previous, rows, words);+ if (linked(target, 'text')) {+ // Never claim an insertion that cannot be written to a linked prompt.+ next.records = next.records.filter(row => previous.some(old => old.name === row.name && old.words === row.words));+ } else if (next.prompt !== value(target, 'text')) {+ set(target, 'text', next.prompt);+ syncReferencePrompt(target, t);+ // Encoded conditioning skips reference remapping, but both text+ // editors still display edits to the unlinked prompt widget.+ if (linked(target, 'conditioning')) window.dispatchEvent(new CustomEvent('freevideo-reference-prompt', {detail: target.id}));+ }+ if (JSON.stringify(previous) !== JSON.stringify(next.records)) {+ (target.properties ||= {})[LORA_TRIGGERS] = next.records;+ target.graph?.change(); target.setDirtyCanvas?.(true, true);+ }+ }+ }+ function refreshTriggerWords(name) {+ if (disposed) return;+ try {+ const rows = read();+ if (!rows.some(row => row.name === name)) return;+ syncPrompt(rows);+ for (const trigger of list.querySelectorAll('.fv-lora-trigger')) {+ if (trigger.dataset.name === name && !drafts.has(name)) trigger.value = triggerEntry(name).data?.words ?? '';+ }+ note.textContent = rows.map(row => errors.get(row.name)).find(Boolean) || loraWarning();+ } catch (error) { note.textContent = error.message; }+ }+ const write = rows => { if (set(node, 'adapters', JSON.stringify(rows))) { syncPrompt(rows); window.dispatchEvent(new CustomEvent('freevideo-loras', {detail: node.id})); } };function render() {- if (disposed) return; list.replaceChildren();+ if (disposed) return;+ if (rendering) { renderAgain = true; return; }+ rendering = true;try {+ list.replaceChildren();const rows = read();+ syncPrompt(rows);rows.forEach((row, index) => {const wrap = el('div', null, 'fv-lora-row'); wrap.dataset.enabled = String(row.enabled !== false);const enabled = el('input'); enabled.type = 'checkbox'; enabled.checked = row.enabled !== false;@@ -97,9 +198,31 @@ export function loraPanel(node, panel) {select.value = row.name; select.title = row.name; select.onchange = () => { row.name = select.value; write(rows); };const strength = el('input'); strength.type = 'number'; strength.min = '-4'; strength.max = '4'; strength.step = '.05'; strength.value = row.strength ?? 1;strength.setAttribute('aria-label', t('LoRA strength', 'LoRA 强度')); strength.onchange = () => { if (strength.reportValidity() && strength.value !== '') { row.strength = Number(strength.value); write(rows); } };- select.disabled = strength.disabled = row.enabled === false;+ const trigger = el('input', null, 'fv-lora-trigger'); trigger.type = 'text'; trigger.maxLength = 300;+ trigger.dataset.name = row.name;+ trigger.placeholder = t('Trigger words', '触发词'); trigger.setAttribute('aria-label', trigger.placeholder);+ trigger.value = drafts.get(row.name) ?? triggerEntry(row.name).data?.words ?? '';+ trigger.oninput = () => drafts.set(trigger.dataset.name, trigger.value);+ trigger.onchange = async () => {+ // Switching models can blur the old field after row.name changes.+ const name = trigger.dataset.name, draft = trigger.value;+ const request = Symbol(); saves.set(name, request);+ drafts.set(name, draft); errors.delete(name);+ try {+ await saveTriggers(name, draft);+ if (saves.get(name) !== request) return;+ errors.delete(name);+ if (drafts.get(name) === draft) drafts.delete(name);+ refreshTriggerWords(name);+ } catch (error) {+ if (!disposed && saves.get(name) === request && drafts.get(name) === draft) {+ errors.set(name, error.message); refreshTriggerWords(name);+ }+ }+ };+ select.disabled = strength.disabled = trigger.disabled = row.enabled === false;const remove = button('×', () => { rows.splice(index, 1); write(rows); }); remove.setAttribute('aria-label', t('Remove LoRA', '移除 LoRA'));- wrap.append(enabled, select, strength, remove);+ wrap.append(enabled, select, strength, remove, trigger);if (rows.length > 1) {const order = el('div', null, 'fv-lora-order');for (const [label, delta] of [['↑', -1], ['↓', 1]]) {@@ -110,9 +233,17 @@ export function loraPanel(node, panel) {wrap.append(order);}list.append(wrap);+ loadTriggers(row.name).catch(error => { if (!disposed && trigger.isConnected) note.textContent = error.message; });});- note.textContent = loraWarning();- } catch (error) { note.textContent = error.message; }+ note.textContent = rows.map(row => errors.get(row.name)).find(Boolean) || loraWarning();+ } catch (error) {+ if (error instanceof DOMException) throw error;+ note.textContent = error.message;+ }+ finally {+ rendering = false;+ if (renderAgain) { renderAgain = false; queueMicrotask(render); }+ }}const add = button(t('Add', '添加'), async () => {await refresh(); // The folder may have changed since the list was last read.@@ -125,11 +256,13 @@ export function loraPanel(node, panel) {actions.append(add);const changed = e => { if (String(e.detail) === String(node.id)) render(); };window.addEventListener('freevideo-loras', changed);+ const triggersChanged = e => refreshTriggerWords(e.detail);+ window.addEventListener('freevideo-lora-triggers', triggersChanged);const configure = node.onConfigure;// Only the persistent node panel participates in graph loading.- if (panel.classList.contains('fv-lora-panel')) node.onConfigure = function (...args) { const result = configure?.apply(this, args); render(); return result; };+ if (panel.classList.contains('fv-lora-panel')) node.onConfigure = function (...args) { const result = configure?.apply(this, args); queueMicrotask(render); return result; };render(); refresh();- const dispose = () => { disposed = true; window.removeEventListener('freevideo-loras', changed); };+ const dispose = () => { disposed = true; window.removeEventListener('freevideo-loras', changed); window.removeEventListener('freevideo-lora-triggers', triggersChanged); };dispose.refresh = refresh;return dispose;}@@ -143,7 +276,9 @@ function pendingLoras(node, existing = null) {const LiteGraph = globalThis.LiteGraph;if (!(slot >= 0) || !node.graph || (!existing && !LiteGraph?.registered_node_types?.FreeVideoLoRAStack)) return null;let stack = existing;- const adapters = {name: 'adapters', value: existing ? value(existing, 'adapters') || '[]' : '[]', callback(next) {+ let adaptersValue = existing ? value(existing, 'adapters') || '[]' : '[]';+ const adapters = {name: 'adapters', get value() { return stack ? value(stack, 'adapters') || '[]' : adaptersValue; },+ set value(next) { adaptersValue = next; }, callback(next) {let rows; try { rows = JSON.parse(next); } catch { return; }const graph = node.graph, active = Array.isArray(rows) && rows.length > 0;if (active && !stack) {@@ -164,7 +299,7 @@ function pendingLoras(node, existing = null) {graph.change?.();window.dispatchEvent(new CustomEvent('freevideo-loras', {detail: stack.id}));}};- return {id: 'creation-lora', graph: node.graph, widgets: [adapters], inputs: []};+ return {get id() { return stack?.id ?? 'creation-lora'; }, graph: node.graph, widgets: [adapters], inputs: []};}let current;@@ -259,7 +394,7 @@ export function openStudio(node, {extendFrom = null} = {}) {return {seconds: Number(value(node, 'seconds')), media: items.map(row => ({file: row.file, role: row.role || 'reference'}))};}});cleanup.push(() => enhancer.dispose());- const promptChanged = e => { if (String(e.detail) === String(node.id)) { if (prompt.value !== shown(value(node, 'text'))) prompt.value = shown(value(node, 'text')); placeholder(); references.refresh(); enhancer.sync(); } };+ 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(); references.refresh(); enhancer.sync(); } };window.addEventListener('freevideo-reference-prompt', promptChanged);cleanup.push(() => window.removeEventListener('freevideo-reference-prompt', promptChanged));const promptSection = section(t('Describe your scene', '描述画面'));@@ -371,7 +506,7 @@ export function openStudio(node, {extendFrom = null} = {}) {const loraNode = connectedLora?.properties?.[CREATED_BY_PANEL] ? pendingLoras(node, connectedLora) : connectedLora || pendingLoras(node);const [loraDetails, loraMount] = expand(t('LoRA', 'LoRA'));if (loraNode && widget(loraNode, 'adapters')) {- const stop = loraPanel(loraNode, loraMount); cleanup.push(stop);+ const stop = loraPanel(loraNode, loraMount, {promptNode: node}); cleanup.push(stop);loraDetails.addEventListener('toggle', () => { if (loraDetails.open) stop.refresh(); });loraDetails.open = JSON.parse(value(loraNode, 'adapters') || '[]').length > 0;}