comfy-env 0.0.26__tar.gz → 0.0.27__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {comfy_env-0.0.26 → comfy_env-0.0.27}/PKG-INFO +1 -1
- {comfy_env-0.0.26 → comfy_env-0.0.27}/pyproject.toml +1 -1
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/install.py +61 -1
- {comfy_env-0.0.26 → comfy_env-0.0.27}/.github/workflows/publish.yml +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/.gitignore +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/LICENSE +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/README.md +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/__init__.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/cli.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/decorator.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/__init__.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/config.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/config_file.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/cuda_gpu_detection.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/manager.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/platform/__init__.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/platform/base.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/platform/darwin.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/platform/linux.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/platform/windows.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/env/security.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/errors.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/ipc/__init__.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/ipc/bridge.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/ipc/protocol.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/ipc/tensor.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/ipc/torch_bridge.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/ipc/transport.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/ipc/worker.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/nodes.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/pixi.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/registry.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/resolver.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/stubs/__init__.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/stubs/folder_paths.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/wheel_sources.yml +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/workers/__init__.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/workers/base.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/workers/pool.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/workers/tensor_utils.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/workers/torch_mp.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/src/comfy_env/workers/venv.py +0 -0
- {comfy_env-0.0.26 → comfy_env-0.0.27}/untitled.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: comfy-env
|
|
3
|
-
Version: 0.0.
|
|
3
|
+
Version: 0.0.27
|
|
4
4
|
Summary: Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation
|
|
5
5
|
Project-URL: Homepage, https://github.com/PozzettiAndrea/comfy-env
|
|
6
6
|
Project-URL: Repository, https://github.com/PozzettiAndrea/comfy-env
|
|
@@ -24,7 +24,7 @@ import sys
|
|
|
24
24
|
from pathlib import Path
|
|
25
25
|
from typing import Any, Callable, Dict, List, Optional, Set, Union
|
|
26
26
|
|
|
27
|
-
from .env.config import IsolatedEnv, NodeReq, SystemConfig
|
|
27
|
+
from .env.config import IsolatedEnv, LocalConfig, NodeReq, SystemConfig
|
|
28
28
|
from .env.config_file import load_config, discover_config
|
|
29
29
|
from .env.manager import IsolatedEnvManager
|
|
30
30
|
from .errors import CUDANotFoundError, DependencyError, InstallError, WheelNotFoundError
|
|
@@ -254,6 +254,9 @@ def install(
|
|
|
254
254
|
return _install_isolated(env_config, node_dir, log, dry_run)
|
|
255
255
|
elif env_config:
|
|
256
256
|
return _install_inplace(env_config, node_dir, log, dry_run, verify_wheels)
|
|
257
|
+
elif full_config.has_local:
|
|
258
|
+
# Handle [local.cuda] and [local.packages] without isolated env
|
|
259
|
+
return _install_local(full_config.local, node_dir, log, dry_run)
|
|
257
260
|
else:
|
|
258
261
|
return True
|
|
259
262
|
|
|
@@ -353,6 +356,63 @@ def _install_inplace(
|
|
|
353
356
|
return True
|
|
354
357
|
|
|
355
358
|
|
|
359
|
+
def _install_local(
|
|
360
|
+
local_config: LocalConfig,
|
|
361
|
+
node_dir: Path,
|
|
362
|
+
log: Callable[[str], None],
|
|
363
|
+
dry_run: bool,
|
|
364
|
+
) -> bool:
|
|
365
|
+
"""Install local packages into current environment (no isolated venv)."""
|
|
366
|
+
log("Installing local packages into host environment")
|
|
367
|
+
|
|
368
|
+
# Install MSVC runtime on Windows (required for CUDA/PyTorch native extensions)
|
|
369
|
+
if sys.platform == "win32":
|
|
370
|
+
log("Installing MSVC runtime for Windows...")
|
|
371
|
+
if not dry_run:
|
|
372
|
+
_pip_install(["msvc-runtime"], no_deps=False, log=log)
|
|
373
|
+
|
|
374
|
+
# Detect runtime environment
|
|
375
|
+
env = RuntimeEnv.detect()
|
|
376
|
+
log(f"Detected environment: {env}")
|
|
377
|
+
|
|
378
|
+
# Check CUDA requirement
|
|
379
|
+
if not env.cuda_version and local_config.cuda_packages:
|
|
380
|
+
raise CUDANotFoundError(package=", ".join(local_config.cuda_packages.keys()))
|
|
381
|
+
|
|
382
|
+
# Convert cuda_packages dict to list of specs
|
|
383
|
+
cuda_packages = []
|
|
384
|
+
for pkg, ver in local_config.cuda_packages.items():
|
|
385
|
+
if ver:
|
|
386
|
+
cuda_packages.append(f"{pkg}=={ver}")
|
|
387
|
+
else:
|
|
388
|
+
cuda_packages.append(pkg)
|
|
389
|
+
|
|
390
|
+
if dry_run:
|
|
391
|
+
log("\nDry run - would install:")
|
|
392
|
+
for pkg in cuda_packages:
|
|
393
|
+
log(f" {pkg}")
|
|
394
|
+
if local_config.requirements:
|
|
395
|
+
log(" Regular packages:")
|
|
396
|
+
for pkg in local_config.requirements:
|
|
397
|
+
log(f" {pkg}")
|
|
398
|
+
return True
|
|
399
|
+
|
|
400
|
+
# Install CUDA packages
|
|
401
|
+
if cuda_packages:
|
|
402
|
+
log(f"\nInstalling {len(cuda_packages)} CUDA packages...")
|
|
403
|
+
for req in cuda_packages:
|
|
404
|
+
package, version = parse_wheel_requirement(req)
|
|
405
|
+
_install_cuda_package(package, version, env, [], log)
|
|
406
|
+
|
|
407
|
+
# Install regular packages
|
|
408
|
+
if local_config.requirements:
|
|
409
|
+
log(f"\nInstalling {len(local_config.requirements)} regular packages...")
|
|
410
|
+
_pip_install(local_config.requirements, no_deps=False, log=log)
|
|
411
|
+
|
|
412
|
+
log("\nLocal installation complete!")
|
|
413
|
+
return True
|
|
414
|
+
|
|
415
|
+
|
|
356
416
|
def _get_install_info(
|
|
357
417
|
package: str,
|
|
358
418
|
version: Optional[str],
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|