Merge main to mainnet

.github/workflows/build-engine.yml

@@ -5,12 +5,16 @@ on:
     inputs:
       solution:
         required: true
+        description: 'Solution to build'
         type: choice
         options:
           - text-generation-webui-gpu
           - text-generation-webui-cpu
           - comfyui
           - n8n
+          - dia-tts
+          - jupyter
+          - unsloth
       target:
         description: 'Target'
         required: true
@@ -55,7 +59,7 @@ jobs:
             if [[ "$SOLUTION" == *cpu ]]; then
               BUILD_ARGS="--build-arg GPU_CHOICE=N"
             elif [[ "$SOLUTION" == *gpu ]]; then
-              BUILD_ARGS="--build-arg GPU_CHOICE=A"
+              BUILD_ARGS="--build-arg GPU_CHOICE=E"
             fi
 
           elif [ "$SOLUTION" == "comfyui" ]; then
@@ -67,6 +71,20 @@ jobs:
           elif [ "$SOLUTION" == "n8n" ]; then
             DOCKERFILE="./n8n/Dockerfile"
             DOCKERFILE_CONTEXT="./n8n/"
+
+          elif [ "$SOLUTION" == "dia-tts" ]; then
+            SUBMODULE_PATH="Dia TTS Server/dia-tts-server"
+            DOCKERFILE="./Dia TTS Server/Dockerfile"
+            DOCKERFILE_CONTEXT="./Dia TTS Server/"
+            ALLOW_MULTIPLE_UPDATE="true"
+
+          elif [ "$SOLUTION" == "jupyter" ]; then
+            DOCKERFILE="./Jupyter/Dockerfile"
+            DOCKERFILE_CONTEXT="./Jupyter/"
+
+          elif [ "$SOLUTION" == "unsloth" ]; then
+            DOCKERFILE="./unsloth/Dockerfile"
+            DOCKERFILE_CONTEXT="./unsloth/"
 
           else
             echo "Invalid solution name"
@@ -120,7 +138,7 @@ jobs:
 
       - name: Set SPCTL repository type
         run: |
-          if [ "$TARGET" == "develop" || "$TARGET" == "stage" ]; then
+          if [ "$TARGET" == "develop" || "$TARGET" == "stage" || "$TARGET" == "testnet" ]; then
             SPCTL_REPOSITORY_TYPE=private
           else
             SPCTL_REPOSITORY_TYPE=public

.github/workflows/update-engine-configuration.yml

@@ -12,6 +12,9 @@ on:
           - 'ComfyUI (GPU only)'
           - 'Text Generation Web UI (CPU only)'
           - 'Text Generation Web UI (GPU only)'
+          - 'Dia TTS Server (GPU)'
+          - 'Dia TTS Server (CPU)'
+          - 'Jupyter'
       target:
         description: 'Target environment where the offer exists.'
         required: true
@@ -43,7 +46,10 @@ jobs:
               'ComfyUI (CPU only)': { configFile: './ComfyUI/configuration-cpu.json', varName: 'COMFYUI_CPU_OFFER_ID' },
               'ComfyUI (GPU only)': { configFile: './ComfyUI/configuration-gpu.json', varName: 'COMFYUI_GPU_OFFER_ID' },
               'Text Generation Web UI (CPU only)': { configFile: './Text Generation WebUI/configuration.json', varName: 'TEXT_GENERATION_WEB_UI_CPU_OFFER_ID' },
-              'Text Generation Web UI (GPU only)': { configFile: './Text Generation WebUI/configuration.json', varName: 'TEXT_GENERATION_WEB_UI_GPU_OFFER_ID' }
+              'Text Generation Web UI (GPU only)': { configFile: './Text Generation WebUI/configuration.json', varName: 'TEXT_GENERATION_WEB_UI_GPU_OFFER_ID' },
+              'Dia TTS Server (GPU)': { configFile: './Dia TTS Server/configuration.json', varName: 'DIA_TTS_GPU_OFFER_ID' },
+              'Dia TTS Server (CPU)': { configFile: './Dia TTS Server/configuration.json', varName: 'DIA_TTS_CPU_OFFER_ID' }
+              'Jupyter': { configFile: './Jupyter/configuration.json', varName: 'JUPYTER_OFFER_ID' }
             };
             const solution = context.payload.inputs.solution;
             const targetEnv = context.payload.inputs.target;

.gitignore

@@ -110,3 +110,5 @@ sp-secrets
 sp-inputs
 sp-configurations
 sp-certs
+
+.vscode

.gitmodules

@@ -5,3 +5,7 @@
 [submodule "ComfyUI/ComfyUI"]
 	path = ComfyUI/ComfyUI
 	url = https://github.com/comfyanonymous/ComfyUI
+
+[submodule "Dia TTS Server/dia-tts-server"]
+	path = Dia TTS Server/dia-tts-server
+	url = https://github.com/devnen/Dia-TTS-Server.git

ComfyUI/Dockerfile

@@ -89,7 +89,7 @@ ENV COMFYUI_PATH /home/node/app/ComfyUI
 RUN mkdir -p /sp/inputs /sp/output /sp/run
 
 RUN git clone https://github.com/comfyanonymous/ComfyUI.git ./ComfyUI &&\
-    cd ./ComfyUI && git checkout af8cf79a2dbdd541493d49c4f26c60d60d85ceae && cd .. &&\
+    cd ./ComfyUI && git checkout v0.3.71 && cd .. &&\
     pip install -r ./ComfyUI/requirements.txt &&\
     git clone https://github.com/ltdrdata/ComfyUI-Manager.git ./ComfyUI/custom_nodes/ComfyUI-Manager &&\
     pip install -r ./ComfyUI/custom_nodes/ComfyUI-Manager/requirements.txt &&\

ComfyUI/Dockerfile.local-cpu

@@ -26,8 +26,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy
 
 # Set environment variables
-ARG COMFYUI_VERSION=0.3.29
-ARG COMFYUI_MANAGER_VERSION=3.31.12
+ARG COMFYUI_VERSION=0.3.71
+ARG COMFYUI_MANAGER_VERSION=3.37.1
 ARG COMFYUI_PATH=/opt/ComfyUI
 
 RUN git config --global user.email "container@super-protocol.com" \

ComfyUI/Dockerfile.prod

@@ -62,8 +62,8 @@ RUN --mount=type=cache,target=/root/.npm \
   npm ci --omit=dev
 
 # Set environment variables
-ARG COMFYUI_VERSION=0.3.29
-ARG COMFYUI_MANAGER_VERSION=3.31.12
+ARG COMFYUI_VERSION=0.3.71
+ARG COMFYUI_MANAGER_VERSION=3.37.1
 ENV COMFYUI_PATH=/opt/ComfyUI
 
 RUN git config --global user.email "container@super-protocol.com" \