comfy-env 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

comfy_env/environment/cache.py

@@ -2,6 +2,7 @@
 
 import glob
 import hashlib
+import os
 import shutil
 import sys
 from datetime import datetime
@@ -16,14 +17,16 @@ try:
 except ImportError:
     __version__ = "0.0.0-dev"
 
-CACHE_DIR = Path.home() / ".comfy-env" / "envs"
+CACHE_DIR = Path.home() / ".comfy-env" / "envs"  # Default, use get_cache_dir() for dynamic lookup
 MARKER_FILE = ".comfy-env-marker.toml"
 METADATA_FILE = ".comfy-env-metadata.toml"
 
 
 def get_cache_dir() -> Path:
-    CACHE_DIR.mkdir(parents=True, exist_ok=True)
-    return CACHE_DIR
+    """Get cache dir, checking COMFY_ENV_CACHE_DIR env var each time."""
+    cache_dir = Path(os.environ.get("COMFY_ENV_CACHE_DIR", Path.home() / ".comfy-env" / "envs"))
+    cache_dir.mkdir(parents=True, exist_ok=True)
+    return cache_dir
 
 
 def compute_config_hash(config_path: Path) -> str:

comfy_env/isolation/workers/subprocess.py

@@ -668,7 +668,10 @@ def _to_shm(obj, registry, visited=None):
         visited = {}
     obj_id = id(obj)
     if obj_id in visited:
-        return visited[obj_id]
+        cached = visited[obj_id]
+        if isinstance(cached, dict) and cached.get("__type__") == "TensorRef":
+            print(f"[SHM DEBUG] _to_shm CACHE HIT: id={obj_id} -> storage_key=...{cached.get('storage_key','?')[-20:]}, tensor_size={cached.get('tensor_size')}", file=sys.stderr)
+        return cached
     t = type(obj).__name__
 
     # Tensor -> use PyTorch's native shared memory (bypasses resource_tracker)
@@ -676,6 +679,7 @@ def _to_shm(obj, registry, visited=None):
         import torch
         tensor = obj.detach().cpu().contiguous()
         result = _serialize_tensor_native(tensor, registry)
+        print(f"[SHM DEBUG] _to_shm Tensor: id={obj_id}, orig_shape={list(obj.shape)}, new_shape={list(tensor.shape)} -> storage_key=...{result.get('storage_key','?')[-20:]}, tensor_size={result.get('tensor_size')}", file=sys.stderr)
         visited[obj_id] = result
         return result
 
@@ -769,6 +773,7 @@ def _from_shm(obj):
     # TensorRef -> use PyTorch's native deserialization (new format, worker->parent)
     if obj.get("__type__") == "TensorRef":
         tensor = _deserialize_tensor_native(obj)
+        print(f"[SHM DEBUG] _from_shm TensorRef: storage_key=...{obj.get('storage_key','?')[-20:]}, expected_size={obj.get('tensor_size')} -> actual_shape={list(tensor.shape)}", file=sys.stderr)
         # Convert back to numpy if it was originally numpy
         if obj.get("__was_numpy__"):
             return tensor.numpy()

comfy_env/packages/apt.py

@@ -32,29 +32,35 @@ def apt_install(packages: List[str], log: Callable[[str], None] = print) -> bool
     else:
         log("[apt] apt-get update succeeded")
 
-    # Install missing packages
-    log(f"[apt] Running: sudo apt-get install -y {' '.join(missing)}")
-    result = subprocess.run(
-        ["sudo", "apt-get", "install", "-y"] + missing,
-        capture_output=True, text=True
-    )
-
-    if result.returncode != 0:
-        log(f"[apt] ERROR: apt-get install failed (exit {result.returncode})")
-        log(f"[apt] stdout: {result.stdout}")
-        log(f"[apt] stderr: {result.stderr}")
-        return False
+    # Install packages ONE BY ONE so one failure doesn't block others
+    installed = []
+    failed = []
+    for pkg in missing:
+        log(f"[apt] Installing: {pkg}")
+        result = subprocess.run(
+            ["sudo", "apt-get", "install", "-y", pkg],
+            capture_output=True, text=True
+        )
+        if result.returncode != 0:
+            log(f"[apt] FAILED: {pkg} - {result.stderr.strip()}")
+            failed.append(pkg)
+        else:
+            log(f"[apt] OK: {pkg}")
+            installed.append(pkg)
 
-    log("[apt] Installation succeeded")
+    # Summary
+    if installed:
+        log(f"[apt] Successfully installed: {installed}")
+    if failed:
+        log(f"[apt] Failed to install: {failed}")
 
-    # Verify installation
-    still_missing = check_apt_packages(missing)
+    # Verify what's actually installed now
+    still_missing = check_apt_packages(packages)
     if still_missing:
-        log(f"[apt] WARNING: These packages still not found: {still_missing}")
-        return False
+        log(f"[apt] WARNING: These packages are not available: {still_missing}")
 
-    log("[apt] All packages verified installed")
-    return True
+    # Return True if we installed at least something (partial success is OK)
+    return len(installed) > 0 or len(missing) == len(failed)
 
 
 def check_apt_packages(packages: List[str]) -> List[str]:

{comfy_env-0.1.23.dist-info → comfy_env-0.1.25.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ comfy_env/detection/gpu.py,sha256=Rf7pgtZXzUbJqcXzZXQi-yK5naeuSP1FiL6SdreeADM,83
 comfy_env/detection/platform.py,sha256=Xe01dIZm7JT19kIH-j11h7KIBVRaKTLh8u4TzI3uZ6E,2127
 comfy_env/detection/runtime.py,sha256=gDplni7ZPGW7WjNJuqWbtgSwkWz27kBWSFvYbhXun6o,3756
 comfy_env/environment/__init__.py,sha256=WfZnyOvbI0MrDQPYTtOG2kHn0XCSCrqKcOlJcmB29nU,1009
-comfy_env/environment/cache.py,sha256=RGfVW2caMO0Dd1nX2otUQP0xW3pVS7iSOP4vIUAMdEA,4568
+comfy_env/environment/cache.py,sha256=pRhY9xafWELu47evSfnKEJ3Ha-7OqpZulcg5lJpUbNA,4799
 comfy_env/environment/libomp.py,sha256=nzr3kDnRLgcf9CZ_WF4ItWskqEDS2S0geqZS43XoKig,1319
 comfy_env/environment/paths.py,sha256=5TFFAkOZXa8R3cHfVHDEFnwy6_JcHilVBOHJuy-yqR0,1129
 comfy_env/environment/setup.py,sha256=KQgeqlEaqB_tOVhsR2RQF76-LuPud2EPtkQWUM3AJ5Y,3231
@@ -19,17 +19,17 @@ comfy_env/isolation/tensor_utils.py,sha256=2_f4jjylqCPaPldD1Jw-es5CyOtuF5I1ROdyE
 comfy_env/isolation/wrap.py,sha256=d-JLGHHBfb6NerAtETMZouqqCSmQD3CsPpgsN8FVCac,8412
 comfy_env/isolation/workers/__init__.py,sha256=rmfSuH03_BbFFy0TSBTBL9UthhzP69o3Ou8p5R0WBrw,264
 comfy_env/isolation/workers/base.py,sha256=feRCKtjVtTVh1r3efZJ1cJ3rH9D1xKBCbbwLlckcBJk,2348
-comfy_env/isolation/workers/subprocess.py,sha256=mvhuc2kvt3g3FP_moLHJ407IkOoZrGn-pmyk7PL95FU,64609
+comfy_env/isolation/workers/subprocess.py,sha256=uw3yvbDtIY5OADAntViAD3bGQCk8Oe1zWf-KjAJPD2M,65325
 comfy_env/packages/__init__.py,sha256=4pRCUnfcVFVgy7hkbPz9BPVXELtSFHha6L7n-hqNuZA,1155
-comfy_env/packages/apt.py,sha256=9ETym5yFcBKhq6-gZiLOfmHSObKJkjfPMQOZS90twUU,2099
+comfy_env/packages/apt.py,sha256=FOQ4c7cKhu3W3K3LEreLxLIQ4QEHR1sPMVMZ1rsE2mo,2356
 comfy_env/packages/cuda_wheels.py,sha256=G_CnlwNcfeWlEU24aCVBpeqQQ05y8_02dDLBwBFNwII,3980
 comfy_env/packages/node_dependencies.py,sha256=AX_CY6j43tTY5KhyPfU7Wz6zgLAfWF0o0JkTrcNSecg,2966
 comfy_env/packages/pixi.py,sha256=RPu8x5sSOLE1CYAhWMMjoQrbFGGt00fdsbqtRcTz7LQ,3871
 comfy_env/packages/toml_generator.py,sha256=Vhc8F9euHhMTwH1TV6t96-D9Pjrn9jIN4e9WXrCIFE8,3414
 comfy_env/templates/comfy-env-instructions.txt,sha256=ve1RAthW7ouumU9h6DM7mIRX1MS8_Tyonq2U4tcrFu8,1031
 comfy_env/templates/comfy-env.toml,sha256=ROIqi4BlPL1MEdL1VgebfTHpdwPNYGHwWeigI9Kw-1I,4831
-comfy_env-0.1.23.dist-info/METADATA,sha256=yXsl4C2U5OE4sP39hjYflT1iYV3GzPhQpvdxq1IXa4I,4829
-comfy_env-0.1.23.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.1.23.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.1.23.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.1.23.dist-info/RECORD,,
+comfy_env-0.1.25.dist-info/METADATA,sha256=XfGNXJwUNG4OIdnmwhSG2aiRI1_NUIziDqX6IY3wRt4,4829
+comfy_env-0.1.25.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.1.25.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.1.25.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.1.25.dist-info/RECORD,,