mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-05-07 00:46:44 -03:00
fix(civitai): use red-only api host (#897)
This commit is contained in:
@@ -62,6 +62,12 @@ async def test_download_file_uses_downloader(tmp_path, downloader):
|
||||
assert downloader.download_calls[0]["use_auth"] is True
|
||||
|
||||
|
||||
async def test_client_defaults_to_red_api_host(downloader):
|
||||
client = await CivitaiClient.get_instance()
|
||||
|
||||
assert client.base_url == "https://civitai.red/api/v1"
|
||||
|
||||
|
||||
async def test_get_model_by_hash_enriches_metadata(monkeypatch, downloader):
|
||||
version_payload = {
|
||||
"modelId": 123,
|
||||
@@ -551,36 +557,12 @@ async def test_get_image_info_prefers_red_host_for_red_source(monkeypatch, downl
|
||||
]
|
||||
|
||||
|
||||
async def test_get_image_info_falls_back_from_com_to_red(monkeypatch, downloader):
|
||||
async def test_get_image_info_uses_red_host_even_for_red_source(monkeypatch, downloader):
|
||||
requested_urls = []
|
||||
|
||||
async def fake_make_request(method, url, use_auth=True, **kwargs):
|
||||
requested_urls.append(url)
|
||||
if url.startswith("https://civitai.com/"):
|
||||
return True, {"items": []}
|
||||
return True, {"items": [{"id": 124950237, "name": "fallback"}]}
|
||||
|
||||
downloader.make_request = fake_make_request
|
||||
|
||||
client = await CivitaiClient.get_instance()
|
||||
|
||||
result = await client.get_image_info("124950237")
|
||||
|
||||
assert result == {"id": 124950237, "name": "fallback"}
|
||||
assert requested_urls == [
|
||||
"https://civitai.com/api/v1/images?imageId=124950237&nsfw=X",
|
||||
"https://civitai.red/api/v1/images?imageId=124950237&nsfw=X",
|
||||
]
|
||||
|
||||
|
||||
async def test_get_image_info_falls_back_from_red_to_com(monkeypatch, downloader):
|
||||
requested_urls = []
|
||||
|
||||
async def fake_make_request(method, url, use_auth=True, **kwargs):
|
||||
requested_urls.append(url)
|
||||
if url.startswith("https://civitai.red/"):
|
||||
return True, {"items": []}
|
||||
return True, {"items": [{"id": 124950237, "name": "fallback"}]}
|
||||
return True, {"items": [{"id": 124950237, "name": "target"}]}
|
||||
|
||||
downloader.make_request = fake_make_request
|
||||
|
||||
@@ -590,21 +572,18 @@ async def test_get_image_info_falls_back_from_red_to_com(monkeypatch, downloader
|
||||
"124950237", source_url="https://civitai.red/images/124950237"
|
||||
)
|
||||
|
||||
assert result == {"id": 124950237, "name": "fallback"}
|
||||
assert result == {"id": 124950237, "name": "target"}
|
||||
assert requested_urls == [
|
||||
"https://civitai.red/api/v1/images?imageId=124950237&nsfw=X",
|
||||
"https://civitai.com/api/v1/images?imageId=124950237&nsfw=X",
|
||||
]
|
||||
|
||||
|
||||
async def test_get_image_info_falls_back_after_request_failure(monkeypatch, downloader):
|
||||
async def test_get_image_info_does_not_fall_back_after_request_failure(monkeypatch, downloader):
|
||||
requested_urls = []
|
||||
|
||||
async def fake_make_request(method, url, use_auth=True, **kwargs):
|
||||
requested_urls.append(url)
|
||||
if url.startswith("https://civitai.red/"):
|
||||
return False, "403 forbidden"
|
||||
return True, {"items": [{"id": 124950237, "name": "fallback"}]}
|
||||
return False, "403 forbidden"
|
||||
|
||||
downloader.make_request = fake_make_request
|
||||
|
||||
@@ -614,10 +593,9 @@ async def test_get_image_info_falls_back_after_request_failure(monkeypatch, down
|
||||
"124950237", source_url="https://civitai.red/images/124950237"
|
||||
)
|
||||
|
||||
assert result == {"id": 124950237, "name": "fallback"}
|
||||
assert result is None
|
||||
assert requested_urls == [
|
||||
"https://civitai.red/api/v1/images?imageId=124950237&nsfw=X",
|
||||
"https://civitai.com/api/v1/images?imageId=124950237&nsfw=X",
|
||||
]
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user