Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-19 17:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(civitai): keep civitai's reason on refused downloads

Browse Source 
A refused download recorded only the status code and logged nothing.
The error now carries CivitAI's own message, as in "HTTP 403: Early
Access: ...", and the refusal and rename failure log like every other
branch.
This commit is contained in:
CalamitousFelicitousness
2026-09-14 03:33:05 +01:00
parent 9a6b7a1c93
commit 6d20ea0332
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/civitai/client_civitai.py
+3
View File
@@ -55,6 +55,9 @@ def response_message(response) -> str:
error = '; '.join(f"{'.'.join(str(p) for p in issue.get('path', []))}: {issue.get('message', '')}" for issue in json.loads(error))
except Exception:
pass
message = body.get('message') if isinstance(body, dict) else None
if isinstance(error, str) and isinstance(message, str) and message and message != error: # download refusals carry a short error and a longer message
error = f'{error}: {message}'
if not error:
error = getattr(response, 'reason', '') or getattr(response, 'text', '')
return str(error).strip()[:200]
modules/civitai/download_civitai.py
+8 -4
View File
@@ -200,9 +200,12 @@ class DownloadManager:
try:
r = shared.req(item.url, headers=headers if headers else None, stream=True)
if r.status_code not in (200, 206):
from modules.civitai.client_civitai import response_message
reason = response_message(r)
item.status = "failed"
item.error = f'HTTP {r.status_code}'
item.error = f'HTTP {r.status_code}: {reason}' if reason else f'HTTP {r.status_code}'
item.completed_at = datetime.now()
log.error(f'CivitAI download refused: id={item.id} file="{item.filename}" code={r.status_code} message="{reason}"')
return
# A text/* response is an error or login page served with HTTP 200,
@@ -212,7 +215,7 @@ class DownloadManager:
item.status = "failed"
item.error = f'invalid content-type: {content_type}'
item.completed_at = datetime.now()
log.warning(f'CivitAI download invalid content-type: id={item.id} content-type="{content_type}"')
log.warning(f'CivitAI download invalid content-type: id={item.id} file="{item.filename}" content-type="{content_type}"')
return
# A 200 reply to a Range request means the server ignored the range
@@ -276,7 +279,7 @@ class DownloadManager:
item.status = "failed"
item.error = f'incomplete: expected={expected} got={written}'
item.completed_at = datetime.now()
log.warning(f'CivitAI download incomplete: id={item.id} expected={expected} got={written}')
log.warning(f'CivitAI download incomplete: id={item.id} file="{item.filename}" expected={expected} got={written}')
return
elif written < 1024:
try:
@@ -293,7 +296,7 @@ class DownloadManager:
item.status = "failed"
item.error = str(e)
item.completed_at = datetime.now()
log.error(f'CivitAI download error: id={item.id} {e}')
log.error(f'CivitAI download error: id={item.id} file="{item.filename}" {e}')
return
computed = digest.hexdigest()
@@ -317,6 +320,7 @@ class DownloadManager:
item.status = "failed"
item.error = f'rename failed: {e}'
item.completed_at = datetime.now()
log.error(f'CivitAI download rename failed: id={item.id} file="{final_file}" {e}')
return
item.status = "completed"