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

comfy_env/install.py

@@ -59,6 +59,10 @@ def install(
     if cfg.apt_packages:
         _install_apt_packages(cfg.apt_packages, log, dry_run)
 
+    # Set persistent env vars (for OpenMP settings, etc.)
+    if cfg.env_vars:
+        _set_persistent_env_vars(cfg.env_vars, log, dry_run)
+
     # Install node dependencies
     if cfg.node_reqs:
         _install_node_dependencies(cfg.node_reqs, node_dir, log, dry_run)
@@ -117,20 +121,116 @@ def _install_apt_packages(
     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,
-    )
+    # Install each package individually (some may not exist on all distros)
+    log("[apt] Installing packages...")
+    installed = []
+    skipped = []
+    for pkg in packages:
+        result = subprocess.run(
+            prefix + ["apt-get", "install", "-y", pkg],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode == 0:
+            installed.append(pkg)
+            log(f"  [apt] Installed {pkg}")
+        else:
+            skipped.append(pkg)
+            log(f"  [apt] Skipped {pkg} (not available)")
+
+    if installed:
+        log(f"[apt] Installed {len(installed)} package(s)")
+    if skipped:
+        log(f"[apt] Skipped {len(skipped)} unavailable package(s)")
+
+
+def _set_persistent_env_vars(
+    env_vars: dict,
+    log: Callable[[str], None],
+    dry_run: bool,
+) -> None:
+    """Set env vars permanently (survives restarts)."""
+    import os
+    import platform
+    import subprocess
+    from pathlib import Path
+
+    if not env_vars:
+        return
+
+    system = platform.system()
+    log(f"\n[env] Setting {len(env_vars)} persistent environment variable(s)...")
 
-    if result.returncode == 0:
-        log("[apt] System packages installed successfully!")
+    for key, value in env_vars.items():
+        log(f"  - {key}={value}")
+
+    if dry_run:
+        log("  (dry run - no changes made)")
+        return
+
+    if system == "Windows":
+        # Windows: use setx (writes to registry)
+        for key, value in env_vars.items():
+            result = subprocess.run(
+                ["setx", key, value],
+                capture_output=True, text=True
+            )
+            if result.returncode == 0:
+                log(f"  [env] Set {key} (Windows registry)")
+            else:
+                log(f"  [env] Warning: Failed to set {key}: {result.stderr.strip()}")
+        log("[env] Restart terminal/ComfyUI for changes to take effect")
+
+    elif system == "Darwin":  # macOS
+        # macOS: launchctl for GUI apps + zshrc for terminal
+        for key, value in env_vars.items():
+            subprocess.run(["launchctl", "setenv", key, value], capture_output=True)
+            log(f"  [env] Set {key} (launchctl)")
+
+        # Also add to zshrc for terminal (zsh is default on macOS)
+        _add_to_shell_profile(env_vars, log)
+
+    else:  # Linux
+        _add_to_shell_profile(env_vars, log)
+
+
+def _add_to_shell_profile(
+    env_vars: dict,
+    log: Callable[[str], None],
+) -> None:
+    """Add env vars to shell profile (Linux/macOS)."""
+    import os
+    from pathlib import Path
+
+    # Determine shell profile
+    shell = os.environ.get("SHELL", "/bin/bash")
+    if "zsh" in shell:
+        rc_file = Path.home() / ".zshrc"
+    else:
+        rc_file = Path.home() / ".bashrc"
+
+    profile_file = Path.home() / ".comfy-env-profile"
+
+    # Write env vars to our dedicated file
+    with open(profile_file, "w") as f:
+        f.write("# Generated by comfy-env - do not edit manually\n")
+        for key, value in env_vars.items():
+            f.write(f'export {key}="{value}"\n')
+    log(f"  [env] Wrote {profile_file}")
+
+    # Add source line to shell rc (only once)
+    source_line = f'source "{profile_file}"'
+    existing = rc_file.read_text() if rc_file.exists() else ""
+
+    if source_line not in existing and str(profile_file) not in existing:
+        with open(rc_file, "a") as f:
+            f.write(f'\n# comfy-env environment variables\n')
+            f.write(f'{source_line}\n')
+        log(f"  [env] Added source line to {rc_file}")
     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)}")
+        log(f"  [env] Already configured in {rc_file}")
+
+    log("[env] Restart terminal/ComfyUI for changes to take effect")
 
 
 def _install_node_dependencies(

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

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

@@ -1,7 +1,7 @@
 comfy_env/__init__.py,sha256=s0RkyKsBlDiSI4ZSwivtWLvYhc8DS0CUEWgFLVJbtLA,2176
 comfy_env/cli.py,sha256=ty4HYlzollCUCS0o6Sha6eczPAsW_gHRVgvck3IfA2w,12723
 comfy_env/errors.py,sha256=q-C3vyrPa_kk_Ao8l17mIGfJiG2IR0hCFV0GFcNLmcI,9924
-comfy_env/install.py,sha256=t7C5lpF3NVDlAKiRR0TsgYlK6icn7NEtKOU3uGbHnZc,7072
+comfy_env/install.py,sha256=N7eBj8wB2DrGepVYk-Hks2mSf6UuGzj34pfVLNYJgQ4,10357
 comfy_env/nodes.py,sha256=nBkG2pESeOt5kXSgTDIHAHaVdHK8-rEueR3BxXWn6TE,4354
 comfy_env/prestartup.py,sha256=rP0TtT9lxiU7Py27U79Ew7954VpHsYL6lfx4IpQY1Uc,3152
 comfy_env/config/__init__.py,sha256=4Guylkb-FV8QxhFwschzpzbr2eu8y-KNgNT3_JOm9jc,403
@@ -25,8 +25,8 @@ comfy_env/workers/base.py,sha256=4ZYTaQ4J0kBHCoO_OfZnsowm4rJCoqinZUaOtgkOPbw,230
 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.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,,
+comfy_env-0.0.74.dist-info/METADATA,sha256=rmFALPp_CocGIiAe5vF03FMHrJvFtrSt27UhPGVmmUc,6946
+comfy_env-0.0.74.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.0.74.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.0.74.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.0.74.dist-info/RECORD,,