wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-05-26 17:07:25 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Merge branch 'comfyanonymous:master' into feature/maskeditor-context-menu

Browse Source
This commit is contained in:
Dr.Lt.Data 2023-05-14 23:12:06 +09:00 committed by GitHub
commit 342db1d5f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
execution.py
View File

@ -6,6 +6,7 @@ import threading
import heapq import heapq
import traceback import traceback
import gc import gc
import time
import torch import torch
import nodes import nodes
@ -215,6 +216,7 @@ class PromptExecutor:
else: else:
self.server.client_id = None self.server.client_id = None
execution_start_time = time.perf_counter()
if self.server.client_id is not None: if self.server.client_id is not None:
self.server.send_sync("execution_start", { "prompt_id": prompt_id}, self.server.client_id) self.server.send_sync("execution_start", { "prompt_id": prompt_id}, self.server.client_id)
@ -272,6 +274,7 @@ class PromptExecutor:
if self.server.client_id is not None: if self.server.client_id is not None:
self.server.send_sync("executing", { "node": None, "prompt_id": prompt_id }, self.server.client_id) self.server.send_sync("executing", { "node": None, "prompt_id": prompt_id }, self.server.client_id)
print("Prompt executed in {:.2f} seconds".format(time.perf_counter() - execution_start_time))
gc.collect() gc.collect()
comfy.model_management.soft_empty_cache() comfy.model_management.soft_empty_cache()

7
server.py
View File

@ -323,12 +323,11 @@ class PromptServer():
self.prompt_queue.put((number, prompt_id, prompt, extra_data, valid[2])) self.prompt_queue.put((number, prompt_id, prompt, extra_data, valid[2]))
return web.json_response({"prompt_id": prompt_id}) return web.json_response({"prompt_id": prompt_id})
else: else:
resp_code = 400
out_string = valid[1]
print("invalid prompt:", valid[1]) print("invalid prompt:", valid[1])
return web.json_response({"error": valid[1]}, status=400)
else:
return web.json_response({"error": "no prompt"}, status=400)
return web.Response(body=out_string, status=resp_code)
@routes.post("/queue") @routes.post("/queue")
async def post_queue(request): async def post_queue(request):
json_data = await request.json() json_data = await request.json()

2
web/scripts/api.js
View File

@ -163,7 +163,7 @@ class ComfyApi extends EventTarget {
if (res.status !== 200) { if (res.status !== 200) {
throw { throw {
response: await res.text(), response: await res.json(),
}; };
} }
} }

2
web/scripts/app.js
View File

@ -1260,7 +1260,7 @@ export class ComfyApp {
try { try {
await api.queuePrompt(number, p); await api.queuePrompt(number, p);
} catch (error) { } catch (error) {
this.ui.dialog.show(error.response || error.toString()); this.ui.dialog.show(error.response.error || error.toString());
break; break;
} }