chore: update all the changes to upstream.

.devcontainer/post-create.sh

@@ -5,7 +5,7 @@ cd /workspace/comfystream
 
 # Install Comfystream in editable mode.
 echo -e "\e[32mInstalling Comfystream in editable mode...\e[0m"
-/workspace/miniconda3/envs/comfystream/bin/python3 -m pip install -e . --root-user-action=ignore > /dev/null
+/workspace/miniconda3/envs/comfystream/bin/python3 -m pip install -e .[server] -c src/comfystream/scripts/constraints.txt --root-user-action=ignore > /dev/null
 
 # Install npm packages if needed
 if [ ! -d "/workspace/comfystream/ui/node_modules" ]; then

.editorconfig

@@ -13,7 +13,9 @@ insert_final_newline = true
 insert_final_newline = unset
 
 [*.py]
+indent_style = space
 indent_size = 4
+trim_trailing_whitespace = false
 
 [workflows/comfy*/*.json]
 insert_final_newline = unset

.github/workflows/docker.yaml

@@ -27,7 +27,7 @@ jobs:
     runs-on: [self-hosted, linux, gpu]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -93,7 +93,7 @@ jobs:
     runs-on: [self-hosted, linux, amd64]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/opencv-cuda-artifact.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
@@ -101,7 +101,7 @@ jobs:
           rm -rf test-extract
 
       - name: Upload OpenCV CUDA Release Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: opencv-cuda-release-python${{ env.PYTHON_VERSION }}-cuda${{ env.CUDA_VERSION }}-${{ github.sha }}
           path: |
@@ -141,7 +141,7 @@ jobs:
           EOF
 
       - name: Upload Release Info
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: release-info-python${{ env.PYTHON_VERSION }}-cuda${{ env.CUDA_VERSION }}-${{ github.sha }}
           path: release-info.txt
@@ -155,22 +155,22 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: opencv-cuda-release-python${{ env.PYTHON_VERSION }}-cuda${{ env.CUDA_VERSION }}-${{ github.sha }}
           path: ./artifacts
 
       - name: Download release info
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: release-info-python${{ env.PYTHON_VERSION }}-cuda${{ env.CUDA_VERSION }}-${{ github.sha }}
           path: ./artifacts
 
       - name: Create Release Draft
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: opencv-cuda-v${{ env.PYTHON_VERSION }}-${{ env.CUDA_VERSION }}-${{ github.run_number }}
           name: OpenCV CUDA Release - Python ${{ env.PYTHON_VERSION }} CUDA ${{ env.CUDA_VERSION }}

.github/workflows/publish-comfyui-node.yaml

@@ -0,0 +1,26 @@
+name: Publish ComfyUI Custom Node
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  issues: write
+
+jobs:
+  publish-comfyui-node:
+    name: Publish Custom Node to ComfyUI registry
+    runs-on: ubuntu-latest
+    # Ensure this only runs on main branch
+    if: ${{ github.ref == 'refs/heads/main' }}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+        with:
+          submodules: true
+
+      - name: Publish Custom Node
+        uses: Comfy-Org/publish-node-action@v1
+        with:
+          ## Add your own personal access token to your Github Repository secrets and reference it here.
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

.github/workflows/release.yaml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: 18
           cache: npm
@@ -38,7 +38,7 @@ jobs:
           cd -
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: release-artifacts
           path: releases/

.github/workflows/test.yaml

@@ -19,28 +19,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: typescript,javascript,python
           config-file: ./.github/codeql-config.yaml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
 
 
   editorconfig:
     name: Run editorconfig checker
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           # Check https://github.com/livepeer/go-livepeer/pull/1891
           # for ref value discussion
@@ -59,14 +59,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           # Check https://github.com/livepeer/go-livepeer/pull/1891
           # for ref value discussion
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
           cache: pip

.husky/pre-commit

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd ui && npx lint-staged
+

__init__.py

@@ -4,4 +4,4 @@
 # Import and expose node classes
 from .nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
 
-__all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS']
+__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]

benchmark.py

@@ -1,15 +1,16 @@
-import av
+import argparse
+import asyncio
 import json
-import time
-import torch
 import logging
-import asyncio
-import argparse
+import time
+
+import av
 import numpy as np
+import torch
 
 from comfystream.client import ComfyStreamClient
 
-logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s')
+logging.basicConfig(format="%(asctime)s - %(levelname)s - %(message)s")
 logger = logging.getLogger()
 
 
@@ -22,14 +23,30 @@ def create_dummy_video_frame(width, height):
 
 async def main():
     parser = argparse.ArgumentParser(description="Benchmark ComfyStreamClient workflow execution.")
-    parser.add_argument("--workflow-path", default="./workflows/comfystream/tensor-utils-example-api.json", help="Path to the workflow JSON file.")
+    parser.add_argument(
+        "--workflow-path",
+        default="./workflows/comfystream/tensor-utils-example-api.json",
+        help="Path to the workflow JSON file.",
+    )
     parser.add_argument("--num-requests", type=int, default=100, help="Number of requests to send.")
-    parser.add_argument("--fps", type=float, default=None, help="Frames per second for FPS-based benchmarking.")
-    parser.add_argument("--cwd", default="/workspace/ComfyUI", help="Current working directory for ComfyStreamClient.")
+    parser.add_argument(
+        "--fps", type=float, default=None, help="Frames per second for FPS-based benchmarking."
+    )
+    parser.add_argument(
+        "--cwd",
+        default="/workspace/ComfyUI",
+        help="Current working directory for ComfyStreamClient.",
+    )
     parser.add_argument("--width", type=int, default=512, help="Width of dummy video frames.")
     parser.add_argument("--height", type=int, default=512, help="Height of dummy video frames.")
-    parser.add_argument("--verbose", action="store_true", help="Enable verbose logging (shows progress for each request).")
-    parser.add_argument("--warmup-runs", type=int, default=5, help="Number of warm-up runs before benchmarking.")
+    parser.add_argument(
+        "--verbose",
+        action="store_true",
+        help="Enable verbose logging (shows progress for each request).",
+    )
+    parser.add_argument(
+        "--warmup-runs", type=int, default=5, help="Number of warm-up runs before benchmarking."
+    )
 
     args = parser.parse_args()
 
@@ -44,7 +61,9 @@ async def main():
     client = ComfyStreamClient(cwd=args.cwd)
     await client.set_prompts([prompt])
 
-    logger.info(f"Starting benchmark with workflow: {args.workflow_path}, requests: {args.num_requests}, resolution: {args.width}x{args.height}, warmup runs: {args.warmup_runs}")
+    logger.info(
+        f"Starting benchmark with workflow: {args.workflow_path}, requests: {args.num_requests}, resolution: {args.width}x{args.height}, warmup runs: {args.warmup_runs}"
+    )
 
     if args.warmup_runs > 0:
         logger.info(f"Running {args.warmup_runs} warm-up runs...")
@@ -66,11 +85,13 @@ async def main():
             await client.get_video_output()
             request_end_time = time.time()
             round_trip_times.append(request_end_time - request_start_time)
-            logger.debug(f"Request {i+1}/{args.num_requests} completed in {round_trip_times[-1]:.4f} seconds")
+            logger.debug(
+                f"Request {i + 1}/{args.num_requests} completed in {round_trip_times[-1]:.4f} seconds"
+            )
 
         end_time = time.time()
         total_time = end_time - start_time
-        output_fps = args.num_requests / total_time if total_time > 0 else float('inf')
+        output_fps = args.num_requests / total_time if total_time > 0 else float("inf")
 
         # Calculate percentiles for sequential mode
         p50_rtt = np.percentile(round_trip_times, 50)
@@ -79,17 +100,17 @@ async def main():
         p95_rtt = np.percentile(round_trip_times, 95)
         p99_rtt = np.percentile(round_trip_times, 99)
 
-        print("\n" + "="*40)
+        print("\n" + "=" * 40)
         print("FPS Results:")
-        print("="*40)
+        print("=" * 40)
         print(f"Total requests: {args.num_requests}")
         print(f"Total time:     {total_time:.4f} seconds")
         print(f"Actual Output FPS:{output_fps:.2f}")
         print(f"Total requests:   {args.num_requests}")
         print(f"Total time:       {total_time:.4f} seconds")
-        print("\n" + "="*40)
+        print("\n" + "=" * 40)
         print("Latency Results:")
-        print("="*40)
+        print("=" * 40)
         print(f"Average: {np.mean(round_trip_times):.4f}")
         print(f"Min:     {np.min(round_trip_times):.4f}")
         print(f"Max:     {np.max(round_trip_times):.4f}")
@@ -99,7 +120,6 @@ async def main():
         print(f"P95:     {p95_rtt:.4f}")
         print(f"P99:     {p99_rtt:.4f}")
 
-
     else:
         # This is mainly used to stress test the ComfyUI client, gives us a good idea on how frame skipping etc is working on the client end.
         logger.info(f"Running FPS-based benchmark at {args.fps} FPS...")
@@ -118,9 +138,11 @@ async def collect_outputs_task():
 
                     last_output_receive_time = time.time()
                     received_frames_count += 1
-                    logger.debug(f"Received output frame {received_frames_count} at {last_output_receive_time - start_time:.4f} seconds")
+                    logger.debug(
+                        f"Received output frame {received_frames_count} at {last_output_receive_time - start_time:.4f} seconds"
+                    )
                 except asyncio.TimeoutError:
-                    logger.debug(f"Output collection task timed out after waiting for 5 seconds.")
+                    logger.debug("Output collection task timed out after waiting for 5 seconds.")
                     break
                 except Exception as e:
                     logger.debug(f"Output collection task finished due to exception: {e}")
@@ -140,7 +162,9 @@ async def collect_outputs_task():
             request_send_time = time.time()
             client.put_video_input(frame)
 
-            logger.debug(f"Sent request {i+1}/{args.num_requests} at {request_send_time - start_time:.4f} seconds")
+            logger.debug(
+                f"Sent request {i + 1}/{args.num_requests} at {request_send_time - start_time:.4f} seconds"
+            )
 
         await output_collector_task
 
@@ -150,16 +174,16 @@ async def collect_outputs_task():
         elif received_frames_count == 0:
             output_fps = 0.0
         else:
-             output_fps = float('inf')
+            output_fps = float("inf")
 
-        print("\n" + "="*40)
+        print("\n" + "=" * 40)
         print("FPS Results:")
-        print("="*40)
+        print("=" * 40)
         print(f"Target Input FPS: {args.fps:.2f}")
         print(f"Actual Output FPS:{output_fps:.2f} ({received_frames_count} frames received)")
         print(f"Total requests:   {args.num_requests}")
         print(f"Total time:       {last_output_receive_time - start_time:.4f} seconds")
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    asyncio.run(main())

configs/nodes.yaml

@@ -5,8 +5,6 @@ nodes:
     url: "https://github.com/yondonfu/ComfyUI_TensorRT.git"
     branch: "quantization_with_controlnet_fixes"
     type: "tensorrt"
-    dependencies:
-      - "tensorrt==10.12.0.36"
 
   comfyui-depthanything-tensorrt:
     name: "ComfyUI DepthAnything TensorRT"

docker/Dockerfile

@@ -1,6 +1,6 @@
 ARG	BASE_IMAGE=livepeer/comfyui-base:latest
 
-FROM	${BASE_IMAGE}
+FROM ${BASE_IMAGE}
 
 ENV	PATH="/workspace/miniconda3/bin:${PATH}" \
 	NVM_DIR=/root/.nvm \