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:
@@ -57,23 +57,50 @@
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Favourite filter -->
|
||||
<div class="col-auto">
|
||||
<label class="form-label form-label-sm mb-1"> </label>
|
||||
<div class="form-check mt-1">
|
||||
<input class="form-check-input" type="checkbox" name="favourite" value="on" id="favFilter" {% if favourite_filter == 'on' %}checked{% endif %} onchange="this.form.submit()">
|
||||
<label class="form-check-label small" for="favFilter">★ Favourites</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- NSFW filter -->
|
||||
<div class="col-auto">
|
||||
<label class="form-label form-label-sm mb-1">Rating</label>
|
||||
<select name="nsfw" class="form-select form-select-sm" onchange="this.form.submit()">
|
||||
<option value="all" {% if nsfw_filter == 'all' %}selected{% endif %}>All</option>
|
||||
<option value="sfw" {% if nsfw_filter == 'sfw' %}selected{% endif %}>SFW only</option>
|
||||
<option value="nsfw" {% if nsfw_filter == 'nsfw' %}selected{% endif %}>NSFW only</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Active filter chips -->
|
||||
<div class="col">
|
||||
{% if category != 'all' %}
|
||||
<span class="badge bg-primary me-1">
|
||||
{{ category | capitalize }}
|
||||
<a href="{{ url_for('gallery', sort=sort, per_page=per_page) }}" class="text-white ms-1 text-decoration-none">×</a>
|
||||
<a href="{{ url_for('gallery', sort=sort, per_page=per_page, xref_category=xref_category, xref_slug=xref_slug) }}" class="text-white ms-1 text-decoration-none">×</a>
|
||||
</span>
|
||||
{% endif %}
|
||||
{% if slug %}
|
||||
<span class="badge bg-secondary me-1">
|
||||
{{ slug }}
|
||||
<a href="{{ url_for('gallery', category=category, sort=sort, per_page=per_page) }}" class="text-white ms-1 text-decoration-none">×</a>
|
||||
<a href="{{ url_for('gallery', category=category, sort=sort, per_page=per_page, xref_category=xref_category, xref_slug=xref_slug) }}" class="text-white ms-1 text-decoration-none">×</a>
|
||||
</span>
|
||||
{% endif %}
|
||||
{% if xref_category and xref_slug %}
|
||||
<span class="badge bg-info me-1">
|
||||
Cross-ref: {{ xref_category | capitalize }} = {{ xref_slug }}
|
||||
<a href="{{ url_for('gallery', category=category, slug=slug, sort=sort, per_page=per_page) }}" class="text-white ms-1 text-decoration-none">×</a>
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<input type="hidden" name="page" value="1">
|
||||
{% if xref_category %}<input type="hidden" name="xref_category" value="{{ xref_category }}">{% endif %}
|
||||
{% if xref_slug %}<input type="hidden" name="xref_slug" value="{{ xref_slug }}">{% endif %}
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -113,10 +140,21 @@
|
||||
class="badge {% if category == 'detailers' %}bg-secondary{% else %}bg-light text-dark{% endif %} text-decoration-none px-3 py-2">
|
||||
Detailers
|
||||
</a>
|
||||
<a href="{{ url_for('gallery', category='checkpoints', sort=sort, per_page=per_page) }}"
|
||||
<a href="{{ url_for('gallery', category='checkpoints', sort=sort, per_page=per_page) }}"
|
||||
class="badge {% if category == 'checkpoints' %}bg-dark{% else %}bg-light text-dark{% endif %} text-decoration-none px-3 py-2">
|
||||
Checkpoints
|
||||
</a>
|
||||
<span class="text-muted small mx-1">|</span>
|
||||
<a href="{{ url_for('gallery', category='presets', sort=sort, per_page=per_page) }}"
|
||||
class="badge {% if category == 'presets' %}text-white{% else %}bg-light text-dark{% endif %} text-decoration-none px-3 py-2"
|
||||
{% if category == 'presets' %}style="background-color: #6f42c1"{% endif %}>
|
||||
Presets
|
||||
</a>
|
||||
<a href="{{ url_for('gallery', category='generator', sort=sort, per_page=per_page) }}"
|
||||
class="badge {% if category == 'generator' %}text-white{% else %}bg-light text-dark{% endif %} text-decoration-none px-3 py-2"
|
||||
{% if category == 'generator' %}style="background-color: #20c997"{% endif %}>
|
||||
Generator
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -222,6 +260,9 @@
|
||||
'styles': 'warning',
|
||||
'detailers': 'secondary',
|
||||
'checkpoints': 'dark',
|
||||
'looks': 'primary',
|
||||
'presets': 'purple',
|
||||
'generator': 'teal',
|
||||
} %}
|
||||
{% for img in images %}
|
||||
<div class="gallery-card"
|
||||
@@ -237,6 +278,8 @@
|
||||
<span class="cat-badge badge bg-{{ cat_colors.get(img.category, 'secondary') }}">
|
||||
{{ img.category[:-1] if img.category.endswith('s') else img.category }}
|
||||
</span>
|
||||
{% if img._sidecar.get('is_favourite') %}<span class="fav-badge" title="Favourite" onclick="event.stopPropagation(); toggleImageFavourite('{{ img.path }}', this)">★</span>{% else %}<span class="fav-badge fav-off" title="Mark as favourite" onclick="event.stopPropagation(); toggleImageFavourite('{{ img.path }}', this)">☆</span>{% endif %}
|
||||
{% if img._sidecar.get('is_nsfw') %}<span class="nsfw-badge badge bg-danger" style="position:absolute;top:4px;right:4px;font-size:0.6rem;">NSFW</span>{% endif %}
|
||||
|
||||
<!-- Info View Additional Metadata -->
|
||||
<div class="info-meta">
|
||||
@@ -280,8 +323,12 @@
|
||||
<a href="{{ url_for('checkpoint_detail', slug=img.slug) }}"
|
||||
class="btn btn-sm btn-outline-light py-0 px-2"
|
||||
onclick="event.stopPropagation()">Open</a>
|
||||
{% elif img.category in ('presets', 'generator') %}
|
||||
<a href="{{ url_for('preset_detail', slug=img.slug) }}"
|
||||
class="btn btn-sm btn-outline-light py-0 px-2"
|
||||
onclick="event.stopPropagation()">Preset</a>
|
||||
{% else %}
|
||||
<a href="{{ url_for('generator') }}?{{ img.category[:-1] }}={{ img.slug }}"
|
||||
<a href="{{ url_for('generator') }}?preset={{ img.slug }}"
|
||||
class="btn btn-sm btn-outline-light py-0 px-2"
|
||||
onclick="event.stopPropagation()">Generator</a>
|
||||
{% endif %}
|
||||
@@ -376,6 +423,12 @@
|
||||
<div class="meta-grid" id="metaGrid"></div>
|
||||
</div>
|
||||
|
||||
<!-- Cross-reference entity chips (from sidecar) -->
|
||||
<div class="mb-3 d-none" id="xrefRow">
|
||||
<label class="form-label fw-semibold mb-1">Used Entities</label>
|
||||
<div class="d-flex flex-wrap gap-1" id="xrefContainer"></div>
|
||||
</div>
|
||||
|
||||
<div id="noMetaMsg" class="d-none">
|
||||
<p class="text-muted small fst-italic mb-0">No generation metadata found in this image.</p>
|
||||
</div>
|
||||
@@ -409,7 +462,31 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<style>
|
||||
.fav-badge { position: absolute; top: 4px; left: 4px; font-size: 1.2rem; color: #ffc107; cursor: pointer; text-shadow: 0 0 3px rgba(0,0,0,0.7); z-index: 2; }
|
||||
.fav-badge.fav-off { color: rgba(255,255,255,0.5); }
|
||||
.fav-badge:hover { transform: scale(1.2); }
|
||||
</style>
|
||||
<script>
|
||||
async function toggleImageFavourite(path, el) {
|
||||
const resp = await fetch('/gallery/image/favourite', {
|
||||
method: 'POST', headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({path})
|
||||
});
|
||||
const data = await resp.json();
|
||||
if (data.success) {
|
||||
el.innerHTML = data.is_favourite ? '★' : '☆';
|
||||
el.classList.toggle('fav-off', !data.is_favourite);
|
||||
}
|
||||
}
|
||||
async function toggleImageNsfw(path, el) {
|
||||
const resp = await fetch('/gallery/image/nsfw', {
|
||||
method: 'POST', headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({path})
|
||||
});
|
||||
const data = await resp.json();
|
||||
if (data.success) location.reload();
|
||||
}
|
||||
// ---- Prompt modal ----
|
||||
let promptModal;
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
@@ -473,15 +550,55 @@ async function showPrompt(imgPath, name, category, slug) {
|
||||
document.getElementById('noMetaMsg').classList.toggle('d-none',
|
||||
!!(data.positive || loras.length || hasParams));
|
||||
|
||||
// Cross-reference entity chips (from sidecar)
|
||||
const xrefContainer = document.getElementById('xrefContainer');
|
||||
const xrefRow = document.getElementById('xrefRow');
|
||||
xrefContainer.innerHTML = '';
|
||||
if (data.sidecar) {
|
||||
const sc = data.sidecar;
|
||||
const xrefColors = {
|
||||
character: 'primary', outfit: 'success', action: 'danger',
|
||||
style: 'warning', scene: 'info', detailer: 'secondary',
|
||||
look: 'primary', preset: 'purple'
|
||||
};
|
||||
for (const [key, sidecarKey] of [
|
||||
['character', 'character_slug'], ['outfit', 'outfit_slug'],
|
||||
['action', 'action_slug'], ['style', 'style_slug'],
|
||||
['scene', 'scene_slug'], ['detailer', 'detailer_slug'],
|
||||
['look', 'look_slug'], ['preset', 'preset_slug']
|
||||
]) {
|
||||
const val = sc[sidecarKey];
|
||||
if (!val) continue;
|
||||
const chip = document.createElement('a');
|
||||
chip.className = `badge bg-${xrefColors[key] || 'secondary'} text-decoration-none`;
|
||||
chip.href = `/gallery?xref_category=${key}&xref_slug=${encodeURIComponent(val)}`;
|
||||
chip.textContent = `${key}: ${sc[sidecarKey.replace('_slug', '_name')] || val}`;
|
||||
chip.title = `Show all images using this ${key}`;
|
||||
xrefContainer.appendChild(chip);
|
||||
}
|
||||
xrefRow.classList.toggle('d-none', xrefContainer.children.length === 0);
|
||||
} else {
|
||||
xrefRow.classList.add('d-none');
|
||||
}
|
||||
|
||||
// Generator link
|
||||
const genUrl = category === 'characters'
|
||||
? `/character/${slug}`
|
||||
: category === 'checkpoints'
|
||||
? `/checkpoint/${slug}`
|
||||
: `/generator?${category.replace(/s$/, '')}=${encodeURIComponent(slug)}`;
|
||||
let genUrl, genLabel;
|
||||
if (category === 'characters') {
|
||||
genUrl = `/character/${slug}`;
|
||||
genLabel = 'Open';
|
||||
} else if (category === 'checkpoints') {
|
||||
genUrl = `/checkpoint/${slug}`;
|
||||
genLabel = 'Open';
|
||||
} else if (category === 'presets' || category === 'generator') {
|
||||
genUrl = `/generator?preset=${encodeURIComponent(slug)}`;
|
||||
genLabel = 'Open in Generator';
|
||||
} else {
|
||||
genUrl = `/generator?${category.replace(/s$/, '')}=${encodeURIComponent(slug)}`;
|
||||
genLabel = 'Open in Generator';
|
||||
}
|
||||
const genBtn = document.getElementById('openGeneratorBtn');
|
||||
genBtn.href = genUrl;
|
||||
genBtn.textContent = (category === 'characters' || category === 'checkpoints') ? 'Open' : 'Open in Generator';
|
||||
genBtn.textContent = genLabel;
|
||||
} catch (e) {
|
||||
document.getElementById('promptPositive').value = 'Error loading metadata.';
|
||||
} finally {
|
||||
|
||||
Reference in New Issue
Block a user