refactor: improve logging format and add validation for file_info in upload process

This commit is contained in:
KarrixLee
2025-04-25 13:40:38 +08:00
parent 5d85bfd38f
commit e86a484160
+18 -4
View File
@@ -139,7 +139,9 @@ async def async_request_with_retry(
logger.error(f"Error response body: {error_body}")
if attempt == max_retries - 1:
logger.error(f"Request {method} : {url} failed after {max_retries} attempts: {e}")
logger.error(
f"Request {method} : {url} failed after {max_retries} attempts: {e}"
)
raise
await asyncio.sleep(retry_delay)
@@ -1842,8 +1844,13 @@ async def upload_file(
def have_pending_upload(prompt_id):
# Check if there are pending uploads in the queue
if prompt_id in upload_queue.pending_uploads and upload_queue.pending_uploads[prompt_id]:
logger.info(f"Have pending upload {len(upload_queue.pending_uploads[prompt_id])}")
if (
prompt_id in upload_queue.pending_uploads
and upload_queue.pending_uploads[prompt_id]
):
logger.info(
f"Have pending upload {len(upload_queue.pending_uploads[prompt_id])}"
)
return True
logger.info("No pending upload")
@@ -2011,7 +2018,9 @@ async def upload_in_background(
filename = os.path.basename(item)
# Extract folder name from the path
folder_path = os.path.dirname(item)
subfolder = os.path.basename(folder_path) if folder_path else ""
subfolder = (
os.path.basename(folder_path) if folder_path else ""
)
item = {
"filename": filename,
"subfolder": subfolder,
@@ -2395,6 +2404,11 @@ class UploadQueue:
logger.warning(f"No upload endpoint for prompt ID: {prompt_id}")
return
# Check if file_info is a valid dictionary with a filename
if not isinstance(file_info, dict) or "filename" not in file_info:
logger.warning(f"Invalid file_info for prompt ID {prompt_id}: {file_info}")
return
filename = file_info.get("filename")
subfolder = file_info.get("subfolder")
file_type = file_info.get("type", "output")