mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-05-07 08:56:43 -03:00
fix(network): return friendly offline message for memory downloads
This commit is contained in:
@@ -22,6 +22,7 @@ from typing import Optional, Dict, Tuple, Callable, Union, Awaitable
|
|||||||
from ..services.settings_manager import get_settings_manager
|
from ..services.settings_manager import get_settings_manager
|
||||||
from .connectivity_guard import (
|
from .connectivity_guard import (
|
||||||
OFFLINE_COOLDOWN_ERROR,
|
OFFLINE_COOLDOWN_ERROR,
|
||||||
|
OFFLINE_FRIENDLY_MESSAGE,
|
||||||
ConnectivityGuard,
|
ConnectivityGuard,
|
||||||
)
|
)
|
||||||
from .errors import RateLimitError
|
from .errors import RateLimitError
|
||||||
@@ -803,7 +804,7 @@ class Downloader:
|
|||||||
"""
|
"""
|
||||||
guard = await ConnectivityGuard.get_instance()
|
guard = await ConnectivityGuard.get_instance()
|
||||||
if guard.should_block_request():
|
if guard.should_block_request():
|
||||||
return False, OFFLINE_COOLDOWN_ERROR, None
|
return False, OFFLINE_FRIENDLY_MESSAGE, None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
session = await self.session
|
session = await self.session
|
||||||
@@ -849,7 +850,7 @@ class Downloader:
|
|||||||
if guard.is_network_unreachable_error(e):
|
if guard.is_network_unreachable_error(e):
|
||||||
guard.register_network_failure(e)
|
guard.register_network_failure(e)
|
||||||
if guard.should_block_request():
|
if guard.should_block_request():
|
||||||
return False, OFFLINE_COOLDOWN_ERROR, None
|
return False, OFFLINE_FRIENDLY_MESSAGE, None
|
||||||
logger.debug("Network unavailable during memory download: %s", e)
|
logger.debug("Network unavailable during memory download: %s", e)
|
||||||
return False, str(e), None
|
return False, str(e), None
|
||||||
logger.error(f"Error downloading to memory from {url}: {e}")
|
logger.error(f"Error downloading to memory from {url}: {e}")
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import pytest
|
|||||||
|
|
||||||
from py.services.connectivity_guard import (
|
from py.services.connectivity_guard import (
|
||||||
OFFLINE_COOLDOWN_ERROR,
|
OFFLINE_COOLDOWN_ERROR,
|
||||||
|
OFFLINE_FRIENDLY_MESSAGE,
|
||||||
ConnectivityGuard,
|
ConnectivityGuard,
|
||||||
)
|
)
|
||||||
from py.services.downloader import Downloader
|
from py.services.downloader import Downloader
|
||||||
@@ -66,7 +67,7 @@ async def test_downloader_short_circuits_all_request_helpers_during_cooldown():
|
|||||||
|
|
||||||
ok, payload, headers = await downloader.download_to_memory("https://example.invalid")
|
ok, payload, headers = await downloader.download_to_memory("https://example.invalid")
|
||||||
assert ok is False
|
assert ok is False
|
||||||
assert payload == OFFLINE_COOLDOWN_ERROR
|
assert payload == OFFLINE_FRIENDLY_MESSAGE
|
||||||
assert headers is None
|
assert headers is None
|
||||||
|
|
||||||
ok, payload = await downloader.get_response_headers("https://example.invalid")
|
ok, payload = await downloader.get_response_headers("https://example.invalid")
|
||||||
|
|||||||
Reference in New Issue
Block a user