a38915b354
- Fix Replace Cover: routes now read preview_path from form POST instead of session (session writes from background threads were lost) - Fix batch generation: submit all jobs immediately, poll all in parallel via Promise.all - Fix label NameError in character generate route - Fix style detail missing characters context - Selected Preview pane: click any image to select it; data-preview-path on all images across all 8 detail templates - Gallery → Library rename across all index page headings and navbar - Settings: add configurable LoRA/checkpoint directories; default checkpoint selector moved from navbar to settings page - Consolidate 6 get_available_*_loras() into single get_available_loras(category) reading from Settings - ComfyUI tooltip shows currently loaded checkpoint name - Remove navbar checkpoint bar - Phase 4 cleanup: remove dead _queue_generation(), add session.modified, standardize log prefixes, rename action_type → action Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
432 lines
24 KiB
HTML
432 lines
24 KiB
HTML
{% extends "layout.html" %}
|
|
|
|
{% block content %}
|
|
<!-- JSON Editor Modal -->
|
|
<div class="modal fade" id="jsonEditorModal" tabindex="-1" aria-hidden="true">
|
|
<div class="modal-dialog modal-lg modal-dialog-centered">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<h5 class="modal-title">Edit JSON — {{ detailer.name }}</h5>
|
|
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
|
</div>
|
|
<div class="modal-body">
|
|
<ul class="nav nav-tabs mb-3" role="tablist">
|
|
<li class="nav-item"><button class="nav-link active" id="json-simple-tab" type="button">Simple</button></li>
|
|
<li class="nav-item"><button class="nav-link" id="json-advanced-tab" type="button">Advanced JSON</button></li>
|
|
</ul>
|
|
<div id="json-editor-error" class="alert alert-danger d-none"></div>
|
|
<div id="json-simple-panel"></div>
|
|
<div id="json-advanced-panel" class="d-none">
|
|
<textarea id="json-editor-textarea" class="form-control font-monospace" rows="20" spellcheck="false"></textarea>
|
|
</div>
|
|
<script type="application/json" id="json-raw-data">{{ detailer.data | tojson }}</script>
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
|
|
<button type="button" class="btn btn-primary" id="json-save-btn">Save</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- 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 detailer.default_fields is not none %}
|
|
{% if section + '::' + key in detailer.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 detailer.image_path %}
|
|
<img src="{{ url_for('static', filename='uploads/' + detailer.image_path) }}" alt="{{ detailer.name }}" class="img-fluid" data-preview-path="{{ detailer.image_path }}">
|
|
{% else %}
|
|
<div class="d-flex align-items-center justify-content-center bg-light" style="height: 400px;">
|
|
<span class="text-muted">No Image Attached</span>
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
<div class="card-body">
|
|
<form action="{{ url_for('upload_detailer_image', slug=detailer.slug) }}" method="post" enctype="multipart/form-data">
|
|
<div class="mb-3">
|
|
<label for="image" class="form-label text-muted small">Update Cover Image</label>
|
|
<input class="form-control form-control-sm" type="file" id="image" name="image" required>
|
|
</div>
|
|
<button type="submit" class="btn btn-sm btn-outline-primary w-100 mb-2">Upload</button>
|
|
</form>
|
|
|
|
<hr>
|
|
|
|
{# 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 (Detailer 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>
|
|
|
|
{# Action Selector #}
|
|
<div class="mb-3">
|
|
<label for="action_select" class="form-label">Action / Pose LoRA</label>
|
|
<select class="form-select" id="action_select" name="action_slug" form="generate-form">
|
|
<option value="">-- No Action --</option>
|
|
{% for act in actions %}
|
|
<option value="{{ act.slug }}" {% if selected_action == act.slug %}selected{% endif %}>{{ act.name }}</option>
|
|
{% endfor %}
|
|
</select>
|
|
</div>
|
|
|
|
{# Additional Prompts #}
|
|
<div class="mb-2">
|
|
<label for="extra_positive" class="form-label">Additional Positive</label>
|
|
<textarea class="form-control form-control-sm font-monospace" id="extra_positive" name="extra_positive" rows="2" placeholder="e.g. masterpiece, best quality" form="generate-form">{{ extra_positive or '' }}</textarea>
|
|
</div>
|
|
<div class="mb-3">
|
|
<label for="extra_negative" class="form-label">Additional Negative</label>
|
|
<textarea class="form-control form-control-sm font-monospace" id="extra_negative" name="extra_negative" rows="2" placeholder="e.g. blurry, low quality" form="generate-form">{{ extra_negative or '' }}</textarea>
|
|
</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_detailer_defaults', slug=detailer.slug) }}" class="btn btn-sm btn-outline-secondary mt-2">Save Selection as Default</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>
|
|
|
|
<div class="card mb-4 {% if preview_image %}border-success{% else %}border-secondary d-none{% endif %}" id="preview-card">
|
|
<div class="card-header {% if preview_image %}bg-success{% else %}bg-secondary{% endif %} text-white d-flex justify-content-between align-items-center p-2" id="preview-card-header">
|
|
<small>Selected Preview</small>
|
|
<form action="{{ url_for('replace_detailer_cover_from_preview', slug=detailer.slug) }}" method="post" class="m-0" id="replace-cover-form">
|
|
<input type="hidden" name="preview_path" id="preview-path" value="{{ preview_image or '' }}">
|
|
<button type="submit" class="btn btn-sm btn-outline-light" id="replace-cover-btn" {% if not preview_image %}disabled{% endif %}>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) if preview_image else '' }}" alt="Preview" class="img-fluid">
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col-md-8">
|
|
<div class="d-flex justify-content-between align-items-center mb-3">
|
|
<div>
|
|
<h1 class="mb-0">{{ detailer.name }}</h1>
|
|
<div class="mt-1">
|
|
<a href="{{ url_for('edit_detailer', slug=detailer.slug) }}" class="btn btn-sm btn-link text-decoration-none ps-0">Edit Detailer</a>
|
|
</div>
|
|
</div>
|
|
<div class="d-flex gap-2">
|
|
<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#jsonEditorModal">Edit JSON</button>
|
|
<a href="{{ url_for('detailers_index') }}" class="btn btn-outline-secondary">Back to Library</a>
|
|
</div>
|
|
</div>
|
|
|
|
<ul class="nav nav-tabs mb-4" id="detailTabs" role="tablist">
|
|
<li class="nav-item" role="presentation">
|
|
<button class="nav-link active" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-pane" type="button" role="tab">Settings</button>
|
|
</li>
|
|
<li class="nav-item" role="presentation">
|
|
<button class="nav-link" id="previews-tab" data-bs-toggle="tab" data-bs-target="#previews-pane" type="button" role="tab">
|
|
Previews{% if existing_previews %} <span class="badge bg-secondary">{{ existing_previews|length }}</span>{% endif %}
|
|
</button>
|
|
</li>
|
|
</ul>
|
|
|
|
<div class="tab-content" id="detailTabContent">
|
|
<div class="tab-pane fade show active" id="settings-pane" role="tabpanel">
|
|
<form id="generate-form" action="{{ url_for('generate_detailer_image', slug=detailer.slug) }}" method="post">
|
|
{# Detailer definition section #}
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-light">
|
|
<strong>Detailer Definition</strong>
|
|
</div>
|
|
<div class="card-body">
|
|
<dl class="row mb-0">
|
|
<dt class="col-sm-4 text-capitalize">
|
|
{{ selection_checkbox('special', 'tags', 'Prompt', detailer.data.prompt) }}
|
|
Prompt
|
|
</dt>
|
|
<dd class="col-sm-8">{{ detailer.data.prompt if detailer.data.prompt 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.
|
|
</div>
|
|
</div>
|
|
|
|
{# LoRA section #}
|
|
{% set lora = detailer.data.get('lora', {}) %}
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-light d-flex justify-content-between align-items-center">
|
|
<strong>LoRA Integration</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 detailer.default_fields is not none %}
|
|
{% if 'lora::lora_triggers' in detailer.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">
|
|
<dt class="col-sm-4">LoRA Name</dt>
|
|
<dd class="col-sm-8 text-muted small">{{ lora.get('lora_name') if lora.get('lora_name') else '--' }}</dd>
|
|
|
|
<dt class="col-sm-4">Weight</dt>
|
|
<dd class="col-sm-8">{{ lora.get('lora_weight', 1.0) }}</dd>
|
|
|
|
<dt class="col-sm-4">Triggers</dt>
|
|
<dd class="col-sm-8 small"><code>{{ lora.get('lora_triggers') if lora.get('lora_triggers') else '--' }}</code></dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
|
|
<div class="tab-pane fade" id="previews-pane" role="tabpanel">
|
|
<div class="d-flex justify-content-between align-items-center mb-3">
|
|
<span class="text-muted small">{{ existing_previews|length }} preview(s)</span>
|
|
<div class="d-flex gap-2">
|
|
<button type="button" id="generate-all-btn" class="btn btn-primary btn-sm">Generate All Characters</button>
|
|
<button type="button" id="stop-all-btn" class="btn btn-danger btn-sm d-none">Stop</button>
|
|
</div>
|
|
</div>
|
|
<div id="batch-progress" class="mb-3 d-none">
|
|
<label id="batch-label" class="form-label small fw-semibold"></label>
|
|
<div class="progress" style="height: 8px;">
|
|
<div id="batch-bar" class="progress-bar progress-bar-striped progress-bar-animated" style="width: 0%"></div>
|
|
</div>
|
|
</div>
|
|
<div id="preview-gallery" class="row row-cols-2 row-cols-md-3 g-2">
|
|
{% for img in existing_previews %}
|
|
<div class="col">
|
|
<img src="{{ url_for('static', filename='uploads/' + img) }}"
|
|
class="img-fluid rounded"
|
|
style="cursor: pointer; aspect-ratio: 1; object-fit: cover; width: 100%;"
|
|
onclick="showImage(this.src)"
|
|
data-bs-toggle="modal" data-bs-target="#imageModal"
|
|
data-preview-path="{{ img }}">
|
|
</div>
|
|
{% else %}
|
|
<div class="col-12 text-muted small" id="gallery-empty">No previews yet. Generate some!</div>
|
|
{% endfor %}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{% set sg_entity = detailer %}
|
|
{% set sg_category = 'detailers' %}
|
|
{% set sg_has_lora = detailer.data.get('lora', {}).get('lora_name', '') != '' %}
|
|
{% include 'partials/strengths_gallery.html' %}
|
|
{% 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 previewPath = document.getElementById('preview-path');
|
|
const replaceBtn = document.getElementById('replace-cover-btn');
|
|
const previewHeader = document.getElementById('preview-card-header');
|
|
const charSelect = document.getElementById('character_select');
|
|
const charContext = document.getElementById('character-context');
|
|
const actionSelect = document.getElementById('action_select');
|
|
|
|
charSelect.addEventListener('change', () => {
|
|
charContext.classList.toggle('d-none', !charSelect.value || charSelect.value === '__random__');
|
|
});
|
|
|
|
function selectPreview(relativePath, imageUrl) {
|
|
if (!relativePath) return;
|
|
previewImg.src = imageUrl;
|
|
previewPath.value = relativePath;
|
|
replaceBtn.disabled = false;
|
|
previewCard.classList.remove('d-none');
|
|
previewHeader.classList.replace('bg-secondary', 'bg-success');
|
|
previewCard.classList.replace('border-secondary', 'border-success');
|
|
}
|
|
|
|
document.addEventListener('click', e => {
|
|
const img = e.target.closest('img[data-preview-path]');
|
|
if (img) selectPreview(img.dataset.previewPath, img.src);
|
|
});
|
|
|
|
async function waitForJob(jobId) {
|
|
return new Promise((resolve, reject) => {
|
|
const poll = setInterval(async () => {
|
|
try {
|
|
const resp = await fetch(`/api/queue/${jobId}/status`);
|
|
const data = await resp.json();
|
|
if (data.status === 'done') { clearInterval(poll); resolve(data); }
|
|
else if (data.status === 'failed' || data.status === 'removed') { clearInterval(poll); reject(new Error(data.error || 'Job failed')); }
|
|
else progressLabel.textContent = data.status === 'processing' ? 'Generating…' : 'Queued…';
|
|
} catch (err) { console.error('Poll error:', err); }
|
|
}, 1500);
|
|
});
|
|
}
|
|
|
|
form.addEventListener('submit', async (e) => {
|
|
const submitter = e.submitter;
|
|
if (!submitter || submitter.value !== 'preview') return;
|
|
e.preventDefault();
|
|
const formData = new FormData(form);
|
|
formData.append('action', 'preview');
|
|
progressContainer.classList.remove('d-none');
|
|
progressBar.style.width = '100%'; progressBar.textContent = '';
|
|
progressBar.classList.add('progress-bar-striped', 'progress-bar-animated');
|
|
progressLabel.textContent = 'Queuing…';
|
|
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); return; }
|
|
progressLabel.textContent = 'Queued…';
|
|
const jobResult = await waitForJob(data.job_id);
|
|
if (jobResult.result?.image_url) {
|
|
selectPreview(jobResult.result.relative_path, jobResult.result.image_url);
|
|
addToPreviewGallery(jobResult.result.image_url, jobResult.result.relative_path, '');
|
|
}
|
|
} catch (err) { console.error(err); alert('Generation failed: ' + err.message); }
|
|
finally { progressContainer.classList.add('d-none'); progressBar.classList.remove('progress-bar-striped', 'progress-bar-animated'); }
|
|
});
|
|
|
|
const allCharacters = [
|
|
{% for char in characters %}{ slug: "{{ char.slug }}", name: {{ char.name | tojson }} },
|
|
{% endfor %}
|
|
];
|
|
let stopBatch = false;
|
|
const generateAllBtn = document.getElementById('generate-all-btn');
|
|
const stopAllBtn = document.getElementById('stop-all-btn');
|
|
const batchProgress = document.getElementById('batch-progress');
|
|
const batchLabel = document.getElementById('batch-label');
|
|
const batchBar = document.getElementById('batch-bar');
|
|
|
|
function addToPreviewGallery(imageUrl, relativePath, charName) {
|
|
const gallery = document.getElementById('preview-gallery');
|
|
const placeholder = document.getElementById('gallery-empty');
|
|
if (placeholder) placeholder.remove();
|
|
const col = document.createElement('div');
|
|
col.className = 'col';
|
|
col.innerHTML = `<div class="position-relative">
|
|
<img src="${imageUrl}" class="img-fluid rounded"
|
|
style="cursor: pointer; aspect-ratio: 1; object-fit: cover; width: 100%;"
|
|
onclick="showImage(this.src)"
|
|
data-bs-toggle="modal" data-bs-target="#imageModal"
|
|
data-preview-path="${relativePath}"
|
|
title="${charName}">
|
|
${charName ? `<div class="position-absolute bottom-0 start-0 w-100 bg-dark bg-opacity-50 text-white p-1 rounded-bottom" style="font-size: 0.7rem; line-height: 1.2;">${charName}</div>` : ''}
|
|
</div>`;
|
|
gallery.insertBefore(col, gallery.firstChild);
|
|
const badge = document.querySelector('#previews-tab .badge');
|
|
if (badge) badge.textContent = parseInt(badge.textContent || '0') + 1;
|
|
else document.getElementById('previews-tab').insertAdjacentHTML('beforeend', ' <span class="badge bg-secondary">1</span>');
|
|
}
|
|
|
|
generateAllBtn.addEventListener('click', async () => {
|
|
if (allCharacters.length === 0) { alert('No characters available.'); return; }
|
|
stopBatch = false;
|
|
generateAllBtn.disabled = true;
|
|
stopAllBtn.classList.remove('d-none');
|
|
batchProgress.classList.remove('d-none');
|
|
bootstrap.Tab.getOrCreateInstance(document.getElementById('previews-tab')).show();
|
|
|
|
const genForm = document.getElementById('generate-form');
|
|
const formAction = genForm.getAttribute('action');
|
|
batchLabel.textContent = 'Queuing all characters…';
|
|
const pending = [];
|
|
for (const char of allCharacters) {
|
|
if (stopBatch) break;
|
|
const fd = new FormData();
|
|
genForm.querySelectorAll('input[name="include_field"]:checked').forEach(cb => fd.append('include_field', cb.value));
|
|
fd.append('character_slug', char.slug);
|
|
fd.append('action_slug', actionSelect.value);
|
|
fd.append('extra_positive', document.getElementById('extra_positive').value);
|
|
fd.append('extra_negative', document.getElementById('extra_negative').value);
|
|
fd.append('action', 'preview');
|
|
try {
|
|
const resp = await fetch(formAction, { method: 'POST', body: fd, headers: { 'X-Requested-With': 'XMLHttpRequest' } });
|
|
const data = await resp.json();
|
|
if (!data.error) pending.push({ char, jobId: data.job_id });
|
|
} catch (err) { console.error(`Submit error for ${char.name}:`, err); }
|
|
}
|
|
|
|
batchBar.style.width = '0%';
|
|
let done = 0;
|
|
const total = pending.length;
|
|
batchLabel.textContent = `0 / ${total} complete`;
|
|
await Promise.all(pending.map(({ char, jobId }) =>
|
|
waitForJob(jobId).then(result => {
|
|
done++;
|
|
batchBar.style.width = `${Math.round((done / total) * 100)}%`;
|
|
batchLabel.textContent = `${done} / ${total} complete`;
|
|
if (result.result?.image_url) addToPreviewGallery(result.result.image_url, result.result.relative_path, char.name);
|
|
}).catch(err => { done++; console.error(`Failed for ${char.name}:`, err); })
|
|
));
|
|
|
|
batchBar.style.width = '100%';
|
|
batchLabel.textContent = stopBatch ? 'Stopped.' : 'Complete!';
|
|
generateAllBtn.disabled = false;
|
|
stopAllBtn.classList.add('d-none');
|
|
setTimeout(() => { batchProgress.classList.add('d-none'); batchBar.style.width = '0%'; }, 3000);
|
|
});
|
|
|
|
stopAllBtn.addEventListener('click', () => {
|
|
stopBatch = true;
|
|
stopAllBtn.classList.add('d-none');
|
|
batchLabel.textContent = 'Stopping…';
|
|
});
|
|
|
|
initJsonEditor('{{ url_for("save_detailer_json", slug=detailer.slug) }}');
|
|
});
|
|
|
|
function showImage(src) {
|
|
document.getElementById('modalImage').src = src;
|
|
}
|
|
</script>
|
|
{% endblock %}
|