467c90594c
- Added Actions gallery with CRUD and JSON sync - Implemented Triple LoRA workflow (Character -> Outfit -> Action) - Added character-integrated previews for Actions with style matching - Implemented granular prompt selection and default persistence for Actions - Added detailed development guide for extending gallery features
408 lines
19 KiB
HTML
408 lines
19 KiB
HTML
{% extends "layout.html" %}
|
|
|
|
{% block content %}
|
|
<!-- Image Modal -->
|
|
<div class="modal fade" id="imageModal" tabindex="-1" aria-labelledby="imageModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog modal-xl modal-dialog-centered">
|
|
<div class="modal-content bg-transparent border-0">
|
|
<div class="modal-body p-0 text-center">
|
|
<img id="modalImage" src="" alt="Enlarged Image" class="img-fluid" style="max-height: 90vh;">
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{% macro selection_checkbox(section, key, label, value) %}
|
|
<input class="form-check-input me-1" type="checkbox" name="include_field" value="{{ section }}::{{ key }}"
|
|
{% if preferences is not none %}
|
|
{% if section + '::' + key in preferences %}checked{% endif %}
|
|
{% elif action.default_fields is not none %}
|
|
{% if section + '::' + key in action.default_fields %}checked{% endif %}
|
|
{% else %}
|
|
{% if value %}checked{% endif %}
|
|
{% endif %}>
|
|
{% endmacro %}
|
|
|
|
<div class="row">
|
|
<div class="col-md-4">
|
|
<div class="card mb-4">
|
|
<div class="img-container" style="height: auto; min-height: 400px; cursor: pointer;" data-bs-toggle="modal" data-bs-target="#imageModal" onclick="showImage(this.querySelector('img').src)">
|
|
{% if action.image_path %}
|
|
<img src="{{ url_for('static', filename='uploads/' + action.image_path) }}" alt="{{ action.name }}" class="img-fluid">
|
|
{% else %}
|
|
<span class="text-muted">No Image Attached</span>
|
|
{% endif %}
|
|
</div>
|
|
<div class="card-body">
|
|
<form action="{{ url_for('upload_action_image', slug=action.slug) }}" method="post" enctype="multipart/form-data">
|
|
<div class="mb-3">
|
|
<label for="image" class="form-label">Update Image</label>
|
|
<input class="form-control" type="file" id="image" name="image" required>
|
|
</div>
|
|
<button type="submit" class="btn btn-primary w-100 mb-2">Upload</button>
|
|
</form>
|
|
|
|
{# Character Selector #}
|
|
<div class="mb-3">
|
|
<label for="character_select" class="form-label">Preview with Character</label>
|
|
<select class="form-select" id="character_select" name="character_slug" form="generate-form">
|
|
<option value="">-- No Character (Action Only) --</option>
|
|
<option value="__random__" {% if selected_character == '__random__' %}selected{% endif %}>🎲 Random Character</option>
|
|
{% for char in characters %}
|
|
<option value="{{ char.slug }}" {% if selected_character == char.slug %}selected{% endif %}>{{ char.name }}</option>
|
|
{% endfor %}
|
|
</select>
|
|
<div class="form-text">Select a character to preview this action on their model.</div>
|
|
</div>
|
|
|
|
<div class="d-grid gap-2">
|
|
<button type="submit" name="action" value="preview" class="btn btn-success" form="generate-form">Generate Preview</button>
|
|
<button type="submit" form="generate-form" formaction="{{ url_for('save_action_defaults', slug=action.slug) }}" class="btn btn-sm btn-outline-secondary mt-2">Save as Default Selection</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div id="progress-container" class="mb-4 d-none">
|
|
<label id="progress-label" class="form-label">Generating...</label>
|
|
<div class="progress" role="progressbar" aria-label="Generation Progress" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
|
|
<div id="progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" style="width: 0%">0%</div>
|
|
</div>
|
|
</div>
|
|
|
|
{% if preview_image %}
|
|
<div class="card mb-4 border-success">
|
|
<div class="card-header bg-success text-white d-flex justify-content-between align-items-center">
|
|
<span>Latest Preview</span>
|
|
<form action="{{ url_for('replace_action_cover_from_preview', slug=action.slug) }}" method="post" class="m-0">
|
|
<button type="submit" class="btn btn-sm btn-outline-light">Replace Cover</button>
|
|
</form>
|
|
</div>
|
|
<div class="card-body p-0">
|
|
<div class="img-container" style="height: auto; min-height: 400px; cursor: pointer;" data-bs-toggle="modal" data-bs-target="#imageModal" onclick="showImage(this.querySelector('img').src)">
|
|
<img id="preview-img" src="{{ url_for('static', filename='uploads/' + preview_image) }}" alt="Preview" class="img-fluid">
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{% else %}
|
|
<div class="card mb-4 border-secondary d-none" id="preview-card">
|
|
<div class="card-header bg-secondary text-white d-flex justify-content-between align-items-center">
|
|
<span>Latest Preview</span>
|
|
<form action="{{ url_for('replace_action_cover_from_preview', slug=action.slug) }}" method="post" class="m-0" id="replace-cover-form">
|
|
<button type="submit" class="btn btn-sm btn-outline-light" id="replace-cover-btn" disabled>Replace Cover</button>
|
|
</form>
|
|
</div>
|
|
<div class="card-body p-0">
|
|
<div class="img-container" style="height: auto; min-height: 400px; cursor: pointer;" data-bs-toggle="modal" data-bs-target="#imageModal" onclick="showImage(this.querySelector('img').src)">
|
|
<img id="preview-img" src="" alt="Preview" class="img-fluid">
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-dark text-white d-flex justify-content-between align-items-center">
|
|
<span>Tags</span>
|
|
<div class="form-check form-switch">
|
|
<input class="form-check-input" type="checkbox" name="include_field" value="special::tags" id="includeTags" form="generate-form"
|
|
{% if preferences is not none %}
|
|
{% if 'special::tags' in preferences %}checked{% endif %}
|
|
{% elif action.default_fields is not none %}
|
|
{% if 'special::tags' in action.default_fields %}checked{% endif %}
|
|
{% else %}
|
|
checked
|
|
{% endif %}>
|
|
<label class="form-check-label text-white small" for="includeTags">Include</label>
|
|
</div>
|
|
</div>
|
|
<div class="card-body">
|
|
{% for tag in action.data.tags %}
|
|
<span class="badge bg-secondary">{{ tag }}</span>
|
|
{% else %}
|
|
<span class="text-muted">No tags</span>
|
|
{% endfor %}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col-md-8">
|
|
<div class="d-flex justify-content-between align-items-center mb-4">
|
|
<div>
|
|
<h1 class="mb-0">{{ action.name }}</h1>
|
|
<a href="{{ url_for('edit_action', slug=action.slug) }}" class="btn btn-sm btn-link text-decoration-none">Edit Profile</a>
|
|
<form action="{{ url_for('clone_action', slug=action.slug) }}" method="post" style="display: inline;">
|
|
<button type="submit" class="btn btn-sm btn-link text-decoration-none">Clone Action</button>
|
|
</form>
|
|
</div>
|
|
<a href="{{ url_for('actions_index') }}" class="btn btn-outline-secondary">Back to Gallery</a>
|
|
</div>
|
|
|
|
<form id="generate-form" action="{{ url_for('generate_action_image', slug=action.slug) }}" method="post">
|
|
{# Action details section #}
|
|
{% set action_details = action.data.get('action', {}) %}
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-light">
|
|
<strong>Action Details</strong>
|
|
</div>
|
|
<div class="card-body">
|
|
<dl class="row mb-0">
|
|
{% for key, value in action_details.items() %}
|
|
<dt class="col-sm-4 text-capitalize">
|
|
{{ selection_checkbox('action', key, key.replace('_', ' '), value) }}
|
|
{{ key.replace('_', ' ') }}
|
|
</dt>
|
|
<dd class="col-sm-8">{{ value if value else '--' }}</dd>
|
|
{% endfor %}
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
|
|
{# Defaults (Pose/Expression Aggregates) #}
|
|
<div class="card mb-4 border-info">
|
|
<div class="card-header bg-info text-white">
|
|
<strong>Prompt Aggregates (Character Overrides)</strong>
|
|
</div>
|
|
<div class="card-body">
|
|
<div class="form-text mb-3">These fields will override character defaults when a character is selected.</div>
|
|
<dl class="row mb-0">
|
|
<dt class="col-sm-4 text-capitalize">
|
|
{{ selection_checkbox('defaults', 'pose', 'Pose', True) }}
|
|
Pose (Combined)
|
|
</dt>
|
|
<dd class="col-sm-8 text-muted small">Aggregated from Action Pose fields</dd>
|
|
|
|
<dt class="col-sm-4 text-capitalize">
|
|
{{ selection_checkbox('defaults', 'expression', 'Expression', True) }}
|
|
Expression (Combined)
|
|
</dt>
|
|
<dd class="col-sm-8 text-muted small">Aggregated from Action Expression fields</dd>
|
|
|
|
<dt class="col-sm-4 text-capitalize">
|
|
{{ selection_checkbox('defaults', 'scene', 'Scene', action_details.get('additional')) }}
|
|
Scene (Additional)
|
|
</dt>
|
|
<dd class="col-sm-8 small">{{ action_details.get('additional') if action_details.get('additional') else '--' }}</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
|
|
{# Character Identity/Wardrobe context when character is selected #}
|
|
<div id="character-context" class="{% if not selected_character or selected_character == '__random__' %}d-none{% endif %}">
|
|
<div class="alert alert-info">
|
|
<i class="bi bi-info-circle"></i> When a character is selected, their identity and active wardrobe fields will be automatically included based on the character's default selection.
|
|
</div>
|
|
</div>
|
|
|
|
{# LoRA section #}
|
|
{% set lora = action.data.get('lora', {}) %}
|
|
{% if lora %}
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-light d-flex justify-content-between align-items-center">
|
|
<strong>LoRA</strong>
|
|
<div class="form-check form-switch">
|
|
<input class="form-check-input" type="checkbox" name="include_field" value="lora::lora_triggers" id="includeLora"
|
|
{% if preferences is not none %}
|
|
{% if 'lora::lora_triggers' in preferences %}checked{% endif %}
|
|
{% elif action.default_fields is not none %}
|
|
{% if 'lora::lora_triggers' in action.default_fields %}checked{% endif %}
|
|
{% else %}
|
|
checked
|
|
{% endif %}>
|
|
<label class="form-check-label small" for="includeLora">Include Triggers</label>
|
|
</div>
|
|
</div>
|
|
<div class="card-body">
|
|
<dl class="row mb-0">
|
|
{% for key, value in lora.items() %}
|
|
<dt class="col-sm-4 text-capitalize">{{ key.replace('_', ' ') }}</dt>
|
|
<dd class="col-sm-8">{{ value if value else '--' }}</dd>
|
|
{% endfor %}
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
</form>
|
|
</div>
|
|
</div>
|
|
{% endblock %}
|
|
|
|
{% block scripts %}
|
|
<script>
|
|
document.addEventListener('DOMContentLoaded', () => {
|
|
const form = document.getElementById('generate-form');
|
|
const progressBar = document.getElementById('progress-bar');
|
|
const progressContainer = document.getElementById('progress-container');
|
|
const progressLabel = document.getElementById('progress-label');
|
|
const previewCard = document.getElementById('preview-card');
|
|
const previewImg = document.getElementById('preview-img');
|
|
const charSelect = document.getElementById('character_select');
|
|
const charContext = document.getElementById('character-context');
|
|
|
|
// Toggle character context info
|
|
charSelect.addEventListener('change', () => {
|
|
if (charSelect.value && charSelect.value !== '__random__') {
|
|
charContext.classList.remove('d-none');
|
|
} else {
|
|
charContext.classList.add('d-none');
|
|
}
|
|
});
|
|
|
|
// Generate a unique client ID
|
|
const clientId = 'action_detail_' + Math.random().toString(36).substring(2, 15);
|
|
|
|
// ComfyUI WebSocket
|
|
const socket = new WebSocket(`ws://127.0.0.1:8188/ws?clientId=${clientId}`);
|
|
|
|
let currentPromptId = null;
|
|
let currentAction = null;
|
|
|
|
socket.addEventListener('message', (event) => {
|
|
if (!currentPromptId) return;
|
|
|
|
const msg = JSON.parse(event.data);
|
|
|
|
if (msg.type === 'status') {
|
|
const queueRemaining = msg.data.status.exec_info.queue_remaining;
|
|
if (queueRemaining > 0) {
|
|
progressLabel.textContent = `Queue position: ${queueRemaining}`;
|
|
}
|
|
}
|
|
else if (msg.type === 'progress') {
|
|
const value = msg.data.value;
|
|
const max = msg.data.max;
|
|
const percent = Math.round((value / max) * 100);
|
|
progressBar.style.width = `${percent}%`;
|
|
progressBar.textContent = `${percent}%`;
|
|
}
|
|
else if (msg.type === 'executing') {
|
|
if (msg.data.node === null && msg.data.prompt_id === currentPromptId) {
|
|
// Execution finished via WebSocket
|
|
console.log('Finished via WebSocket');
|
|
if (resolveCompletion) resolveCompletion();
|
|
}
|
|
}
|
|
});
|
|
|
|
let resolveCompletion = null;
|
|
async function waitForCompletion(promptId) {
|
|
return new Promise((resolve) => {
|
|
const checkResolve = () => {
|
|
clearInterval(pollInterval);
|
|
resolve();
|
|
};
|
|
resolveCompletion = checkResolve;
|
|
|
|
// Fallback polling in case WebSocket is blocked (403)
|
|
const pollInterval = setInterval(async () => {
|
|
try {
|
|
const resp = await fetch(`/check_status/${promptId}`);
|
|
const data = await resp.json();
|
|
if (data.status === 'finished') {
|
|
console.log('Finished via Polling');
|
|
checkResolve();
|
|
}
|
|
} catch (err) { console.error('Polling error:', err); }
|
|
}, 2000);
|
|
});
|
|
}
|
|
|
|
form.addEventListener('submit', async (e) => {
|
|
// Only intercept generate actions
|
|
const submitter = e.submitter;
|
|
if (!submitter || submitter.value !== 'preview') {
|
|
return;
|
|
}
|
|
|
|
e.preventDefault();
|
|
|
|
currentAction = submitter.value;
|
|
const formData = new FormData(form);
|
|
formData.append('action', currentAction);
|
|
formData.append('client_id', clientId);
|
|
|
|
// UI Reset
|
|
progressContainer.classList.remove('d-none');
|
|
progressBar.style.width = '0%';
|
|
progressBar.textContent = '0%';
|
|
progressLabel.textContent = 'Starting...';
|
|
|
|
try {
|
|
const response = await fetch(form.getAttribute('action'), {
|
|
method: 'POST',
|
|
body: formData,
|
|
headers: {
|
|
'X-Requested-With': 'XMLHttpRequest'
|
|
}
|
|
});
|
|
|
|
const data = await response.json();
|
|
|
|
if (data.error) {
|
|
alert('Error: ' + data.error);
|
|
progressContainer.classList.add('d-none');
|
|
return;
|
|
}
|
|
|
|
currentPromptId = data.prompt_id;
|
|
progressLabel.textContent = 'Queued...';
|
|
|
|
// Wait for completion (WebSocket or Polling)
|
|
await waitForCompletion(currentPromptId);
|
|
|
|
// Finalize
|
|
finalizeGeneration(currentPromptId, currentAction);
|
|
currentPromptId = null;
|
|
|
|
} catch (err) {
|
|
console.error(err);
|
|
alert('Request failed');
|
|
progressContainer.classList.add('d-none');
|
|
}
|
|
});
|
|
|
|
async function finalizeGeneration(promptId, action) {
|
|
progressLabel.textContent = 'Saving image...';
|
|
const url = `/action/{{ action.slug }}/finalize_generation/${promptId}`;
|
|
const formData = new FormData();
|
|
formData.append('action', 'preview'); // Always save as preview
|
|
|
|
try {
|
|
const response = await fetch(url, {
|
|
method: 'POST',
|
|
body: formData
|
|
});
|
|
const data = await response.json();
|
|
|
|
if (data.success) {
|
|
// Update preview image
|
|
previewImg.src = data.image_url;
|
|
if (previewCard) previewCard.classList.remove('d-none');
|
|
|
|
// Enable the replace cover button if it exists
|
|
const replaceBtn = document.getElementById('replace-cover-btn');
|
|
if (replaceBtn) {
|
|
replaceBtn.disabled = false;
|
|
// Check if there's a form to update
|
|
const form = replaceBtn.closest('form');
|
|
if (form) {
|
|
form.action = `/action/{{ action.slug }}/replace_cover_from_preview`;
|
|
}
|
|
}
|
|
} else {
|
|
alert('Save failed: ' + data.error);
|
|
}
|
|
} catch (err) {
|
|
console.error(err);
|
|
alert('Finalize request failed');
|
|
} finally {
|
|
progressContainer.classList.add('d-none');
|
|
}
|
|
}
|
|
});
|
|
|
|
// Image modal function
|
|
function showImage(src) {
|
|
document.getElementById('modalImage').src = src;
|
|
}
|
|
</script>
|
|
{% endblock %}
|