comfy-env 0.0.75__py3-none-any.whl → 0.1.2__py3-none-any.whl

comfy_env/workers/mp.py

@@ -64,14 +64,37 @@ def _worker_loop(queue_in, queue_out, sys_path_additions=None, lib_path=None):
     # Set worker mode env var
     os.environ["COMFYUI_ISOLATION_WORKER"] = "1"
 
-    # Set LD_LIBRARY_PATH for conda libraries (must be done before imports)
-    if lib_path:
-        if sys.platform == "win32":
-            # Windows: add to PATH for DLL loading
-            os.environ["PATH"] = lib_path + ";" + os.environ.get("PATH", "")
-        else:
-            # Linux/Mac: LD_LIBRARY_PATH
-            os.environ["LD_LIBRARY_PATH"] = lib_path + ":" + os.environ.get("LD_LIBRARY_PATH", "")
+    # DLL/library isolation - match SubprocessWorker's isolation level
+    # Filter out conflicting paths from conda/mamba/etc and use proper DLL registration
+    path_sep = ";" if sys.platform == "win32" else ":"
+
+    if sys.platform == "win32":
+        # Use os.add_dll_directory() for explicit DLL registration (Python 3.8+)
+        if lib_path and hasattr(os, "add_dll_directory"):
+            try:
+                os.add_dll_directory(lib_path)
+            except Exception:
+                pass
+
+        # Filter conflicting paths from PATH (matches subprocess.py:1203-1212)
+        current_path = os.environ.get("PATH", "")
+        clean_parts = [
+            p for p in current_path.split(path_sep)
+            if not any(x in p.lower() for x in (".ct-envs", "conda", "mamba", "miniforge", "miniconda", "anaconda", "mingw"))
+        ]
+        if lib_path:
+            clean_parts.insert(0, lib_path)
+        os.environ["PATH"] = path_sep.join(clean_parts)
+    else:
+        # Linux/Mac: Filter LD_LIBRARY_PATH with same patterns
+        current = os.environ.get("LD_LIBRARY_PATH", "")
+        clean_parts = [
+            p for p in current.split(path_sep) if p
+            and not any(x in p.lower() for x in (".ct-envs", "conda", "mamba", "miniforge", "miniconda", "anaconda"))
+        ]
+        if lib_path:
+            clean_parts.insert(0, lib_path)
+        os.environ["LD_LIBRARY_PATH"] = path_sep.join(clean_parts)
 
     # Find ComfyUI base and add to sys.path for real folder_paths/comfy modules
     # This works because comfy.options.args_parsing=False by default, so folder_paths

{comfy_env-0.0.75.dist-info → comfy_env-0.1.2.dist-info}/METADATA

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

@@ -22,11 +22,11 @@ comfy_env/templates/comfy-env-instructions.txt,sha256=ve1RAthW7ouumU9h6DM7mIRX1M
 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/mp.py,sha256=pn_1RNyPTCq-oE_pTHWuMMROCkY-cwQnAhezJraT9OI,27013
 comfy_env/workers/subprocess.py,sha256=UMhKhaJoSjv2-FWnwQq9TeMWtaDLIs3ajAFTq1ngdJw,57844
 comfy_env/workers/tensor_utils.py,sha256=TCuOAjJymrSbkgfyvcKtQ_KbVWTqSwP9VH_bCaFLLq8,6409
-comfy_env-0.0.75.dist-info/METADATA,sha256=UoNQP1R_ddXCEFsPIpALxZp3wGBKKnj9xmJWU8guiis,6946
-comfy_env-0.0.75.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.0.75.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.0.75.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.0.75.dist-info/RECORD,,
+comfy_env-0.1.2.dist-info/METADATA,sha256=y9VJ1ErAv5lWCtTbruKtEwwc1bWd1xe7W-2txfKzyXM,6945
+comfy_env-0.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.1.2.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.1.2.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.1.2.dist-info/RECORD,,