comfy-env 0.0.52__tar.gz → 0.0.54__tar.gz

{comfy_env-0.0.52 → comfy_env-0.0.54}/PKG-INFO

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

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

{comfy_env-0.0.52 → comfy_env-0.0.54}/src/comfy_env/decorator.py

@@ -382,7 +382,7 @@ def isolated(
 
             # Log entry with argument descriptions
             if VERBOSE_LOGGING:
-                log_fn(f"→ {cls.__name__}.{func_name}({_describe_args(call_kwargs)})")
+                log_fn(f"-> {cls.__name__}.{func_name}({_describe_args(call_kwargs)})")
 
             start_time = time.time()
 
@@ -425,13 +425,13 @@ def isolated(
                 elapsed = time.time() - start_time
                 if VERBOSE_LOGGING:
                     result_desc = _describe_tensor(result) if not isinstance(result, tuple) else f"tuple({len(result)} items)"
-                    log_fn(f"← {cls.__name__}.{func_name} returned {result_desc} [{elapsed:.2f}s]")
+                    log_fn(f"<- {cls.__name__}.{func_name} returned {result_desc} [{elapsed:.2f}s]")
 
                 return result
 
             except Exception as e:
                 elapsed = time.time() - start_time
-                log_fn(f"✗ {cls.__name__}.{func_name} failed after {elapsed:.2f}s: {e}")
+                log_fn(f"[FAIL] {cls.__name__}.{func_name} failed after {elapsed:.2f}s: {e}")
                 raise
 
         # Store original method before replacing (for worker to access)
@@ -689,7 +689,7 @@ def auto_isolate(func: Callable) -> Callable:
             )
 
             elapsed = time.time() - start_time
-            _log(env_name, f"← {func.__name__} completed in isolated env [{elapsed:.2f}s]")
+            _log(env_name, f"<- {func.__name__} completed in isolated env [{elapsed:.2f}s]")
 
             return result
 

{comfy_env-0.0.52 → comfy_env-0.0.54}/src/comfy_env/env/cuda_gpu_detection.py

@@ -1,7 +1,7 @@
 """
 Robust CUDA/GPU detection with multiple fallback methods.
 
-Detection priority: NVML → PyTorch → nvidia-smi → sysfs → env vars
+Detection priority: NVML -> PyTorch -> nvidia-smi -> sysfs -> env vars
 """
 
 from __future__ import annotations

{comfy_env-0.0.52 → comfy_env-0.0.54}/src/comfy_env/errors.py

@@ -229,7 +229,7 @@ class DependencyError(EnvManagerError):
             # Skip empty lines and progress bars
             if not line.strip():
                 continue
-            if line.startswith("  ") and ("%" in line or "━" in line):
+            if line.startswith("  ") and "%" in line:
                 continue
 
             # Keep error lines and important info

{comfy_env-0.0.52 → comfy_env-0.0.54}/src/comfy_env/install.py

@@ -2,8 +2,8 @@
 Installation API for comfy-env.
 
 This module provides the main `install()` function that handles:
-- Named environments [envname] → pixi (isolated Python environment)
-- Local packages [local] → uv/pip (in-place to current Python)
+- Named environments [envname] -> pixi (isolated Python environment)
+- Local packages [local] -> uv/pip (in-place to current Python)
 
 Example:
     from comfy_env import install
@@ -183,7 +183,7 @@ def install(
     user_wheel_sources = full_config.wheel_sources if hasattr(full_config, 'wheel_sources') else {}
 
     if env_config:
-        # Named environment → always pixi
+        # Named environment -> always pixi
         log(f"Found environment: {env_config.name}")
         python_ver = env_config.python or "3.11"  # Default to 3.11 if not specified
         if not env_config.python:
@@ -204,7 +204,7 @@ def install(
         log(f"  Using pixi backend (Python {python_ver})")
         return pixi_install(env_config, node_dir, log, dry_run)
     elif full_config.has_local:
-        # [local] section → uv in-place install
+        # [local] section -> uv in-place install
         return _install_local(full_config.local, node_dir, log, dry_run, user_wheel_sources)
     else:
         log("No packages to install")

{comfy_env-0.0.52 → comfy_env-0.0.54}/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
@@ -375,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.52 → comfy_env-0.0.54}/src/comfy_env/workers/venv.py

@@ -671,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)
@@ -705,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):