Merge pull request #211 from livepeer/main

release: sync commits to upstream

Author: eliteprox

.devcontainer/devcontainer.json

@@ -17,7 +17,7 @@
 				"python.defaultInterpreterPath": "/workspace/miniconda3/envs/comfystream/bin/python",
 				"python.venvPath": "/workspace/miniconda3/envs",
 				"python.terminal.activateEnvInCurrentTerminal": false,
-				"python.terminal.activateEnvironment": true,
+				"python.terminal.activateEnvironment": false,
 				"terminal.integrated.shellIntegration.enabled": true
 			},
 			"extensions": [

.editorconfig

@@ -9,6 +9,19 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[.gitignore]
+insert_final_newline = unset
+
+[*.py]
+indent_size = 4
+
+[workflows/comfy*/*.json]
+insert_final_newline = unset
+
 [Dockerfile*]
-indent_style = tab
-indent_size = 8
+indent_size = 4
+
+[*.{md,txt,mkdn}]
+indent_size = 4
+indent_size = unset
+trim_trailing_whitespace = false

.github/codeql-config.yaml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - "docker/"

.github/workflows/comfyui-base.yaml

@@ -2,19 +2,13 @@ name: Build and push comfyui-base docker image
 
 on:
   pull_request:
-    paths:
-      - docker/Dockerfile.base
-      - src/comfystream/scripts/
-      - configs/
-      - .github/workflows/comfyui-base.yaml
+    paths-ignore:
+      - "ui/*"
     branches:
       - main
   push:
-    paths:
-      - docker/Dockerfile.base
-      - src/comfystream/scripts/
-      - configs/
-      - .github/workflows/comfyui-base.yaml
+    paths-ignore:
+      - "ui/*"
     branches:
       - main
     tags:

.github/workflows/test.yaml

@@ -0,0 +1,86 @@
+name: Test project
+
+on:
+  pull_request:
+    branches:
+      - "main"
+  push:
+    branches:
+      - "main"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  codeql:
+    name: Perform CodeQL analysis
+    if: ${{ github.repository == 'livepeer/comfystream' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        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
+        with:
+          languages: typescript,javascript,python
+          config-file: ./.github/codeql-config.yaml
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+
+
+  editorconfig:
+    name: Run editorconfig checker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          # Check https://github.com/livepeer/go-livepeer/pull/1891
+          # for ref value discussion
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Install editorconfig-checker
+        uses: editorconfig-checker/action-editorconfig-checker@main
+
+      - name: Run editorconfig checker against the repo
+        if: false
+        # disabled editorconfig lint rule for now
+        run: editorconfig-checker --format github-actions
+
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        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
+        with:
+          python-version: '3.11'
+          cache: pip
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install '.[dev]'
+
+      - name: Run tests
+        run: pytest --cov --verbose --showlocals
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CI_CODECOV_TOKEN }}
+          name: ${{ github.event.repository.name }}

.gitignore

@@ -2,8 +2,8 @@ __pycache__
 *.egg-info
 build
 .DS_STORE
-comfyui/
-ComfyUI/
+./comfyui/
+./ComfyUI/
 cuda_temp
 
 # VS Code settings
@@ -22,3 +22,6 @@ launch.json
 nodes/web/static/*
 .cursor/
 !nodes/web/static/.gitkeep
+
+# opencv files
+opencv

configs/models.yaml

@@ -16,11 +16,15 @@ models:
       - url: "https://huggingface.co/aaronb/dreamshaper-8-dmd-1kstep/raw/main/config.json"
         path: "unet/dreamshaper-8-dmd-1kstep.json"
 
-  # Depth Anything ONNX model
+  # Depth Anything V2 ONNX models
   depthanything-onnx:
     name: "DepthAnything ONNX"
     url: "https://huggingface.co/yuvraj108c/Depth-Anything-2-Onnx/resolve/main/depth_anything_v2_vitb.onnx?download=true"
     path: "tensorrt/depth-anything/depth_anything_vitl14.onnx"
+  depth-anything-v2-large-onnx:
+    name: "DepthAnything V2 Large ONNX"
+    url: "https://huggingface.co/yuvraj108c/Depth-Anything-2-Onnx/resolve/main/depth_anything_v2_vitl.onnx?download=true"
+    path: "tensorrt/depth-anything/depth_anything_v2_vitl.onnx"
 
   # TAESD models
   taesd:
@@ -68,4 +72,4 @@ models:
     name: "ClipTextModel"
     url: "https://huggingface.co/Lykon/dreamshaper-8/resolve/main/text_encoder/model.fp16.safetensors"
     path: "text_encoders/CLIPText/model.fp16.safetensors"
-    type: "text_encoder"
+    type: "text_encoder"

configs/nodes.yaml

@@ -11,7 +11,8 @@ nodes:
 
   comfyui-depthanything-tensorrt:
     name: "ComfyUI DepthAnything TensorRT"
-    url: "https://github.com/yuvraj108c/ComfyUI-Depth-Anything-Tensorrt"
+    url: "https://github.com/rickstaa/ComfyUI-Depth-Anything-Tensorrt"
+    branch: "feature/add-export-trt-args"
     type: "tensorrt"
 
   # Ryan's nodes
@@ -73,5 +74,5 @@ nodes:
   comfyui-stream-pack:
     name: "ComfyUI Stream Pack"
     url: "https://github.com/livepeer/ComfyUI-Stream-Pack"
-    branch: "expose_feature_bank_to_comfyui"
-    type: "utility"
+    branch: "main"
+    type: "utility"

docker/Dockerfile

@@ -23,7 +23,6 @@ RUN	bash -c "source $NVM_DIR/nvm.sh && \
 ENV	NODE_PATH="$NVM_DIR/v$NODE_VERSION/lib/node_modules" \
 	PATH="$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH"
 
-RUN	conda init bash
 
 # Create the supervisor configuration file for ComfyUI and ComfyStream
 COPY	docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf

docker/Dockerfile.base

@@ -27,19 +27,15 @@ RUN mkdir -p /workspace/comfystream && \
     wget "https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh" -O /tmp/miniconda.sh && \
     bash /tmp/miniconda.sh -b -p /workspace/miniconda3 && \
     eval "$(/workspace/miniconda3/bin/conda shell.bash hook)" && \
-    conda create -n comfystream python="${PYTHON_VERSION}" -y && \
-    rm /tmp/miniconda.sh && \
-    conda run -n comfystream --no-capture-output pip install aiortc aiohttp requests tqdm pyyaml --root-user-action=ignore
+    conda create -n comfystream python="${PYTHON_VERSION}" ffmpeg=6 -c conda-forge -y && \
+    rm /tmp/miniconda.sh && echo 'export LD_LIBRARY_PATH=/workspace/miniconda3/envs/comfystream/lib:$LD_LIBRARY_PATH' >> ~/.bashrc
 
 # Clone ComfyUI
-ADD --link https://github.com/comfyanonymous/ComfyUI.git /workspace/ComfyUI
+RUN git clone https://github.com/comfyanonymous/ComfyUI.git /workspace/ComfyUI
 
 # Copy only files needed for setup
-COPY --link ./src/comfystream/scripts /workspace/comfystream/src/comfystream/scripts
-COPY --link ./configs /workspace/comfystream/configs
-
-# Run setup_nodes (cached unless setup_nodes.py or nodes/ changes)
-RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream python src/comfystream/scripts/setup_nodes.py --workspace /workspace/ComfyUI
+COPY ./src/comfystream/scripts /workspace/comfystream/src/comfystream/scripts
+COPY ./configs /workspace/comfystream/configs
 
 # Copy ComfyStream files into ComfyUI
 COPY . /workspace/comfystream
@@ -52,14 +48,24 @@ COPY ./test/example-512x512.png /workspace/ComfyUI/input
 RUN conda run -n comfystream --no-capture-output --cwd /workspace/ComfyUI pip install -r requirements.txt --root-user-action=ignore
 
 # Install ComfyStream requirements
-RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream pip install -r requirements.txt --root-user-action=ignore
-RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream pip install . --root-user-action=ignore
 RUN ln -s /workspace/comfystream /workspace/ComfyUI/custom_nodes/comfystream
+RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream pip install -e . --root-user-action=ignore
 RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream python install.py --workspace /workspace/ComfyUI
+
+# Run setup_nodes
+RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream python src/comfystream/scripts/setup_nodes.py --workspace /workspace/ComfyUI
+
+# Install additional dependencies
 RUN conda run -n comfystream --no-capture-output pip install --upgrade tensorrt-cu12-bindings tensorrt-cu12-libs --root-user-action=ignore
 
+# Setup opencv with CUDA support
+RUN conda run -n comfystream --no-capture-output bash /workspace/comfystream/docker/entrypoint.sh --opencv-cuda
+
 # Configure no environment activation by default
 RUN conda config --set auto_activate_base false && \
     conda init bash
 
+# Set comfystream environment as default
+RUN echo "conda activate comfystream" >> ~/.bashrc
+
 WORKDIR /workspace/comfystream