mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2025-09-10 11:35:40 +00:00
a9f1bb10a5
* Fix showing progress from other sessions Because `client_id` was missing from ths `progress_state` message, it was being sent to all connected sessions. This technically meant that if someone had a graph with the same nodes, they would see the progress updates for others. Also added a test to prevent reoccurance and moved the tests around to make CI easier to hook up. * Fix CI issues related to timing-sensitive tests
79 lines
2.1 KiB
Python
79 lines
2.1 KiB
Python
import asyncio
|
|
import time
|
|
from comfy.comfy_types import IO, ComfyNodeABC, InputTypeDict
|
|
from comfy_api.v0_0_2 import ComfyAPI, ComfyAPISync
|
|
|
|
api = ComfyAPI()
|
|
api_sync = ComfyAPISync()
|
|
|
|
|
|
class TestAsyncProgressUpdate(ComfyNodeABC):
|
|
"""Test node with async VALIDATE_INPUTS."""
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(cls) -> InputTypeDict:
|
|
return {
|
|
"required": {
|
|
"value": (IO.ANY, {}),
|
|
"sleep_seconds": (IO.FLOAT, {"default": 1.0}),
|
|
},
|
|
}
|
|
|
|
RETURN_TYPES = (IO.ANY,)
|
|
FUNCTION = "execute"
|
|
CATEGORY = "_for_testing/async"
|
|
|
|
async def execute(self, value, sleep_seconds):
|
|
start = time.time()
|
|
expiration = start + sleep_seconds
|
|
now = start
|
|
while now < expiration:
|
|
now = time.time()
|
|
await api.execution.set_progress(
|
|
value=(now - start) / sleep_seconds,
|
|
max_value=1.0,
|
|
)
|
|
await asyncio.sleep(0.01)
|
|
return (value,)
|
|
|
|
|
|
class TestSyncProgressUpdate(ComfyNodeABC):
|
|
"""Test node with async VALIDATE_INPUTS."""
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(cls) -> InputTypeDict:
|
|
return {
|
|
"required": {
|
|
"value": (IO.ANY, {}),
|
|
"sleep_seconds": (IO.FLOAT, {"default": 1.0}),
|
|
},
|
|
}
|
|
|
|
RETURN_TYPES = (IO.ANY,)
|
|
FUNCTION = "execute"
|
|
CATEGORY = "_for_testing/async"
|
|
|
|
def execute(self, value, sleep_seconds):
|
|
start = time.time()
|
|
expiration = start + sleep_seconds
|
|
now = start
|
|
while now < expiration:
|
|
now = time.time()
|
|
api_sync.execution.set_progress(
|
|
value=(now - start) / sleep_seconds,
|
|
max_value=1.0,
|
|
)
|
|
time.sleep(0.01)
|
|
return (value,)
|
|
|
|
|
|
API_TEST_NODE_CLASS_MAPPINGS = {
|
|
"TestAsyncProgressUpdate": TestAsyncProgressUpdate,
|
|
"TestSyncProgressUpdate": TestSyncProgressUpdate,
|
|
}
|
|
|
|
API_TEST_NODE_DISPLAY_NAME_MAPPINGS = {
|
|
"TestAsyncProgressUpdate": "Async Progress Update Test Node",
|
|
"TestSyncProgressUpdate": "Sync Progress Update Test Node",
|
|
}
|