From e7b9d2c02cffd59fecca4ee617137ea38641078a Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Sun, 14 May 2023 01:30:58 -0400
Subject: [PATCH 1/2] /prompt endpoint error is now in json format.

---
 server.py          | 7 +++----
 web/scripts/api.js | 2 +-
 web/scripts/app.js | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/server.py b/server.py
index ba4dcba03..f52117f10 100644
--- a/server.py
+++ b/server.py
@@ -323,12 +323,11 @@ class PromptServer():
                     self.prompt_queue.put((number, prompt_id, prompt, extra_data, valid[2]))
                     return web.json_response({"prompt_id": prompt_id})
                 else:
-                    resp_code = 400
-                    out_string = 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")
         async def post_queue(request):
             json_data =  await request.json()
diff --git a/web/scripts/api.js b/web/scripts/api.js
index d29faa5ba..4f061c358 100644
--- a/web/scripts/api.js
+++ b/web/scripts/api.js
@@ -163,7 +163,7 @@ class ComfyApi extends EventTarget {
 
 		if (res.status !== 200) {
 			throw {
-				response: await res.text(),
+				response: await res.json(),
 			};
 		}
 	}
diff --git a/web/scripts/app.js b/web/scripts/app.js
index 1a4a18b94..00d3c9746 100644
--- a/web/scripts/app.js
+++ b/web/scripts/app.js
@@ -1222,7 +1222,7 @@ export class ComfyApp {
 					try {
 						await api.queuePrompt(number, p);
 					} catch (error) {
-						this.ui.dialog.show(error.response || error.toString());
+						this.ui.dialog.show(error.response.error || error.toString());
 						break;
 					}
 

From 9bf67c4c5a5c8b8d1efc2d4ce7e7ab1eccce1fa8 Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Sun, 14 May 2023 01:34:25 -0400
Subject: [PATCH 2/2] Print prompt execution time.

---
 execution.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/execution.py b/execution.py
index b9548229c..dd88029bc 100644
--- a/execution.py
+++ b/execution.py
@@ -6,6 +6,7 @@ import threading
 import heapq
 import traceback
 import gc
+import time
 
 import torch
 import nodes
@@ -215,6 +216,7 @@ class PromptExecutor:
         else:
             self.server.client_id = None
 
+        execution_start_time = time.perf_counter()
         if self.server.client_id is not None:
             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:
                     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()
         comfy.model_management.soft_empty_cache()