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

Merge branch 'main' into dev

Browse Source
This commit is contained in:
BennyKok 2024-07-07 22:06:54 -07:00 committed by GitHub
commit 8c8f2abc16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
custom_routes.py
View File

@ -1170,16 +1170,19 @@ async def update_run_with_output(prompt_id, data, node_id=None):
"run_id": prompt_id, "run_id": prompt_id,
"output_data": data "output_data": data
} }
have_upload_media = 'images' in data or 'files' in data or 'gifs' in data or 'mesh' in data
if bypass_upload and have_upload_media:
print("CD_BYPASS_UPLOAD is enabled, skipping the upload of the output:", node_id)
return
if not bypass_upload and prompt_metadata[prompt_id].file_upload_endpoint is not None: if have_upload_media:
try: try:
have_upload = 'images' in data or 'files' in data or 'gifs' in data or 'mesh' in data
logger.info(f"\nhave_upload {have_upload} {node_id}") logger.info(f"\nhave_upload {have_upload} {node_id}")
if have_upload: if have_upload_media:
await update_file_status(prompt_id, data, True, node_id=node_id) await update_file_status(prompt_id, data, True, node_id=node_id)
asyncio.create_task(upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload)) asyncio.create_task(upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload_media))
# await upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload) # await upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload)
except Exception as e: except Exception as e:
@ -1244,7 +1247,6 @@ def run_in_new_thread(coroutine):
if cd_enable_log: if cd_enable_log:
run_in_new_thread(watch_file_changes(log_file_path, send_logs_to_websocket)) run_in_new_thread(watch_file_changes(log_file_path, send_logs_to_websocket))
# use after calling GET /object_info (it populates the `filename_list_cache` variable) # use after calling GET /object_info (it populates the `filename_list_cache` variable)
@server.PromptServer.instance.routes.get("/comfyui-deploy/filename_list_cache") @server.PromptServer.instance.routes.get("/comfyui-deploy/filename_list_cache")
async def get_filename_list_cache(_): async def get_filename_list_cache(_):