- 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>
296 lines
15 KiB
HTML
296 lines
15 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 — {{ look.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">{{ look.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-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 look.image_path %}
|
|
<img src="{{ url_for('static', filename='uploads/' + look.image_path) }}" alt="{{ look.name }}" class="img-fluid">
|
|
{% else %}
|
|
<span class="text-muted">No Image Attached</span>
|
|
{% endif %}
|
|
</div>
|
|
<div class="card-body">
|
|
<form action="{{ url_for('upload_look_image', slug=look.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 --</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.character_id or selected_character == char.slug %}selected
|
|
{% elif not selected_character and look.character_id == char.character_id %}selected
|
|
{% endif %}>{{ char.name }}</option>
|
|
{% endfor %}
|
|
</select>
|
|
<div class="form-text">Defaults to the linked character.</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_look_defaults', slug=look.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-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_look_cover_from_preview', slug=look.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_look_cover_from_preview', slug=look.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 look.default_fields is not none %}
|
|
{% if 'special::tags' in look.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 look.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">{{ look.name }}</h1>
|
|
{% if look.character_id %}
|
|
<small class="text-muted">Linked to: <strong>{{ look.character_id.replace('_', ' ').title() }}</strong></small>
|
|
{% endif %}
|
|
<br>
|
|
<a href="{{ url_for('edit_look', slug=look.slug) }}" class="btn btn-sm btn-link text-decoration-none">Edit Profile</a>
|
|
</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('looks_index') }}" class="btn btn-outline-secondary">Back to Gallery</a>
|
|
</div>
|
|
</div>
|
|
|
|
<form id="generate-form" action="{{ url_for('generate_look_image', slug=look.slug) }}" method="post">
|
|
{# Positive prompt #}
|
|
{% if look.data.positive %}
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-light d-flex justify-content-between align-items-center">
|
|
<strong>Positive Prompt</strong>
|
|
<div class="form-check form-switch">
|
|
<input class="form-check-input" type="checkbox" name="include_field" value="positive" id="includePositive" form="generate-form"
|
|
{% if preferences is not none %}
|
|
{% if 'positive' in preferences %}checked{% endif %}
|
|
{% elif look.default_fields is not none %}
|
|
{% if 'positive' in look.default_fields %}checked{% endif %}
|
|
{% else %}
|
|
checked
|
|
{% endif %}>
|
|
<label class="form-check-label small" for="includePositive">Include</label>
|
|
</div>
|
|
</div>
|
|
<div class="card-body">
|
|
<p class="mb-0">{{ look.data.positive }}</p>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
|
|
{# Negative prompt #}
|
|
{% if look.data.negative %}
|
|
<div class="card mb-4">
|
|
<div class="card-header bg-light"><strong>Negative Prompt</strong></div>
|
|
<div class="card-body">
|
|
<p class="mb-0 text-muted">{{ look.data.negative }}</p>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
|
|
{# LoRA section #}
|
|
{% set lora = look.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 look.default_fields is not none %}
|
|
{% if 'lora::' + key in look.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>
|
|
|
|
{% set sg_entity = look %}
|
|
{% set sg_category = 'looks' %}
|
|
{% set sg_has_lora = look.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;
|
|
|
|
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) => {
|
|
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); progressContainer.classList.add('d-none'); return; }
|
|
currentJobId = data.job_id;
|
|
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'); }
|
|
});
|
|
});
|
|
|
|
function showImage(src) {
|
|
document.getElementById('modalImage').src = src;
|
|
}
|
|
|
|
initJsonEditor('{{ url_for("save_look_json", slug=look.slug) }}');
|
|
</script>
|
|
{% endblock %}
|