3c828a170f
- Implements sequential job queue with background worker thread (_enqueue_job, _queue_worker) - All generate routes now return job_id instead of prompt_id; frontend polls /api/queue/<id>/status - Queue management UI in navbar with live badge, job list, pause/resume/remove controls - Fix: replaced url_for() calls inside finalize callbacks with direct string paths (url_for raises RuntimeError without request context in background threads) - Batch cover generation now uses two-phase pattern: queue all jobs upfront, then poll concurrently via Promise.all so page navigation doesn't interrupt the process - Strengths gallery sweep migrated to same two-phase pattern; sgStop() cancels queued jobs server-side - LoRA weight randomisation via lora_weight_min/lora_weight_max already present in _resolve_lora_weight Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
453 lines
24 KiB
HTML
453 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 — {{ outfit.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">{{ outfit.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>
|
|
|
|
<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 outfit.image_path %}
|
|
<img src="{{ url_for('static', filename='uploads/' + outfit.image_path) }}" alt="{{ outfit.name }}" class="img-fluid">
|
|
{% else %}
|
|
<span class="text-muted">No Image Attached</span>
|
|
{% endif %}
|
|
</div>
|
|
<div class="card-body">
|
|
<form action="{{ url_for('upload_outfit_image', slug=outfit.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 (Outfit 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 outfit 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_outfit_defaults', slug=outfit.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_outfit_cover_from_preview', slug=outfit.slug) }}" method="post" class="m-0" id="replace-cover-form">
|
|
<button type="submit" class="btn btn-sm btn-outline-light" id="replace-cover-btn">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_outfit_cover_from_preview', slug=outfit.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 outfit.default_fields is not none %}
|
|
{% if 'special::tags' in outfit.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 outfit.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-3">
|
|
<div>
|
|
<h1 class="mb-0">{{ outfit.name }}</h1>
|
|
<a href="{{ url_for('edit_outfit', slug=outfit.slug) }}" class="btn btn-sm btn-link text-decoration-none">Edit Profile</a>
|
|
<form action="{{ url_for('clone_outfit', slug=outfit.slug) }}" method="post" style="display: inline;">
|
|
<button type="submit" class="btn btn-sm btn-link text-decoration-none">Clone Outfit</button>
|
|
</form>
|
|
</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('outfits_index') }}" class="btn btn-outline-secondary">Back to Gallery</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_outfit_image', slug=outfit.slug) }}" method="post">
|
|
{# Wardrobe section #}
|
|
{% set wardrobe = outfit.data.get('wardrobe', {}) %}
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-light d-flex justify-content-between align-items-center">
|
|
<strong>Wardrobe</strong>
|
|
</div>
|
|
<div class="card-body">
|
|
<dl class="row mb-0">
|
|
{% for key, value in wardrobe.items() %}
|
|
<dt class="col-sm-4 text-capitalize">
|
|
<input class="form-check-input me-1" type="checkbox" name="include_field" value="wardrobe::{{ key }}"
|
|
{% if preferences is not none %}
|
|
{% if 'wardrobe::' + key in preferences %}checked{% endif %}
|
|
{% elif outfit.default_fields is not none %}
|
|
{% if 'wardrobe::' + key in outfit.default_fields %}checked{% endif %}
|
|
{% else %}
|
|
{% if value %}checked{% endif %}
|
|
{% endif %}>
|
|
{{ key.replace('_', ' ') }}
|
|
</dt>
|
|
<dd class="col-sm-8">{{ value if value else '--' }}</dd>
|
|
{% endfor %}
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
|
|
{# LoRA section #}
|
|
{% set lora = outfit.data.get('lora', {}) %}
|
|
{% if lora %}
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-light"><strong>LoRA</strong></div>
|
|
<div class="card-body">
|
|
<dl class="row mb-0">
|
|
{% for key, value in lora.items() %}
|
|
<dt class="col-sm-4 text-capitalize">
|
|
<input class="form-check-input me-1" type="checkbox" name="include_field" value="lora::{{ key }}"
|
|
{% if preferences is not none %}
|
|
{% if 'lora::' + key in preferences %}checked{% endif %}
|
|
{% elif outfit.default_fields is not none %}
|
|
{% if 'lora::' + key in outfit.default_fields %}checked{% endif %}
|
|
{% else %}
|
|
{% if value %}checked{% endif %}
|
|
{% endif %}>
|
|
{{ key.replace('_', ' ') }}
|
|
</dt>
|
|
<dd class="col-sm-8">{{ value if value else '--' }}</dd>
|
|
{% endfor %}
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
</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">
|
|
</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 = outfit %}
|
|
{% set sg_category = 'outfits' %}
|
|
{% set sg_has_lora = outfit.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');
|
|
|
|
let currentJobId = null;
|
|
let currentAction = null;
|
|
|
|
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 if (data.status === 'processing') {
|
|
progressLabel.textContent = 'Generating…';
|
|
} else {
|
|
progressLabel.textContent = 'Queued…';
|
|
}
|
|
} catch (err) { console.error('Poll error:', err); }
|
|
}, 1500);
|
|
});
|
|
}
|
|
|
|
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);
|
|
|
|
// UI Reset
|
|
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);
|
|
progressContainer.classList.add('d-none');
|
|
return;
|
|
}
|
|
|
|
currentJobId = data.job_id;
|
|
progressLabel.textContent = 'Queued…';
|
|
|
|
const jobResult = await waitForJob(currentJobId);
|
|
currentJobId = null;
|
|
|
|
if (jobResult.result && jobResult.result.image_url) {
|
|
previewImg.src = jobResult.result.image_url;
|
|
if (previewCard) previewCard.classList.remove('d-none');
|
|
const replaceBtn = document.getElementById('replace-cover-btn');
|
|
if (replaceBtn) replaceBtn.disabled = false;
|
|
}
|
|
|
|
} 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');
|
|
}
|
|
});
|
|
|
|
// Batch: Generate All Characters
|
|
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, 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"
|
|
title="${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();
|
|
for (let i = 0; i < allCharacters.length; i++) {
|
|
if (stopBatch) break;
|
|
const char = allCharacters[i];
|
|
batchBar.style.width = `${Math.round((i / allCharacters.length) * 100)}%`;
|
|
batchLabel.textContent = `Generating ${char.name} (${i + 1} / ${allCharacters.length})`;
|
|
const genForm = document.getElementById('generate-form');
|
|
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', 'preview');
|
|
try {
|
|
progressContainer.classList.remove('d-none');
|
|
progressBar.style.width = '100%';
|
|
progressBar.textContent = '';
|
|
progressBar.classList.add('progress-bar-striped', 'progress-bar-animated');
|
|
progressLabel.textContent = `${char.name}: Queuing…`;
|
|
const resp = await fetch(genForm.getAttribute('action'), {
|
|
method: 'POST', body: fd, headers: { 'X-Requested-With': 'XMLHttpRequest' }
|
|
});
|
|
const data = await resp.json();
|
|
if (data.error) { console.error(`Error for ${char.name}:`, data.error); progressContainer.classList.add('d-none'); continue; }
|
|
currentJobId = data.job_id;
|
|
const jobResult = await waitForJob(currentJobId);
|
|
currentJobId = null;
|
|
if (jobResult.result && jobResult.result.image_url) {
|
|
addToPreviewGallery(jobResult.result.image_url, char.name);
|
|
previewImg.src = jobResult.result.image_url;
|
|
if (previewCard) previewCard.classList.remove('d-none');
|
|
}
|
|
} catch (err) {
|
|
console.error(`Failed for ${char.name}:`, err);
|
|
currentJobId = null;
|
|
} finally {
|
|
progressContainer.classList.add('d-none');
|
|
progressBar.classList.remove('progress-bar-striped', 'progress-bar-animated');
|
|
}
|
|
}
|
|
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 after current generation...';
|
|
});
|
|
|
|
initJsonEditor('{{ url_for("save_outfit_json", slug=outfit.slug) }}');
|
|
});
|
|
|
|
function showImage(src) {
|
|
document.getElementById('modalImage').src = src;
|
|
}
|
|
</script>
|
|
{% endblock %} |