From 541b4e5b88c48bea2a0d6a6f3bcfc8a205d5d9a6 Mon Sep 17 00:00:00 2001 From: PozzettiAndrea Date: Tue, 11 Aug 2026 20:33:08 +0200 Subject: [PATCH] adapted to new comfy-env --- comfy-env-root.toml | 4 +--- comfy-test.toml | 5 ++++- prestartup_script.py | 15 ++++++++++++--- requirements.txt | 5 ++--- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/comfy-env-root.toml b/comfy-env-root.toml index 17d10481..5dd8fd02 100644 --- a/comfy-env-root.toml +++ b/comfy-env-root.toml @@ -1,3 +1 @@ -[env_vars] -KMP_DUPLICATE_LIB_OK = "TRUE" -OMP_NUM_THREADS = 1 +#empty \ No newline at end of file diff --git a/comfy-test.toml b/comfy-test.toml index 7047040e..3ba235fb 100644 --- a/comfy-test.toml +++ b/comfy-test.toml @@ -3,7 +3,10 @@ levels = ["syntax", "coverage", "install", "registration", "instantiation", "exe publish = true [test.workflows] -timeout = 300 +# 600, not 300: remeshing_all legitimately needs ~260s on bare metal +# (windows-portable-cuda) and >300s inside the Windows Sandbox VM +# (GeometryPack-2144 timed out at 300s mid-QuadriFlow). +timeout = 600 cpu = [ "!fill_holes_all", "!remeshing_all", diff --git a/prestartup_script.py b/prestartup_script.py index 7f8d7c9c..75a55c84 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -36,7 +36,16 @@ for viewer in viewers: # Copy GeometryPack-local frontend JS (tracked source -> served web/js, since web/ is generated) copy_files(SCRIPT_DIR / "web_src", SCRIPT_DIR / "web" / "js", "*.js") -# Copy assets -copy_files(SCRIPT_DIR / "assets", COMFYUI_DIR / "input" / "3d", "**/*") +# Copy assets into the CONFIGURED input directory, not the code-tree one: +# ComfyUI Desktop separates user data from the code tree (--base-directory), +# so COMFYUI_DIR/input is never scanned by the load nodes there. main.py +# calls apply_custom_paths() before prestartup scripts, so folder_paths is +# already configured here. +try: + import folder_paths + INPUT_DIR = Path(folder_paths.get_input_directory()) +except Exception: + INPUT_DIR = COMFYUI_DIR / "input" +copy_files(SCRIPT_DIR / "assets", INPUT_DIR / "3d", "**/*") -copy_files(SCRIPT_DIR / "assets", COMFYUI_DIR / "input" , "*.exr") \ No newline at end of file +copy_files(SCRIPT_DIR / "assets", INPUT_DIR, "*.exr") \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index cce80ff2..1efac36f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -comfy-env==0.4.12 -comfy-3d-viewers==0.2.55 -trimesh[easy]>=4.0.0 \ No newline at end of file +comfy-env==0.4.14 +comfy-3d-viewers==0.2.55 \ No newline at end of file