feat(download): per-file download status and multi-file selection (#1058)

tests/services/test_downloaded_version_history_service.py

@@ -68,3 +68,94 @@ async def test_download_history_bulk_lookup(tmp_path: Path) -> None:
         5: {501, 502},
         6: {601},
     }
+
+
+@pytest.mark.asyncio
+async def test_per_file_history_tracking(tmp_path: Path) -> None:
+    """Per-file records coexist with the version-level row (#1058)."""
+    db_path = tmp_path / "download-history.sqlite"
+    service = DownloadedVersionHistoryService(
+        str(db_path),
+        settings_manager=DummySettings(),
+    )
+
+    await service.mark_downloaded(
+        "lora", 101, model_id=11, source="download",
+        file_path="/models/a.safetensors", file_id=1001, file_name="a.safetensors",
+    )
+    await service.mark_downloaded(
+        "lora", 101, model_id=11, source="download",
+        file_path="/models/b.safetensors", file_id=1002, file_name="b.safetensors",
+    )
+
+    assert await service.get_downloaded_file_ids("lora", 101) == [1001, 1002]
+    # Version-level tracking remains single-row per version
+    assert await service.get_downloaded_version_ids("lora", 11) == [101]
+
+    # Re-downloading the same file updates in place, no duplicate
+    await service.mark_downloaded(
+        "lora", 101, source="download", file_id=1001, file_name="a.safetensors",
+    )
+    assert await service.get_downloaded_file_ids("lora", 101) == [1001, 1002]
+
+    # Single-file deletion keeps the sibling record
+    await service.mark_file_deleted("lora", 101, 1001)
+    assert await service.get_downloaded_file_ids("lora", 101) == [1002]
+
+    # Whole-version deletion clears per-file records
+    await service.mark_as_deleted("lora", 101)
+    assert await service.get_downloaded_file_ids("lora", 101) == []
+    assert await service.has_been_downloaded("lora", 101) is False
+
+
+@pytest.mark.asyncio
+async def test_per_file_history_ignores_invalid_ids(tmp_path: Path) -> None:
+    service = DownloadedVersionHistoryService(
+        str(tmp_path / "download-history.sqlite"),
+        settings_manager=DummySettings(),
+    )
+
+    # mark_downloaded without a file id only touches the version-level table
+    await service.mark_downloaded("lora", 201, model_id=21, source="scan")
+    assert await service.get_downloaded_file_ids("lora", 201) == []
+
+    # Invalid inputs are no-ops
+    await service.mark_file_deleted("lora", 201, None)  # type: ignore[arg-type]
+    assert await service.get_downloaded_file_ids("unknown-type", 201) == []
+
+
+@pytest.mark.asyncio
+async def test_file_history_table_created_for_legacy_db(tmp_path: Path) -> None:
+    """Existing databases gain the per-file table via CREATE IF NOT EXISTS."""
+    import sqlite3
+
+    db_path = tmp_path / "download-history.sqlite"
+    conn = sqlite3.connect(db_path)
+    conn.executescript(
+        """
+        CREATE TABLE downloaded_model_versions (
+            model_type TEXT NOT NULL,
+            version_id INTEGER NOT NULL,
+            model_id INTEGER,
+            first_seen_at REAL NOT NULL,
+            last_seen_at REAL NOT NULL,
+            source TEXT NOT NULL,
+            last_file_path TEXT,
+            last_library_name TEXT,
+            is_deleted_override INTEGER NOT NULL DEFAULT 0,
+            PRIMARY KEY (model_type, version_id)
+        );
+        """
+    )
+    conn.close()
+
+    service = DownloadedVersionHistoryService(
+        str(db_path),
+        settings_manager=DummySettings(),
+    )
+    await service.mark_downloaded(
+        "lora", 301, model_id=31, source="download",
+        file_id=9001, file_name="file.safetensors",
+    )
+    assert await service.get_downloaded_file_ids("lora", 301) == [9001]
+    assert await service.has_been_downloaded("lora", 301) is True

tests/services/test_model_cache.py

@@ -61,3 +61,87 @@ async def test_model_cache_tracks_versions_by_model_id():
     assert cache.get_versions_by_model_id(2) == [
         {'versionId': 201, 'name': 'Gamma', 'fileName': 'model-b'},
     ]
+
+
+@pytest.mark.asyncio
+async def test_version_files_index_tracks_multiple_files_per_version():
+    """Two downloaded files of the same version both stay indexed (#1058)."""
+    item_a = {
+        'file_path': '/models/v1-a.safetensors',
+        'file_name': 'model-v1-a',
+        'folder': '',
+        'civitai': {'id': 301, 'modelId': 3, 'name': 'Multi'},
+    }
+    item_b = {
+        'file_path': '/models/v1-b.safetensors',
+        'file_name': 'model-v1-b',
+        'folder': '',
+        'civitai': {'id': 301, 'modelId': 3, 'name': 'Multi'},
+    }
+
+    cache = ModelCache(
+        raw_data=[item_a, item_b],
+        folders=[],
+        name_display_mode='model_name',
+    )
+
+    files = cache.get_files_by_version_id(301)
+    assert {f['file_path'] for f in files} == {
+        '/models/v1-a.safetensors',
+        '/models/v1-b.safetensors',
+    }
+
+    # Re-adding an existing entry must not duplicate it
+    cache.add_to_version_index(item_a)
+    assert len(cache.get_files_by_version_id(301)) == 2
+
+    # Removing the indexed file re-points version_index to the sibling
+    indexed = cache.version_index[301]
+    sibling = item_b if indexed is item_a else item_a
+    cache.remove_from_version_index(indexed)
+
+    assert 301 in cache.version_index
+    assert cache.version_index[301]['file_path'] == sibling['file_path']
+    assert cache.get_versions_by_model_id(3) == [
+        {'versionId': 301, 'name': 'Multi', 'fileName': sibling['file_name']},
+    ]
+    remaining = cache.get_files_by_version_id(301)
+    assert [f['file_path'] for f in remaining] == [sibling['file_path']]
+
+    # Removing the last file drops the version from all indexes
+    cache.remove_from_version_index(sibling)
+    assert 301 not in cache.version_index
+    assert cache.get_files_by_version_id(301) == []
+    assert cache.get_versions_by_model_id(3) == []
+    assert 3 not in cache.model_id_index
+
+
+@pytest.mark.asyncio
+async def test_version_files_index_rebuild_from_raw_data():
+    """rebuild_version_index reconstructs the multi-valued index (#1058)."""
+    item_a = {
+        'file_path': '/models/v1-a.safetensors',
+        'file_name': 'model-v1-a',
+        'folder': '',
+        'civitai': {'id': 401, 'modelId': 4, 'name': 'Multi'},
+    }
+    item_b = {
+        'file_path': '/models/v1-b.safetensors',
+        'file_name': 'model-v1-b',
+        'folder': '',
+        'civitai': {'id': 401, 'modelId': 4, 'name': 'Multi'},
+    }
+
+    cache = ModelCache(
+        raw_data=[item_a, item_b],
+        folders=[],
+        name_display_mode='model_name',
+    )
+
+    cache.version_files_index = {}
+    cache.rebuild_version_index()
+
+    assert len(cache.get_files_by_version_id(401)) == 2
+    # Invalid ids normalize to empty results
+    assert cache.get_files_by_version_id('not-an-int') == []
+    assert cache.get_files_by_version_id(None) == []