US07-06: Validate Performance and Resource Bounds (#93)
This commit was merged in pull request #93.
This commit is contained in:
@@ -52,6 +52,13 @@ from photo_pipeline.services import availability, hashing
|
||||
NEAR_MAX = 5
|
||||
SIMILAR_MAX = 10
|
||||
|
||||
# Member paging (US07-06). A burst or a re-imported folder can put thousands of
|
||||
# assets in one cluster; review looks at a few at a time, so neither the list view
|
||||
# nor the detail view may load them all.
|
||||
MEMBER_PAGE = 100
|
||||
MAX_MEMBER_PAGE = 500
|
||||
SNAPSHOT_MEMBER_PREVIEW = 20
|
||||
|
||||
|
||||
class Method(str, Enum):
|
||||
EXACT = "exact"
|
||||
@@ -520,39 +527,65 @@ class DuplicateService:
|
||||
items = [self._snapshot(session, c.id) for c in rows]
|
||||
return {"items": items, "total": int(total or 0), "limit": limit, "offset": offset}
|
||||
|
||||
def get_cluster(self, cluster_id: str) -> dict | None:
|
||||
"""Cluster detail enriched with per-member asset evidence for comparison."""
|
||||
def get_cluster(
|
||||
self, cluster_id: str, *, limit: int = MEMBER_PAGE, offset: int = 0
|
||||
) -> dict | None:
|
||||
"""Cluster detail enriched with per-member asset evidence for comparison.
|
||||
|
||||
Members are paged and their evidence is loaded in batches (US07-06). A
|
||||
cluster of a few thousand near-identical frames is a real shape for a phone
|
||||
library, and the review screen only ever shows a handful at a time: loading
|
||||
every member — each with its own asset, thumbnail, and location query — made
|
||||
opening such a cluster cost thousands of round trips and megabytes of JSON.
|
||||
"""
|
||||
limit = max(1, min(limit, MAX_MEMBER_PAGE))
|
||||
offset = max(0, offset)
|
||||
with self._session_factory() as session:
|
||||
cluster = session.get(DuplicateCluster, cluster_id)
|
||||
if cluster is None:
|
||||
return None
|
||||
member_total = int(
|
||||
session.scalar(
|
||||
select(func.count())
|
||||
.select_from(DuplicateMember)
|
||||
.where(DuplicateMember.cluster_id == cluster_id)
|
||||
)
|
||||
or 0
|
||||
)
|
||||
rows = list(
|
||||
session.execute(
|
||||
select(DuplicateMember)
|
||||
.where(DuplicateMember.cluster_id == cluster_id)
|
||||
.order_by(DuplicateMember.asset_id)
|
||||
.limit(limit)
|
||||
.offset(offset)
|
||||
).scalars()
|
||||
)
|
||||
evidence = self._member_evidence(session, [row.asset_id for row in rows])
|
||||
members = []
|
||||
for member in session.execute(
|
||||
select(DuplicateMember).where(DuplicateMember.cluster_id == cluster_id)
|
||||
).scalars():
|
||||
asset = session.get(Asset, member.asset_id)
|
||||
for member in rows:
|
||||
try:
|
||||
evidence = json.loads(member.evidence) if member.evidence else {}
|
||||
member_evidence = json.loads(member.evidence) if member.evidence else {}
|
||||
except json.JSONDecodeError:
|
||||
evidence = {}
|
||||
member_evidence = {}
|
||||
asset, offline = evidence[member.asset_id]
|
||||
members.append(
|
||||
{
|
||||
"asset_id": member.asset_id,
|
||||
"role": member.role,
|
||||
"distance": member.distance,
|
||||
"evidence": evidence,
|
||||
"evidence": member_evidence,
|
||||
"current_path": asset.current_path if asset else None,
|
||||
"byte_size": asset.byte_size if asset else None,
|
||||
"phash": asset.phash if asset else None,
|
||||
**self._offline_evidence(session, asset),
|
||||
**offline,
|
||||
}
|
||||
)
|
||||
members.sort(key=lambda m: m["asset_id"])
|
||||
# A full-resolution comparison of an offline original is impossible; the
|
||||
# UI asks for that named medium instead of guessing (concept §9).
|
||||
mount_required = sorted(
|
||||
{m["archive_location"] for m in members if m["requires_mount"]}
|
||||
)
|
||||
# UI asks for that named medium instead of guessing (concept §9). The
|
||||
# answer covers the whole cluster, not just this page, so a mount is not
|
||||
# discovered halfway through a review.
|
||||
mount_required = self._mount_required(session, cluster_id)
|
||||
return {
|
||||
"id": cluster.id,
|
||||
"method": cluster.method,
|
||||
@@ -564,10 +597,74 @@ class DuplicateService:
|
||||
"requires_confirmation": cluster.method == Method.PERCEPTUAL.value,
|
||||
"mount_required": mount_required,
|
||||
"members": members,
|
||||
"member_total": member_total,
|
||||
"limit": limit,
|
||||
"offset": offset,
|
||||
}
|
||||
|
||||
def _offline_evidence(self, session, asset: Asset | None) -> dict:
|
||||
"""What review can still rely on when a member's original is not readable."""
|
||||
def _member_evidence(self, session, asset_ids: list[str]) -> dict:
|
||||
"""``{asset_id: (asset, offline_evidence)}`` for one page, in three queries."""
|
||||
if not asset_ids:
|
||||
return {}
|
||||
assets = {
|
||||
asset.id: asset
|
||||
for asset in session.execute(
|
||||
select(Asset).where(Asset.id.in_(asset_ids))
|
||||
).scalars()
|
||||
}
|
||||
previews: dict[str, list] = {}
|
||||
for thumbnail in session.execute(
|
||||
select(Thumbnail).where(Thumbnail.asset_id.in_(asset_ids))
|
||||
).scalars():
|
||||
previews.setdefault(thumbnail.asset_id, []).append(thumbnail)
|
||||
location_ids = {
|
||||
asset.archive_location_id for asset in assets.values() if asset.archive_location_id
|
||||
}
|
||||
locations = (
|
||||
{
|
||||
location.id: location
|
||||
for location in session.execute(
|
||||
select(ArchiveLocation).where(ArchiveLocation.id.in_(location_ids))
|
||||
).scalars()
|
||||
}
|
||||
if location_ids
|
||||
else {}
|
||||
)
|
||||
return {
|
||||
asset_id: (
|
||||
assets.get(asset_id),
|
||||
self._offline_evidence(
|
||||
assets.get(asset_id),
|
||||
locations=locations,
|
||||
thumbnails=previews.get(asset_id, []),
|
||||
),
|
||||
)
|
||||
for asset_id in asset_ids
|
||||
}
|
||||
|
||||
def _mount_required(self, session, cluster_id: str) -> list[str]:
|
||||
"""Archive media whose originals this cluster needs, across every member."""
|
||||
rows = session.execute(
|
||||
select(ArchiveLocation.name)
|
||||
.select_from(DuplicateMember)
|
||||
.join(Asset, Asset.id == DuplicateMember.asset_id)
|
||||
.join(ArchiveLocation, ArchiveLocation.id == Asset.archive_location_id)
|
||||
.where(
|
||||
DuplicateMember.cluster_id == cluster_id,
|
||||
Asset.availability_state == availability.ARCHIVED_OFFLINE,
|
||||
)
|
||||
.distinct()
|
||||
).scalars()
|
||||
return sorted(rows)
|
||||
|
||||
def _offline_evidence(
|
||||
self, asset: Asset | None, *, locations: dict, thumbnails: list
|
||||
) -> dict:
|
||||
"""What review can still rely on when a member's original is not readable.
|
||||
|
||||
Takes the already-loaded locations and thumbnails for its page rather than
|
||||
querying per member (US07-06).
|
||||
"""
|
||||
if asset is None:
|
||||
return {
|
||||
"availability_state": None,
|
||||
@@ -577,12 +674,8 @@ class DuplicateService:
|
||||
"preview": {"state": "missing", "protected": False},
|
||||
"requires_mount": False,
|
||||
}
|
||||
location = (
|
||||
session.get(ArchiveLocation, asset.archive_location_id)
|
||||
if asset.archive_location_id
|
||||
else None
|
||||
)
|
||||
preview = self._preview_evidence(session, asset.id)
|
||||
location = locations.get(asset.archive_location_id)
|
||||
preview = self._preview_evidence(thumbnails)
|
||||
archived = asset.availability_state in availability.ARCHIVED
|
||||
return {
|
||||
"availability_state": asset.availability_state,
|
||||
@@ -598,10 +691,7 @@ class DuplicateService:
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def _preview_evidence(session, asset_id: str) -> dict:
|
||||
rows = list(
|
||||
session.execute(select(Thumbnail).where(Thumbnail.asset_id == asset_id)).scalars()
|
||||
)
|
||||
def _preview_evidence(rows: list) -> dict:
|
||||
ready = [r for r in rows if r.state == "ready" and r.path]
|
||||
if ready:
|
||||
best = max(ready, key=lambda r: (bool(r.protected), r.size or 0))
|
||||
@@ -693,11 +783,29 @@ class DuplicateService:
|
||||
session.delete(link)
|
||||
|
||||
def _snapshot(self, session, cluster_id) -> dict:
|
||||
"""A cluster and a *bounded* preview of its members.
|
||||
|
||||
The list view shows a count and a few ids; a snapshot that loaded every
|
||||
member turned one page of 200 clusters into hundreds of thousands of rows
|
||||
(US07-06). ``member_total`` is the honest count either way.
|
||||
"""
|
||||
cluster = session.get(DuplicateCluster, cluster_id)
|
||||
member_total = int(
|
||||
session.scalar(
|
||||
select(func.count())
|
||||
.select_from(DuplicateMember)
|
||||
.where(DuplicateMember.cluster_id == cluster_id)
|
||||
)
|
||||
or 0
|
||||
)
|
||||
members = session.execute(
|
||||
select(DuplicateMember).where(DuplicateMember.cluster_id == cluster_id)
|
||||
select(DuplicateMember)
|
||||
.where(DuplicateMember.cluster_id == cluster_id)
|
||||
.order_by(DuplicateMember.asset_id)
|
||||
.limit(SNAPSHOT_MEMBER_PREVIEW)
|
||||
).scalars()
|
||||
return {
|
||||
"member_total": member_total,
|
||||
"id": cluster.id,
|
||||
"method": cluster.method,
|
||||
"confidence": cluster.confidence,
|
||||
|
||||
Reference in New Issue
Block a user