comfy-env 0.0.67__tar.gz → 0.0.69__tar.gz

{comfy_env-0.0.67 → comfy_env-0.0.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.67
+Version: 0.0.69
 Summary: Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation
 Project-URL: Homepage, https://github.com/PozzettiAndrea/comfy-env
 Project-URL: Repository, https://github.com/PozzettiAndrea/comfy-env

{comfy_env-0.0.67 → comfy_env-0.0.69}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comfy-env"
-version = "0.0.67"
+version = "0.0.69"
 description = "Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation"
 readme = "README.md"
 license = {text = "MIT"}

{comfy_env-0.0.67 → comfy_env-0.0.69}/src/comfy_env/install.py

@@ -151,7 +151,7 @@ def _install_isolated_subdirs(
             log(f"  (dry run)")
             continue
 
-        pixi_install(sub_cfg, sub_dir, log, create_env_link=True)
+        pixi_install(sub_cfg, sub_dir, log)
 
 
 def verify_installation(

{comfy_env-0.0.67 → comfy_env-0.0.69}/src/comfy_env/pixi/core.py

@@ -172,7 +172,6 @@ def pixi_install(
     cfg: ComfyEnvConfig,
     node_dir: Path,
     log: Callable[[str], None] = print,
-    create_env_link: bool = False,
 ) -> bool:
     """
     Install all packages via pixi.
@@ -188,7 +187,6 @@ def pixi_install(
         cfg: ComfyEnvConfig with packages to install.
         node_dir: Directory to install in.
         log: Logging callback.
-        create_env_link: If True, create _env_<name> symlink for isolation.
 
     Returns:
         True if installation succeeded.
@@ -217,9 +215,31 @@ def pixi_install(
         else:
             log("Warning: CUDA packages requested but no GPU detected")
 
+    # Install system dependencies on Linux (OpenGL, build tools)
+    if sys.platform == "linux":
+        log("Installing system dependencies...")
+        subprocess.run(
+            ["sudo", "apt-get", "update"],
+            capture_output=True,
+        )
+        subprocess.run(
+            ["sudo", "apt-get", "install", "-y",
+             "python3-dev",      # Build deps for C extensions
+             "libgl1-mesa-glx",  # OpenGL
+             "libglu1-mesa",     # GLU
+            ],
+            capture_output=True,
+        )
+
     # Clean previous artifacts
     clean_pixi_artifacts(node_dir, log)
 
+    # Create .pixi/config.toml to ensure inline (non-detached) environments
+    pixi_config_dir = node_dir / ".pixi"
+    pixi_config_dir.mkdir(parents=True, exist_ok=True)
+    pixi_config_file = pixi_config_dir / "config.toml"
+    pixi_config_file.write_text("detached-environments = false\n")
+
     # Ensure pixi is installed
     pixi_path = ensure_pixi(log=log)
 
@@ -252,24 +272,10 @@ def pixi_install(
     dependencies.setdefault("pip", "*")  # Always include pip
     pixi_data["dependencies"] = dependencies
 
-    # Add pypi-options for CUDA wheels
+    # Add pypi-options for PyTorch index (CUDA packages installed separately via pip)
     if cfg.has_cuda and cuda_version:
         pypi_options = pixi_data.get("pypi-options", {})
-        # Merge find-links (pixi expects [{url: "..."}, ...] format)
-        find_links = pypi_options.get("find-links", [])
-        existing_urls = {
-            entry.get("url") if isinstance(entry, dict) else entry
-            for entry in find_links
-        }
-        if CUDA_WHEELS_INDEX not in existing_urls:
-            find_links.append({"url": CUDA_WHEELS_INDEX})
-        # Normalize any plain strings to {url: ...} format
-        find_links = [
-            {"url": entry} if isinstance(entry, str) else entry
-            for entry in find_links
-        ]
-        pypi_options["find-links"] = find_links
-        # Merge extra-index-urls
+        # Add PyTorch CUDA index for torch installation
         cuda_short = cuda_version.replace(".", "")[:3]
         pytorch_index = f"https://download.pytorch.org/whl/cu{cuda_short}"
         extra_urls = pypi_options.get("extra-index-urls", [])
@@ -311,46 +317,32 @@ def pixi_install(
         log(f"pixi install failed:\n{result.stderr}")
         raise RuntimeError(f"pixi install failed: {result.stderr}")
 
-    # Install CUDA packages with --no-deps (avoids PyPI version conflicts)
+    # Install CUDA packages with --no-index --find-links (bypasses PyPI completely)
     if cfg.cuda_packages and cuda_version:
-        log(f"Installing CUDA packages with --no-deps: {cfg.cuda_packages}")
+        log(f"Installing CUDA packages: {cfg.cuda_packages}")
         python_path = get_pixi_python(node_dir)
         if not python_path:
             raise RuntimeError("Could not find Python in pixi environment")
 
-        pip_cmd = [
-            str(python_path), "-m", "pip", "install",
-            "--no-deps",
-            "--index-url", CUDA_WHEELS_INDEX,
-        ] + cfg.cuda_packages
+        for package in cfg.cuda_packages:
+            # Each package has its own find-links page at CUDA_WHEELS_INDEX/<package>/
+            find_links_url = f"{CUDA_WHEELS_INDEX}{package}/"
+            log(f"  Installing {package} from {find_links_url}")
+
+            pip_cmd = [
+                str(python_path), "-m", "pip", "install",
+                "--no-index",
+                "--no-deps",
+                "--no-cache-dir",
+                "--find-links", find_links_url,
+                package,
+            ]
+            result = subprocess.run(pip_cmd, capture_output=True, text=True)
+            if result.returncode != 0:
+                log(f"CUDA package install failed for {package}:\n{result.stderr}")
+                raise RuntimeError(f"CUDA package install failed: {result.stderr}")
 
-        result = subprocess.run(pip_cmd, capture_output=True, text=True)
-        if result.returncode != 0:
-            log(f"CUDA package install failed:\n{result.stderr}")
-            raise RuntimeError(f"CUDA package install failed: {result.stderr}")
         log("CUDA packages installed")
 
-    # Create symlink/junction to _env_<name> for discovery (only for isolated subdirs)
-    if create_env_link:
-        env_dir = node_dir / ".pixi" / "envs" / "default"
-        env_link = node_dir / f"_env_{node_dir.name}"
-        if env_dir.exists():
-            # Remove existing link/dir if present
-            if env_link.is_symlink() or env_link.exists():
-                if env_link.is_symlink():
-                    env_link.unlink()
-                else:
-                    shutil.rmtree(env_link)
-            # Create symlink (Linux/Mac) or junction (Windows)
-            if sys.platform == "win32":
-                # Use junction on Windows
-                subprocess.run(
-                    ["cmd", "/c", "mklink", "/J", str(env_link), str(env_dir)],
-                    capture_output=True,
-                )
-            else:
-                env_link.symlink_to(env_dir)
-            log(f"Linked: {env_link.name} -> .pixi/envs/default")
-
     log("Installation complete!")
     return True

{comfy_env-0.0.67 → comfy_env-0.0.69}/src/comfy_env/workers/mp.py

@@ -430,20 +430,68 @@ class MPWorker(Worker):
             return
 
         # Import torch here to avoid import at module level
+        import os
+        import sys
+
+        # Clear conda/pixi environment variables FIRST, before importing multiprocessing
+        # These can cause the child process to pick up the wrong Python interpreter
+        # or stdlib, leading to sys.version mismatch errors in platform module
+        conda_env_vars = [
+            'CONDA_PREFIX',
+            'CONDA_DEFAULT_ENV',
+            'CONDA_PYTHON_EXE',
+            'CONDA_EXE',
+            'CONDA_SHLVL',
+            'PYTHONHOME',
+            'PYTHONPATH',  # Also clear PYTHONPATH to prevent pixi paths
+            '_CE_CONDA',
+            '_CE_M',
+        ]
+        saved_env = {}
+        for var in conda_env_vars:
+            if var in os.environ:
+                saved_env[var] = os.environ.pop(var)
+
+        # Also remove pixi paths from LD_LIBRARY_PATH
+        ld_lib = os.environ.get('LD_LIBRARY_PATH', '')
+        if '.pixi' in ld_lib:
+            saved_env['LD_LIBRARY_PATH'] = ld_lib
+            # Filter out pixi paths
+            new_ld_lib = ':'.join(p for p in ld_lib.split(':') if '.pixi' not in p)
+            if new_ld_lib:
+                os.environ['LD_LIBRARY_PATH'] = new_ld_lib
+            else:
+                os.environ.pop('LD_LIBRARY_PATH', None)
+
         import torch.multiprocessing as mp
 
-        # Use spawn to get clean subprocess (no inherited CUDA context)
-        ctx = mp.get_context('spawn')
-
-        self._queue_in = ctx.Queue()
-        self._queue_out = ctx.Queue()
-        self._process = ctx.Process(
-            target=_worker_loop,
-            args=(self._queue_in, self._queue_out, self._sys_path, self._lib_path),
-            daemon=True,
-        )
-        self._process.start()
-        self._started = True
+        try:
+            # Use spawn to get clean subprocess (no inherited CUDA context)
+            ctx = mp.get_context('spawn')
+
+            # Explicitly set the spawn executable to the current Python
+            # This prevents pixi/conda from hijacking the spawn process
+            import multiprocessing.spawn as mp_spawn
+            original_exe = mp_spawn.get_executable()
+            if original_exe != sys.executable.encode() and original_exe != sys.executable:
+                print(f"[comfy-env] Warning: spawn executable was {original_exe}, forcing to {sys.executable}")
+            mp_spawn.set_executable(sys.executable)
+
+            self._queue_in = ctx.Queue()
+            self._queue_out = ctx.Queue()
+            self._process = ctx.Process(
+                target=_worker_loop,
+                args=(self._queue_in, self._queue_out, self._sys_path, self._lib_path),
+                daemon=True,
+            )
+            self._process.start()
+            self._started = True
+
+            # Restore original executable setting
+            mp_spawn.set_executable(original_exe)
+        finally:
+            # Restore env vars in parent process
+            os.environ.update(saved_env)
 
     def call(
         self,