mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-08-25 23:11:26 -03:00
Will Miao
a202c666bc
The browser extension's apiFetch treats any 404 as a missing endpoint and retries the legacy non-/api/lm URL, producing two spurious 'error_middleware - WARNING - API GET ... 404' log lines per occurrence. - complete_download_in_queue / update_download_queue_status / retry_download_from_history: 'not found' is a normal business outcome, return 200 + success:false instead of 404 (extension behavior unchanged; apiGet ignores the HTTP status) - error_middleware: downgrade /api/lm/download-progress/ 404s to debug like previews - the 404 status itself stays (extension uses it for failure detection), only the log level is lowered
87 lines
2.7 KiB
Python
87 lines
2.7 KiB
Python
"""JSON error middleware for API routes.
|
|
|
|
Ensures all responses to /api/* requests return valid JSON that the
|
|
browser-extension frontend can JSON.parse() without crashing, even when
|
|
the route does not exist (404) or the handler raises an exception (500).
|
|
|
|
Extension consumers call response.json() unconditionally — an HTML error
|
|
page causes ``SyntaxError: unexpected end of data`` that leaks into the
|
|
popup UI as a toast notification.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import Awaitable, Callable
|
|
|
|
from aiohttp import web
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
@web.middleware
|
|
async def api_json_error(
|
|
request: web.Request,
|
|
handler: Callable[[web.Request], Awaitable[web.Response]],
|
|
) -> web.Response:
|
|
"""Return JSON ``{"success": false, "error": "..."}`` for API errors.
|
|
|
|
Only intercepts paths starting with ``/api/`` — all other routes
|
|
(frontend pages, static files, WebSocket upgrades) pass through
|
|
unchanged.
|
|
"""
|
|
if not request.path.startswith("/api/"):
|
|
return await handler(request)
|
|
|
|
try:
|
|
response = await handler(request)
|
|
return response
|
|
except web.HTTPException as exc:
|
|
# Let redirects (301, 302, 307, 308) propagate — they are not errors.
|
|
if exc.status < 400:
|
|
raise
|
|
|
|
# Preview 404 is routine (file deleted from disk) — not worth a warning.
|
|
logger_method = logger.warning
|
|
if request.path.startswith("/api/lm/previews") and exc.status == 404:
|
|
logger_method = logger.debug
|
|
|
|
# Download-progress 404 is routine too: in-memory tracking is removed
|
|
# once a download finishes/fails, so the extension's final polls 404.
|
|
# The extension relies on the 404 status itself (failure detection),
|
|
# so only the log level is lowered.
|
|
if (
|
|
request.path.startswith("/api/lm/download-progress/")
|
|
and exc.status == 404
|
|
):
|
|
logger_method = logger.debug
|
|
|
|
logger_method(
|
|
"API %s %s returned HTTP %d: %s",
|
|
request.method,
|
|
request.path,
|
|
exc.status,
|
|
exc.reason,
|
|
)
|
|
|
|
return web.json_response(
|
|
{"success": False, "error": f"{exc.status}: {exc.reason}"},
|
|
status=exc.status,
|
|
)
|
|
except Exception as exc:
|
|
logger.error(
|
|
"API %s %s raised unhandled exception: %s",
|
|
request.method,
|
|
request.path,
|
|
exc,
|
|
exc_info=True,
|
|
)
|
|
|
|
return web.json_response(
|
|
{
|
|
"success": False,
|
|
"error": f"500: Internal Server Error ({type(exc).__name__})",
|
|
},
|
|
status=500,
|
|
)
|