Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
ComfyUI
Commits
dfc74c19
Commit
dfc74c19
authored
May 11, 2023
by
comfyanonymous
Browse files
Add the prompt_id to some websocket messages.
parent
974958ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
execution.py
execution.py
+4
-4
main.py
main.py
+1
-1
No files found.
execution.py
View file @
dfc74c19
...
...
@@ -147,7 +147,7 @@ class PromptExecutor:
self
.
old_prompt
=
{}
self
.
server
=
server
def
execute
(
self
,
prompt
,
extra_data
=
{},
execute_outputs
=
[]):
def
execute
(
self
,
prompt
,
prompt_id
,
extra_data
=
{},
execute_outputs
=
[]):
nodes
.
interrupt_processing
(
False
)
if
"client_id"
in
extra_data
:
...
...
@@ -170,7 +170,7 @@ class PromptExecutor:
current_outputs
=
set
(
self
.
outputs
.
keys
())
if
self
.
server
.
client_id
is
not
None
:
self
.
server
.
send_sync
(
"execution_cached"
,
{
"nodes"
:
list
(
current_outputs
)
},
self
.
server
.
client_id
)
self
.
server
.
send_sync
(
"execution_cached"
,
{
"nodes"
:
list
(
current_outputs
)
,
"prompt_id"
:
prompt_id
},
self
.
server
.
client_id
)
executed
=
set
()
try
:
to_execute
=
[]
...
...
@@ -190,7 +190,7 @@ class PromptExecutor:
message
=
str
(
traceback
.
format_exc
())
print
(
message
)
if
self
.
server
.
client_id
is
not
None
:
self
.
server
.
send_sync
(
"execution_error"
,
{
"message"
:
message
},
self
.
server
.
client_id
)
self
.
server
.
send_sync
(
"execution_error"
,
{
"message"
:
message
,
"prompt_id"
:
prompt_id
},
self
.
server
.
client_id
)
to_delete
=
[]
for
o
in
self
.
outputs
:
...
...
@@ -207,7 +207,7 @@ class PromptExecutor:
self
.
old_prompt
[
x
]
=
copy
.
deepcopy
(
prompt
[
x
])
self
.
server
.
last_node_id
=
None
if
self
.
server
.
client_id
is
not
None
:
self
.
server
.
send_sync
(
"executing"
,
{
"node"
:
None
},
self
.
server
.
client_id
)
self
.
server
.
send_sync
(
"executing"
,
{
"node"
:
None
,
"prompt_id"
:
prompt_id
},
self
.
server
.
client_id
)
gc
.
collect
()
comfy
.
model_management
.
soft_empty_cache
()
...
...
main.py
View file @
dfc74c19
...
...
@@ -33,7 +33,7 @@ def prompt_worker(q, server):
e
=
execution
.
PromptExecutor
(
server
)
while
True
:
item
,
item_id
=
q
.
get
()
e
.
execute
(
item
[
-
3
],
item
[
-
2
],
item
[
-
1
])
e
.
execute
(
item
[
2
],
item
[
1
],
item
[
3
],
item
[
4
])
q
.
task_done
(
item_id
,
e
.
outputs
)
async
def
run
(
server
,
address
=
''
,
port
=
8188
,
verbose
=
True
,
call_on_start
=
None
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment