comfy-env 0.0.71__tar.gz → 0.0.72__tar.gz

{comfy_env-0.0.71 → comfy_env-0.0.72}/PKG-INFO

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

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

{comfy_env-0.0.71 → comfy_env-0.0.72}/src/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-0.0.71 → comfy_env-0.0.72}/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", "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-0.0.71 → comfy_env-0.0.72}/src/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-0.0.71 → comfy_env-0.0.72}/src/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-0.0.71 → comfy_env-0.0.72}/src/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)
 # =============================================================================