+ Camera — absolute
+
+
`;
html += absAngles.map(a => {
const sel = _sbSelectedAngles.has(a.name) ? ' selected' : '';
const done = donePoses.has(a.name) ? ' done' : '';
@@ -4803,6 +4877,14 @@
renderSidebarGenerate();
}
+ function sbToggleOrbitAll() {
+ const ORBIT_NAMES = ['Front', '¾ Left', '¾ Right', 'Side L', 'Side R', 'Back'];
+ const allSel = ORBIT_NAMES.every(n => _sbSelectedAngles.has(n));
+ if (allSel) { ORBIT_NAMES.forEach(n => _sbSelectedAngles.delete(n)); }
+ else { ORBIT_NAMES.forEach(n => _sbSelectedAngles.add(n)); }
+ renderSidebarGenerate();
+ }
+
function setSbRefMode(mode) {
_sbRefMode = mode;
renderSidebarGenerate();
@@ -5386,6 +5468,8 @@
let _sceneVideo = null, _sceneDuration = 0, _sceneFrameBytes = null, _sceneJobPollTimer = null;
let _sceneGridOpen = false; // whether the video picker grid is expanded
+ let _sceneLibOpen = false; // whether "previous scenery" library panel is expanded
+ let _sceneLib = null; // cached { groups, ungrouped } from /scenery/library
// 3 positional reference slots: 0=Background(image1), 1=Person(image2), 2=Extra(image3).
// Each entry is null | {kind:'bytes', data:} | {kind:'file', name:}.
// Backend contract: slot0→scene_bytes (bytes; a file here is fetched→bytes on submit),
@@ -5518,8 +5602,53 @@
${canGen?'':'disabled'}>Create Scenery
`;
+ // --- Previous scenery library (grouped by source video) ---
+ html += `
+
+ Previous scenery
+
+
`;
+ if (_sceneLibOpen) {
+ if (!_sceneLib) {
+ html += `Loading…
`;
+ } else if (!_sceneLib.groups.length && !_sceneLib.ungrouped.length) {
+ html += `No previous scenery found.
`;
+ } else {
+ const renderLibItems = (items) => items.map(it => {
+ const url = IMAGE_FOLDER + encodeURIComponent(it.filename);
+ const gLabel = it.group_id ? ` ${escHtml(it.group_id)}` : '';
+ return `
+ 
+
`;
+ }).join('');
+ _sceneLib.groups.forEach(g => {
+ const vName = g.video.replace(/\.[^.]+$/, '');
+ html += `
+
`;
+ });
+ if (_sceneLib.ungrouped.length) {
+ html += `📹 ${escHtml(vName)}
+ ${renderLibItems(g.items)}
+
+
`;
+ }
+ }
+ }
+
panel.innerHTML = html;
+ // Lazy-load library data when panel is opened
+ if (_sceneLibOpen && !_sceneLib) {
+ fetch(`${API}/scenery/library`)
+ .then(r => r.ok ? r.json() : null)
+ .then(d => { if (d) { _sceneLib = d; renderSidebarScenery(); } })
+ .catch(() => {});
+ }
+
// Restore the preserved prompt text and size the textarea.
const spEl = document.getElementById('scenePromptInput');
if (spEl) { spEl.value = prevScenePrompt; autoGrowPrompt(spEl); }
@@ -5557,6 +5686,28 @@
renderSidebarScenery();
}
+ function sceneLibToggle() {
+ _sceneLibOpen = !_sceneLibOpen;
+ if (_sceneLibOpen && !_sceneLib) _sceneLib = null; // force re-fetch on open
+ renderSidebarScenery();
+ }
+
+ // Use a library scenery image as slot 0 background (fetched to bytes).
+ async function sceneLibUseAsBackground(filename) {
+ try {
+ const url = IMAGE_FOLDER + encodeURIComponent(filename);
+ const b64 = await _fetchAsBase64(url);
+ _sceneRefs[0] = { kind: 'bytes', data: b64 };
+ _sceneVideo = null;
+ _sceneFrameBytes = null;
+ _sceneGridOpen = false;
+ renderSidebarScenery();
+ showToast('Background set from previous scenery', 'success');
+ } catch (e) {
+ showToast('Could not load image: ' + e, 'error');
+ }
+ }
+
// ---- scenery reference-slot helpers ----
// Thumbnail (URL or data-URL) for a slot ref.
diff --git a/tour-comfy/edit_api.py b/tour-comfy/edit_api.py
index ccdc884..0131959 100644
--- a/tour-comfy/edit_api.py
+++ b/tour-comfy/edit_api.py
@@ -2362,7 +2362,8 @@ def _make_side_by_side(img1: Image.Image, img2: Image.Image,
def _scenery_worker(job_id: str, model_filename: str, scene_pil: Image.Image,
- prompt: str, seed: int, extra_pils: list | None = None):
+ prompt: str, seed: int, extra_pils: list | None = None,
+ scene_video: str | None = None, extra_filename: str | None = None):
output_dir = _load_output_dir()
try:
model_path = os.path.join(output_dir, model_filename)
@@ -2390,10 +2391,16 @@ def _scenery_worker(job_id: str, model_filename: str, scene_pil: Image.Image,
try:
embedding = embeddings.generate_embedding(out_path)
next_order = database.get_next_sort_order(group_id)
+ # Store all source references: person image, background video (if any), extra ref (if any)
+ refs = [model_filename]
+ if scene_video:
+ refs.append(f"video:{scene_video}")
+ if extra_filename:
+ refs.append(extra_filename)
database.upsert_person(out_name, filepath=out_path, embedding=embedding,
group_id=group_id, prompt=prompt,
sort_order=next_order,
- source_refs=json.dumps([model_filename]))
+ source_refs=json.dumps(refs))
except Exception as db_err:
print(f"[scenery] DB error: {db_err}")
jobs[job_id]["status"] = "done"
@@ -2455,11 +2462,50 @@ def generate_scenery(req: SceneryRequest):
threading.Thread(
target=_scenery_worker,
args=(job_id, req.model_filename, scene_pil, prompt, req.seed, extra_pils),
+ kwargs={"scene_video": req.scene_video if req.scene_video else None,
+ "extra_filename": req.extra_filename},
daemon=True,
).start()
return {"job_id": job_id, "model": req.model_filename}
+@app.get("/scenery/library")
+def scenery_library():
+ """Return all scenery images grouped by source video reference."""
+ conn = database.get_db_connection()
+ cur = conn.cursor()
+ try:
+ cur.execute("""
+ SELECT filename, group_id, source_refs
+ FROM person
+ WHERE archived IS NOT TRUE
+ AND filename LIKE '%_sc_%'
+ AND source_refs IS NOT NULL
+ ORDER BY filename DESC
+ """)
+ rows = cur.fetchall()
+ finally:
+ cur.close()
+ database._put_db_connection(conn)
+
+ by_video: dict[str, list] = {}
+ ungrouped: list = []
+ for filename, group_id, source_refs_raw in rows:
+ try:
+ refs = json.loads(source_refs_raw) if source_refs_raw else []
+ except Exception:
+ refs = []
+ video = next((r[len("video:"):] for r in refs if r.startswith("video:")), None)
+ entry = {"filename": filename, "group_id": group_id, "refs": refs}
+ if video:
+ by_video.setdefault(video, []).append(entry)
+ else:
+ ungrouped.append(entry)
+
+ groups = [{"video": v, "items": items} for v, items in by_video.items()]
+ return {"groups": groups, "ungrouped": ungrouped}
+
+
# --- SAM2 background removal --------------------------------------------------
_sam2_predictor = None
📷 uploaded / other
+ ${renderLibItems(_sceneLib.ungrouped)}
+