diff --git a/app/assets/database/queries/cache_state.py b/app/assets/database/queries/cache_state.py index 1da3c4430..6ed58717a 100644 --- a/app/assets/database/queries/cache_state.py +++ b/app/assets/database/queries/cache_state.py @@ -39,12 +39,12 @@ def pick_best_live_path(states: Sequence[AssetCacheState]) -> str: def prune_orphaned_assets(session: Session, roots: tuple[str, ...], prefixes_for_root_fn) -> int: """Prune cache states outside configured prefixes, then delete orphaned seed assets. - + Args: session: Database session roots: Tuple of root types to prune prefixes_for_root_fn: Function to get prefixes for a root type - + Returns: Number of orphaned assets deleted """ @@ -91,7 +91,7 @@ def fast_db_consistency_pass( - Optionally return surviving absolute paths """ import contextlib - + prefixes = prefixes_for_root_fn(root) if not prefixes: return set() if collect_existing_paths else None diff --git a/tests-unit/assets_test/queries/test_asset_info.py b/tests-unit/assets_test/queries/test_asset_info.py index 18699da5c..fdcbd489e 100644 --- a/tests-unit/assets_test/queries/test_asset_info.py +++ b/tests-unit/assets_test/queries/test_asset_info.py @@ -1,7 +1,7 @@ import pytest from sqlalchemy.orm import Session -from app.assets.database.models import Asset, AssetInfo, AssetInfoMeta, AssetInfoTag, Tag +from app.assets.database.models import Asset, AssetInfo from app.assets.database.queries import ( asset_info_exists_for_asset_id, get_asset_info_by_id, @@ -116,7 +116,7 @@ class TestListAssetInfosPage: def test_include_tags_filter(self, session: Session): asset = _make_asset(session, "hash1") info1 = _make_asset_info(session, asset, name="tagged") - info2 = _make_asset_info(session, asset, name="untagged") + _make_asset_info(session, asset, name="untagged") ensure_tags_exist(session, ["wanted"]) add_tags_to_asset_info(session, asset_info_id=info1.id, tags=["wanted"]) session.commit() @@ -127,10 +127,10 @@ class TestListAssetInfosPage: def test_exclude_tags_filter(self, session: Session): asset = _make_asset(session, "hash1") - info1 = _make_asset_info(session, asset, name="keep") - info2 = _make_asset_info(session, asset, name="exclude") + _make_asset_info(session, asset, name="keep") + info_exclude = _make_asset_info(session, asset, name="exclude") ensure_tags_exist(session, ["bad"]) - add_tags_to_asset_info(session, asset_info_id=info2.id, tags=["bad"]) + add_tags_to_asset_info(session, asset_info_id=info_exclude.id, tags=["bad"]) session.commit() infos, _, total = list_asset_infos_page(session, exclude_tags=["bad"]) diff --git a/tests-unit/assets_test/queries/test_cache_state.py b/tests-unit/assets_test/queries/test_cache_state.py index f5543523f..6e7d768eb 100644 --- a/tests-unit/assets_test/queries/test_cache_state.py +++ b/tests-unit/assets_test/queries/test_cache_state.py @@ -1,17 +1,11 @@ """Tests for cache_state query functions.""" -import os -import tempfile -from unittest.mock import patch - -import pytest from sqlalchemy.orm import Session -from app.assets.database.models import Asset, AssetCacheState, AssetInfo +from app.assets.database.models import Asset, AssetCacheState from app.assets.database.queries import ( list_cache_states_by_asset_id, pick_best_live_path, ) -from app.assets.helpers import utcnow def _make_asset(session: Session, hash_val: str | None = None, size: int = 1024) -> Asset: diff --git a/tests-unit/assets_test/queries/test_metadata.py b/tests-unit/assets_test/queries/test_metadata.py index 9e0fcfc65..176a6c216 100644 --- a/tests-unit/assets_test/queries/test_metadata.py +++ b/tests-unit/assets_test/queries/test_metadata.py @@ -1,6 +1,4 @@ """Tests for metadata filtering logic in asset_info queries.""" -import pytest -from decimal import Decimal from sqlalchemy.orm import Session from app.assets.database.models import Asset, AssetInfo, AssetInfoMeta