comfy-env 0.0.51__tar.gz → 0.0.53__tar.gz

{comfy_env-0.0.51 → comfy_env-0.0.53}/PKG-INFO

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

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

{comfy_env-0.0.51 → comfy_env-0.0.53}/src/comfy_env/pixi.py

@@ -203,10 +203,12 @@ def create_pixi_toml(
     Returns:
         Path to the generated pixi.toml file.
     """
-    if not env_config.conda:
-        raise ValueError("Environment has no conda configuration")
-
-    conda = env_config.conda
+    # Conda is optional - use defaults if not present
+    if env_config.conda:
+        conda = env_config.conda
+    else:
+        from comfy_env.env.config import CondaConfig
+        conda = CondaConfig(channels=["conda-forge"], packages=[])
     pixi_toml_path = node_dir / "pixi.toml"
 
     # Build pixi.toml content
@@ -246,6 +248,10 @@ def create_pixi_toml(
     lines.append("[dependencies]")
     lines.append(f'python = "{env_config.python}.*"')
 
+    # On Windows, use MKL BLAS to avoid OpenBLAS crashes (numpy blas_fpe_check issue)
+    if sys.platform == "win32":
+        lines.append('libblas = { version = "*", build = "*mkl" }')
+
     for pkg in conda.packages:
         # Parse package spec (name=version or name>=version or just name)
         if "=" in pkg and not pkg.startswith("="):
@@ -371,6 +377,34 @@ def create_pixi_toml(
             lines.append(f'{name} = {value}')
 
         for dep in pypi_deps:
+            # Handle git dependencies in two formats:
+            # 1. pkg @ git+https://github.com/user/repo.git@commit
+            # 2. git+https://github.com/user/repo.git@commit (extract name from URL)
+            if "git+" in dep:
+                if " @ git+" in dep:
+                    # Format: pkg @ git+URL@commit
+                    match = re.match(r'^([a-zA-Z0-9._-]+)\s*@\s*git\+(.+?)(?:@([a-f0-9]+))?$', dep)
+                    if match:
+                        pkg_name = match.group(1)
+                        git_url = match.group(2)
+                        rev = match.group(3)
+                else:
+                    # Format: git+URL@commit (extract package name from repo name)
+                    match = re.match(r'^git\+(.+?)(?:@([a-f0-9]+))?$', dep)
+                    if match:
+                        git_url = match.group(1)
+                        rev = match.group(2)
+                        # Extract package name from URL (repo name without .git)
+                        repo_match = re.search(r'/([^/]+?)(?:\.git)?$', git_url)
+                        pkg_name = repo_match.group(1) if repo_match else git_url.split('/')[-1].replace('.git', '')
+
+                if match:
+                    if rev:
+                        lines.append(f'{pkg_name} = {{ git = "{git_url}", rev = "{rev}" }}')
+                    else:
+                        lines.append(f'{pkg_name} = {{ git = "{git_url}" }}')
+                    continue
+
             # Parse pip requirement format to pixi format
             # Handles extras like trimesh[easy]>=4.0.0
             name, version_spec, extras = _parse_pypi_requirement(dep)

{comfy_env-0.0.51 → comfy_env-0.0.53}/src/comfy_env/stub_imports.py

@@ -156,19 +156,26 @@ def _get_import_names_from_pixi(node_dir: Path) -> Set[str]:
     """
     import_names = set()
 
-    # Find the pixi site-packages
-    pixi_lib = node_dir / ".pixi" / "envs" / "default" / "lib"
+    pixi_base = node_dir / ".pixi" / "envs" / "default"
 
-    if not pixi_lib.exists():
-        return import_names
-
-    # Find the python version directory (e.g., python3.11)
-    python_dirs = list(pixi_lib.glob("python3.*"))
-    if not python_dirs:
-        return import_names
+    # Find site-packages (different paths on Windows vs Linux)
+    # Linux: .pixi/envs/default/lib/python3.x/site-packages
+    # Windows: .pixi/envs/default/Lib/site-packages
+    site_packages = None
 
-    site_packages = python_dirs[0] / "site-packages"
-    if not site_packages.exists():
+    # Try Windows path first (Lib/site-packages)
+    win_site = pixi_base / "Lib" / "site-packages"
+    if win_site.exists():
+        site_packages = win_site
+    else:
+        # Try Linux path (lib/python3.x/site-packages)
+        pixi_lib = pixi_base / "lib"
+        if pixi_lib.exists():
+            python_dirs = list(pixi_lib.glob("python3.*"))
+            if python_dirs:
+                site_packages = python_dirs[0] / "site-packages"
+
+    if site_packages is None or not site_packages.exists():
         return import_names
 
     # Scan for importable modules

{comfy_env-0.0.51 → comfy_env-0.0.53}/src/comfy_env/workers/venv.py

@@ -252,10 +252,29 @@ def _serialize_for_ipc(obj, visited=None):
 # Worker script template - minimal, runs in target venv
 _WORKER_SCRIPT = '''
 import sys
+import os
 import json
 import traceback
 from types import SimpleNamespace
 
+# On Windows, add DLL directories for proper library loading
+if sys.platform == "win32" and hasattr(os, "add_dll_directory"):
+    _host_python_dir = os.environ.get("COMFYUI_HOST_PYTHON_DIR")
+    if _host_python_dir:
+        try:
+            os.add_dll_directory(_host_python_dir)
+            _dlls_dir = os.path.join(_host_python_dir, "DLLs")
+            if os.path.isdir(_dlls_dir):
+                os.add_dll_directory(_dlls_dir)
+        except Exception:
+            pass
+    _pixi_library_bin = os.environ.get("COMFYUI_PIXI_LIBRARY_BIN")
+    if _pixi_library_bin:
+        try:
+            os.add_dll_directory(_pixi_library_bin)
+        except Exception:
+            pass
+
 def _deserialize_isolated_objects(obj):
     """Reconstruct objects serialized with __isolated_object__ marker."""
     if isinstance(obj, dict):
@@ -475,12 +494,29 @@ class VenvWorker(Worker):
             env.update(self.extra_env)
             env["COMFYUI_ISOLATION_WORKER"] = "1"
 
-            # For conda/pixi environments, add lib dir to LD_LIBRARY_PATH
+            # For conda/pixi environments, add lib dir to LD_LIBRARY_PATH (Linux)
             lib_dir = self.python.parent.parent / "lib"
             if lib_dir.is_dir():
                 existing = env.get("LD_LIBRARY_PATH", "")
                 env["LD_LIBRARY_PATH"] = f"{lib_dir}:{existing}" if existing else str(lib_dir)
 
+            # On Windows, pass host Python directory and pixi Library/bin for DLL loading
+            if sys.platform == "win32":
+                env["COMFYUI_HOST_PYTHON_DIR"] = str(Path(sys.executable).parent)
+
+                # For pixi environments with MKL, add Library/bin to PATH for DLL loading
+                # Pixi has python.exe directly in env dir, not in Scripts/
+                env_dir = self.python.parent
+                library_bin = env_dir / "Library" / "bin"
+                if library_bin.is_dir():
+                    existing_path = env.get("PATH", "")
+                    env["PATH"] = f"{env_dir};{library_bin};{existing_path}"
+                    env["COMFYUI_PIXI_LIBRARY_BIN"] = str(library_bin)
+                    # Allow duplicate OpenMP libraries (MKL's libiomp5md.dll + PyTorch's libomp.dll)
+                    env["KMP_DUPLICATE_LIB_OK"] = "TRUE"
+                    # Use UTF-8 encoding for stdout/stderr to handle Unicode symbols
+                    env["PYTHONIOENCODING"] = "utf-8"
+
             # Run subprocess
             cmd = [
                 str(self.python),
@@ -592,6 +628,15 @@ if sys.platform == "win32":
         except Exception:
             pass
 
+    # For pixi environments with MKL, add Library/bin for MKL DLLs
+    _pixi_library_bin = os.environ.get("COMFYUI_PIXI_LIBRARY_BIN")
+    if _pixi_library_bin and hasattr(os, "add_dll_directory"):
+        try:
+            os.add_dll_directory(_pixi_library_bin)
+            print(f"[worker] Added pixi Library/bin to DLL search: {_pixi_library_bin}", flush=True)
+        except Exception as e:
+            print(f"[worker] Failed to add pixi Library/bin: {e}", flush=True)
+
 # =============================================================================
 # Object Reference System - keep complex objects in worker, pass refs to host
 # =============================================================================
@@ -626,8 +671,12 @@ def _should_use_reference(obj):
     # Primitives - pass by value
     if isinstance(obj, (bool, int, float, str, bytes)):
         return False
-    # NumPy arrays and torch tensors - pass by value (they serialize well)
+    # NumPy scalars - pass by value (convert to Python primitives)
     obj_type = type(obj).__name__
+    if obj_type in ('float16', 'float32', 'float64', 'int8', 'int16', 'int32', 'int64',
+                    'uint8', 'uint16', 'uint32', 'uint64', 'bool_'):
+        return False
+    # NumPy arrays and torch tensors - pass by value (they serialize well)
     if obj_type in ('ndarray', 'Tensor'):
         return False
     # Dicts, lists, tuples - recurse into contents (don't ref the container)
@@ -660,6 +709,16 @@ def _serialize_result(obj, visited=None):
         return [_serialize_result(v, visited) for v in obj]
     if isinstance(obj, tuple):
         return tuple(_serialize_result(v, visited) for v in obj)
+
+    # Convert numpy scalars to Python primitives for JSON serialization
+    obj_type = type(obj).__name__
+    if obj_type in ('float16', 'float32', 'float64'):
+        return float(obj)
+    if obj_type in ('int8', 'int16', 'int32', 'int64', 'uint8', 'uint16', 'uint32', 'uint64'):
+        return int(obj)
+    if obj_type == 'bool_':
+        return bool(obj)
+
     return obj
 
 def _deserialize_input(obj):
@@ -977,6 +1036,22 @@ class PersistentVenvWorker(Worker):
         if sys.platform == "win32":
             env["COMFYUI_HOST_PYTHON_DIR"] = str(Path(sys.executable).parent)
 
+            # For pixi environments with MKL, add Library/bin to PATH for DLL loading
+            # MKL DLLs are in .pixi/envs/default/Library/bin/
+            # Pixi has python.exe directly in env dir, not in Scripts/
+            env_dir = self.python.parent
+            library_bin = env_dir / "Library" / "bin"
+            if library_bin.is_dir():
+                existing_path = env.get("PATH", "")
+                # Add env dir and Library/bin to PATH
+                env["PATH"] = f"{env_dir};{library_bin};{existing_path}"
+                # Also pass as env var so worker can use os.add_dll_directory()
+                env["COMFYUI_PIXI_LIBRARY_BIN"] = str(library_bin)
+                # Allow duplicate OpenMP libraries (MKL's libiomp5md.dll + PyTorch's libomp.dll)
+                env["KMP_DUPLICATE_LIB_OK"] = "TRUE"
+                # Use UTF-8 encoding for stdout/stderr to handle Unicode symbols
+                env["PYTHONIOENCODING"] = "utf-8"
+
         # Find ComfyUI base and set env var for folder_paths stub
         comfyui_base = self._find_comfyui_base()
         if comfyui_base: