comfy-cli 1.3.2__tar.gz → 1.3.4__tar.gz

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: comfy-cli
-Version: 1.3.2
+Version: 1.3.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
@@ -34,6 +34,7 @@ Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 
 # Comfy-Cli: A Command Line Tool for ComfyUI
 

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/comfy_cli/cmdline.py

@@ -198,7 +198,7 @@ def install(
             callback=g_gpu_exclusivity.validate,
         ),
     ] = None,
-    cuda_version: Annotated[CUDAVersion, typer.Option(show_default=True)] = CUDAVersion.v12_1,
+    cuda_version: Annotated[CUDAVersion, typer.Option(show_default=True)] = CUDAVersion.v12_4,
     amd: Annotated[
         Optional[bool],
         typer.Option(

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/comfy_cli/command/custom_nodes/command.py

@@ -706,13 +706,17 @@ def validate_node_for_publishing():
     typer.echo("Running security checks...")
     try:
         # Run ruff check with security rules and --exit-zero to only warn
-        cmd = ["ruff", "check", ".", "-q", "--select", "S102,S307", "--exit-zero"]
+        cmd = ["ruff", "check", ".", "-q", "--select", "S102,S307,E702", "--exit-zero"]
         result = subprocess.run(cmd, capture_output=True, text=True)
 
         if result.stdout:
             print("[yellow]Security warnings found:[/yellow]")
             print(result.stdout)
-            print("[bold yellow]We will soon disable exec and eval, so this will be an error soon.[/bold yellow]")
+            print(
+                "[bold yellow]We will soon disable exec and eval, and multiple statements in a single line, so this will be an error soon.[/bold yellow]"
+            )
+        else:
+            print("[green]✓ All validation checks passed successfully[/green]")
 
     except FileNotFoundError:
         print("[red]Ruff is not installed. Please install it with 'pip install ruff'[/red]")
@@ -731,7 +735,7 @@ def validate():
     Run validation checks that would be performed during publishing.
     """
     validate_node_for_publishing()
-    print("[green]✓ All validation checks passed successfully[/green]")
+    # print("[green]✓ All validation checks passed successfully[/green]")
 
 
 @app.command("publish", help="Publish node to registry")

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/comfy_cli/command/install.py

@@ -68,7 +68,12 @@ def pip_install_comfyui_dependencies(
                 "torchvision",
                 "torchaudio",
             ]
-            if plat == constants.OS.WINDOWS and cuda_version == constants.CUDAVersion.v12_1:
+            if plat == constants.OS.WINDOWS and cuda_version == constants.CUDAVersion.v12_4:
+                base_command += [
+                    "--extra-index-url",
+                    "https://download.pytorch.org/whl/cu124",
+                ]
+            elif plat == constants.OS.WINDOWS and cuda_version == constants.CUDAVersion.v12_1:
                 base_command += [
                     "--extra-index-url",
                     "https://download.pytorch.org/whl/cu121",
@@ -159,7 +164,7 @@ def execute(
     commit: Optional[str] = None,
     manager_commit: Optional[str] = None,
     gpu: constants.GPU_OPTION = None,
-    cuda_version: constants.CUDAVersion = constants.CUDAVersion.v12_1,
+    cuda_version: constants.CUDAVersion = constants.CUDAVersion.v12_4,
     plat: constants.OS = None,
     skip_torch_or_directml: bool = False,
     skip_requirement: bool = False,

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/comfy_cli/constants.py

@@ -60,6 +60,7 @@ COMFY_ORIGIN_URL_CHOICES = [
 
 
 class CUDAVersion(str, Enum):
+    v12_4 = "12.4"
     v12_1 = "12.1"
     v11_8 = "11.8"
 

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/comfy_cli/file_utils.py

@@ -6,7 +6,6 @@ from typing import Optional
 
 import httpx
 import requests
-from pathspec import pathspec
 
 from comfy_cli import ui
 
@@ -90,15 +89,26 @@ def download_file(url: str, local_filepath: pathlib.Path, headers: Optional[dict
 
 
 def zip_files(zip_filename):
-    gitignore_path = ".gitignore"
-    if not os.path.exists(gitignore_path):
-        print(f"No .gitignore file found in {os.getcwd()}, proceeding without it.")
-        gitignore = ""
-    else:
-        with open(gitignore_path, "r") as file:
-            gitignore = file.read()
+    """
+    Zip all files in the current directory that are tracked by git.
+    """
+    try:
+        # Get list of git-tracked files using git ls-files
+        import subprocess
 
-    spec = pathspec.PathSpec.from_lines("gitwildmatch", gitignore.splitlines())
+        git_files = subprocess.check_output(["git", "ls-files"], text=True).splitlines()
+        # Zip only git-tracked files
+        with zipfile.ZipFile(zip_filename, "w", zipfile.ZIP_DEFLATED) as zipf:
+            for file_path in git_files:
+                if zip_filename in file_path:
+                    continue
+                if os.path.exists(file_path):
+                    zipf.write(file_path)
+                else:
+                    print(f"File not found. Not including in zip: {file_path}")
+        return
+    except (subprocess.SubprocessError, FileNotFoundError):
+        print("Warning: Not in a git repository or git not installed. Zipping all files.")
 
     with zipfile.ZipFile(zip_filename, "w", zipfile.ZIP_DEFLATED) as zipf:
         for root, dirs, files in os.walk("."):
@@ -110,14 +120,13 @@ def zip_files(zip_filename):
                 if zip_filename in file_path:
                     continue
                 relative_path = os.path.relpath(file_path, start=".")
-                if not spec.match_file(relative_path):
-                    zipf.write(file_path, relative_path)
+                zipf.write(file_path, relative_path)
 
 
 def upload_file_to_signed_url(signed_url: str, file_path: str):
     try:
         with open(file_path, "rb") as f:
-            headers = {"Content-Type": "application/gzip"}
+            headers = {"Content-Type": "application/zip"}
             response = requests.put(signed_url, data=f, headers=headers)
 
             # Simple success check

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/comfy_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: comfy-cli
-Version: 1.3.2
+Version: 1.3.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
@@ -34,6 +34,7 @@ Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 
 # Comfy-Cli: A Command Line Tool for ComfyUI
 

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/comfy_cli.egg-info/requires.txt

@@ -21,3 +21,4 @@ semver~=3.0.2
 pre-commit
 pytest
 ruff
+pytest-cov

{comfy_cli-1.3.2 → comfy_cli-1.3.4}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "comfy-cli"
 license = { text = "GPL-3.0-only" }
-version = "v1.3.2"                                            # Will be filled in by the CI/CD pipeline. Check publish_package.py.
+version = "v1.3.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"
@@ -46,7 +46,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["pre-commit", "pytest", "ruff"]
+dev = ["pre-commit", "pytest", "ruff", "pytest-cov"]
 
 [project.scripts]
 comfy = "comfy_cli.__main__:main"
@@ -62,7 +62,7 @@ include = ["comfy_cli*"]
 
 [tool.ruff]
 line-length = 120
-target-version = "v1.3.2"
+target-version = "v1.3.4"
 
 [tool.ruff.lint]
 select = [