update ruff, enable PyUpgrade rule (#303)

Author: bigcat88

.github/.codecov.yml

@@ -1,11 +1,11 @@
+codecov:
+  allow_coverage_offsets: true  # Avoid "Missing base report" due to committing with "[CI skip]"
+
 comment:
-  require_changes: true
   layout: "diff, files"
 
 coverage:
   status:
     project:
       default:
-        target: auto
-        threshold: 1%
-    patch: off
+        threshold: 0.5%

.github/workflows/pytest.yml

@@ -33,10 +33,11 @@ jobs:
           pytest --cov=comfy_cli --cov-report=xml .
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml
           flags: unittests
           name: codecov-umbrella
           fail_ci_if_error: true
+          verbose: true

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
           (^.*\.(json|txt)$)
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.1
+    rev: v0.12.4
     hooks:
       # Run the linter.
       - id: ruff

comfy_cli/cmdline.py

@@ -2,13 +2,12 @@
 import subprocess
 import sys
 import webbrowser
-from typing import Optional
+from typing import Annotated, Optional
 
 import questionary
 import typer
 from rich import print as rprint
 from rich.console import Console
-from typing_extensions import Annotated, List
 
 from comfy_cli import constants, env_checker, logging, tracking, ui, utils
 from comfy_cli.command import custom_nodes
@@ -487,7 +486,7 @@ def stop():
 @tracking.track_command()
 def launch(
     background: Annotated[bool, typer.Option(help="Launch ComfyUI in background")] = False,
-    extra: List[str] = typer.Argument(None),
+    extra: list[str] = typer.Argument(None),
 ):
     launch_command(background, extra)
 

comfy_cli/command/custom_nodes/bisect_custom_nodes.py

@@ -3,10 +3,9 @@
 import json
 import os
 from pathlib import Path
-from typing import Literal, NamedTuple
+from typing import Annotated, Literal, NamedTuple
 
 import typer
-from typing_extensions import Annotated
 
 from comfy_cli.command.custom_nodes.cm_cli_util import execute_cm_cli
 from comfy_cli.command.launch import launch as launch_command

comfy_cli/command/custom_nodes/command.py

@@ -4,12 +4,11 @@
 import subprocess
 import sys
 import uuid
-from typing import Optional
+from typing import Annotated, Optional
 
 import typer
 from rich import print
 from rich.console import Console
-from typing_extensions import Annotated, List
 
 from comfy_cli import logging, tracking, ui, utils
 from comfy_cli.command.custom_nodes.bisect_custom_nodes import bisect_app
@@ -151,7 +150,7 @@ def execute_install_script(repo_path):
         # import pdb
         # pdb.set_trace()
         print("Install: pip packages")
-        with open(requirements_path, "r", encoding="utf-8") as requirements_file:
+        with open(requirements_path, encoding="utf-8") as requirements_file:
             for line in requirements_file:
                 # From Yoland: disable pip override
                 # package_name = remap_pip_package(line.strip())
@@ -269,7 +268,7 @@ def node_completer(incomplete: str) -> list[str]:
         config_manager = ConfigManager()
         tmp_path = os.path.join(config_manager.get_config_path(), "tmp", "node-cache.list")
 
-        with open(tmp_path, "r", encoding="UTF-8", errors="ignore") as cache_file:
+        with open(tmp_path, encoding="UTF-8", errors="ignore") as cache_file:
             return [node_id for node_id in cache_file.readlines() if node_id.startswith(incomplete)]
 
     except Exception:
@@ -285,7 +284,7 @@ def node_or_all_completer(incomplete: str) -> list[str]:
         if "all".startswith(incomplete):
             all_opt = ["all"]
 
-        with open(tmp_path, "r", encoding="UTF-8", errors="ignore") as cache_file:
+        with open(tmp_path, encoding="UTF-8", errors="ignore") as cache_file:
             return [node_id for node_id in cache_file.readlines() if node_id.startswith(incomplete)] + all_opt
 
     except Exception:
@@ -384,7 +383,7 @@ def simple_show(
 @app.command(help="Install custom nodes")
 @tracking.track_command("node")
 def install(
-    nodes: List[str] = typer.Argument(..., help="List of custom nodes to install", autocompletion=node_completer),
+    nodes: list[str] = typer.Argument(..., help="List of custom nodes to install", autocompletion=node_completer),
     channel: Annotated[
         Optional[str],
         typer.Option(
@@ -431,7 +430,7 @@ def install(
 @app.command(help="Reinstall custom nodes")
 @tracking.track_command("node")
 def reinstall(
-    nodes: List[str] = typer.Argument(..., help="List of custom nodes to reinstall", autocompletion=node_completer),
+    nodes: list[str] = typer.Argument(..., help="List of custom nodes to reinstall", autocompletion=node_completer),
     channel: Annotated[
         Optional[str],
         typer.Option(
@@ -466,7 +465,7 @@ def reinstall(
 @app.command(help="Uninstall custom nodes")
 @tracking.track_command("node")
 def uninstall(
-    nodes: List[str] = typer.Argument(..., help="List of custom nodes to uninstall", autocompletion=node_completer),
+    nodes: list[str] = typer.Argument(..., help="List of custom nodes to uninstall", autocompletion=node_completer),
     channel: Annotated[
         Optional[str],
         typer.Option(
@@ -512,7 +511,7 @@ def update_node_id_cache():
 @app.command(help="Update custom nodes or ComfyUI")
 @tracking.track_command("node")
 def update(
-    nodes: List[str] = typer.Argument(
+    nodes: list[str] = typer.Argument(
         ...,
         help="[all|List of custom nodes to update]",
         autocompletion=node_or_all_completer,
@@ -541,7 +540,7 @@ def update(
 @app.command(help="Disable custom nodes")
 @tracking.track_command("node")
 def disable(
-    nodes: List[str] = typer.Argument(
+    nodes: list[str] = typer.Argument(
         ...,
         help="[all|List of custom nodes to disable]",
         autocompletion=node_or_all_completer,
@@ -568,7 +567,7 @@ def disable(
 @app.command(help="Enable custom nodes")
 @tracking.track_command("node")
 def enable(
-    nodes: List[str] = typer.Argument(
+    nodes: list[str] = typer.Argument(
         ...,
         help="[all|List of custom nodes to enable]",
         autocompletion=node_or_all_completer,
@@ -595,7 +594,7 @@ def enable(
 @app.command(help="Fix dependencies of custom nodes")
 @tracking.track_command("node")
 def fix(
-    nodes: List[str] = typer.Argument(
+    nodes: list[str] = typer.Argument(
         ...,
         help="[all|List of custom nodes to fix]",
         autocompletion=node_or_all_completer,

comfy_cli/command/install.py

@@ -2,7 +2,7 @@
 import platform
 import subprocess
 import sys
-from typing import Dict, List, Optional, TypedDict
+from typing import Optional, TypedDict
 from urllib.parse import urlparse
 
 import requests
@@ -389,7 +389,7 @@ def handle_github_rate_limit(response):
         raise GitHubRateLimitError(message)
 
 
-def fetch_github_releases(repo_owner: str, repo_name: str) -> List[Dict[str, str]]:
+def fetch_github_releases(repo_owner: str, repo_name: str) -> list[dict[str, str]]:
     """
     Fetch the list of releases from the GitHub API.
     Handles rate limiting by logging the wait time.
@@ -425,11 +425,11 @@ class GithubRelease(TypedDict):
     download_url: str
 
 
-def parse_releases(releases: List[Dict[str, str]]) -> List[GithubRelease]:
+def parse_releases(releases: list[dict[str, str]]) -> list[GithubRelease]:
     """
     Parse the list of releases fetched from the GitHub API into a list of GithubRelease objects.
     """
-    parsed_releases: List[GithubRelease] = []
+    parsed_releases: list[GithubRelease] = []
     for release in releases:
         tag = release["tag_name"]
         if tag.lower() in ["latest", "nightly"]:
@@ -441,7 +441,7 @@ def parse_releases(releases: List[Dict[str, str]]) -> List[GithubRelease]:
     return parsed_releases
 
 
-def select_version(releases: List[GithubRelease], version: str) -> Optional[GithubRelease]:
+def select_version(releases: list[GithubRelease], version: str) -> Optional[GithubRelease]:
     """
     Given a list of Github releases, select the release that matches the specified version.
     """

comfy_cli/command/models/models.py

@@ -1,13 +1,12 @@
 import os
 import pathlib
 import sys
-from typing import List, Optional, Tuple
+from typing import Annotated, Optional
 from urllib.parse import unquote, urlparse
 
 import requests
 import typer
 from rich import print
-from typing_extensions import Annotated
 
 from comfy_cli import constants, tracking, ui
 from comfy_cli.config_manager import ConfigManager
@@ -39,7 +38,7 @@ def potentially_strip_param_url(path_name: str) -> str:
     return path_name
 
 
-def check_huggingface_url(url: str) -> Tuple[bool, Optional[str], Optional[str], Optional[str], Optional[str]]:
+def check_huggingface_url(url: str) -> tuple[bool, Optional[str], Optional[str], Optional[str], Optional[str]]:
     """
     Check if the given URL is a Hugging Face URL and extract relevant information.
 
@@ -76,7 +75,7 @@ def check_huggingface_url(url: str) -> Tuple[bool, Optional[str], Optional[str],
     return True, repo_id, filename, folder_name, branch_name
 
 
-def check_civitai_url(url: str) -> Tuple[bool, bool, int, int]:
+def check_civitai_url(url: str) -> tuple[bool, bool, int, int]:
     """
     Returns:
         is_civitai_model_url: True if the url is a civitai model url
@@ -314,7 +313,7 @@ def remove(
         help="The relative path from the current workspace where the models are stored.",
         show_default=True,
     ),
-    model_names: Optional[List[str]] = typer.Option(
+    model_names: Optional[list[str]] = typer.Option(
         None,
         help="List of model filenames to delete, separated by spaces",
         show_default=False,

comfy_cli/command/run.py

@@ -98,7 +98,7 @@ def get_renderables(self):
         )
 
         for task in self.tasks:
-            percent = "[progress.percentage]{task.percentage:>3.0f}%".format(task=task)
+            percent = "[progress.percentage]{task.percentage:>3.0f}%".format(task=task)  # noqa
             if task.fields.get("progress_type") == "overall":
                 overall_table = Table.grid(*table_columns, padding=(0, 1), expand=self.expand)
                 overall_table.add_row(BarColumn().render(task), percent, TimeElapsedColumn().render(task))

comfy_cli/config_manager.py

@@ -1,17 +1,17 @@
 import configparser
 import os
 from importlib.metadata import version
-from typing import Optional, Tuple
+from typing import Optional
 
 from comfy_cli import constants, logging
 from comfy_cli.utils import get_os, is_running, singleton
 
 
 @singleton
-class ConfigManager(object):
+class ConfigManager:
     def __init__(self):
         self.config = configparser.ConfigParser()
-        self.background: Optional[Tuple[str, int, int]] = None
+        self.background: Optional[tuple[str, int, int]] = None
         self.load()
 
     @staticmethod