Merge branch 'main' into feat/multiprompt_dynamic_node

Author: eliteprox

README.md

@@ -8,6 +8,8 @@ This repo also includes a WebRTC server and UI that uses comfystream to support
   - [Quick Start](#quick-start)
     - [Docker DevContainer](#docker-devcontainer)
     - [Docker Image](#docker-image)
+      - [RunPod](#runpod)
+      - [Tensordock](#tensordock)
   - [Download Models](#download-models)
   - [Install package](#install-package)
     - [Custom Nodes](#custom-nodes)
@@ -21,6 +23,7 @@ This repo also includes a WebRTC server and UI that uses comfystream to support
 ## Quick Start
 
 ### Docker DevContainer
+
 Refer to [.devcontainer/README.md](.devcontainer/README.md) to setup ComfyStream in a devcontainer using a pre-configured ComfyUI docker environment.
 
 For other installation options, refer to [Install ComfyUI and ComfyStream](https://pipelines.livepeer.org/docs/technical/install/local-testing) in the Livepeer pipelines documentation.
@@ -37,6 +40,10 @@ Refer to the documentation at [https://pipelines.livepeer.org/docs/technical/get
 
 The RunPod template [livepeer-comfystream](https://runpod.io/console/deploy?template=w01m180vxx&ref=u8tlskew) can be used to deploy to RunPod.
 
+#### Tensordock
+
+We also have a python script that can be used to spin up a ComfyStream instance on a [Tensordock server](https://tensordock.com/). Refer to [scripts/README.md](scripts/README.md) for instructions.
+
 ## Download Models
 
 Refer to [src/comfystream/scripts/README.md](src/comfystream/scripts/README.md) for instructions to download commonly used models.
@@ -180,7 +187,7 @@ npm run dev
 
 By default the app will be available at <http://localhost:3000>.
 
-The Stream URL is the URL of the [server](#run-server) which defaults to <http://127.0.0.1:8888>.
+The Stream URL is the URL of the [server](#run-server) which defaults to <http://127.0.0.1:8889>.
 
 > [!NOTE]
 > To run the UI on HTTPS (necessary for webcam functionality), use `npm run dev:https`. You'll need to accept the self-signed certificate in your browser.

configs/models.yaml

@@ -57,3 +57,9 @@ models:
     url: "https://civitai.com/api/download/models/276570?type=Model&format=SafeTensor"
     path: "loras/SD1.5/ral-chrome-sd15.safetensors"
     type: "lora"
+
+  outfitToOutfit_v20:
+    name: "outfitToOutfit_v20"
+    url: "https://huggingface.co/EmmaJohnson311/outfitToOutfit/resolve/main/outfitToOutfit_v20_sd15.safetensors"
+    path: "controlnet/outfitToOutfit_v20.safetensors"
+    type: "controlnet"

docker/Dockerfile.base

@@ -32,7 +32,7 @@ COPY . /workspace/comfystream
 
 # Copy ComfyStream files into ComfyUI
 COPY ./nodes/ /workspace/ComfyUI/custom_nodes/
-COPY ./workflows/ui* /workspace/ComfyUI/user/default/workflows/examples
+COPY ./workflows* /workspace/ComfyUI/user/default/workflows
 
 # WORKDIR /workspace/comfystream
 

scripts/README.md

@@ -0,0 +1,42 @@
+# ComfyUI Helper Scripts
+
+This directory contains various helper scripts designed to streamline working with ComfyStream:
+
+- `spinup_comfystream_tensordock.py`: Spins up a ComfyStream instance on a [Tensordock server](https://tensordock.com/), installs dependencies, and starts the server.
+
+## Usage Instructions
+
+### Spinup TensorDock ComfyStream Instance
+
+1. **Create a Tensordock Account**: Register at [Tensordock](https://dashboard.tensordock.com/register), attach a credit card, and create an API key and token.
+2. **Check Available Options** *(Optional but Recommended)*:  
+   To see all available script options, run:
+
+    ```bash
+    python spinup_comfystream_tensordock.py --help
+    ```
+
+3. **Run the Script**:  
+   Execute the following command to spin up a ComfyStream instance:
+
+    ```bash
+    python spinup_comfystream_tensordock.py --api-key <API_KEY> --api-token <API_TOKEN>
+    ```
+
+4. **Access the Server**:  
+   The script will set up the instance, install dependencies, and start the server. This process will take a few minutes. Once completed, you can access the ComfyStream server and UI using the provided URLs.
+
+5. **Stop the Server**:  
+   To stop the server, run:
+
+    ```bash
+    python spinup_comfystream_tensordock.py --delete <VM_ID>
+    ```
+
+   Replace `<VM_ID>` with the ID of the VM you want to delete. You can find the VM ID in the script logs or the [Tensordock dashboard](https://dashboard.tensordock.com/).
+
+> [!NOTE]  
+> By default, the ComfyUI port is not publicly exposed for security reasons. However, you can enable public access using the `--expose-comfyui` flag. Credentials will be provided in the logs, but keep in mind that this is not a foolproof security measure, and exposing the port may pose security risks.
+
+> [!IMPORTANT]  
+> Due to a known bug in TensorDock, the server may sometimes fail to detect the NVIDIA GPU until it is rebooted. If you experience GPU-related issues, try restarting the server first.

scripts/config/cloud_init_comfystream_template.yaml

@@ -0,0 +1,23 @@
+write_files:
+  # Add reverse proxy configuration for ComfyUI with basic authentication
+  - path: /etc/caddy/comfystream.caddy
+    content: |
+      :8189 {
+          reverse_proxy http://127.0.0.1:8188
+          basic_auth {
+              comfyadmin <PASSWORD_PLACEHOLDER>
+          }
+      }
+
+runcmd:
+  # Setup auth proxy for ComfyUI (requires port 8189 to be open)
+  - curl -1sLf 'https://dl.cloudsmith.io/public/caddy/testing/gpg.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-testing-archive-keyring.gpg
+  - curl -1sLf 'https://dl.cloudsmith.io/public/caddy/testing/debian.deb.txt' | sudo tee /etc/apt/sources.list.d/caddy-testing.list
+  - sudo apt update
+  - sudo apt install -y caddy
+  - echo 'import /etc/caddy/comfystream.caddy' | sudo tee -a /etc/caddy/Caddyfile
+  - sudo systemctl restart caddy
+  # Install, configure, and start Comfystream and ComfyUI
+  - docker pull <DOCKER_IMAGE_PLACEHOLDER>
+  - mkdir -p ~/models/ComfyUI--models ~/models/ComfyUI--output
+  - docker run --restart unless-stopped --stop-timeout 300 --gpus all --name comfystream -v ${HOME}/models/ComfyUI--models:/workspace/ComfyUI/models -v ${HOME}/models/ComfyUI--output:/workspace/ComfyUI/output -p 3000:3000 -p 8188:8188 -p 8889:8889 <DOCKER_IMAGE_PLACEHOLDER> --download-models --build-engines --server

scripts/requirements.txt

@@ -0,0 +1,7 @@
+# TensorDock Spinup requirements
+requests
+geopy
+colorama
+qrcode
+qrcode_terminal
+click