CI / lint (push) Successful in 8s
CI / extension-version (push) Successful in 9s
Build images / sign-extension (push) Successful in 9s
Build images / build-agent (push) Successful in 17s
CI / frontend-build (push) Successful in 35s
CI / backend-lint-and-test (push) Successful in 1m18s
Build images / build-web (push) Successful in 1m22s
Build images / smoke-web (push) Skipped
Build images / build-ml (push) Successful in 2m19s
Build images / promote (push) Skipped
CI / integration (push) Successful in 2m38s
Two surfaces render a post's HTML body. get_post did _localize_inline_images(sanitize_post_html(...)); provenance_service._post_dict called sanitize_post_html alone. So opening the Provenance panel fetched images from Patreon's CDN for files FC had already downloaded - the archive reaching out to the platform to display what it had archived, which is the thing 830 Phase 2 set out to stop. The same bodies also break when a CDN URL expires or a post is removed, while the identical local copy sits unused. The fix is the shape, not the call. Those were two separately-callable halves and only the first looked mandatory, so a second caller was always going to do half of it. render_post_body in the new services/post_body.py is the whole pipeline in one call, and sanitizing-without-localizing is no longer a reachable operation. _localize_inline_images moves there verbatim; post_feed_service loses five imports that went with it. _post_dict becomes async and takes the session. Both call sites are already inside async methods, so for_image's list comprehension awaits per entry - fine, because localization issues ZERO queries for a body with no inline <img>, which is most of them. Recorded that early exit in the module so the loop isn't "optimized" into a batch without a measurement. Deliberately NOT fixed: provenance still names the same columns url/title/date where the feed says post_url/post_title/post_date, and its description_translated is full text where the feed truncates to DESCRIPTION_LIMIT. That is 3965's wider half - a breaking payload change for ProvenancePanel with no second reason to spend it today. Noted in _post_dict's docstring so the next reader knows it was seen and left. Four regression tests on the provenance path, covering both entry points plus the two refusals the feed already pins: an uncaptured image stays hotlinked (a broken local path is worse than an intact remote one), and a filehash owned by another artist never leaks in. Reverting render_post_body to a bare sanitize fails the first two. Recorded as snippet 3968. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SHQB1YukL3VyvMK8rcbmV9
177 lines
6.9 KiB
Python
177 lines
6.9 KiB
Python
"""Read-only provenance queries.
|
|
|
|
Provenance is its own system, intentionally separate from the tag/ML
|
|
system (see project_provenance_separation). This service joins
|
|
ImageProvenance -> Post/Source/Artist and returns plain dicts. It never
|
|
mutates and never imports tag/ML modules.
|
|
"""
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from ..models import (
|
|
Artist,
|
|
ImageProvenance,
|
|
ImageRecord,
|
|
Post,
|
|
PostAttachment,
|
|
Source,
|
|
attachment_download_url,
|
|
)
|
|
from .post_body import render_post_body
|
|
|
|
|
|
async def _post_dict(session: AsyncSession, p: Post) -> dict:
|
|
"""One provenance entry's post.
|
|
|
|
NOTE: the key names here deliberately differ from
|
|
`PostFeedService._to_dict` (`url`/`title`/`date` vs
|
|
`post_url`/`post_title`/`post_date`, `attachment_count` vs `attachments`),
|
|
and `description_translated` is the FULL text here where the feed truncates
|
|
it to DESCRIPTION_LIMIT. That divergence is issue #3965's wider half and is
|
|
deliberately NOT addressed here — renaming is a breaking payload change for
|
|
ProvenancePanel with no second reason to spend it.
|
|
|
|
What IS fixed here is the body: this used to call `sanitize_post_html`
|
|
alone, so provenance bodies hotlinked the platform CDN for images already
|
|
on disk while the post detail view served local copies. `render_post_body`
|
|
is the whole pipeline, so the two surfaces cannot drift apart again.
|
|
"""
|
|
return {
|
|
"id": p.id,
|
|
"external_post_id": p.external_post_id,
|
|
"url": p.post_url,
|
|
"title": p.post_title,
|
|
"date": p.post_date.isoformat() if p.post_date else None,
|
|
"description_html": await render_post_body(session, p.description, p.artist_id),
|
|
"attachment_count": p.attachment_count,
|
|
# Translation (#143): the English title/description shown by default when
|
|
# a translation exists; the UI toggles to the original. Source lang labels
|
|
# the original.
|
|
"title_translated": p.post_title_translated,
|
|
"description_translated": p.description_translated,
|
|
"translated_source_lang": p.translated_source_lang,
|
|
"translation_override": p.translation_override,
|
|
}
|
|
|
|
|
|
def _source_dict(s: Source) -> dict:
|
|
return {"id": s.id, "platform": s.platform, "url": s.url}
|
|
|
|
|
|
def _artist_dict(a: Artist) -> dict:
|
|
return {"id": a.id, "name": a.name, "slug": a.slug}
|
|
|
|
|
|
def _attachment_dict(a: PostAttachment) -> dict:
|
|
return {
|
|
"id": a.id,
|
|
"original_filename": a.original_filename,
|
|
"size_bytes": a.size_bytes,
|
|
"ext": a.ext,
|
|
"download_url": attachment_download_url(a.id),
|
|
}
|
|
|
|
|
|
class ProvenanceService:
|
|
def __init__(self, session: AsyncSession):
|
|
self.session = session
|
|
|
|
async def _attachments_for_posts(self, post_ids: list[int]) -> list[dict]:
|
|
if not post_ids:
|
|
return []
|
|
rows = (
|
|
await self.session.execute(
|
|
select(PostAttachment)
|
|
.where(PostAttachment.post_id.in_(post_ids))
|
|
.order_by(PostAttachment.id.asc())
|
|
)
|
|
).scalars().all()
|
|
return [_attachment_dict(a) for a in rows]
|
|
|
|
async def _attachment_by_id(self, attachment_id: int) -> list[dict]:
|
|
att = await self.session.get(PostAttachment, attachment_id)
|
|
return [_attachment_dict(att)] if att is not None else []
|
|
|
|
async def for_image(self, image_id: int) -> dict | None:
|
|
rec = await self.session.get(ImageRecord, image_id)
|
|
if rec is None:
|
|
return None
|
|
# Artist via Post.artist_id (alembic 0030); Source via LEFT JOIN
|
|
# since both Post.source_id and ImageProvenance.source_id can be
|
|
# NULL for filesystem-imported content. Frontend renders source=
|
|
# null as "filesystem import."
|
|
stmt = (
|
|
select(ImageProvenance, Post, Source, Artist)
|
|
.join(Post, Post.id == ImageProvenance.post_id)
|
|
.join(Artist, Artist.id == Post.artist_id)
|
|
.outerjoin(Source, Source.id == ImageProvenance.source_id)
|
|
.where(ImageProvenance.image_record_id == image_id)
|
|
.order_by(ImageProvenance.captured_at.asc(),
|
|
ImageProvenance.id.asc())
|
|
)
|
|
rows = (await self.session.execute(stmt)).all()
|
|
post_ids = [ip.post_id for ip, _p, _s, _a in rows]
|
|
# Prefer the EXACT archive this file came out of (milestone #87): if the
|
|
# originating post's provenance row records from_attachment_id, the image
|
|
# was extracted from that one .zip/.rar, so show only it — not the dozens
|
|
# of unrelated archives a "High Resolution Files" bundle post carries.
|
|
from_att_id = next(
|
|
(
|
|
ip.from_attachment_id
|
|
for ip, _p, _s, _a in rows
|
|
if ip.post_id == rec.primary_post_id
|
|
and ip.from_attachment_id is not None
|
|
),
|
|
None,
|
|
)
|
|
if from_att_id is not None:
|
|
attachments = await self._attachment_by_id(from_att_id)
|
|
else:
|
|
# No recorded containing archive (loose download, or pre-backfill):
|
|
# scope to the originating post only, not every pHash-linked post.
|
|
# primary_post_id is the post this file was actually captured from;
|
|
# fall back to all linked posts when it's unset (older rows /
|
|
# filesystem imports).
|
|
attach_post_ids = (
|
|
[rec.primary_post_id]
|
|
if rec.primary_post_id is not None
|
|
else post_ids
|
|
)
|
|
attachments = await self._attachments_for_posts(attach_post_ids)
|
|
return {
|
|
"image_id": image_id,
|
|
"provenance": [
|
|
{
|
|
"provenance_id": ip.id,
|
|
"captured_at": ip.captured_at.isoformat()
|
|
if ip.captured_at else None,
|
|
"post": await _post_dict(self.session, post),
|
|
"source": _source_dict(src) if src is not None else None,
|
|
"artist": _artist_dict(art),
|
|
}
|
|
for ip, post, src, art in rows
|
|
],
|
|
"attachments": attachments,
|
|
}
|
|
|
|
async def for_post(self, post_id: int) -> dict | None:
|
|
# Same LEFT JOIN to Source — get_post must succeed for a
|
|
# NULL-source post.
|
|
stmt = (
|
|
select(Post, Source, Artist)
|
|
.join(Artist, Artist.id == Post.artist_id)
|
|
.outerjoin(Source, Source.id == Post.source_id)
|
|
.where(Post.id == post_id)
|
|
)
|
|
row = (await self.session.execute(stmt)).first()
|
|
if row is None:
|
|
return None
|
|
post, src, art = row
|
|
return {
|
|
"post": await _post_dict(self.session, post),
|
|
"source": _source_dict(src) if src is not None else None,
|
|
"artist": _artist_dict(art),
|
|
"attachments": await self._attachments_for_posts([post.id]),
|
|
}
|