comfy-env 0.0.71__py3-none-any.whl → 0.0.73__py3-none-any.whl

comfy_env/cli.py

@@ -119,6 +119,23 @@ def main(args: Optional[List[str]] = None) -> int:
         help="Path to config file",
     )
 
+    # apt-install command
+    apt_parser = subparsers.add_parser(
+        "apt-install",
+        help="Install system packages from [apt] section (Linux only)",
+        description="Read [apt] packages from comfy-env.toml and install via apt-get",
+    )
+    apt_parser.add_argument(
+        "--config", "-c",
+        type=str,
+        help="Path to comfy-env.toml (default: auto-discover)",
+    )
+    apt_parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Show what would be installed without installing",
+    )
+
     parsed = parser.parse_args(args)
 
     if parsed.command is None:
@@ -136,6 +153,8 @@ def main(args: Optional[List[str]] = None) -> int:
             return cmd_info(parsed)
         elif parsed.command == "doctor":
             return cmd_doctor(parsed)
+        elif parsed.command == "apt-install":
+            return cmd_apt_install(parsed)
         else:
             parser.print_help()
             return 1
@@ -332,5 +351,82 @@ def cmd_doctor(args) -> int:
         return 0
 
 
+def cmd_apt_install(args) -> int:
+    """Handle apt-install command - install system packages from [apt] section."""
+    import os
+    import shutil
+    import subprocess
+    import platform
+
+    if platform.system() != "Linux":
+        print("apt-install is only supported on Linux", file=sys.stderr)
+        return 1
+
+    # Find config
+    if args.config:
+        config_path = Path(args.config).resolve()
+    else:
+        config_path = Path.cwd() / "comfy-env.toml"
+
+    if not config_path.exists():
+        print(f"Config file not found: {config_path}", file=sys.stderr)
+        return 1
+
+    # Parse config to get apt packages
+    from .config.parser import load_config
+    config = load_config(config_path)
+
+    if not config.apt_packages:
+        print("No [apt] packages specified in config")
+        return 0
+
+    packages = config.apt_packages
+    print(f"Found {len(packages)} apt package(s) to install:")
+    for pkg in packages:
+        print(f"  - {pkg}")
+
+    # Determine if we need sudo
+    is_root = os.geteuid() == 0
+    has_sudo = shutil.which("sudo") is not None
+    use_sudo = not is_root and has_sudo
+
+    prefix = ["sudo"] if use_sudo else []
+
+    if args.dry_run:
+        print("\n[Dry run] Would run:")
+        prefix_str = "sudo " if use_sudo else ""
+        print(f"  {prefix_str}apt-get update && {prefix_str}apt-get install -y {' '.join(packages)}")
+        return 0
+
+    if not is_root and not has_sudo:
+        print("\nError: Need root privileges to install apt packages.", file=sys.stderr)
+        print("Run manually with:", file=sys.stderr)
+        print(f"  sudo apt-get update && sudo apt-get install -y {' '.join(packages)}", file=sys.stderr)
+        return 1
+
+    # Run apt-get update
+    print("\nUpdating package lists...")
+    result = subprocess.run(
+        prefix + ["apt-get", "update"],
+        capture_output=False,
+    )
+    if result.returncode != 0:
+        print("Warning: apt-get update failed, continuing anyway...")
+
+    # Run apt-get install
+    print(f"\nInstalling: {' '.join(packages)}")
+    result = subprocess.run(
+        prefix + ["apt-get", "install", "-y"] + packages,
+        capture_output=False,
+    )
+
+    if result.returncode == 0:
+        print("\nSystem packages installed successfully!")
+        return 0
+    else:
+        print("\nFailed to install some packages", file=sys.stderr)
+        return result.returncode
+
+
 if __name__ == "__main__":
     sys.exit(main())

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", "apt"}
+CUSTOM_SECTIONS = {"python", "cuda", "node_reqs", "apt", "env_vars"}
 
 
 def load_config(path: Path) -> ComfyEnvConfig:
@@ -120,6 +120,10 @@ def _parse_config(data: Dict[str, Any]) -> ComfyEnvConfig:
     apt_data = data.pop("apt", {})
     apt_packages = _ensure_list(apt_data.get("packages", []))
 
+    # Extract [env_vars] section
+    env_vars_data = data.pop("env_vars", {})
+    env_vars = {str(k): str(v) for k, v in env_vars_data.items()}
+
     # Extract [node_reqs] section
     node_reqs_data = data.pop("node_reqs", {})
     node_reqs = _parse_node_reqs(node_reqs_data)
@@ -131,6 +135,7 @@ def _parse_config(data: Dict[str, Any]) -> ComfyEnvConfig:
         python=python_version,
         cuda_packages=cuda_packages,
         apt_packages=apt_packages,
+        env_vars=env_vars,
         node_reqs=node_reqs,
         pixi_passthrough=pixi_passthrough,
     )

comfy_env/config/types.py

@@ -56,6 +56,9 @@ class ComfyEnvConfig:
     # [apt] - System packages to install via apt (Linux only)
     apt_packages: List[str] = field(default_factory=list)
 
+    # [env_vars] - Environment variables to set early (in prestartup)
+    env_vars: Dict[str, str] = field(default_factory=dict)
+
     # [node_reqs] - other ComfyUI nodes to clone
     node_reqs: List[NodeReq] = field(default_factory=list)
 

comfy_env/install.py

@@ -55,7 +55,11 @@ def install(
             "Create comfy-env.toml to define dependencies."
         )
 
-    # Install node dependencies first
+    # Install apt packages first (Linux only)
+    if cfg.apt_packages:
+        _install_apt_packages(cfg.apt_packages, log, dry_run)
+
+    # Install node dependencies
     if cfg.node_reqs:
         _install_node_dependencies(cfg.node_reqs, node_dir, log, dry_run)
 
@@ -69,6 +73,66 @@ def install(
     return True
 
 
+def _install_apt_packages(
+    packages: List[str],
+    log: Callable[[str], None],
+    dry_run: bool,
+) -> None:
+    """Install apt packages (Linux only)."""
+    import os
+    import platform
+    import shutil
+    import subprocess
+
+    if platform.system() != "Linux":
+        log(f"[apt] Skipping apt packages (not Linux)")
+        return
+
+    log(f"\n[apt] Installing {len(packages)} system package(s):")
+    for pkg in packages:
+        log(f"  - {pkg}")
+
+    if dry_run:
+        log("  (dry run - no changes made)")
+        return
+
+    # Determine if we need sudo
+    is_root = os.geteuid() == 0
+    has_sudo = shutil.which("sudo") is not None
+    use_sudo = not is_root and has_sudo
+    prefix = ["sudo"] if use_sudo else []
+
+    if not is_root and not has_sudo:
+        log(f"[apt] Warning: No root access. Install manually:")
+        log(f"  sudo apt-get update && sudo apt-get install -y {' '.join(packages)}")
+        return
+
+    # Run apt-get update (suppress output, just show errors)
+    log("[apt] Updating package lists...")
+    result = subprocess.run(
+        prefix + ["apt-get", "update"],
+        capture_output=True,
+        text=True,
+    )
+    if result.returncode != 0:
+        log(f"[apt] Warning: apt-get update failed: {result.stderr.strip()}")
+
+    # Run apt-get install
+    log(f"[apt] Installing packages...")
+    result = subprocess.run(
+        prefix + ["apt-get", "install", "-y"] + packages,
+        capture_output=True,
+        text=True,
+    )
+
+    if result.returncode == 0:
+        log("[apt] System packages installed successfully!")
+    else:
+        log(f"[apt] Warning: Installation failed: {result.stderr.strip()}")
+        log(f"[apt] You may need to install manually:")
+        log(f"  sudo apt-get install -y {' '.join(packages)}")
+
+
 def _install_node_dependencies(
     node_reqs: List[NodeReq],
     node_dir: Path,

comfy_env/prestartup.py

@@ -8,7 +8,35 @@ import glob
 import os
 import sys
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Dict
+
+
+def _load_env_vars(config_path: str) -> Dict[str, str]:
+    """
+    Load [env_vars] section from comfy-env.toml.
+
+    Uses tomllib (Python 3.11+) or tomli fallback.
+    Returns empty dict if file not found or parsing fails.
+    """
+    if not os.path.exists(config_path):
+        return {}
+
+    try:
+        if sys.version_info >= (3, 11):
+            import tomllib
+        else:
+            try:
+                import tomli as tomllib
+            except ImportError:
+                return {}
+
+        with open(config_path, "rb") as f:
+            data = tomllib.load(f)
+
+        env_vars_data = data.get("env_vars", {})
+        return {str(k): str(v) for k, v in env_vars_data.items()}
+    except Exception:
+        return {}
 
 
 def setup_env(node_dir: Optional[str] = None) -> None:
@@ -16,8 +44,9 @@ def setup_env(node_dir: Optional[str] = None) -> None:
     Set up environment for pixi conda libraries.
 
     Call this in prestartup_script.py before any native library imports.
-    Sets LD_LIBRARY_PATH (Linux/Mac) or PATH (Windows) for conda libs,
-    and adds pixi site-packages to sys.path.
+    - Applies [env_vars] from comfy-env.toml first (for OpenMP settings, etc.)
+    - Sets LD_LIBRARY_PATH (Linux/Mac) or PATH (Windows) for conda libs
+    - Adds pixi site-packages to sys.path
 
     Args:
         node_dir: Path to the custom node directory. Auto-detected if not provided.
@@ -33,6 +62,12 @@ def setup_env(node_dir: Optional[str] = None) -> None:
         frame = inspect.stack()[1]
         node_dir = str(Path(frame.filename).parent)
 
+    # Apply [env_vars] from comfy-env.toml FIRST (before any library loading)
+    config_path = os.path.join(node_dir, "comfy-env.toml")
+    env_vars = _load_env_vars(config_path)
+    for key, value in env_vars.items():
+        os.environ[key] = value
+
     pixi_env = os.path.join(node_dir, ".pixi", "envs", "default")
 
     if not os.path.exists(pixi_env):

comfy_env/templates/comfy-env.toml

@@ -3,7 +3,7 @@
 # =============================================================================
 #
 # comfy-env.toml is a SUPERSET of pixi.toml. All pixi.toml syntax works here.
-# We add custom sections: [cuda], [node_reqs], and top-level `python = "x.x"`.
+# We add custom sections: [cuda], [node_reqs], [env_vars], and top-level `python = "x.x"`.
 #
 # GPU is auto-detected to select the right CUDA version.
 #
@@ -22,6 +22,21 @@
 # python = "3.11"
 
 
+# =============================================================================
+# ENVIRONMENT VARIABLES (custom section)
+# =============================================================================
+# Environment variables applied early via setup_env() in prestartup_script.py.
+# Useful for OpenMP settings, library configs, etc. that must be set before imports.
+#
+# Requires prestartup_script.py in your node directory:
+#   from comfy_env import setup_env
+#   setup_env()
+
+[env_vars]
+# KMP_DUPLICATE_LIB_OK = "TRUE"    # Allow duplicate OpenMP libraries (macOS fix)
+# OMP_NUM_THREADS = "4"            # Limit OpenMP threads
+
+
 # =============================================================================
 # CUDA PACKAGES (custom section)
 # =============================================================================

{comfy_env-0.0.71.dist-info → comfy_env-0.0.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.71
+Version: 0.0.73
 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.71.dist-info → comfy_env-0.0.73.dist-info}/RECORD

@@ -1,12 +1,12 @@
 comfy_env/__init__.py,sha256=s0RkyKsBlDiSI4ZSwivtWLvYhc8DS0CUEWgFLVJbtLA,2176
-comfy_env/cli.py,sha256=ky7jC8eArKbjgYw9Uy52MKajmtLb16wYblrbEOoiy2U,9599
+comfy_env/cli.py,sha256=ty4HYlzollCUCS0o6Sha6eczPAsW_gHRVgvck3IfA2w,12723
 comfy_env/errors.py,sha256=q-C3vyrPa_kk_Ao8l17mIGfJiG2IR0hCFV0GFcNLmcI,9924
-comfy_env/install.py,sha256=Fkjk3ci9_mAabUFqyuXShV9-Ry2iTX-JWAx9fnr5q_Q,5098
+comfy_env/install.py,sha256=t7C5lpF3NVDlAKiRR0TsgYlK6icn7NEtKOU3uGbHnZc,7072
 comfy_env/nodes.py,sha256=nBkG2pESeOt5kXSgTDIHAHaVdHK8-rEueR3BxXWn6TE,4354
-comfy_env/prestartup.py,sha256=_b9QIWsHzkQD5VYdiyn0beHMLoWx18aC4RKB8SlJiGE,2048
+comfy_env/prestartup.py,sha256=rP0TtT9lxiU7Py27U79Ew7954VpHsYL6lfx4IpQY1Uc,3152
 comfy_env/config/__init__.py,sha256=4Guylkb-FV8QxhFwschzpzbr2eu8y-KNgNT3_JOm9jc,403
-comfy_env/config/parser.py,sha256=V3jjrCqkRDBAE-wmYjbwy6D6rt1Lg5rJk_hQMRbbdls,4106
-comfy_env/config/types.py,sha256=EqXj6fjZDZo0gmTMC-8jbShkONSociPVAmWztFbP_bE,2007
+comfy_env/config/parser.py,sha256=dA1lX5ExBEfCqUJwe4V5i_jn2NJ69bMq3c3ji3lMSV8,4295
+comfy_env/config/types.py,sha256=Sb8HO34xsSZu5YAc2K4M7Gb3QNevJlngf12hHiwuU0w,2140
 comfy_env/isolation/__init__.py,sha256=vw9a4mpJ2CFjy-PLe_A3zQ6umBQklgqWNxwn9beNw3g,175
 comfy_env/isolation/wrap.py,sha256=9bXxK9h4FMrFL9k4EAdILWxkjXYytVCJV68MuwwufK8,11485
 comfy_env/pixi/__init__.py,sha256=BUrq7AQf3WDm0cHWh72B2xZbURNnDu2dCuELWiQCUiM,997
@@ -19,14 +19,14 @@ comfy_env/pixi/platform/darwin.py,sha256=HK3VkLT6DfesAnIXwx2IaUFHTBclF0xTQnC7azW
 comfy_env/pixi/platform/linux.py,sha256=xLp8FEbFqZLQrzIZBI9z3C4g23Ab1ASTHLsXDzsdCoA,2062
 comfy_env/pixi/platform/windows.py,sha256=FCOCgpzGzorY9-HueMlJUR8DxM2eH-cj9iZk6K026Is,10891
 comfy_env/templates/comfy-env-instructions.txt,sha256=ve1RAthW7ouumU9h6DM7mIRX1MS8_Tyonq2U4tcrFu8,1031
-comfy_env/templates/comfy-env.toml,sha256=TBa_8V8gdwoRej4Lb_mkqZ_Ytk_quFTnbwwc1YK_gHE,4190
+comfy_env/templates/comfy-env.toml,sha256=ROIqi4BlPL1MEdL1VgebfTHpdwPNYGHwWeigI9Kw-1I,4831
 comfy_env/workers/__init__.py,sha256=TMVG55d2XLP1mJ3x1d16H0SBDJZtk2kMC5P4HLk9TrA,1073
 comfy_env/workers/base.py,sha256=4ZYTaQ4J0kBHCoO_OfZnsowm4rJCoqinZUaOtgkOPbw,2307
 comfy_env/workers/mp.py,sha256=d6PFVrgqp3MK7Gkt08a8LQD_VSwHtoIcGx2Lovou3vM,25972
 comfy_env/workers/subprocess.py,sha256=UMhKhaJoSjv2-FWnwQq9TeMWtaDLIs3ajAFTq1ngdJw,57844
 comfy_env/workers/tensor_utils.py,sha256=TCuOAjJymrSbkgfyvcKtQ_KbVWTqSwP9VH_bCaFLLq8,6409
-comfy_env-0.0.71.dist-info/METADATA,sha256=jo9huPsDqbxsSsZEFtCvc_m7kJmz9XDDjNwAewXjnIk,6946
-comfy_env-0.0.71.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.0.71.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.0.71.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.0.71.dist-info/RECORD,,
+comfy_env-0.0.73.dist-info/METADATA,sha256=-VodLMkozSi5lHL_8xyarwc3SCWGSdIsfNPdSzCjZ4U,6946
+comfy_env-0.0.73.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.0.73.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.0.73.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.0.73.dist-info/RECORD,,