- 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>
221 lines
11 KiB
HTML
221 lines
11 KiB
HTML
{% extends "layout.html" %}
|
|
|
|
{% block content %}
|
|
<div class="d-flex justify-content-between align-items-center mb-4">
|
|
<h2>Character Gallery</h2>
|
|
<div class="d-flex gap-1 align-items-center">
|
|
<button id="batch-generate-btn" class="btn btn-sm btn-outline-success btn-icon" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Generate cover images for characters without one"><img src="{{ url_for('static', filename='icons/new-cover-batch.png') }}"></button>
|
|
<button id="regenerate-all-btn" class="btn btn-sm btn-outline-danger btn-icon" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Regenerate cover images for all characters"><img src="{{ url_for('static', filename='icons/new-cover-batch.png') }}"></button>
|
|
<form action="{{ url_for('rescan') }}" method="post" class="d-contents">
|
|
<button type="submit" class="btn btn-sm btn-outline-primary btn-icon" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Rescan character files from disk"><img src="{{ url_for('static', filename='icons/refresh.png') }}"></button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Batch Progress Bar -->
|
|
<div id="batch-progress-container" class="card mb-4 d-none">
|
|
<div class="card-body">
|
|
<div class="d-flex justify-content-between align-items-center mb-1">
|
|
<h5 id="batch-status-text" class="mb-0">Batch Generating...</h5>
|
|
<span id="batch-node-status" class="badge bg-info">Starting...</span>
|
|
</div>
|
|
|
|
<div class="mb-3">
|
|
<small class="text-muted">Overall Batch Progress</small>
|
|
<div class="progress" role="progressbar" aria-label="Batch Progress" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="height: 10px;">
|
|
<div id="batch-progress-bar" class="progress-bar bg-success" style="width: 0%"></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-2">
|
|
<div class="d-flex justify-content-between">
|
|
<small id="current-char-name" class="text-muted mb-1"></small>
|
|
<small id="current-step-progress" class="text-muted mb-1"></small>
|
|
</div>
|
|
<div class="progress" role="progressbar" aria-label="Task Progress" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="height: 20px;">
|
|
<div id="task-progress-bar" class="progress-bar progress-bar-striped progress-bar-animated bg-info" style="width: 0%"></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 g-4">
|
|
{% for char in characters %}
|
|
<div class="col" id="card-{{ char.slug }}">
|
|
<div class="card h-100 character-card" onclick="window.location.href='/character/{{ char.slug }}'">
|
|
<div class="img-container">
|
|
{% if char.image_path %}
|
|
<img id="img-{{ char.slug }}" src="{{ url_for('static', filename='uploads/' + char.image_path) }}" alt="{{ char.name }}">
|
|
<span id="no-img-{{ char.slug }}" class="text-muted d-none">No Image</span>
|
|
{% else %}
|
|
<img id="img-{{ char.slug }}" src="" alt="{{ char.name }}" class="d-none">
|
|
<span id="no-img-{{ char.slug }}" class="text-muted">No Image</span>
|
|
{% endif %}
|
|
</div>
|
|
<div class="card-body">
|
|
<h5 class="card-title text-center">{{ char.name }}</h5>
|
|
<p class="card-text small text-center text-muted">
|
|
{% set ns = namespace(parts=[]) %}
|
|
{% for section_key in ['identity', 'defaults'] %}
|
|
{% if char.data[section_key] is mapping %}
|
|
{% for v in char.data[section_key].values() %}
|
|
{% if v %}{% set ns.parts = ns.parts + [v] %}{% endif %}
|
|
{% endfor %}
|
|
{% endif %}
|
|
{% endfor %}
|
|
{% set wardrobe = char.data.get('wardrobe', {}) %}
|
|
{% if wardrobe %}
|
|
{% set outfit_data = wardrobe.get('default', wardrobe) %}
|
|
{% if outfit_data is mapping %}
|
|
{% for v in outfit_data.values() %}
|
|
{% if v and v is string %}{% set ns.parts = ns.parts + [v] %}{% endif %}
|
|
{% endfor %}
|
|
{% endif %}
|
|
{% endif %}
|
|
{% if char.data.lora and char.data.lora.lora_triggers %}
|
|
{% set ns.parts = ns.parts + [char.data.lora.lora_triggers] %}
|
|
{% endif %}
|
|
{{ ns.parts | join(', ') }}
|
|
</p>
|
|
</div>
|
|
{% if char.data.lora.lora_name %}
|
|
{% set lora_name = char.data.lora.lora_name.split('/')[-1].replace('.safetensors', '') %}
|
|
<div class="card-footer text-center p-1">
|
|
<small class="text-muted" title="{{ char.data.lora.lora_name }}">{{ lora_name }}</small>
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
</div>
|
|
{% endfor %}
|
|
</div>
|
|
{% endblock %}
|
|
|
|
{% block scripts %}
|
|
<script>
|
|
document.addEventListener('DOMContentLoaded', () => {
|
|
const batchBtn = document.getElementById('batch-generate-btn');
|
|
const regenAllBtn = document.getElementById('regenerate-all-btn');
|
|
const progressBar = document.getElementById('batch-progress-bar');
|
|
const taskProgressBar = document.getElementById('task-progress-bar');
|
|
const container = document.getElementById('batch-progress-container');
|
|
const statusText = document.getElementById('batch-status-text');
|
|
const nodeStatus = document.getElementById('batch-node-status');
|
|
const charNameText = document.getElementById('current-char-name');
|
|
const stepProgressText = document.getElementById('current-step-progress');
|
|
|
|
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') nodeStatus.textContent = 'Generating…';
|
|
else nodeStatus.textContent = 'Queued…';
|
|
} catch (err) {}
|
|
}, 1500);
|
|
});
|
|
}
|
|
|
|
async function runBatch() {
|
|
const response = await fetch('/get_missing_characters');
|
|
const data = await response.json();
|
|
const missing = data.missing;
|
|
|
|
if (missing.length === 0) {
|
|
alert("No characters missing cover images.");
|
|
return;
|
|
}
|
|
|
|
batchBtn.disabled = true;
|
|
regenAllBtn.disabled = true;
|
|
container.classList.remove('d-none');
|
|
|
|
// Phase 1: Queue all jobs upfront so the page can be navigated away from
|
|
progressBar.style.width = '100%';
|
|
progressBar.textContent = '';
|
|
progressBar.classList.add('progress-bar-striped', 'progress-bar-animated');
|
|
nodeStatus.textContent = 'Queuing…';
|
|
|
|
const jobs = [];
|
|
for (const char of missing) {
|
|
statusText.textContent = `Queuing ${jobs.length + 1} / ${missing.length}…`;
|
|
try {
|
|
const genResp = await fetch(`/character/${char.slug}/generate`, {
|
|
method: 'POST',
|
|
body: new URLSearchParams({ action: 'replace' }),
|
|
headers: { 'X-Requested-With': 'XMLHttpRequest' }
|
|
});
|
|
const genData = await genResp.json();
|
|
if (genData.job_id) jobs.push({ item: char, jobId: genData.job_id });
|
|
} catch (err) {
|
|
console.error(`Failed to queue ${char.name}:`, err);
|
|
}
|
|
}
|
|
|
|
// Phase 2: Poll all jobs concurrently; update UI as each finishes
|
|
progressBar.classList.remove('progress-bar-striped', 'progress-bar-animated');
|
|
progressBar.style.width = '0%';
|
|
progressBar.textContent = '0%';
|
|
statusText.textContent = `0 / ${jobs.length} done`;
|
|
|
|
let completed = 0;
|
|
await Promise.all(jobs.map(async ({ item, jobId }) => {
|
|
try {
|
|
const jobResult = await waitForJob(jobId);
|
|
if (jobResult.result && jobResult.result.image_url) {
|
|
const img = document.getElementById(`img-${item.slug}`);
|
|
const noImgSpan = document.getElementById(`no-img-${item.slug}`);
|
|
if (img) { img.src = jobResult.result.image_url; img.classList.remove('d-none'); }
|
|
if (noImgSpan) noImgSpan.classList.add('d-none');
|
|
}
|
|
} catch (err) {
|
|
console.error(`Failed for ${item.name}:`, err);
|
|
}
|
|
completed++;
|
|
const pct = Math.round((completed / jobs.length) * 100);
|
|
progressBar.style.width = `${pct}%`;
|
|
progressBar.textContent = `${pct}%`;
|
|
statusText.textContent = `${completed} / ${jobs.length} done`;
|
|
}));
|
|
|
|
progressBar.style.width = '100%';
|
|
progressBar.textContent = '100%';
|
|
statusText.textContent = 'Batch Complete!';
|
|
charNameText.textContent = '';
|
|
nodeStatus.textContent = 'Done';
|
|
stepProgressText.textContent = '';
|
|
taskProgressBar.style.width = '0%';
|
|
taskProgressBar.textContent = '';
|
|
batchBtn.disabled = false;
|
|
regenAllBtn.disabled = false;
|
|
setTimeout(() => container.classList.add('d-none'), 5000);
|
|
}
|
|
|
|
batchBtn.addEventListener('click', async () => {
|
|
const response = await fetch('/get_missing_characters');
|
|
const data = await response.json();
|
|
if (data.missing.length === 0) {
|
|
alert("No characters missing cover images.");
|
|
return;
|
|
}
|
|
if (!confirm(`Generate cover images for ${data.missing.length} characters?`)) return;
|
|
runBatch();
|
|
});
|
|
|
|
regenAllBtn.addEventListener('click', async () => {
|
|
if (!confirm("This will unassign ALL current cover images and generate new ones for every character. Existing files will be kept on disk. Proceed?")) return;
|
|
|
|
const clearResp = await fetch('/clear_all_covers', { method: 'POST' });
|
|
if (clearResp.ok) {
|
|
// Update UI to show "No Image" for all
|
|
document.querySelectorAll('.img-container img').forEach(img => img.classList.add('d-none'));
|
|
document.querySelectorAll('.img-container .text-muted').forEach(span => span.classList.remove('d-none'));
|
|
runBatch();
|
|
}
|
|
});
|
|
});
|
|
</script>
|
|
{% endblock %}
|