comfy-cli 1.2.2__tar.gz → 1.2.4__tar.gz

{comfy_cli-1.2.2 → comfy_cli-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: comfy-cli
-Version: 1.2.2
+Version: 1.2.4
 Summary: A CLI tool for installing and using ComfyUI.
 Maintainer-email: Yoland Yan <yoland@drip.art>, James Kwon <hongilkwon316@gmail.com>, Robin Huang <robin@drip.art>, "Dr.Lt.Data" <dr.lt.data@gmail.com>
 License: GPL-3.0-only
@@ -26,7 +26,7 @@ Requires-Dist: rich
 Requires-Dist: tomlkit
 Requires-Dist: typer>=0.9.0
 Requires-Dist: typing-extensions>=4.7.0
-Requires-Dist: uv
+Requires-Dist: uv<=0.4.0
 Requires-Dist: websocket-client
 Requires-Dist: semver~=3.0.2
 Provides-Extra: dev

{comfy_cli-1.2.2 → comfy_cli-1.2.4}/comfy_cli/cmdline.py

@@ -22,6 +22,7 @@ from comfy_cli.constants import GPU_OPTION, CUDAVersion
 from comfy_cli.env_checker import EnvChecker
 from comfy_cli.standalone import StandalonePython
 from comfy_cli.update import check_for_updates
+from comfy_cli.uv import DependencyCompiler
 from comfy_cli.workspace_manager import WorkspaceManager, check_comfy_repo
 
 logging.setup_logging()
@@ -566,6 +567,19 @@ def feedback():
     rprint("Thank you for your feedback!")
 
 
+@app.command(hidden=True)
+@app.command(
+    help="Given an existing installation of comfy core and any custom nodes, installs any needed python dependencies"
+)
+@tracking.track_command()
+def dependency():
+    comfy_path, _ = workspace_manager.get_workspace_path()
+
+    depComp = DependencyCompiler(cwd=comfy_path)
+    depComp.compile_deps()
+    depComp.install_deps()
+
+
 @app.command(help="Download a standalone Python interpreter and dependencies based on an existing comfyui workspace")
 @tracking.track_command()
 def standalone(
@@ -576,6 +590,13 @@ def standalone(
             help="setuptools-style requirement specificer pointing to an instance of comfy-cli",
         ),
     ] = "comfy-cli",
+    pack_wheels: Annotated[
+        bool,
+        typer.Option(
+            show_default=False,
+            help="Pack requirement wheels in archive when creating standalone bundle",
+        ),
+    ] = False,
     platform: Annotated[
         Optional[constants.OS],
         typer.Option(
@@ -605,10 +626,10 @@ def standalone(
 
     if rehydrate:
         sty = StandalonePython.FromTarball(fpath="python.tgz")
-        sty.rehydrate_comfy_deps()
+        sty.rehydrate_comfy_deps(packWheels=pack_wheels)
     else:
         sty = StandalonePython.FromDistro(platform=platform, proc=proc)
-        sty.dehydrate_comfy_deps(comfyDir=comfy_path, extraSpecs=cli_spec)
+        sty.dehydrate_comfy_deps(comfyDir=comfy_path, extraSpecs=[cli_spec], packWheels=pack_wheels)
         sty.to_tarball()
 
 

{comfy_cli-1.2.2 → comfy_cli-1.2.4}/comfy_cli/constants.py

@@ -79,4 +79,4 @@ SUPPORTED_PT_EXTENSIONS = (".ckpt", ".pt", ".bin", ".pth", ".safetensors")
 NODE_ZIP_FILENAME = "node.zip"
 
 # The default version to download from python-build-standalone.
-DEFAULT_STANDALONE_PYTHON_DOWNLOAD_VERSION = "3.12.6"
+DEFAULT_STANDALONE_PYTHON_DOWNLOAD_VERSION = "3.12.7"

{comfy_cli-1.2.2 → comfy_cli-1.2.4}/comfy_cli/standalone.py

@@ -115,7 +115,7 @@ class StandalonePython:
         for pycache in self.rpath.glob("**/__pycache__"):
             shutil.rmtree(pycache)
 
-    def run_module(self, mod: str, *args: list[str]):
+    def run_module(self, mod: str, *args: str):
         cmd: list[str] = [
             str(self.executable),
             "-m",
@@ -125,10 +125,10 @@ class StandalonePython:
 
         subprocess.run(cmd, check=True)
 
-    def pip_install(self, *args: list[str]):
+    def pip_install(self, *args: str):
         self.run_module("pip", "install", *args)
 
-    def uv_install(self, *args: list[str]):
+    def uv_install(self, *args: str):
         self.run_module("uv", "pip", "install", *args)
 
     def install_comfy_cli(self, dev: bool = False):
@@ -137,16 +137,17 @@ class StandalonePython:
         else:
             self.uv_install("comfy_cli")
 
-    def run_comfy_cli(self, *args: list[str]):
+    def run_comfy_cli(self, *args: str):
         self.run_module("comfy_cli", *args)
 
-    def install_comfy(self, *args: list[str], gpu_arg: str = "--nvidia"):
+    def install_comfy(self, *args: str, gpu_arg: str = "--nvidia"):
         self.run_comfy_cli("--here", "--skip-prompt", "install", "--fast-deps", gpu_arg, *args)
 
     def dehydrate_comfy_deps(
         self,
         comfyDir: PathLike,
         extraSpecs: Optional[list[str]] = None,
+        packWheels: bool = False,
     ):
         self.dep_comp = DependencyCompiler(
             cwd=comfyDir,
@@ -156,14 +157,19 @@ class StandalonePython:
         )
         self.dep_comp.compile_deps()
 
-        skip_uv = get_os() == OS.WINDOWS
-        self.dep_comp.fetch_dep_wheels(skip_uv=skip_uv)
+        if packWheels:
+            skip_uv = get_os() == OS.WINDOWS
+            self.dep_comp.fetch_dep_wheels(skip_uv=skip_uv)
 
-    def rehydrate_comfy_deps(self):
+    def rehydrate_comfy_deps(self, packWheels: bool = False):
         self.dep_comp = DependencyCompiler(
             executable=self.executable, outDir=self.rpath, reqFilesCore=[], reqFilesExt=[]
         )
-        self.dep_comp.install_wheels_directly()
+
+        if packWheels:
+            self.dep_comp.install_wheels_directly()
+        else:
+            self.dep_comp.install_deps()
 
     def to_tarball(self, outPath: Optional[PathLike] = None, show_progress: bool = True):
         # remove any __pycache__ before creating archive

{comfy_cli-1.2.2 → comfy_cli-1.2.4}/comfy_cli/uv.py

@@ -79,21 +79,28 @@ class DependencyCompiler:
     """
     ).strip()
 
-    reqNames = {
+    reqNames = (
         "requirements.txt",
         "pyproject.toml",
         "setup.cfg",
         "setup.py",
-    }
+    )
 
     @staticmethod
     def Find_Req_Files(*ders: PathLike) -> list[Path]:
-        return [
-            file  # fmt: skip
-            for der in ders
-            for file in Path(der).absolute().iterdir()
-            if file.name in DependencyCompiler.reqNames
-        ]
+        reqFiles = []
+        for der in ders:
+            reqFound = False
+            for reqName in DependencyCompiler.reqNames:
+                for file in Path(der).absolute().iterdir():
+                    if file.name == reqName:
+                        reqFiles.append(file)
+                        reqFound = True
+                        break
+                if reqFound:
+                    break
+
+        return reqFiles
 
     @staticmethod
     def Install_Build_Deps(executable: PathLike = sys.executable):
@@ -184,7 +191,7 @@ class DependencyCompiler:
         override: Optional[PathLike] = None,
         reqs: Optional[list[str]] = None,
         reqFile: Optional[list[PathLike]] = None,
-    ) -> subprocess.CompletedProcess[Any]:
+    ) -> None:
         cmd = [
             str(executable),
             "-m",
@@ -232,7 +239,7 @@ class DependencyCompiler:
         executable: PathLike = sys.executable,
         extraUrl: Optional[str] = None,
         index_strategy: str = "unsafe-best-match",
-    ) -> subprocess.CompletedProcess[Any]:
+    ) -> None:
         cmd = [
             str(executable),
             "-m",
@@ -262,7 +269,7 @@ class DependencyCompiler:
         out: Optional[PathLike] = None,
         reqs: Optional[list[str]] = None,
         reqFile: Optional[list[PathLike]] = None,
-    ) -> subprocess.CompletedProcess[Any]:
+    ) -> None:
         """For now, the `download` cmd has no uv support, so use pip"""
         cmd = [
             str(executable),
@@ -298,7 +305,7 @@ class DependencyCompiler:
         out: Optional[PathLike] = None,
         reqs: Optional[list[str]] = None,
         reqFile: Optional[list[PathLike]] = None,
-    ) -> subprocess.CompletedProcess[Any]:
+    ) -> None:
         """For now, the `wheel` cmd has no uv support, so use pip"""
         cmd = [
             str(executable),
@@ -480,20 +487,20 @@ class DependencyCompiler:
     def install_deps(self):
         DependencyCompiler.Install(
             cwd=self.cwd,
-            reqFile=[self.out],
             executable=self.executable,
             extra_index_url=self.gpuUrl,
             override=self.override,
+            reqFile=[self.out],
         )
 
     def install_dists(self):
         DependencyCompiler.Install(
             cwd=self.cwd,
-            reqFile=[self.out],
             executable=self.executable,
             find_links=[self.outDir / "dists"],
             no_deps=True,
             no_index=True,
+            reqFile=[self.out],
         )
 
     def install_wheels(self):

{comfy_cli-1.2.2 → comfy_cli-1.2.4}/comfy_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: comfy-cli
-Version: 1.2.2
+Version: 1.2.4
 Summary: A CLI tool for installing and using ComfyUI.
 Maintainer-email: Yoland Yan <yoland@drip.art>, James Kwon <hongilkwon316@gmail.com>, Robin Huang <robin@drip.art>, "Dr.Lt.Data" <dr.lt.data@gmail.com>
 License: GPL-3.0-only
@@ -26,7 +26,7 @@ Requires-Dist: rich
 Requires-Dist: tomlkit
 Requires-Dist: typer>=0.9.0
 Requires-Dist: typing-extensions>=4.7.0
-Requires-Dist: uv
+Requires-Dist: uv<=0.4.0
 Requires-Dist: websocket-client
 Requires-Dist: semver~=3.0.2
 Provides-Extra: dev

{comfy_cli-1.2.2 → comfy_cli-1.2.4}/comfy_cli.egg-info/requires.txt

@@ -12,7 +12,7 @@ rich
 tomlkit
 typer>=0.9.0
 typing-extensions>=4.7.0
-uv
+uv<=0.4.0
 websocket-client
 semver~=3.0.2
 

{comfy_cli-1.2.2 → comfy_cli-1.2.4}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "comfy-cli"
 license = { text = "GPL-3.0-only" }
-version = "v1.2.2"                                            # Will be filled in by the CI/CD pipeline. Check publish_package.py.
+version = "v1.2.4"                                            # Will be filled in by the CI/CD pipeline. Check publish_package.py.
 requires-python = ">= 3.9"
 description = "A CLI tool for installing and using ComfyUI."
 readme = "README.md"
@@ -39,7 +39,7 @@ dependencies = [
     "tomlkit",
     "typer>=0.9.0",
     "typing-extensions>=4.7.0",
-    "uv",
+    "uv<=0.4.0",
     "websocket-client",
     "semver~=3.0.2",
 ]
@@ -61,7 +61,7 @@ include = ["comfy_cli*"]
 
 [tool.ruff]
 line-length = 120
-target-version = "v1.2.2"
+target-version = "v1.2.4"
 
 [tool.ruff.lint]
 select = [