fix(builder): url mismatch

This commit is contained in:
BennyKok 2024-01-07 22:03:40 +08:00
parent 9af3bb26d2
commit 08b2ff8b09
2 changed files with 19 additions and 5 deletions

View File

@ -310,11 +310,11 @@ async def build_logic(item: Item):
"timestamp": time.time() "timestamp": time.time()
}})) }}))
if "Created comfyui_api =>" in l or (l.startswith("https://") and l.endswith(".modal.run")): if "Created comfyui-api =>" in l or (l.startswith("https://") and l.endswith(".modal.run")):
if "Created comfyui_api =>" in l: if "Created comfyui-api =>" in l:
url = l.split("=>")[1].strip() url = l.split("=>")[1].strip()
# making sure it is a url # making sure it is a url
elif "comfyui_api" in l: elif "comfyui-api" in l:
# Some case it only prints the url on a blank line # Some case it only prints the url on a blank line
url = l url = l
@ -361,12 +361,15 @@ async def build_logic(item: Item):
stderr_task = asyncio.create_task( stderr_task = asyncio.create_task(
read_stream(process.stderr, True, url_queue)) read_stream(process.stderr, True, url_queue))
url = await url_queue.get()
await asyncio.wait([stdout_task, stderr_task]) await asyncio.wait([stdout_task, stderr_task])
# Wait for the subprocess to finish # Wait for the subprocess to finish
await process.wait() await process.wait()
if not url_queue.empty():
# The queue is not empty, you can get an item
url = await url_queue.get()
# Close the ws connection and also pop the item # Close the ws connection and also pop the item
if item.machine_id in machine_id_websocket_dict and machine_id_websocket_dict[item.machine_id] is not None: if item.machine_id in machine_id_websocket_dict and machine_id_websocket_dict[item.machine_id] is not None:
await machine_id_websocket_dict[item.machine_id].close() await machine_id_websocket_dict[item.machine_id].close()

View File

@ -198,6 +198,17 @@ export const columns: ColumnDef<Machine>[] = [
Disable Machine Disable Machine
</DropdownMenuItem> </DropdownMenuItem>
)} )}
{machine.type === "comfy-deploy-serverless" && (
<DropdownMenuItem
onClick={async () => {
window.open(
machine.endpoint.replace("comfyui-api", "comfyui-app")
);
}}
>
Open ComfyUI
</DropdownMenuItem>
)}
<DropdownMenuItem onClick={() => setOpen(true)}> <DropdownMenuItem onClick={() => setOpen(true)}>
Edit Edit
</DropdownMenuItem> </DropdownMenuItem>