mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-19 22:44:35 +00:00
8ff4d38ad1
This change solves the basename collision bug by using UNIQUE(file_path) on the unified asset_references table. Key changes: Database: - Migration 0005 merges asset_cache_states and asset_infos into asset_references - AssetReference now contains: cache state fields (file_path, mtime_ns, needs_verify, is_missing, enrichment_level) plus info fields (name, owner_id, preview_id, etc.) - AssetReferenceMeta replaces AssetInfoMeta - AssetReferenceTag replaces AssetInfoTag - UNIQUE constraint on file_path prevents duplicate entries for same file Code: - New unified query module: asset_reference.py (replaces asset_info.py, cache_state.py) - Updated scanner, seeder, and services to use AssetReference - Updated API routes to use reference_id instead of asset_info_id Tests: - All 175 unit tests updated and passing - Integration tests require server environment (not run here) Amp-Thread-ID: https://ampcode.com/threads/T-019c4fe8-9dcb-75ce-bea8-ea786343a581 Co-authored-by: Amp <amp@ampcode.com>
55 lines
1.5 KiB
Python
55 lines
1.5 KiB
Python
import tempfile
|
|
from pathlib import Path
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
from sqlalchemy import create_engine
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.assets.database.models import Base
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def autoclean_unit_test_assets():
|
|
"""Override parent autouse fixture - service unit tests don't need server cleanup."""
|
|
yield
|
|
|
|
|
|
@pytest.fixture
|
|
def db_engine():
|
|
"""In-memory SQLite engine for fast unit tests."""
|
|
engine = create_engine("sqlite:///:memory:")
|
|
Base.metadata.create_all(engine)
|
|
return engine
|
|
|
|
|
|
@pytest.fixture
|
|
def session(db_engine):
|
|
"""Session fixture for tests that need direct DB access."""
|
|
with Session(db_engine) as sess:
|
|
yield sess
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_create_session(db_engine):
|
|
"""Patch create_session to use our in-memory database."""
|
|
from contextlib import contextmanager
|
|
from sqlalchemy.orm import Session as SASession
|
|
|
|
@contextmanager
|
|
def _create_session():
|
|
with SASession(db_engine) as sess:
|
|
yield sess
|
|
|
|
with patch("app.assets.services.ingest.create_session", _create_session), \
|
|
patch("app.assets.services.asset_management.create_session", _create_session), \
|
|
patch("app.assets.services.tagging.create_session", _create_session):
|
|
yield _create_session
|
|
|
|
|
|
@pytest.fixture
|
|
def temp_dir():
|
|
"""Temporary directory for file operations."""
|
|
with tempfile.TemporaryDirectory() as tmpdir:
|
|
yield Path(tmpdir)
|