Original & Rembg
{% if original_name %}
+ {% set img = img_attrs(job_id, original_name, sizes=PAIR_SIZES) %}
- 
+ 
Original ·
Download
@@ -22,8 +30,16 @@
{% endif %}
{% if has_rembg and rembg_name %}
+ {% set img = img_attrs(job_id, rembg_name, sizes=PAIR_SIZES) %}
- 
+
Rembg ·
Download
@@ -45,8 +61,16 @@
{% else %}
-
{% for v in manifest.variants %}
+ {% set img = img_attrs(job_id, v.file) %}
-
-
+
{{ v.id }} {{ v.source }}-
@@ -72,8 +96,16 @@
-
-
+
{% endfor %}
diff --git a/compare-bg/README.md b/compare-bg/README.md
deleted file mode 100644
index d0027eb..0000000
--- a/compare-bg/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Background-removal comparison
-
-Inbox originals from `live.f12.rocks` vs. backends.
-
-## Layout
-
-- `inputs/` — originals from boka inbox
-- `outputs/` — results, naming:
-
-```
-
Zwischenschritte
-
{% for name in intermediates %}
+ {% set img = img_attrs(job_id, name) %}
__rembg-u2net__no-alpha.png - __rembg-u2net__alpha.png - __rembg-default__no-alpha.png - __rembg-default__alpha.png - __rembg-birefnet-general__no-alpha.png - __rembg-birefnet-general__alpha.png - __withoutbg-open-weights.png -``` - -- `rembg-default` = `rembg.remove()` without session (library default = u2net) -- `rembg-u2net` = explicit `new_session("u2net")` — expect identical to default -- `withoutbg` open-weights includes matting in-graph (~2GB RAM claimed) - -## Re-run - -```bash -./run.sh -``` - -Skips existing non-empty outputs. Models cached in `model-cache/`. diff --git a/compare-bg/run.sh b/compare-bg/run.sh deleted file mode 100755 index 86b6818..0000000 --- a/compare-bg/run.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# Run rembg/withoutbg comparison in Python 3.11 (host is 3.14-only). -set -euo pipefail -ROOT="$(cd "$(dirname "$0")" && pwd)" -IMG="livef12-bg-compare:py311" -LOG="$ROOT/compare.log" - -docker build -t "$IMG" - <<'EOF' -FROM python:3.11-slim-bookworm -RUN apt-get update && apt-get install -y --no-install-recommends libgl1 libglib2.0-0 \ - && rm -rf /var/lib/apt/lists/* -RUN pip install --no-cache-dir 'rembg>=2.0.59,<2.1' 'pillow>=10.4,<11' \ - 'onnxruntime>=1.19,<1.20' withoutbg -WORKDIR /work -EOF - -echo "Starting comparison; log: $LOG" -docker run --rm \ - --name livef12-bg-compare \ - -e TQDM_DISABLE=1 \ - -e COMPARE_INPUT=/data/inputs \ - -e COMPARE_OUTPUT=/data/outputs \ - -e HOME=/cache \ - -v "$ROOT/inputs:/data/inputs:ro" \ - -v "$ROOT/outputs:/data/outputs" \ - -v "$ROOT/run_compare.py:/work/run_compare.py:ro" \ - -v "$ROOT/model-cache:/cache" \ - "$IMG" python -u /work/run_compare.py 2>&1 | tee "$LOG" diff --git a/compare-bg/run_compare.py b/compare-bg/run_compare.py deleted file mode 100644 index 96f4e32..0000000 --- a/compare-bg/run_compare.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/env python3 -"""Compare background-removal backends on the live.f12.rocks inbox uploads. - -Outputs land next to each other with explicit names so Fränky can pick a winner: - - __rembg-u2net__no-alpha.png - __rembg-u2net__alpha.png - __rembg-default__no-alpha.png - __rembg-default__alpha.png - __rembg-birefnet-general__no-alpha.png - __rembg-birefnet-general__alpha.png - __withoutbg-open-weights.png - -`rembg-default` = rembg.remove() with no session (library default model). -`rembg-u2net` = rembg.new_session("u2net") explicitly. -withoutbg embeds matting in its open-weights graph — one output only. -""" - -from __future__ import annotations - -import os -import sys -import time -import traceback -from pathlib import Path - -os.environ.setdefault("TQDM_DISABLE", "1") - -INPUT_DIR = Path(os.environ.get("COMPARE_INPUT", "/data/inputs")) -OUTPUT_DIR = Path(os.environ.get("COMPARE_OUTPUT", "/data/outputs")) -EXTS = {".jpg", ".jpeg", ".png", ".webp"} - - -def log(msg: str) -> None: - print(msg, flush=True) - - -def run_rembg_named(data: bytes, label: str, model: str | None, alpha: bool, out: Path) -> None: - from rembg import new_session, remove - - t0 = time.monotonic() - kwargs: dict = {"alpha_matting": alpha} - if model is None: - result = remove(data, **kwargs) - model_note = "default" - else: - session = new_session(model) - result = remove(data, session=session, **kwargs) - model_note = model - out.write_bytes(result) - log(f" OK {label} model={model_note} alpha={alpha} {time.monotonic()-t0:.1f}s -> {out.name} ({out.stat().st_size} bytes)") - - -def run_withoutbg(path: Path, out: Path) -> None: - from withoutbg import WithoutBG - - t0 = time.monotonic() - model = WithoutBG.open_weights() - result = model.remove_background(str(path)) - result.save(out) - log(f" OK withoutbg-open-weights {time.monotonic()-t0:.1f}s -> {out.name} ({out.stat().st_size} bytes)") - - -def process_one(path: Path) -> None: - stem = path.stem - log(f"=== {path.name} ===") - data = path.read_bytes() - jobs = [ - ("rembg-u2net", "u2net", False), - ("rembg-u2net", "u2net", True), - ("rembg-default", None, False), - ("rembg-default", None, True), - ("rembg-birefnet-general", "birefnet-general", False), - ("rembg-birefnet-general", "birefnet-general", True), - ] - for label, model, alpha in jobs: - tag = "alpha" if alpha else "no-alpha" - out = OUTPUT_DIR / f"{stem}__{label}__{tag}.png" - if out.exists() and out.stat().st_size > 0: - log(f" SKIP {out.name} (exists)") - continue - try: - run_rembg_named(data, label, model, alpha, out) - except Exception as exc: # noqa: BLE001 - err = OUTPUT_DIR / f"{stem}__{label}__{tag}.ERROR.txt" - err.write_text(f"{type(exc).__name__}: {exc}\n\n{traceback.format_exc()}", encoding="utf-8") - log(f" FAIL {label} alpha={alpha}: {type(exc).__name__}: {exc}") - - out_w = OUTPUT_DIR / f"{stem}__withoutbg-open-weights.png" - if out_w.exists() and out_w.stat().st_size > 0: - log(f" SKIP {out_w.name} (exists)") - else: - try: - run_withoutbg(path, out_w) - except Exception as exc: # noqa: BLE001 - err = OUTPUT_DIR / f"{stem}__withoutbg-open-weights.ERROR.txt" - err.write_text(f"{type(exc).__name__}: {exc}\n\n{traceback.format_exc()}", encoding="utf-8") - log(f" FAIL withoutbg: {type(exc).__name__}: {exc}") - - -def main() -> int: - OUTPUT_DIR.mkdir(parents=True, exist_ok=True) - inputs = sorted(p for p in INPUT_DIR.iterdir() if p.is_file() and p.suffix.lower() in EXTS) - if not inputs: - log(f"No images in {INPUT_DIR}") - return 1 - log(f"Comparing {len(inputs)} image(s); outputs -> {OUTPUT_DIR}") - for path in inputs: - process_one(path) - log("DONE") - return 0 - - -if __name__ == "__main__": - raise SystemExit(main()) diff --git a/tests/conftest.py b/tests/conftest.py index 5ccea05..96b5fc3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,7 +14,8 @@ def data_dir(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Path: intermediates = tmp_path / "intermediates" meta = tmp_path / "meta" inbox = tmp_path / "incoming" - for directory in (variants, intermediates, meta, inbox): + webcache = tmp_path / "webcache" + for directory in (variants, intermediates, meta, inbox, webcache): directory.mkdir() monkeypatch.setattr("app.config.DATA_DIR", tmp_path) @@ -22,5 +23,6 @@ def data_dir(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Path: monkeypatch.setattr("app.config.INTERMEDIATES_DIR", intermediates) monkeypatch.setattr("app.config.META_DIR", meta) monkeypatch.setattr("app.config.INBOX_DIR", inbox) + monkeypatch.setattr("app.config.WEB_CACHE_DIR", webcache) monkeypatch.setattr("app.config.PROCESSED_FILE", tmp_path / "processed.json") return tmp_path diff --git a/tests/test_io_utils.py b/tests/test_io_utils.py index e99c58d..faecc7a 100644 --- a/tests/test_io_utils.py +++ b/tests/test_io_utils.py @@ -24,3 +24,21 @@ def test_write_json_atomic_roundtrip(tmp_path: Path) -> None: write_json_atomic(path, payload) assert json.loads(path.read_text(encoding="utf-8")) == payload assert not path.with_suffix(path.suffix + ".tmp").exists() + + +def test_file_lock_exclusive(tmp_path: Path) -> None: + from concurrent.futures import ThreadPoolExecutor + + from app.io_utils import file_lock + + lock_path = tmp_path / "job.lock" + counter = {"n": 0} + + def bump() -> None: + with file_lock(lock_path): + current = counter["n"] + counter["n"] = current + 1 + + with ThreadPoolExecutor(max_workers=8) as pool: + list(pool.map(lambda _: bump(), range(40))) + assert counter["n"] == 40 diff --git a/tests/test_main.py b/tests/test_main.py index 5f43f11..c583173 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -5,10 +5,11 @@ from __future__ import annotations from pathlib import Path import pytest -from app import config, pipeline +from app import config, images, pipeline from app.main import _safe_job_file, _validate_job_id, app from fastapi import HTTPException from fastapi.testclient import TestClient +from PIL import Image @pytest.fixture @@ -16,11 +17,26 @@ def client(data_dir: Path) -> TestClient: return TestClient(app) +def _write_test_png(path: Path, size: tuple[int, int] = (1200, 800)) -> None: + path.parent.mkdir(parents=True, exist_ok=True) + Image.new("RGB", size, color=(40, 80, 120)).save(path, format="PNG") + + def test_validate_job_id_sanitizes_input() -> None: assert _validate_job_id("foo@bar") == "foo_bar" assert _validate_job_id("photo01") == "photo01" +def test_validate_job_id_rejects_path_like() -> None: + with pytest.raises(HTTPException) as exc: + _validate_job_id("a/b") + assert exc.value.status_code == 400 + with pytest.raises(HTTPException): + _validate_job_id("../evil") + with pytest.raises(HTTPException): + _validate_job_id("") + + def test_safe_job_file_rejects_wrong_prefix(data_dir: Path) -> None: stem = "photo01" paths = pipeline.job_paths(stem) @@ -40,3 +56,48 @@ def test_index_empty(client: TestClient) -> None: def test_job_not_found(client: TestClient) -> None: response = client.get("/jobs/does-not-exist") assert response.status_code == 404 + + +def test_job_file_srcset_resize(client: TestClient, data_dir: Path) -> None: + stem = "photo01" + paths = pipeline.job_paths(stem) + png = paths.variants / f"{stem}_v1.png" + _write_test_png(png) + pipeline.write_status(paths, "done", created_at="2026-01-01T00:00:00") + pipeline.write_manifest( + paths, + { + "variants": [{"id": "v1", "file": png.name}], + "created_at": "2026-01-01T00:00:00", + }, + ) + + full = client.get(f"/jobs/{stem}/files/{png.name}") + assert full.status_code == 200 + assert full.headers["content-type"].startswith("image/") + + bad = client.get(f"/jobs/{stem}/files/{png.name}?w=999") + assert bad.status_code == 400 + + resized = client.get(f"/jobs/{stem}/files/{png.name}?w=320") + assert resized.status_code == 200 + assert resized.headers["content-type"] == "image/webp" + assert len(resized.content) < len(full.content) + + cached = config.WEB_CACHE_DIR / f"{png.name}.w320.webp" + assert cached.is_file() + with Image.open(cached) as img: + assert img.width == 320 + + index = client.get("/") + assert index.status_code == 200 + assert f"/jobs/{stem}/files/{png.name}?w=640" in index.text + assert "srcset=" in index.text + assert "data-full-src=" in index.text + + +def test_img_attrs_builds_srcset() -> None: + attrs = images.img_attrs("job1", "job1_v1.png") + assert attrs["src"].endswith("?w=640") + assert "320w" in attrs["srcset"] + assert attrs["full_src"].endswith("?w=1280") diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py index aff36c7..ad3be95 100644 --- a/tests/test_pipeline.py +++ b/tests/test_pipeline.py @@ -13,6 +13,7 @@ from app import pipeline [ ("photo.jpg", "photo"), ("../evil", "evil"), + ("a/b", "a_b"), ("", "photo"), (" spaced ", "spaced"), ("foo@bar", "foo_bar"), @@ -78,3 +79,56 @@ def test_list_job_ids(data_dir: Path) -> None: paths = pipeline.job_paths("b") pipeline.write_status(paths, "processing") assert sorted(pipeline.list_job_ids()) == ["a", "b"] + + +def test_parallel_manifest_merge_keeps_all_variants(data_dir: Path) -> None: + """Concurrent write_manifest callers must not clobber each other's variants.""" + from concurrent.futures import ThreadPoolExecutor + + paths = pipeline.job_paths("race") + pipeline.write_status(paths, "processing") + pipeline.write_manifest( + paths, + { + "source_stem": "race", + "original_file": "race_original.jpg", + "rembg_file": "race_rembg.png", + "created_at": pipeline.now_iso(), + "variants": [], + }, + ) + + def write_one(i: int) -> None: + pipeline.write_manifest( + paths, + { + "variants": [{"id": f"v{i}", "file": f"race_v{i}.png"}], + }, + ) + + with ThreadPoolExecutor(max_workers=8) as pool: + list(pool.map(write_one, range(20))) + + meta = pipeline.read_meta("race") + assert meta is not None + ids = {v["id"] for v in meta["variants"]} + assert ids == {f"v{i}" for i in range(20)} + assert meta["original_file"] == "race_original.jpg" + + +def test_filter_timeout_is_thread_local() -> None: + import threading + + results: dict[str, int] = {} + + def worker(name: str, value: int) -> None: + with pipeline.filter_timeout(value): + results[name] = pipeline._active_filter_timeout() + + t1 = threading.Thread(target=worker, args=("a", 11)) + t2 = threading.Thread(target=worker, args=("b", 22)) + t1.start() + t2.start() + t1.join() + t2.join() + assert results == {"a": 11, "b": 22} -
-