chunzhi/comfyui-deploy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
bennykok 2024-09-17 23:36:24 -07:00
parent 7ed4284a6f
commit aa47f3523f
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
custom_routes.py
View File

@ -1260,47 +1260,49 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
size = str(len(data))
# logger.info(f"Image size: {size}")
start_time = time.time() # Start timing here
headers = {
"Content-Type": content_type,
"Content-Length": size,
}
start_time = time.time() # Start timing here
headers = {
"Content-Type": content_type,
"Content-Length": size,
}
if ok.get('include_acl') is True:
headers["x-amz-acl"] = "public-read"
logger.info(headers)
# response = requests.put(ok.get("url"), headers=headers, data=data)
# response = await async_request_with_retry('PUT', ok.get("url"), headers=headers, data=data)
# logger.info(f"Upload file response status: {response.status}, status text: {response.reason}")
if ok.get('include_acl') is True:
headers["x-amz-acl"] = "public-read"
async with aiohttp.ClientSession() as session:
try:
async with session.put(ok.get("url"), headers=headers, data=data) as response:
upload_duration = time.time() - start_time
logger.info(f"Upload completed in {upload_duration:.2f} seconds")
logger.info(f"Upload response status: {response.status}")
logger.info(f"Upload response reason: {response.reason}")
# response = requests.put(ok.get("url"), headers=headers, data=data)
# response = await async_request_with_retry('PUT', ok.get("url"), headers=headers, data=data)
# logger.info(f"Upload file response status: {response.status}, status text: {response.reason}")
response_headers = response.headers
logger.info(f"Response headers: {dict(response_headers)}")
async with aiohttp.ClientSession() as session:
try:
async with session.put(ok.get("url"), headers=headers, data=data) as response:
upload_duration = time.time() - start_time
logger.info(f"Upload completed in {upload_duration:.2f} seconds")
logger.info(f"Upload response status: {response.status}")
logger.info(f"Upload response reason: {response.reason}")
response_text = await response.text()
logger.info(f"Response body: {response_text[:1000]}...") # Log first 1000 characters of response body
response_headers = response.headers
logger.info(f"Response headers: {dict(response_headers)}")
if response.status not in [200, 201, 204]:
logger.error(f"Upload failed with status {response.status}")
logger.error(f"Full response body: {response_text}")
else:
logger.info("Upload successful")
response_text = await response.text()
logger.info(f"Response body: {response_text[:1000]}...") # Log first 1000 characters of response body
except aiohttp.ClientError as e:
logger.error(f"Client error during upload: {str(e)}")
except Exception as e:
logger.error(f"Unexpected error during upload: {str(e)}")
logger.error(traceback.format_exc())
if response.status not in [200, 201, 204]:
logger.error(f"Upload failed with status {response.status}")
logger.error(f"Full response body: {response_text}")
else:
logger.info("Upload successful")
end_time = time.time() # End timing after the request is complete
logger.info("Upload time: {:.2f} seconds".format(end_time - start_time))
except aiohttp.ClientError as e:
logger.error(f"Client error during upload: {str(e)}")
except Exception as e:
logger.error(f"Unexpected error during upload: {str(e)}")
logger.error(traceback.format_exc())
end_time = time.time() # End timing after the request is complete
logger.info("Upload time: {:.2f} seconds".format(end_time - start_time))
if item is not None:
file_download_url = ok.get("download_url")