CI / lint (push) Failing after 2s
CI / extension-version (push) Successful in 2s
Build images / sign-extension (push) Successful in 4s
Build images / build-agent (push) Successful in 6s
CI / frontend-build (push) Successful in 23s
CI / backend-lint-and-test (push) Successful in 33s
Build images / build-web (push) Successful in 1m11s
Build images / smoke-web (push) Skipped
Build images / build-ml (push) Successful in 2m4s
Build images / promote (push) Skipped
CI / integration (push) Successful in 2m50s
Step 1 of milestone #421. The images tree has 57 directory families for what the database says are single artists — `Conto`/`conto`, `InCaseArt`/`incaseart`, `StickySpoodge`/`Stickyspoodge`/`stickyspoodge`, and so on down to a four-way split for Pocket Ace Games. There was never a duplicate Artist row. `/api/artists/names` returns exactly one per artist. The files simply get written to two places for one row: `_copy_to_library` built its destination from `derive_subdir`, which mirrors the IMPORT tree's folder name verbatim, while the download path leaves files where the ingester wrote them — under the slug. Two writers, two conventions, one artist. This is the half that stops it re-growing, and it has to land before anything moves existing files: consolidate first and the next filesystem import out of a capitalised folder re-creates the directory that was just emptied. `canonical_subdir` replaces the top-level segment with the artist's slug and leaves everything below it alone — the post hierarchy is the downloader's business. Two deliberate pass-throughs: no resolved artist (nothing authoritative to canonicalise against) and an empty subdir (a file at the images root, whose fate is task #4247, not a side effect of this helper). `_supersede` resolves the KEPT row's artist for the same reason — a supersede rewrites `existing.path`, so writing it anywhere else would move a row back out of the tree being consolidated. ImageRecord carries `artist_id` with no relationship attribute, so that is a session lookup rather than an attribute. test_import_one_happy_path pinned the old `Alice/` destination and now pins `alice/` (rule 90). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LVjrnpQjRgHdvq95rASoiR
242 lines
8.8 KiB
Python
242 lines
8.8 KiB
Python
"""Importer integration tests.
|
|
|
|
These exercise the real Importer against a real Postgres + a real filesystem
|
|
(via tmp_path). The DB fixture rolls back after each test so the import_root
|
|
fixture is fresh per-test.
|
|
"""
|
|
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from PIL import Image
|
|
from sqlalchemy import select
|
|
|
|
from backend.app.models import Artist, ImageRecord, ImportSettings
|
|
from backend.app.services.importer import Importer, SkipReason
|
|
from backend.app.services.thumbnailer import Thumbnailer
|
|
|
|
pytestmark = pytest.mark.integration
|
|
|
|
|
|
@pytest.fixture
|
|
def import_layout(tmp_path):
|
|
import_root = tmp_path / "import"
|
|
images_root = tmp_path / "images"
|
|
import_root.mkdir()
|
|
images_root.mkdir()
|
|
return import_root, images_root
|
|
|
|
|
|
def _make_jpeg(path: Path, size: tuple[int, int] = (800, 600)):
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
Image.new("RGB", size, color=(120, 200, 80)).save(path, "JPEG")
|
|
|
|
|
|
def _make_png_rgba(path: Path, size: tuple[int, int], alpha: int):
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
Image.new("RGBA", size, color=(120, 200, 80, alpha)).save(path, "PNG")
|
|
|
|
|
|
@pytest.fixture
|
|
def importer(db_sync, import_layout):
|
|
import_root, images_root = import_layout
|
|
settings = db_sync.execute(select(ImportSettings).where(ImportSettings.id == 1)).scalar_one()
|
|
thumbnailer = Thumbnailer(images_root=images_root)
|
|
return Importer(
|
|
session=db_sync,
|
|
images_root=images_root,
|
|
import_root=import_root,
|
|
thumbnailer=thumbnailer,
|
|
settings=settings,
|
|
)
|
|
|
|
|
|
def test_import_one_happy_path(importer, import_layout):
|
|
import_root, images_root = import_layout
|
|
src = import_root / "Alice" / "first.jpg"
|
|
_make_jpeg(src)
|
|
result = importer.import_one(src)
|
|
assert result.status == "imported"
|
|
record = importer.session.get(ImageRecord, result.image_id)
|
|
# Under the artist's SLUG, not the import folder's "Alice" (milestone
|
|
# #421) — the import tree's capitalisation is an accident of how the
|
|
# operator named a folder, and honouring it gave one artist two homes.
|
|
assert record.path.startswith(str(images_root / "alice"))
|
|
assert record.path.endswith(".jpg")
|
|
|
|
|
|
def test_library_path_uses_the_artist_slug_not_the_folder_name(
|
|
importer, import_layout,
|
|
):
|
|
"""The regression that grew 57 duplicate artist directories: an import
|
|
from `/import/Conto/...` wrote `<images>/Conto/...` while the downloader
|
|
wrote `<images>/conto/...` for the same Artist row."""
|
|
import_root, images_root = import_layout
|
|
src = import_root / "StickySpoodge" / "patreon" / "a.jpg"
|
|
_make_jpeg(src)
|
|
result = importer.import_one(src)
|
|
|
|
record = importer.session.get(ImageRecord, result.image_id)
|
|
artist = importer.session.execute(
|
|
select(Artist).where(Artist.slug == "stickyspoodge")
|
|
).scalar_one()
|
|
assert artist.name == "StickySpoodge"
|
|
# Artist segment canonicalised; the post hierarchy below it untouched.
|
|
assert record.path.startswith(
|
|
str(images_root / "stickyspoodge" / "patreon")
|
|
)
|
|
assert not Path(record.path).is_relative_to(images_root / "StickySpoodge")
|
|
|
|
|
|
def test_folder_creates_artist_and_links_artist_id(importer, import_layout):
|
|
# FC-2d-vii-c: folder import creates the Artist and sets the canonical
|
|
# image_record.artist_id — no artist-kind Tag (that path was retired;
|
|
# the no-tag invariant is covered by test_importer_artist_id.py).
|
|
import_root, _ = import_layout
|
|
src = import_root / "Alice" / "first.jpg"
|
|
_make_jpeg(src)
|
|
result = importer.import_one(src)
|
|
|
|
artist = importer.session.execute(
|
|
select(Artist).where(Artist.slug == "alice")
|
|
).scalar_one()
|
|
assert artist.name == "Alice"
|
|
|
|
record = importer.session.get(ImageRecord, result.image_id)
|
|
assert record.artist_id == artist.id
|
|
|
|
|
|
def test_dedup_by_hash(importer, import_layout):
|
|
import_root, _ = import_layout
|
|
src1 = import_root / "Alice" / "first.jpg"
|
|
src2 = import_root / "Bob" / "duplicate.jpg"
|
|
_make_jpeg(src1)
|
|
src2.parent.mkdir(parents=True, exist_ok=True)
|
|
src2.write_bytes(src1.read_bytes())
|
|
|
|
r1 = importer.import_one(src1)
|
|
r2 = importer.import_one(src2)
|
|
assert r1.status == "imported"
|
|
assert r2.status == "skipped"
|
|
assert r2.skip_reason == SkipReason.duplicate_hash
|
|
|
|
|
|
def test_min_width_filter(importer, import_layout):
|
|
import_root, _ = import_layout
|
|
importer.settings.min_width = 1000 # mutate the in-memory copy for this test
|
|
src = import_root / "small.jpg"
|
|
_make_jpeg(src, size=(500, 500))
|
|
result = importer.import_one(src)
|
|
assert result.status == "skipped"
|
|
assert result.skip_reason == SkipReason.too_small
|
|
|
|
|
|
def test_transparent_filter(importer, import_layout):
|
|
import_root, _ = import_layout
|
|
importer.settings.skip_transparent = True
|
|
importer.settings.transparency_threshold = 0.5
|
|
src = import_root / "ghost.png"
|
|
_make_png_rgba(src, size=(100, 100), alpha=0) # fully transparent
|
|
result = importer.import_one(src)
|
|
assert result.status == "skipped"
|
|
assert result.skip_reason == SkipReason.too_transparent
|
|
|
|
|
|
def test_single_color_filter(importer, import_layout):
|
|
"""The skip_single_color setting existed since FC-2 but was never wired
|
|
(the audit module's docstring said so); wired 2026-07-02 using the same
|
|
canonical predicate as the Cleanup audit. Solid fill skips when enabled,
|
|
imports when disabled (the default)."""
|
|
from PIL import Image as PILImage
|
|
|
|
import_root, _ = import_layout
|
|
solid = import_root / "solid.png"
|
|
solid.parent.mkdir(parents=True, exist_ok=True)
|
|
PILImage.new("RGB", (100, 100), (12, 34, 56)).save(solid)
|
|
|
|
importer.settings.skip_single_color = True
|
|
importer.settings.single_color_threshold = 0.95
|
|
result = importer.import_one(solid)
|
|
assert result.status == "skipped"
|
|
assert result.skip_reason == SkipReason.single_color
|
|
|
|
importer.settings.skip_single_color = False
|
|
solid2 = import_root / "solid2.png"
|
|
PILImage.new("RGB", (100, 100), (200, 10, 10)).save(solid2)
|
|
assert importer.import_one(solid2).status == "imported"
|
|
|
|
|
|
def test_unsupported_extension(importer, import_layout):
|
|
# FC-2d-iii: non-media is no longer skipped — it's captured as a
|
|
# PostAttachment so nothing a post contained is lost.
|
|
import_root, _ = import_layout
|
|
src = import_root / "Alice" / "notes.txt"
|
|
src.parent.mkdir(parents=True, exist_ok=True)
|
|
src.write_text("hello")
|
|
result = importer.import_one(src)
|
|
assert result.status == "attached"
|
|
|
|
|
|
def test_root_level_file_has_no_artist(importer, import_layout):
|
|
import_root, _ = import_layout
|
|
src = import_root / "loose.jpg"
|
|
_make_jpeg(src)
|
|
importer.import_one(src)
|
|
artists = importer.session.execute(select(Artist)).scalars().all()
|
|
assert artists == []
|
|
|
|
|
|
def test_pil_load_oserror_in_transparency_check_skips_not_raises(
|
|
importer, import_layout, monkeypatch,
|
|
):
|
|
"""PIL.verify() only validates header structure — broken pixel data
|
|
only surfaces when load() actually decodes. The importer must catch
|
|
the OSError and return a skipped: invalid_image result so the Celery
|
|
autoretry loop doesn't bounce the same broken file forever.
|
|
Operator hit this 2026-05-25 with a corrupt JPEG in the IR set."""
|
|
import_root, _ = import_layout
|
|
src = import_root / "Bob" / "corrupt.png"
|
|
# Make a real RGBA PNG so the has_alpha path engages.
|
|
_make_png_rgba(src, (100, 100), alpha=128)
|
|
|
|
importer.settings.skip_transparent = True
|
|
importer.settings.transparency_threshold = 0.5
|
|
|
|
# Force the next _transparency_pct call to raise as if PIL's load()
|
|
# blew up on truncated pixel data.
|
|
def _boom(_self, _src):
|
|
raise OSError("broken data stream when reading image file")
|
|
monkeypatch.setattr(
|
|
type(importer), "_transparency_pct", _boom,
|
|
)
|
|
|
|
result = importer.import_one(src)
|
|
assert result.status == "skipped"
|
|
assert result.skip_reason == SkipReason.invalid_image
|
|
assert "transparency check" in (result.error or "")
|
|
|
|
|
|
def test_pil_load_oserror_in_phash_compute_skips_not_raises(
|
|
importer, import_layout, monkeypatch,
|
|
):
|
|
"""Same shape as the transparency-check guard, but for the phash
|
|
compute block — the OTHER place PIL.load() runs implicitly during
|
|
the dedup pipeline."""
|
|
import_root, _ = import_layout
|
|
src = import_root / "Carol" / "corrupt.jpg"
|
|
_make_jpeg(src)
|
|
|
|
# Disable transparency check so we reach the phash compute block.
|
|
importer.settings.skip_transparent = False
|
|
|
|
from backend.app.services import importer as importer_module
|
|
|
|
def _boom(_im):
|
|
raise OSError("broken data stream when reading image file")
|
|
monkeypatch.setattr(importer_module, "compute_phash", _boom)
|
|
|
|
result = importer.import_one(src)
|
|
assert result.status == "skipped"
|
|
assert result.skip_reason == SkipReason.invalid_image
|
|
assert "phash compute" in (result.error or "")
|