Merge branch 'comfyanonymous:master' into master

This commit is contained in:
sylym 2023-03-27 11:11:24 +08:00 committed by GitHub
commit 2e57762b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions

View File

@ -747,6 +747,13 @@ class SaveImage:
digits = 0
return (digits, prefix)
def compute_vars(input):
input = input.replace("%width%", str(images[0].shape[1]))
input = input.replace("%height%", str(images[0].shape[0]))
return input
filename_prefix = compute_vars(filename_prefix)
subfolder = os.path.dirname(os.path.normpath(filename_prefix))
filename = os.path.basename(os.path.normpath(filename_prefix))

View File

@ -29,6 +29,8 @@ async def cache_control(request: web.Request, handler):
class PromptServer():
def __init__(self, loop):
PromptServer.instance = self
mimetypes.init();
mimetypes.types_map['.js'] = 'application/javascript; charset=utf-8'
self.prompt_queue = None

View File

@ -1,8 +1,15 @@
class ComfyApi extends EventTarget {
#registered = new Set();
constructor() {
super();
}
addEventListener(type, callback, options) {
super.addEventListener(type, callback, options);
this.#registered.add(type);
}
/**
* Poll status for colab and other things that don't support websockets.
*/
@ -82,7 +89,11 @@ class ComfyApi extends EventTarget {
this.dispatchEvent(new CustomEvent("executed", { detail: msg.data }));
break;
default:
throw new Error("Unknown message type");
if (this.#registered.has(msg.type)) {
this.dispatchEvent(new CustomEvent(msg.type, { detail: msg.data }));
} else {
throw new Error("Unknown message type");
}
}
} catch (error) {
console.warn("Unhandled message:", event.data);