Added style browser.

This commit is contained in:
Aodhan Collins
2026-02-20 21:22:53 +00:00
parent 116941673e
commit 8487b177b4
297 changed files with 5311 additions and 80 deletions

View File

@@ -0,0 +1,36 @@
{% extends "layout.html" %}
{% block content %}
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card shadow-sm border-0">
<div class="card-header bg-success text-white">Create New Style</div>
<div class="card-body p-4">
<form action="{{ url_for('create_style') }}" method="post">
<div class="mb-4">
<label for="name" class="form-label fw-bold">Style Name</label>
<input type="text" class="form-control" id="name" name="name" placeholder="e.g. Sabu Style" required>
<div class="form-text">The display name for the style gallery.</div>
</div>
<div class="mb-4">
<label for="filename" class="form-label fw-bold">Style ID / Filename <small class="text-muted">(Optional)</small></label>
<input type="text" class="form-control" id="filename" name="filename" placeholder="e.g. sabu_01">
<div class="form-text">Used for the JSON file and URL. Auto-generated from name if empty.</div>
</div>
<div class="alert alert-info border-0 shadow-none bg-light">
<i class="bi bi-info-circle me-2"></i> A blank style profile will be created. You can then edit it to add specific artistic tags, artist attribution, and LoRA settings.
</div>
<div class="d-grid mt-4">
<button type="submit" class="btn btn-success btn-lg shadow-sm">Create Style</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -0,0 +1,346 @@
{% extends "layout.html" %}
{% block content %}
<!-- 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>
{% macro selection_checkbox(section, key, label, value) %}
<input class="form-check-input me-1" type="checkbox" name="include_field" value="{{ section }}::{{ key }}"
{% if preferences is not none %}
{% if section + '::' + key in preferences %}checked{% endif %}
{% elif style.default_fields is not none %}
{% if section + '::' + key in style.default_fields %}checked{% endif %}
{% else %}
{% if value %}checked{% endif %}
{% endif %}>
{% endmacro %}
<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 style.image_path %}
<img src="{{ url_for('static', filename='uploads/' + style.image_path) }}" alt="{{ style.name }}" class="img-fluid">
{% else %}
<div class="d-flex align-items-center justify-content-center bg-light" style="height: 400px;">
<span class="text-muted">No Image Attached</span>
</div>
{% endif %}
</div>
<div class="card-body">
<form action="{{ url_for('upload_style_image', slug=style.slug) }}" method="post" enctype="multipart/form-data">
<div class="mb-3">
<label for="image" class="form-label text-muted small">Update Cover Image</label>
<input class="form-control form-control-sm" type="file" id="image" name="image" required>
</div>
<button type="submit" class="btn btn-sm btn-outline-primary w-100 mb-2">Upload</button>
</form>
<hr>
{# 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 (Style 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>
<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_style_defaults', slug=style.slug) }}" class="btn btn-sm btn-outline-secondary mt-2">Save Selection as Default</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 p-2">
<small>Latest Preview</small>
<form action="{{ url_for('replace_style_cover_from_preview', slug=style.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 p-2">
<small>Latest Preview</small>
<form action="{{ url_for('replace_style_cover_from_preview', slug=style.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>
<div class="col-md-8">
<div class="d-flex justify-content-between align-items-center mb-4">
<div>
<h1 class="mb-0">{{ style.name }}</h1>
<div class="mt-1">
<a href="{{ url_for('edit_style', slug=style.slug) }}" class="btn btn-sm btn-link text-decoration-none ps-0">Edit Style</a>
<span class="text-muted">|</span>
<form action="{{ url_for('clone_style', slug=style.slug) }}" method="post" style="display: inline;">
<button type="submit" class="btn btn-sm btn-link text-decoration-none">Clone Style</button>
</form>
</div>
</div>
<a href="{{ url_for('styles_index') }}" class="btn btn-outline-secondary">Back to Gallery</a>
</div>
<form id="generate-form" action="{{ url_for('generate_style_image', slug=style.slug) }}" method="post">
{# Style definition section #}
{% set sdata = style.data.get('style', {}) %}
<div class="card mb-4">
<div class="card-header bg-light">
<strong>Style Definition</strong>
</div>
<div class="card-body">
<dl class="row mb-0">
<dt class="col-sm-4 text-capitalize">
{{ selection_checkbox('style', 'artist_name', 'Artist Name', sdata.get('artist_name')) }}
Artist Name
</dt>
<dd class="col-sm-8">by {{ sdata.get('artist_name') if sdata.get('artist_name') else '--' }}</dd>
<dt class="col-sm-4 text-capitalize">
{{ selection_checkbox('style', 'artistic_style', 'Artistic Style', sdata.get('artistic_style')) }}
Artistic Style
</dt>
<dd class="col-sm-8">{{ sdata.get('artistic_style') if sdata.get('artistic_style') else '--' }}</dd>
</dl>
</div>
</div>
{# Character Identity/Wardrobe context when character is selected #}
<div id="character-context" class="{% if not selected_character or selected_character == '__random__' %}d-none{% endif %}">
<div class="alert alert-info">
<i class="bi bi-info-circle"></i> When a character is selected, their identity and active wardrobe fields will be automatically included.
</div>
</div>
{# LoRA section #}
{% set lora = style.data.get('lora', {}) %}
<div class="card mb-4">
<div class="card-header bg-light d-flex justify-content-between align-items-center">
<strong>LoRA Integration</strong>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" name="include_field" value="lora::lora_triggers" id="includeLora"
{% if preferences is not none %}
{% if 'lora::lora_triggers' in preferences %}checked{% endif %}
{% elif style.default_fields is not none %}
{% if 'lora::lora_triggers' in style.default_fields %}checked{% endif %}
{% else %}
checked
{% endif %}>
<label class="form-check-label small" for="includeLora">Include Triggers</label>
</div>
</div>
<div class="card-body">
<dl class="row mb-0">
<dt class="col-sm-4">LoRA Name</dt>
<dd class="col-sm-8 text-muted small">{{ lora.get('lora_name') if lora.get('lora_name') else '--' }}</dd>
<dt class="col-sm-4">Weight</dt>
<dd class="col-sm-8">{{ lora.get('lora_weight', 1.0) }}</dd>
<dt class="col-sm-4">Triggers</dt>
<dd class="col-sm-8 small"><code>{{ lora.get('lora_triggers') if lora.get('lora_triggers') else '--' }}</code></dd>
</dl>
</div>
</div>
</form>
</div>
</div>
{% 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');
const charSelect = document.getElementById('character_select');
const charContext = document.getElementById('character-context');
// Toggle character context info
charSelect.addEventListener('change', () => {
if (charSelect.value && charSelect.value !== '__random__') {
charContext.classList.remove('d-none');
} else {
charContext.classList.add('d-none');
}
});
// Generate a unique client ID
const clientId = 'style_detail_' + Math.random().toString(36).substring(2, 15);
// ComfyUI WebSocket
const socket = new WebSocket(`ws://127.0.0.1:8188/ws?clientId=${clientId}`);
let currentPromptId = null;
let currentAction = null;
socket.addEventListener('message', (event) => {
if (!currentPromptId) return;
const msg = JSON.parse(event.data);
if (msg.type === 'status') {
const queueRemaining = msg.data.status.exec_info.queue_remaining;
if (queueRemaining > 0) {
progressLabel.textContent = `Queue position: ${queueRemaining}`;
}
}
else if (msg.type === 'progress') {
const value = msg.data.value;
const max = msg.data.max;
const percent = Math.round((value / max) * 100);
progressBar.style.width = `${percent}%`;
progressBar.textContent = `${percent}%`;
}
else if (msg.type === 'executing') {
if (msg.data.node === null && msg.data.prompt_id === currentPromptId) {
// Execution finished
if (resolveCompletion) resolveCompletion();
}
}
});
let resolveCompletion = null;
async function waitForCompletion(promptId) {
return new Promise((resolve) => {
const checkResolve = () => {
clearInterval(pollInterval);
resolve();
};
resolveCompletion = checkResolve;
// Fallback polling
const pollInterval = setInterval(async () => {
try {
const resp = await fetch(`/check_status/${promptId}`);
const data = await resp.json();
if (data.status === 'finished') {
checkResolve();
}
} catch (err) { console.error('Polling error:', err); }
}, 2000);
});
}
form.addEventListener('submit', async (e) => {
const submitter = e.submitter;
if (!submitter || submitter.value !== 'preview') return;
e.preventDefault();
currentAction = submitter.value;
const formData = new FormData(form);
formData.append('action', currentAction);
formData.append('client_id', clientId);
progressContainer.classList.remove('d-none');
progressBar.style.width = '0%';
progressBar.textContent = '0%';
progressLabel.textContent = 'Starting...';
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;
}
currentPromptId = data.prompt_id;
progressLabel.textContent = 'Queued...';
await waitForCompletion(currentPromptId);
finalizeGeneration(currentPromptId, currentAction);
currentPromptId = null;
} catch (err) {
console.error(err);
alert('Request failed');
progressContainer.classList.add('d-none');
}
});
async function finalizeGeneration(promptId, action) {
progressLabel.textContent = 'Saving image...';
const url = `/style/{{ style.slug }}/finalize_generation/${promptId}`;
const formData = new FormData();
formData.append('action', 'preview'); // Always save as preview
try {
const response = await fetch(url, { method: 'POST', body: formData });
const data = await response.json();
if (data.success) {
previewImg.src = data.image_url;
if (previewCard) previewCard.classList.remove('d-none');
const replaceBtn = document.getElementById('replace-cover-btn');
if (replaceBtn) {
replaceBtn.disabled = false;
const form = replaceBtn.closest('form');
if (form) {
form.action = `/style/{{ style.slug }}/replace_cover_from_preview`;
}
}
} else {
alert('Save failed: ' + data.error);
}
} catch (err) {
console.error(err);
alert('Finalize request failed');
} finally {
progressContainer.classList.add('d-none');
}
}
});
function showImage(src) {
document.getElementById('modalImage').src = src;
}
</script>
{% endblock %}

View File

@@ -0,0 +1,75 @@
{% extends "layout.html" %}
{% block content %}
<div class="container">
<div class="d-flex justify-content-between align-items-center mb-4">
<h1>Edit Style: {{ style.name }}</h1>
<a href="{{ url_for('style_detail', slug=style.slug) }}" class="btn btn-outline-secondary">Cancel</a>
</div>
<form action="{{ url_for('edit_style', slug=style.slug) }}" method="post" id="main-form">
<div class="row">
<div class="col-md-8">
<!-- Basic Info -->
<div class="card mb-4">
<div class="card-header bg-dark text-white">Basic Information</div>
<div class="card-body">
<div class="mb-3">
<label for="style_name" class="form-label">Display Name</label>
<input type="text" class="form-control" id="style_name" name="style_name" value="{{ style.name }}" required>
</div>
</div>
</div>
<!-- LoRA -->
<div class="card mb-4">
<div class="card-header bg-info text-white">LoRA Settings</div>
<div class="card-body">
<div class="row">
<div class="col-md-8">
<label for="lora_lora_name" class="form-label">LoRA Name</label>
<select class="form-select" id="lora_lora_name" name="lora_lora_name">
<option value="">None</option>
{% for lora in loras %}
<option value="{{ lora }}" {% if style.data.lora and style.data.lora.lora_name == lora %}selected{% endif %}>{{ lora }}</option>
{% endfor %}
</select>
</div>
<div class="col-md-4">
<label for="lora_lora_weight" class="form-label">Weight</label>
<input type="number" step="0.01" class="form-control" id="lora_lora_weight" name="lora_lora_weight" value="{{ style.data.lora.lora_weight if style.data.lora else 1.0 }}">
</div>
</div>
<div class="mt-3">
<label for="lora_lora_triggers" class="form-label">Triggers</label>
<input type="text" class="form-control" id="lora_lora_triggers" name="lora_lora_triggers" value="{{ style.data.lora.lora_triggers if style.data.lora else '' }}">
</div>
</div>
</div>
<!-- Style Definition Section -->
{% set sdata = style.data.get('style', {}) %}
<div class="card mb-4">
<div class="card-header bg-light"><strong>Style Definition</strong></div>
<div class="card-body">
<div class="mb-3">
<label for="style_artist_name" class="form-label">Artist Name (prefixed with 'by ' in prompt)</label>
<input type="text" class="form-control" id="style_artist_name" name="style_artist_name" value="{{ sdata.get('artist_name', '') }}">
</div>
<div class="mb-3">
<label for="style_artistic_style" class="form-label">Artistic Style Tags (appended to prompt)</label>
<input type="text" class="form-control" id="style_artistic_style" name="style_artistic_style" value="{{ sdata.get('artistic_style', '') }}">
<div class="form-text">e.g., "watercolor painting, soft colors, messy ink"</div>
</div>
</div>
</div>
<div class="d-grid gap-2 d-md-flex justify-content-md-end">
<a href="{{ url_for('style_detail', slug=style.slug) }}" class="btn btn-secondary">Cancel</a>
<button type="submit" class="btn btn-primary">Save Changes</button>
</div>
</div>
</div>
</form>
</div>
{% endblock %}

193
templates/styles/index.html Normal file
View File

@@ -0,0 +1,193 @@
{% extends "layout.html" %}
{% block content %}
<div class="d-flex justify-content-between align-items-center mb-4">
<h2>Style Gallery</h2>
<div class="d-flex">
<button id="batch-generate-btn" class="btn btn-outline-success me-2">Generate Missing Covers</button>
<button id="regenerate-all-btn" class="btn btn-outline-danger me-2">Regenerate All Covers</button>
<form action="{{ url_for('bulk_create_styles_from_loras') }}" method="post" class="me-2">
<button type="submit" class="btn btn-primary">Bulk Create from LoRAs</button>
</form>
<a href="{{ url_for('create_style') }}" class="btn btn-success me-2">Create New Style</a>
<form action="{{ url_for('rescan_styles') }}" method="post">
<button type="submit" class="btn btn-outline-primary">Rescan Style Files</button>
</form>
</div>
</div>
<!-- Batch Progress Bar -->
<div id="batch-progress-container" class="card mb-4 d-none">
<div class="card-body">
<h5 id="batch-status-text">Batch Generating Styles...</h5>
<div class="progress mt-2" role="progressbar" aria-label="Batch Progress" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
<div id="batch-progress-bar" class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width: 0%">0%</div>
</div>
<p id="current-style-name" class="small text-muted mt-2 mb-0"></p>
</div>
</div>
<div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 g-4">
{% for style in styles %}
<div class="col" id="card-{{ style.slug }}">
<div class="card h-100 character-card" onclick="window.location.href='/style/{{ style.slug }}'">
<div class="img-container">
{% if style.image_path %}
<img id="img-{{ style.slug }}" src="{{ url_for('static', filename='uploads/' + style.image_path) }}" alt="{{ style.name }}">
<span id="no-img-{{ style.slug }}" class="text-muted d-none">No Image</span>
{% else %}
<img id="img-{{ style.slug }}" src="" alt="{{ style.name }}" class="d-none">
<span id="no-img-{{ style.slug }}" class="text-muted">No Image</span>
{% endif %}
</div>
<div class="card-body">
<h5 class="card-title text-center">{{ style.name }}</h5>
<p class="card-text small text-center text-muted">
{% if style.data.style.artist_name %}by {{ style.data.style.artist_name }}{% endif %}
</p>
</div>
{% if style.data.lora and style.data.lora.lora_name %}
{% set lora_name = style.data.lora.lora_name.split('/')[-1].replace('.safetensors', '') %}
<div class="card-footer text-center p-1">
<small class="text-muted" title="{{ style.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 container = document.getElementById('batch-progress-container');
const statusText = document.getElementById('batch-status-text');
const styleNameText = document.getElementById('current-style-name');
const clientId = 'styles_batch_' + Math.random().toString(36).substring(2, 15);
const socket = new WebSocket(`ws://127.0.0.1:8188/ws?clientId=${clientId}`);
let currentPromptId = null;
let resolveGeneration = null;
socket.addEventListener('message', (event) => {
const msg = JSON.parse(event.data);
if (msg.type === 'executing') {
if (msg.data.node === null && msg.data.prompt_id === currentPromptId) {
if (resolveGeneration) resolveGeneration();
}
}
});
async function waitForCompletion(promptId) {
return new Promise((resolve) => {
const checkResolve = () => {
clearInterval(pollInterval);
resolve();
};
resolveGeneration = checkResolve;
const pollInterval = setInterval(async () => {
try {
const resp = await fetch(`/check_status/${promptId}`);
const data = await resp.json();
if (data.status === 'finished') {
checkResolve();
}
} catch (err) {}
}, 2000);
});
}
async function runBatch() {
const response = await fetch('/get_missing_styles');
const data = await response.json();
const missing = data.missing;
if (missing.length === 0) {
alert("No styles missing cover images.");
return;
}
batchBtn.disabled = true;
regenAllBtn.disabled = true;
container.classList.remove('d-none');
let completed = 0;
for (const style of missing) {
completed++;
const percent = Math.round((completed / missing.length) * 100);
progressBar.style.width = `${percent}%`;
progressBar.textContent = `${percent}%`;
statusText.textContent = `Batch Generating Styles: ${completed} / ${missing.length}`;
styleNameText.textContent = `Current: ${style.name}`;
try {
const genResp = await fetch(`/style/${style.slug}/generate`, {
method: 'POST',
body: new URLSearchParams({
'action': 'replace',
'client_id': clientId,
'character_slug': '__random__'
}),
headers: { 'X-Requested-With': 'XMLHttpRequest' }
});
const genData = await genResp.json();
currentPromptId = genData.prompt_id;
await waitForCompletion(currentPromptId);
const finResp = await fetch(`/style/${style.slug}/finalize_generation/${currentPromptId}`, {
method: 'POST',
body: new URLSearchParams({ 'action': 'replace' })
});
const finData = await finResp.json();
if (finData.success) {
const img = document.getElementById(`img-${style.slug}`);
const noImgSpan = document.getElementById(`no-img-${style.slug}`);
if (img) {
img.src = finData.image_url;
img.classList.remove('d-none');
}
if (noImgSpan) noImgSpan.classList.add('d-none');
}
} catch (err) {
console.error(`Failed for ${style.name}:`, err);
}
}
statusText.textContent = "Batch Style Generation Complete!";
styleNameText.textContent = "";
batchBtn.disabled = false;
regenAllBtn.disabled = false;
setTimeout(() => { container.classList.add('d-none'); }, 5000);
}
batchBtn.addEventListener('click', async () => {
const response = await fetch('/get_missing_styles');
const data = await response.json();
if (data.missing.length === 0) {
alert("No styles missing cover images.");
return;
}
if (!confirm(`Generate cover images for ${data.missing.length} styles?`)) return;
runBatch();
});
regenAllBtn.addEventListener('click', async () => {
if (!confirm("This will unassign ALL current style cover images and generate new ones. Proceed?")) return;
const clearResp = await fetch('/clear_all_style_covers', { method: 'POST' });
if (clearResp.ok) {
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 %}