feature: add management api to comfystream

.github/workflows/docker.yaml

@@ -15,26 +15,109 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    name: docker builds
+  base:
+    name: comfyui-base image
     if: ${{ github.repository == 'livepeer/comfystream' }}
+    outputs:
+      repository: ${{ steps.repo.outputs.repository }}
+      image-digest: ${{ steps.build.outputs.digest }}
     permissions:
       packages: write
       contents: read
-    runs-on: [self-hosted, linux, amd64]
+    runs-on: [self-hosted, linux, gpu]
     steps:
       - name: Check out code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Output image repository
+        id: repo
+        shell: bash
+        run: |
+          echo "repository=livepeer/comfyui-base" >> "$GITHUB_OUTPUT"
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ steps.repo.outputs.repository }}
+          tags: |
+            type=sha
+            type=ref,event=pr
+            type=ref,event=tag
+            type=sha,format=long
+            type=ref,event=branch
+            type=semver,pattern={{version}},prefix=v
+            type=semver,pattern={{major}}.{{minor}},prefix=v
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=${{ github.event.pull_request.head.ref }}
+            type=raw,value=stable,enable=${{ startsWith(github.event.ref, 'refs/tags/v') }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.CI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.CI_DOCKERHUB_TOKEN }}
 
+      - name: Build and push livepeer docker image
+        id: build
+        timeout-minutes: 200
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          provenance: mode=max
+          sbom: true
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          file: docker/Dockerfile.base
+          labels: ${{ steps.meta.outputs.labels }}
+          annotations: ${{ steps.meta.outputs.annotations }}
+          cache-from: type=registry,ref=livepeer/comfyui-base:build-cache
+          cache-to: type=registry,mode=max,ref=livepeer/comfyui-base:build-cache
+
+  trigger:
+    name: Trigger ai-runner workflow
+    needs: base
+    if: ${{ github.repository == 'livepeer/comfystream' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send workflow dispatch event to ai-runner
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.CI_GITHUB_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: "ai-runner",
+              workflow_id: "comfyui-trigger.yaml",
+              ref: "main",
+              inputs: {
+                "comfyui-base-digest": "${{ needs.base.outputs.image-digest }}",
+                "triggering-branch": "${{ github.head_ref || github.ref_name }}",
+              },
+            });
+
+  comfystream:
+    name: comfystream image
+    needs: base
+    if: ${{ github.repository == 'livepeer/comfystream' }}
+    permissions:
+      packages: write
+      contents: read
+    runs-on: [self-hosted, linux, amd64]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
@@ -56,6 +139,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.CI_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.CI_DOCKERHUB_TOKEN }}
+
       - name: Build and push livepeer docker image
         uses: docker/build-push-action@v6
         with:
@@ -65,6 +154,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           file: docker/Dockerfile
+          build-args: |
+            BASE_IMAGE=${{ needs.base.outputs.repository }}@${{ needs.base.outputs.image-digest }}
           labels: ${{ steps.meta.outputs.labels }}
           annotations: ${{ steps.meta.outputs.annotations }}
           cache-from: type=registry,ref=${{ github.repository }}:build-cache

README.md

@@ -78,7 +78,7 @@ Make sure you have [PyTorch](https://pytorch.org/get-started/locally/) installed
 Install `comfystream`:
 
 ```bash
-pip install git+https://github.com/yondonfu/comfystream.git
+pip install git+https://github.com/livepeer/comfystream.git
 
 # This can be used to install from a local repo
 # pip install .

configs/nodes.yaml

@@ -7,7 +7,7 @@ nodes:
     type: "tensorrt"
     dependencies: 
       - "onnxruntime-gpu>=1.17.0"
-      - "onnx>=1.17.0"
+      - "onnx==1.17.0"
 
   comfyui-depthanything-tensorrt:
     name: "ComfyUI DepthAnything TensorRT"

docker/Dockerfile

@@ -23,16 +23,13 @@ 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"
 
-
 # Create the supervisor configuration file for ComfyUI and ComfyStream
 COPY	docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 WORKDIR	/workspace/comfystream
 COPY --chmod=0755	docker/entrypoint.sh /workspace/comfystream/docker/entrypoint.sh
 
-EXPOSE	8188
-EXPOSE	8889
-EXPOSE	3000
+EXPOSE	8188	8889	3000
 EXPOSE	1024-65535/udp
 
 ENTRYPOINT	[ "/workspace/comfystream/docker/entrypoint.sh" ]

docker/Dockerfile.base

@@ -31,7 +31,7 @@ RUN mkdir -p /workspace/comfystream && \
     rm /tmp/miniconda.sh && echo 'export LD_LIBRARY_PATH=/workspace/miniconda3/envs/comfystream/lib:$LD_LIBRARY_PATH' >> ~/.bashrc
 
 # Clone ComfyUI
-RUN git clone https://github.com/comfyanonymous/ComfyUI.git /workspace/ComfyUI
+RUN git clone --branch v0.3.27 --depth 1 https://github.com/comfyanonymous/ComfyUI.git /workspace/ComfyUI
 
 # Copy only files needed for setup
 COPY ./src/comfystream/scripts /workspace/comfystream/src/comfystream/scripts

docker/entrypoint.sh

@@ -3,17 +3,19 @@
 set -e
 eval "$(conda shell.bash hook)"
 
-# Handle workspace mounting
-if [ -d "/app" ] && [ ! -d "/app/miniconda3" ]; then
-  echo "Initializing workspace in /app..."
-  cp -r /workspace/* /app
-fi
+if [ "$1" = "--server" ]; then
+  # Handle workspace mounting
+  if [ -d "/app" ] && [ ! -d "/app/miniconda3" ]; then
+    echo "Initializing workspace in /app..."
+    cp -r /workspace/* /app
+  fi
 
-if [ -d "/app" ] && [ ! -L "/workspace" ]; then
-  echo "Starting from volume mount /app..."
-  cd / && rm -rf /workspace
-  ln -sf /app /workspace
-  cd /workspace/comfystream
+  if [ -d "/app" ] && [ ! -L "/workspace" ]; then
+    echo "Starting from volume mount /app..."
+    cd / && rm -rf /workspace
+    ln -sf /app /workspace
+    cd /workspace/comfystream
+  fi
 fi
 
 # Add help command to show usage

nodes/api/__init__.py

@@ -8,6 +8,7 @@
 import aiohttp
 from ..server_manager import LocalComfyStreamServer
 from .. import settings_storage
+import subprocess
 
 routes = None
 server_manager = None
@@ -215,3 +216,45 @@ async def manage_configuration(request):
             logging.error(f"Error managing configuration: {str(e)}")
             return web.json_response({"error": str(e)}, status=500)
 
+    @routes.post('/comfystream/settings/manage')
+    async def manage_comfystream(request):
+        """Manage ComfyStream server settings"""
+        #check if server is running
+        server_status = server_manager.get_status()
+        if not server_status["running"]:
+            return web.json_response({"error": "ComfyStream Server is not running"}, status=503)
+
+        try:
+            data = await request.json()
+            action_type = data.get("action_type")
+            action = data.get("action")
+            payload = data.get("payload")
+            url_host = server_status.get("host", "localhost")
+            url_port = server_status.get("port", "8889")
+            mgmt_url = f"http://{url_host}:{url_port}/settings/{action_type}/{action}"
+
+            async with aiohttp.ClientSession() as session:
+                async with session.post(
+                    mgmt_url,
+                    json=payload,
+                    headers={"Content-Type": "application/json"}
+                ) as response:
+                    if not response.ok:
+                        return web.json_response(
+                            {"error": f"Server error: {response.status}"}, 
+                            status=response.status
+                        )
+                    return web.json_response(await response.json())
+        except Exception as e:
+            logging.error(f"Error managing ComfyStream: {str(e)}")
+            return web.json_response({"error": str(e)}, status=500)
+
+    @routes.post('/comfyui/restart')
+    async def manage_configuration(request):
+        server_status = server_manager.get_status()
+        if server_status["running"]:
+            await server_manager.stop()
+        logging.info("Restarting ComfyUI...")
+        subprocess.run(["supervisorctl", "restart", "comfyui"])
+        logging.info("Restarting ComfyUI...in process")
+        return web.json_response({"success": True}, status=200)