comfy-env 0.0.16__py3-none-any.whl → 0.0.18__py3-none-any.whl

comfy_env/cli.py

@@ -47,7 +47,7 @@ def main(args: Optional[List[str]] = None) -> int:
     install_parser = subparsers.add_parser(
         "install",
         help="Install dependencies from config",
-        description="Install CUDA wheels and dependencies from comfyui_env.toml",
+        description="Install CUDA wheels and dependencies from comfy-env.toml",
     )
     install_parser.add_argument(
         "--config", "-c",
@@ -450,7 +450,7 @@ def cmd_list_packages(args) -> int:
     print("=" * 60)
     print()
     print("These packages can be installed without specifying wheel_sources.")
-    print("Just add them to your comfyui_env.toml:")
+    print("Just add them to your comfy-env.toml:")
     print()
     print("  [cuda]")
     print("  torch-scatter = \"2.1.2\"")

comfy_env/decorator.py

@@ -153,7 +153,7 @@ def _get_or_create_worker(config: WorkerConfig, log_fn: Callable):
             # Same Python - use TorchMPWorker (fast, zero-copy)
             from .workers import TorchMPWorker
             log_fn(f"Creating TorchMPWorker (same Python, zero-copy tensors)")
-            worker = TorchMPWorker(name=config.env_name)
+            worker = TorchMPWorker(name=config.env_name, sys_path=config.sys_path)
         else:
             # Different Python - use PersistentVenvWorker
             from .workers.venv import PersistentVenvWorker
@@ -369,6 +369,11 @@ def isolated(
                 # Get module name for import in worker
                 module_name = cls.__module__
 
+                # Handle ComfyUI's dynamic import which can set __module__ to a path
+                if module_name.startswith('/') or module_name.startswith('\\'):
+                    # Module name is a filesystem path - use the source file stem instead
+                    module_name = source_file.stem
+
                 # Call worker using appropriate method
                 if worker_config.python is None:
                     # TorchMPWorker - use call_method protocol (avoids pickle issues)

comfy_env/env/config.py

@@ -34,7 +34,7 @@ class ToolConfig:
 @dataclass
 class EnvManagerConfig:
     """
-    Full configuration parsed from comfyui_env.toml.
+    Full configuration parsed from comfy-env.toml.
 
     Supports the v2 schema:
         [local.cuda]        - CUDA packages for host environment

comfy_env/install.py

@@ -12,10 +12,10 @@ Example:
     install()
 
     # In-place with explicit config
-    install(config="comfyui_env.toml", mode="inplace")
+    install(config="comfy-env.toml", mode="inplace")
 
     # Isolated environment
-    install(config="comfyui_env.toml", mode="isolated")
+    install(config="comfy-env.toml", mode="isolated")
 """
 
 import shutil
@@ -42,7 +42,7 @@ def install(
     verify_wheels: bool = False,
 ) -> bool:
     """
-    Install dependencies from a comfyui_env.toml configuration.
+    Install dependencies from a comfy-env.toml configuration.
 
     This is the main entry point for installing CUDA dependencies.
 
@@ -67,7 +67,7 @@ def install(
         install()
 
         # Explicit config file
-        install(config="comfyui_env.toml")
+        install(config="comfy-env.toml")
 
         # Isolated mode
         install(mode="isolated")
@@ -83,7 +83,7 @@ def install(
     if full_config is None:
         raise FileNotFoundError(
             "No configuration file found. "
-            "Create comfyui_env.toml or specify path explicitly."
+            "Create comfy-env.toml or specify path explicitly."
         )
 
     # Install tools first (e.g., Blender)
@@ -238,7 +238,11 @@ def _get_install_info(
         index_url = _substitute_template(config.get("index_url", ""), env)
 
         if method == "index":
-            return {"method": method, "description": f"from index {index_url}"}
+            version_info = ""
+            if "version_template" in config:
+                resolved_version = _substitute_template(config["version_template"], env)
+                version_info = f" (version {resolved_version})"
+            return {"method": method, "description": f"from index {index_url}{version_info}"}
         elif method == "github_index":
             return {"method": method, "description": f"from {index_url}"}
         elif method == "find_links":
@@ -277,8 +281,13 @@ def _install_cuda_package(
         if method == "index":
             # PEP 503 index - use pip --extra-index-url
             index_url = _substitute_template(config["index_url"], env)
-            pkg_spec = f"{package}=={version}" if version else package
-            log(f"  Installing {package} from PyG index...")
+            # Check for version_template (e.g., detectron2 with embedded torch/cuda version)
+            if "version_template" in config:
+                resolved_version = _substitute_template(config["version_template"], env)
+                pkg_spec = f"{package}=={resolved_version}"
+            else:
+                pkg_spec = f"{package}=={version}" if version else package
+            log(f"  Installing {package} from index...")
             _pip_install_with_index(pkg_spec, index_url, log)
 
         elif method == "github_index":

comfy_env/wheel_sources.yml

@@ -120,6 +120,18 @@ packages:
     method: pypi
     description: Triton compiler for custom CUDA kernels
 
+  # ===========================================================================
+  # detectron2 - Facebook's detection library
+  # https://github.com/facebookresearch/detectron2
+  # Prebuilt wheels from miropsota's torch_packages_builder
+  # Version format: 0.6+<commit>pt<torch_version>cu<cuda_short>
+  # ===========================================================================
+  detectron2:
+    method: index
+    index_url: "https://miropsota.github.io/torch_packages_builder"
+    version_template: "0.6+2a420edpt{torch_version}cu{cuda_short}"
+    description: Detectron2 - Facebook's detection and segmentation library
+
   # ===========================================================================
   # flash-attn - Multi-source prebuilt wheels
   # ===========================================================================

comfy_env/workers/torch_mp.py

@@ -40,7 +40,7 @@ _SHUTDOWN = object()
 _CALL_METHOD = "call_method"
 
 
-def _worker_loop(queue_in, queue_out):
+def _worker_loop(queue_in, queue_out, sys_path_additions=None):
     """
     Worker process main loop.
 
@@ -54,10 +54,22 @@ def _worker_loop(queue_in, queue_out):
     import importlib
     import os
     import sys
+    from pathlib import Path
 
     # Set worker mode env var
     os.environ["COMFYUI_ISOLATION_WORKER"] = "1"
 
+    # Add stubs directory for folder_paths etc. (same as PersistentVenvWorker)
+    stubs_dir = Path(__file__).parent.parent / "stubs"
+    if str(stubs_dir) not in sys.path:
+        sys.path.insert(0, str(stubs_dir))
+
+    # Add custom paths to sys.path for module discovery
+    if sys_path_additions:
+        for path in sys_path_additions:
+            if path not in sys.path:
+                sys.path.insert(0, path)
+
     while True:
         try:
             item = queue_in.get()
@@ -151,14 +163,16 @@ class TorchMPWorker(Worker):
     interpreter without inherited state from the parent.
     """
 
-    def __init__(self, name: Optional[str] = None):
+    def __init__(self, name: Optional[str] = None, sys_path: Optional[list] = None):
         """
         Initialize the worker.
 
         Args:
             name: Optional name for logging/debugging.
+            sys_path: Optional list of paths to add to sys.path in worker process.
         """
         self.name = name or "TorchMPWorker"
+        self._sys_path = sys_path or []
         self._process = None
         self._queue_in = None
         self._queue_out = None
@@ -185,7 +199,7 @@ class TorchMPWorker(Worker):
         self._queue_out = ctx.Queue()
         self._process = ctx.Process(
             target=_worker_loop,
-            args=(self._queue_in, self._queue_out),
+            args=(self._queue_in, self._queue_out, self._sys_path),
             daemon=True,
         )
         self._process.start()

{comfy_env-0.0.16.dist-info → comfy_env-0.0.18.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
 comfy_env/__init__.py,sha256=76gIAh7qFff_v_bAolXVzuWzcgvD3bp-yQGCNzba_Iw,3287
-comfy_env/cli.py,sha256=q4y_tlPyqKMZhge7XeO9VdbFVZ4dl9LZsgnnTVQYXD4,15979
-comfy_env/decorator.py,sha256=daFR5aLzshkmo5sRKhSGPcTUgIUWml7Gs6A1bfnDuyc,15718
+comfy_env/cli.py,sha256=X-GCQMP0mtMcE3ZgkT-VLQ4Gq3UUvcb_Ux_NClEFhgI,15975
+comfy_env/decorator.py,sha256=FwM6O0eIYK1FlKmniE4sJyzLLIr4mVg3ON-PnuTF2cw,16056
 comfy_env/errors.py,sha256=8hN8NDlo8oBUdapc-eT3ZluigI5VBzfqsSBvQdfWlz4,9943
-comfy_env/install.py,sha256=uk7mtmoDrcCs6MCfz-5WuyYtgd9JFaByarBWgSUc7Dk,20518
+comfy_env/install.py,sha256=K0sayQ8HVG5t7XpxrAouhicFYnqSXpaQeDa5DgHO6L4,21064
 comfy_env/registry.py,sha256=uFCtGmWYvwGCqObXgzmArX7o5JsFNsHXxayofk3m6no,2569
 comfy_env/resolver.py,sha256=l-AnmCE1puG6CvdpDB-KrsfG_cn_3uO2DryYizUnG_4,12474
 comfy_env/tools.py,sha256=mFNB_uq64ON5hlreH_0wTLONahDo3pBHxhQYTcTHxXE,6554
 comfy_env/env/__init__.py,sha256=imQdoQEQvrRT-QDtyNpFlkVbm2fBzgACdpQwRPd09fI,1157
-comfy_env/env/config.py,sha256=6KZPhRiW8ShhuDnX-e6_yjZHMdO_xBm02w00Q3NBJXM,5980
+comfy_env/env/config.py,sha256=h2EJqg1bf5GamBwXV2uXeYZ4fBpW9nqs0WG1Xzlqjmc,5978
 comfy_env/env/config_file.py,sha256=tJ9xfmf2RghzK6PUxwTrhpvqV_5pecjC6IYYBoZ0U58,21890
 comfy_env/env/cuda_gpu_detection.py,sha256=YLuXUdWg6FeKdNyLlQAHPlveg4rTenXJ2VbeAaEi9QE,9755
 comfy_env/env/manager.py,sha256=bbV1MpURNGuBJ1sSWg_2oSU0J-dW-FhBCuHHHQxgrSM,24785
@@ -30,11 +30,11 @@ comfy_env/workers/__init__.py,sha256=IKZwOvrWOGqBLDUIFAalg4CdqzJ_YnAdxo2Ha7gZTJ0
 comfy_env/workers/base.py,sha256=ZILYXlvGCWuCZXmjKqfG8VeD19ihdYaASdlbasl2BMo,2312
 comfy_env/workers/pool.py,sha256=MtjeOWfvHSCockq8j1gfnxIl-t01GSB79T5N4YB82Lg,6956
 comfy_env/workers/tensor_utils.py,sha256=TCuOAjJymrSbkgfyvcKtQ_KbVWTqSwP9VH_bCaFLLq8,6409
-comfy_env/workers/torch_mp.py,sha256=DsfxE3LBAWEuGtk-p-YL0UhVQ7VDh73KT_TFRxYN4-Q,12563
+comfy_env/workers/torch_mp.py,sha256=1cNhcrCWZ9E6AHCIEMC3vDLo_qjyV2wuQh5iZslg0Hg,13222
 comfy_env/workers/venv.py,sha256=_ekHfZPqBIPY08DjqiXm6cTBQH4DrbxRWR3AAv3mit8,31589
-comfy_env/wheel_sources.yml,sha256=ubVuQllCQGkZhLNQaG54divCwn0zLzYg4turzhnIZQ8,7150
-comfy_env-0.0.16.dist-info/METADATA,sha256=jj04Wmh8ojLkTKSOwyRug1kSWT4SrpsY5PKfgbuq0NE,5399
-comfy_env-0.0.16.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.0.16.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.0.16.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.0.16.dist-info/RECORD,,
+comfy_env/wheel_sources.yml,sha256=nSZ8XB_I5JXQGB7AgC6lHs_IXMd9Kcno10artNL8BKw,7775
+comfy_env-0.0.18.dist-info/METADATA,sha256=2AL5DPZlU5EXPmtM9OhEt-FZ8wlIw6lzs5kGMGW4dKI,5399
+comfy_env-0.0.18.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.0.18.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.0.18.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.0.18.dist-info/RECORD,,