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

Merge 4f1bed4eca into 593be209a4

Browse Source
This commit is contained in:
Neha Prasad 2026-03-16 12:01:25 +09:00 committed by GitHub
commit 07a6b289b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
execution.py
View File

@ -196,7 +196,7 @@ def get_input_data(inputs, class_def, unique_id, execution_list=None, dynprompt=
if io.Hidden.auth_token_comfy_org.name in hidden: if io.Hidden.auth_token_comfy_org.name in hidden:
hidden_inputs_v3[io.Hidden.auth_token_comfy_org] = extra_data.get("auth_token_comfy_org", None) hidden_inputs_v3[io.Hidden.auth_token_comfy_org] = extra_data.get("auth_token_comfy_org", None)
if io.Hidden.api_key_comfy_org.name in hidden: if io.Hidden.api_key_comfy_org.name in hidden:
hidden_inputs_v3[io.Hidden.api_key_comfy_org] = extra_data.get("api_key_comfy_org", None) hidden_inputs_v3[io.Hidden.api_key_comfy_org] = extra_data.get("api_key_comfy_org") or extra_data.get("api_key")
else: else:
if "hidden" in valid_inputs: if "hidden" in valid_inputs:
h = valid_inputs["hidden"] h = valid_inputs["hidden"]
@ -212,7 +212,7 @@ def get_input_data(inputs, class_def, unique_id, execution_list=None, dynprompt=
if h[x] == "AUTH_TOKEN_COMFY_ORG": if h[x] == "AUTH_TOKEN_COMFY_ORG":
input_data_all[x] = [extra_data.get("auth_token_comfy_org", None)] input_data_all[x] = [extra_data.get("auth_token_comfy_org", None)]
if h[x] == "API_KEY_COMFY_ORG": if h[x] == "API_KEY_COMFY_ORG":
input_data_all[x] = [extra_data.get("api_key_comfy_org", None)] input_data_all[x] = [extra_data.get("api_key_comfy_org") or extra_data.get("api_key")]
v3_data["hidden_inputs"] = hidden_inputs_v3 v3_data["hidden_inputs"] = hidden_inputs_v3
return input_data_all, missing_keys, v3_data return input_data_all, missing_keys, v3_data

4
server.py
View File

@ -901,10 +901,14 @@ class PromptServer():
extra_data["client_id"] = json_data["client_id"] extra_data["client_id"] = json_data["client_id"]
if valid[0]: if valid[0]:
outputs_to_execute = valid[2] outputs_to_execute = valid[2]
if "api_key_comfy_org" not in extra_data and "api_key" in extra_data:
extra_data["api_key_comfy_org"] = extra_data.pop("api_key")
sensitive = {} sensitive = {}
for sensitive_val in execution.SENSITIVE_EXTRA_DATA_KEYS: for sensitive_val in execution.SENSITIVE_EXTRA_DATA_KEYS:
if sensitive_val in extra_data: if sensitive_val in extra_data:
sensitive[sensitive_val] = extra_data.pop(sensitive_val) sensitive[sensitive_val] = extra_data.pop(sensitive_val)
if "api_key" in extra_data:
extra_data.pop("api_key")
extra_data["create_time"] = int(time.time() * 1000) # timestamp in milliseconds extra_data["create_time"] = int(time.time() * 1000) # timestamp in milliseconds
self.prompt_queue.put((number, prompt_id, prompt, extra_data, outputs_to_execute, sensitive)) self.prompt_queue.put((number, prompt_id, prompt, extra_data, outputs_to_execute, sensitive))
response = {"prompt_id": prompt_id, "number": number, "node_errors": valid[3]} response = {"prompt_id": prompt_id, "number": number, "node_errors": valid[3]}