comfy-env 0.1.18__py3-none-any.whl → 0.1.20__py3-none-any.whl

comfy_env/isolation/workers/mp.py

@@ -565,7 +565,9 @@ class MPWorker(Worker):
     interpreter without inherited state from the parent.
     """
 
-    def __init__(self, name: Optional[str] = None, sys_path: Optional[list] = None, lib_path: Optional[str] = None, env_vars: Optional[dict] = None):
+    def __init__(self, name: Optional[str] = None, sys_path: Optional[list] = None,
+                 lib_path: Optional[str] = None, env_vars: Optional[dict] = None,
+                 python: Optional[str] = None):
         """
         Initialize the worker.
 
@@ -574,11 +576,15 @@ class MPWorker(Worker):
             sys_path: Optional list of paths to add to sys.path in worker process.
             lib_path: Optional path to add to LD_LIBRARY_PATH (for conda libraries).
             env_vars: Optional environment variables to set in worker process.
+            python: Optional path to venv Python executable for true process isolation.
+                   When provided, spawn uses this Python instead of sys.executable,
+                   avoiding Windows issues where spawn re-imports main.py.
         """
         self.name = name or "MPWorker"
         self._sys_path = sys_path or []
         self._lib_path = lib_path
         self._env_vars = env_vars or {}
+        self._python = python  # Venv Python for true isolation (like pyisolate)
         self._process = None
         self._queue_in = None
         self._queue_out = None
@@ -635,13 +641,18 @@ class MPWorker(Worker):
             # Use spawn to get clean subprocess (no inherited CUDA context)
             ctx = mp.get_context('spawn')
 
-            # Explicitly set the spawn executable to the current Python
-            # This prevents pixi/conda from hijacking the spawn process
+            # Set the spawn executable for true process isolation (like pyisolate)
+            # When venv python is provided, use it to avoid Windows spawn importing main.py
             import multiprocessing.spawn as mp_spawn
             original_exe = mp_spawn.get_executable()
-            if original_exe != sys.executable.encode() and original_exe != sys.executable:
-                print(f"[comfy-env] Warning: spawn executable was {original_exe}, forcing to {sys.executable}")
-            mp_spawn.set_executable(sys.executable)
+            if self._python:
+                # True isolation: use venv Python (fixes Windows spawn __main__ issue)
+                mp_spawn.set_executable(self._python)
+            else:
+                # Fallback: use current Python (may fail on Windows with ComfyUI)
+                if original_exe != sys.executable.encode() and original_exe != sys.executable:
+                    print(f"[comfy-env] Warning: spawn executable was {original_exe}, forcing to {sys.executable}")
+                mp_spawn.set_executable(sys.executable)
 
             self._queue_in = ctx.Queue()
             self._queue_out = ctx.Queue()

comfy_env/isolation/workers/subprocess.py

@@ -533,6 +533,21 @@ if sys.platform == "win32":
 from multiprocessing import shared_memory as shm
 import numpy as np
 
+
+def _prepare_trimesh_for_pickle(mesh):
+    """
+    Prepare a trimesh object for cross-Python-version pickling.
+    Strips native extension helpers that cause import errors.
+    """
+    mesh = mesh.copy()
+    for attr in ('ray', '_ray', 'permutate', 'nearest'):
+        try:
+            delattr(mesh, attr)
+        except AttributeError:
+            pass
+    return mesh
+
+
 def _to_shm(obj, registry, visited=None):
     """Serialize to shared memory. Returns JSON-safe metadata."""
     if visited is None:

comfy_env/isolation/wrap.py

@@ -74,16 +74,20 @@ def _get_worker(env_dir: Path, working_dir: Path, sys_path: list[str],
 
         host_ver = f"{sys.version_info.major}.{sys.version_info.minor}"
         iso_ver = _get_python_version(env_dir)
+        python = env_dir / ("python.exe" if sys.platform == "win32" else "bin/python")
 
         if iso_ver and iso_ver != host_ver:
+            # Different Python version - must use SubprocessWorker
             from .workers.subprocess import SubprocessWorker
-            python = env_dir / ("python.exe" if sys.platform == "win32" else "bin/python")
             print(f"[comfy-env] SubprocessWorker: {python} ({iso_ver} vs {host_ver})")
             worker = SubprocessWorker(python=str(python), working_dir=working_dir, sys_path=sys_path, name=working_dir.name)
         else:
+            # Same version - use MPWorker with venv Python for true isolation (like pyisolate)
+            # This fixes Windows where spawn would otherwise re-import main.py
             from .workers.mp import MPWorker
-            print(f"[comfy-env] MPWorker: {env_dir}")
-            worker = MPWorker(name=working_dir.name, sys_path=sys_path, lib_path=lib_path, env_vars=env_vars)
+            print(f"[comfy-env] MPWorker: {python}")
+            worker = MPWorker(name=working_dir.name, sys_path=sys_path, lib_path=lib_path,
+                            env_vars=env_vars, python=str(python))
 
         _workers[cache_key] = worker
         return worker

{comfy_env-0.1.18.dist-info → comfy_env-0.1.20.dist-info}/METADATA

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

@@ -16,11 +16,11 @@ comfy_env/environment/paths.py,sha256=5TFFAkOZXa8R3cHfVHDEFnwy6_JcHilVBOHJuy-yqR
 comfy_env/environment/setup.py,sha256=KQgeqlEaqB_tOVhsR2RQF76-LuPud2EPtkQWUM3AJ5Y,3231
 comfy_env/isolation/__init__.py,sha256=XfMLEiBIcEzHG_k2vk9fT9GvFfmOsfbpM26czuxbdRI,800
 comfy_env/isolation/tensor_utils.py,sha256=2_f4jjylqCPaPldD1Jw-es5CyOtuF5I1ROdyEIxsg-U,2951
-comfy_env/isolation/wrap.py,sha256=K7GAkqU_Uxe717eUtPsFv5kcr_Jfbh3x79A-8vbY1nY,8592
+comfy_env/isolation/wrap.py,sha256=UO5tVK-Bzp-8AVxkRd9WNU8m9lOfy_oZFkA6trHOcbM,8876
 comfy_env/isolation/workers/__init__.py,sha256=Zp6sZSRBcb5Negqgzqs3jPjfO9T1u3nNrQhp6WqTAuc,325
 comfy_env/isolation/workers/base.py,sha256=4ZYTaQ4J0kBHCoO_OfZnsowm4rJCoqinZUaOtgkOPbw,2307
-comfy_env/isolation/workers/mp.py,sha256=ygOgx2iyLN7l5fWkKI4lqzQsDyfAAd9Gb4gTYLp7o1A,34061
-comfy_env/isolation/workers/subprocess.py,sha256=4qKtzla0zfVvzGW6y-2PyeFiL-aSQsYxK6Qk8LUKYUQ,57262
+comfy_env/isolation/workers/mp.py,sha256=0zGDo5RxbuiSGTbTxf5qYE0tD-Sistzl48CsIOkYCdg,34777
+comfy_env/isolation/workers/subprocess.py,sha256=15G4rQA7bO-mmVkkeeR3we9ytHIw6kHLNdjc9XWXCu8,57650
 comfy_env/packages/__init__.py,sha256=4pRCUnfcVFVgy7hkbPz9BPVXELtSFHha6L7n-hqNuZA,1155
 comfy_env/packages/apt.py,sha256=pxy3A5ZHv3X8ExCVyohODY8Fcy9ji4izIVPfYoxhqT4,1027
 comfy_env/packages/cuda_wheels.py,sha256=G_CnlwNcfeWlEU24aCVBpeqQQ05y8_02dDLBwBFNwII,3980
@@ -29,8 +29,8 @@ comfy_env/packages/pixi.py,sha256=RPu8x5sSOLE1CYAhWMMjoQrbFGGt00fdsbqtRcTz7LQ,38
 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.18.dist-info/METADATA,sha256=u07OMiP4riErJHu-44eSuN-gfL3iYh9dEDjBNDcQPLg,4808
-comfy_env-0.1.18.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.1.18.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.1.18.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.1.18.dist-info/RECORD,,
+comfy_env-0.1.20.dist-info/METADATA,sha256=TnybPs-8qbU-3NjJxnAadtdp2mj7Pj6fjTfMA2e7PqQ,4808
+comfy_env-0.1.20.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.1.20.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.1.20.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.1.20.dist-info/RECORD,,