mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-10-03 16:45:33 -03:00
Add OpenModelDB (openmodeldb.info) as a metadata and download source for
the existing upscaler model type.
Metadata:
- New OpenModelDBClient: fetches the site's bulk JSON dumps, caches them
on disk (24h TTL + ETag revalidation), and builds a local sha256 index
- New OpenModelDBModelMetadataProvider adapts catalogue entries to the
CivitAI-shaped version dict contract; registered in the fallback chain
behind the enable_openmodeldb_api setting (default on), gated to the
upscaler sub-type so other model types never trigger the dump download
- Persisted provenance uses metadata_source "openmodeldb" plus a nested
openmodeldb block (page URL, architecture, scale, license)
Images: paired-image LR/SR URLs are ephemeral imgdiff.net sessions, so
displayable images come from the site-hosted auto-generated thumbnails
(model-level cover leads images[], per-image thumbs for the rest); the
original comparison URL is kept in meta.comparisonUrl.
Downloads:
- New OpenModelDBSource (flat model ids, omdb: group prefix) with
resource filename derivation that recovers names hidden mid-path
(mediafire) or synthesizes {id}.{type} for folder links
- HTML-gateway mirrors (mediafire/mega/drive) are rejected with a clear
manual-download hint instead of silently saving an HTML page as .pth
- ModelSource base gains is_valid_source_id / default_subdir_parts /
resolve_download_url hooks so flat-id sources need no platform branches
UI: "View on OpenModelDB" link in the model modal (downloaded and
hash-enriched models), settings toggle next to the CivArchive one.
226 lines
7.8 KiB
Python
226 lines
7.8 KiB
Python
from types import SimpleNamespace
|
|
from typing import Optional
|
|
from unittest.mock import AsyncMock
|
|
|
|
import pytest
|
|
|
|
from py.services import metadata_service
|
|
from py.services.model_metadata_provider import (
|
|
FallbackMetadataProvider,
|
|
ModelMetadataProvider,
|
|
RateLimitRetryingProvider,
|
|
)
|
|
|
|
|
|
class DummyProvider(ModelMetadataProvider):
|
|
async def get_model_by_hash(self, model_hash: str):
|
|
return None, None
|
|
|
|
async def get_model_versions(self, model_id: str):
|
|
return None
|
|
|
|
async def get_model_versions_bulk(self, model_ids):
|
|
return None
|
|
|
|
async def get_model_version(self, model_id: Optional[int] = None, version_id: Optional[int] = None):
|
|
return None
|
|
|
|
async def get_model_version_info(self, version_id: str):
|
|
return None, None
|
|
|
|
async def get_user_models(self, username: str, cursor: Optional[str] = None):
|
|
return None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_get_metadata_provider_wraps_non_fallback(monkeypatch):
|
|
provider = DummyProvider()
|
|
dummy_manager = SimpleNamespace(_get_provider=lambda _name=None: provider)
|
|
monkeypatch.setattr(
|
|
metadata_service.ModelMetadataProviderManager,
|
|
"get_instance",
|
|
AsyncMock(return_value=dummy_manager),
|
|
)
|
|
|
|
wrapped = await metadata_service.get_metadata_provider("dummy")
|
|
|
|
assert isinstance(wrapped, RateLimitRetryingProvider)
|
|
assert wrapped is not provider
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_get_metadata_provider_returns_fallback_as_is(monkeypatch):
|
|
fallback = FallbackMetadataProvider([("dummy", DummyProvider())])
|
|
dummy_manager = SimpleNamespace(_get_provider=lambda _name=None: fallback)
|
|
monkeypatch.setattr(
|
|
metadata_service.ModelMetadataProviderManager,
|
|
"get_instance",
|
|
AsyncMock(return_value=dummy_manager),
|
|
)
|
|
|
|
provider = await metadata_service.get_metadata_provider()
|
|
|
|
assert provider is fallback
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# initialize_metadata_providers — provider gating + fallback ordering
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _stub_settings(**overrides):
|
|
"""Minimal settings stub returning configured values."""
|
|
base = {
|
|
"enable_metadata_archive_db": False,
|
|
"enable_civarchive_api": True,
|
|
"enable_openmodeldb_api": False,
|
|
"metadata_provider_order": "civitai_archive_sqlite",
|
|
}
|
|
base.update(overrides)
|
|
return SimpleNamespace(get=lambda key, default=None: base.get(key, default))
|
|
|
|
|
|
async def _run_initialize(monkeypatch, settings):
|
|
# Fresh provider manager for each test
|
|
monkeypatch.setattr(
|
|
metadata_service.ModelMetadataProviderManager,
|
|
"get_instance",
|
|
AsyncMock(return_value=metadata_service.ModelMetadataProviderManager()),
|
|
)
|
|
monkeypatch.setattr(
|
|
metadata_service, "get_settings_manager", lambda: settings
|
|
)
|
|
monkeypatch.setattr(
|
|
metadata_service.ServiceRegistry,
|
|
"get_civitai_client",
|
|
AsyncMock(return_value=object()),
|
|
)
|
|
monkeypatch.setattr(
|
|
metadata_service.ServiceRegistry,
|
|
"get_civarchive_client",
|
|
AsyncMock(return_value=object()),
|
|
)
|
|
monkeypatch.setattr(
|
|
metadata_service.ServiceRegistry,
|
|
"get_openmodeldb_client",
|
|
AsyncMock(return_value=object()),
|
|
)
|
|
|
|
# Make MetadataArchiveManager report a usable db path when enabled
|
|
fake_archive = SimpleNamespace(get_database_path=lambda: "/tmp/fake.db")
|
|
monkeypatch.setattr(
|
|
metadata_service, "MetadataArchiveManager", lambda _base: fake_archive
|
|
)
|
|
# Pretend the db file exists
|
|
monkeypatch.setattr(metadata_service.os.path, "exists", lambda _p: True)
|
|
|
|
manager = await metadata_service.initialize_metadata_providers()
|
|
return manager
|
|
|
|
|
|
def _fallback_provider_order(manager):
|
|
"""Return the ordered list of provider labels inside the fallback provider."""
|
|
fallback = manager.providers.get("fallback")
|
|
assert isinstance(fallback, FallbackMetadataProvider), "expected a fallback provider"
|
|
return list(fallback._provider_labels)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_initialize_providers_default_order(monkeypatch):
|
|
settings = _stub_settings(enable_metadata_archive_db=True)
|
|
manager = await _run_initialize(monkeypatch, settings)
|
|
assert _fallback_provider_order(manager) == ["civitai_api", "civarchive_api", "sqlite"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_initialize_providers_prefer_sqlite_order(monkeypatch):
|
|
settings = _stub_settings(
|
|
enable_metadata_archive_db=True,
|
|
metadata_provider_order="civitai_sqlite_archive",
|
|
)
|
|
manager = await _run_initialize(monkeypatch, settings)
|
|
assert _fallback_provider_order(manager) == ["civitai_api", "sqlite", "civarchive_api"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_initialize_providers_disables_civarchive(monkeypatch):
|
|
settings = _stub_settings(
|
|
enable_metadata_archive_db=True,
|
|
enable_civarchive_api=False,
|
|
)
|
|
manager = await _run_initialize(monkeypatch, settings)
|
|
# civarchive_api must not be registered at all
|
|
assert "civarchive_api" not in manager.providers
|
|
assert _fallback_provider_order(manager) == ["civitai_api", "sqlite"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_initialize_providers_skips_unavailable_sqlite_in_preset(monkeypatch):
|
|
# Preset wants sqlite before civarchive, but archive db is disabled ->
|
|
# sqlite is unavailable and must be skipped, civarchive stays.
|
|
settings = _stub_settings(
|
|
enable_metadata_archive_db=False,
|
|
metadata_provider_order="civitai_sqlite_archive",
|
|
)
|
|
manager = await _run_initialize(monkeypatch, settings)
|
|
assert _fallback_provider_order(manager) == ["civitai_api", "civarchive_api"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_initialize_providers_single_provider_when_only_civitai(monkeypatch):
|
|
# Both archive db and civarchive disabled -> only civitai_api remains,
|
|
# which takes the single-provider path (registered as default, no fallback).
|
|
settings = _stub_settings(
|
|
enable_metadata_archive_db=False,
|
|
enable_civarchive_api=False,
|
|
)
|
|
manager = await _run_initialize(monkeypatch, settings)
|
|
assert "fallback" not in manager.providers
|
|
assert manager.default_provider == "civitai_api"
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# initialize_metadata_providers — OpenModelDB gating + ordering
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_initialize_providers_includes_openmodeldb_when_enabled(monkeypatch):
|
|
settings = _stub_settings(enable_openmodeldb_api=True)
|
|
manager = await _run_initialize(monkeypatch, settings)
|
|
assert "openmodeldb_api" in manager.providers
|
|
# Local-index lookups run before the rate-limited CivArchive network API.
|
|
assert _fallback_provider_order(manager) == [
|
|
"civitai_api",
|
|
"openmodeldb_api",
|
|
"civarchive_api",
|
|
]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_initialize_providers_openmodeldb_sqlite_preset(monkeypatch):
|
|
settings = _stub_settings(
|
|
enable_metadata_archive_db=True,
|
|
enable_openmodeldb_api=True,
|
|
metadata_provider_order="civitai_sqlite_archive",
|
|
)
|
|
manager = await _run_initialize(monkeypatch, settings)
|
|
assert _fallback_provider_order(manager) == [
|
|
"civitai_api",
|
|
"openmodeldb_api",
|
|
"sqlite",
|
|
"civarchive_api",
|
|
]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_initialize_providers_skips_openmodeldb_when_disabled(monkeypatch):
|
|
settings = _stub_settings(
|
|
enable_metadata_archive_db=True,
|
|
enable_openmodeldb_api=False,
|
|
)
|
|
manager = await _run_initialize(monkeypatch, settings)
|
|
assert "openmodeldb_api" not in manager.providers
|
|
assert _fallback_provider_order(manager) == ["civitai_api", "civarchive_api", "sqlite"]
|