comfy-env 0.0.68__tar.gz → 0.0.70__tar.gz

{comfy_env-0.0.68 → comfy_env-0.0.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.68
+Version: 0.0.70
 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.68 → comfy_env-0.0.70}/pyproject.toml

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

{comfy_env-0.0.68 → comfy_env-0.0.70}/src/comfy_env/config/parser.py

@@ -49,7 +49,7 @@ from .types import ComfyEnvConfig, NodeReq
 CONFIG_FILE_NAME = "comfy-env.toml"
 
 # Sections we handle specially (not passed through to pixi.toml)
-CUSTOM_SECTIONS = {"python", "cuda", "node_reqs"}
+CUSTOM_SECTIONS = {"python", "cuda", "node_reqs", "apt"}
 
 
 def load_config(path: Path) -> ComfyEnvConfig:
@@ -116,6 +116,10 @@ def _parse_config(data: Dict[str, Any]) -> ComfyEnvConfig:
     cuda_data = data.pop("cuda", {})
     cuda_packages = _ensure_list(cuda_data.get("packages", []))
 
+    # Extract [apt] section
+    apt_data = data.pop("apt", {})
+    apt_packages = _ensure_list(apt_data.get("packages", []))
+
     # Extract [node_reqs] section
     node_reqs_data = data.pop("node_reqs", {})
     node_reqs = _parse_node_reqs(node_reqs_data)
@@ -126,6 +130,7 @@ def _parse_config(data: Dict[str, Any]) -> ComfyEnvConfig:
     return ComfyEnvConfig(
         python=python_version,
         cuda_packages=cuda_packages,
+        apt_packages=apt_packages,
         node_reqs=node_reqs,
         pixi_passthrough=pixi_passthrough,
     )

{comfy_env-0.0.68 → comfy_env-0.0.70}/src/comfy_env/config/types.py

@@ -53,6 +53,9 @@ class ComfyEnvConfig:
     # [cuda] - CUDA packages (installed via find-links index)
     cuda_packages: List[str] = field(default_factory=list)
 
+    # [apt] - System packages to install via apt (Linux only)
+    apt_packages: List[str] = field(default_factory=list)
+
     # [node_reqs] - other ComfyUI nodes to clone
     node_reqs: List[NodeReq] = field(default_factory=list)
 

{comfy_env-0.0.68 → comfy_env-0.0.70}/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.68 → comfy_env-0.0.70}/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,24 @@ def pixi_install(
         else:
             log("Warning: CUDA packages requested but no GPU detected")
 
+    # Install system dependencies on Linux via apt
+    if sys.platform == "linux" and cfg.apt_packages:
+        log(f"Installing apt packages: {cfg.apt_packages}")
+        subprocess.run(["sudo", "apt-get", "update"], capture_output=True)
+        subprocess.run(
+            ["sudo", "apt-get", "install", "-y"] + cfg.apt_packages,
+            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)
 
@@ -324,27 +337,5 @@ def pixi_install(
 
         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