Add semantic tagging, search, favourite/NSFW filtering, and LLM job queue
Replaces old list-format tags (which duplicated prompt content) with structured dict tags per category (origin_series, outfit_type, participants, style_type, scene_type, etc.). Tags are now purely organizational metadata — removed from the prompt pipeline entirely. Adds is_favourite and is_nsfw columns to all 8 resource models. Favourite is DB-only (user preference); NSFW is mirrored in JSON tags for rescan persistence. All library pages get filter controls and favourites-first sorting. Introduces a parallel LLM job queue (_enqueue_task + _llm_queue_worker) for background tag regeneration, with the same status polling UI as ComfyUI jobs. Fixes call_llm() to use has_request_context() fallback for background threads. Adds global search (/search) across resources and gallery images, with navbar search bar. Adds gallery image sidecar JSON for per-image favourite/NSFW metadata. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -31,8 +31,13 @@
|
||||
<a href="/gallery" class="btn btn-sm btn-outline-light">Image Gallery</a>
|
||||
<a href="/settings" class="btn btn-sm btn-outline-light">Settings</a>
|
||||
<div class="vr mx-1 d-none d-lg-block"></div>
|
||||
<!-- Search -->
|
||||
<form action="/search" method="get" class="d-flex" style="max-width:180px;">
|
||||
<input type="text" name="q" class="form-control form-control-sm bg-dark text-light border-secondary" placeholder="Search..." aria-label="Search">
|
||||
</form>
|
||||
<div class="vr mx-1 d-none d-lg-block"></div>
|
||||
<!-- Queue indicator -->
|
||||
<button id="queue-btn" class="btn btn-sm queue-btn" data-bs-toggle="modal" data-bs-target="#queueModal" title="Generation Queue">
|
||||
<button id="queue-btn" class="btn btn-sm queue-btn" data-bs-toggle="modal" data-bs-target="#queueModal" title="Job Queue">
|
||||
<span class="queue-icon">⏳</span>
|
||||
<span id="queue-count-badge" class="queue-badge d-none">0</span>
|
||||
</button>
|
||||
@@ -93,13 +98,13 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Generation Queue Modal -->
|
||||
<!-- Job Queue Modal -->
|
||||
<div class="modal fade" id="queueModal" tabindex="-1">
|
||||
<div class="modal-dialog modal-dialog-centered modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">
|
||||
Generation Queue
|
||||
Job Queue
|
||||
<span id="queue-modal-count" class="badge bg-secondary ms-2">0</span>
|
||||
</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
||||
@@ -232,6 +237,33 @@
|
||||
}
|
||||
}
|
||||
|
||||
function regenerateTags(category, slug) {
|
||||
const btn = document.getElementById('regenerate-tags-btn');
|
||||
if (!btn) return;
|
||||
const origText = btn.innerHTML;
|
||||
btn.disabled = true;
|
||||
btn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Regenerating…';
|
||||
fetch(`/api/${category}/${slug}/regenerate_tags`, {
|
||||
method: 'POST',
|
||||
headers: {'X-Requested-With': 'XMLHttpRequest'}
|
||||
})
|
||||
.then(r => r.json().then(d => ({ok: r.ok, data: d})))
|
||||
.then(({ok, data}) => {
|
||||
if (ok && data.success) {
|
||||
location.reload();
|
||||
} else {
|
||||
alert('Regeneration failed: ' + (data.error || 'Unknown error'));
|
||||
btn.disabled = false;
|
||||
btn.innerHTML = origText;
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
alert('Regeneration failed: ' + err);
|
||||
btn.disabled = false;
|
||||
btn.innerHTML = origText;
|
||||
});
|
||||
}
|
||||
|
||||
function initJsonEditor(saveUrl) {
|
||||
const jsonModal = document.getElementById('jsonEditorModal');
|
||||
if (!jsonModal) return;
|
||||
@@ -533,7 +565,7 @@
|
||||
})();
|
||||
</script>
|
||||
<script>
|
||||
// ---- Generation Queue UI ----
|
||||
// ---- Job Queue UI ----
|
||||
(function() {
|
||||
const badge = document.getElementById('queue-count-badge');
|
||||
const modalCount = document.getElementById('queue-modal-count');
|
||||
@@ -575,7 +607,7 @@
|
||||
queueBtn.title = `${pendingJobs.length} job(s) queued`;
|
||||
} else {
|
||||
queueBtn.classList.remove('queue-btn-generating');
|
||||
queueBtn.title = 'Generation Queue';
|
||||
queueBtn.title = 'Job Queue';
|
||||
}
|
||||
|
||||
// Update modal count
|
||||
@@ -616,6 +648,15 @@
|
||||
statusDot.className = `queue-status-dot queue-status-${job.status}`;
|
||||
li.appendChild(statusDot);
|
||||
|
||||
// Job type badge
|
||||
if (job.job_type === 'llm') {
|
||||
const typeBadge = document.createElement('span');
|
||||
typeBadge.className = 'badge bg-info';
|
||||
typeBadge.textContent = 'LLM';
|
||||
typeBadge.style.fontSize = '0.6rem';
|
||||
li.appendChild(typeBadge);
|
||||
}
|
||||
|
||||
// Label
|
||||
const label = document.createElement('span');
|
||||
label.className = 'flex-grow-1 small';
|
||||
|
||||
Reference in New Issue
Block a user