Devel -> Main - CLAP fix and improvement

.dockerignore

@@ -39,3 +39,17 @@ screenshot/
 htmlcov/
 .coverage
 *.log
+
+# Large model files and caches (these are downloaded inside the container)
+model/
+*.onnx
+*.pt
+*.pth
+*.bin
+*.h5
+*.pb
+CLAMP3/weights_*.pth
+CLAMP3/*.npy
+mulan_model_export/
+.cache/
+*.tar.gz

.github/workflows/build-arm-intel.yml

@@ -1,20 +1,20 @@
 # This workflow builds and tests a multi-architecture Docker image for both AMD64 and ARM64.
-# It triggers on pushes to the main, devel, and onnx branches, as well as on version tags.
+# It triggers on pushes to the main, devel, and mulan branches, as well as on version tags.
 # Tags are automatically generated based on the triggering event:
 # - main branch -> 'latest'
 # - devel branch -> 'devel'
-# - onnx branch -> 'onnx'
+# - mulan branch -> 'mulan'
 # - version tags (e.g., v1.2.3) -> version number (e.g., '1.2.3')
 
 name: Build, Test, and Push AudioMuse AI Docker Image INTEL and ARM
 
 on:
   push:
     # We avoid triggering this workflow on direct pushes to `main` to prevent
-    # accidental builds from routine commits. Keep `devel` and `onnx` as before.
+    # accidental builds from routine commits. Keep `devel` and `mulan` as before.
     branches:
       - devel         # Trigger for 'devel' tag
-      - onnx          # New branch also triggers for 'onnx' tag
+      - mulan         # New branch also triggers for 'mulan' tag
     tags:
       - 'v*.*.*'      # Trigger for version tags like v1.0.0
   # Allow manual runs for debugging or manual pushes
@@ -88,8 +88,8 @@ jobs:
             type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
             # Set 'devel' tag only for the devel branch
             type=raw,value=devel,enable=${{ github.ref == 'refs/heads/devel' }}
-            # Set 'onnx' tag only for the onnx branch
-            type=raw,value=onnx,enable=${{ github.ref == 'refs/heads/onnx' }}
+            # Set 'mulan' tag only for the mulan branch
+            type=raw,value=mulan,enable=${{ github.ref == 'refs/heads/mulan' }}
             # Use the version number for Git tags (e.g., v1.2.3 -> 1.2.3)
             type=semver,pattern={{version}}
 

.github/workflows/build-nvidia.yml

@@ -2,9 +2,12 @@ name: Build and Push AudioMuse AI Docker Image with NVIDIA support
 
 on:
   push:
-    # Only trigger on version tags to avoid automatic runs on direct pushes to main.
+    # Trigger on version tags for stable releases
     tags:
       - 'v*.*.*'  # Trigger for version tags like v1.0.0
+    # Trigger on pushes to devel branch for development releases
+    branches:
+      - devel
   # Allow manual runs from the Actions UI
   workflow_dispatch:
     inputs:
@@ -60,6 +63,11 @@ jobs:
             ALL_TAGS="${VERSIONED_TAG},${LATEST_TAG}"
             echo "Building versioned tag: $VERSIONED_TAG"
             echo "Also tagging as latest: $LATEST_TAG"
+          elif [[ "${GITHUB_REF}" == refs/heads/devel ]]; then
+            # When compiling from devel branch, create devel-nvidia tag
+            DEVEL_TAG="ghcr.io/$REPO_NAME_LOWER:devel-nvidia"
+            ALL_TAGS="${DEVEL_TAG}"
+            echo "Building devel tag: $DEVEL_TAG"
           elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             # Manual run with version input
             VERSION_TAG=$(echo "${{ inputs.version_tag }}" | sed -e 's|^v||g')
@@ -69,7 +77,7 @@ jobs:
             echo "Building manual version tag: $VERSIONED_TAG"
             echo "Also tagging as latest: $LATEST_TAG"
           else
-            echo "This workflow is intended to run on tag pushes (refs/tags/v*) or manual dispatch. Exiting."
+            echo "This workflow is intended to run on tag pushes (refs/tags/v*), devel branch, or manual dispatch. Exiting."
             exit 1
           fi
 

.github/workflows/test.yml

@@ -28,15 +28,16 @@ jobs:
         python -m pip install --upgrade pip
         pip install -r test/requirements.txt
 
-    - name: Download CLAP model
+    - name: Download CLAP models
       run: |
         base_url="https://github.com/NeptuneHub/AudioMuse-AI/releases/download/v3.0.0-model"
-        clap_model="clap_model.onnx"
         mkdir -p test/models
-        echo "Downloading CLAP model..."
-        curl -L "${base_url}/${clap_model}" -o "test/models/${clap_model}"
-        echo "CLAP model downloaded successfully"
-        ls -lh test/models/${clap_model}
+        echo "Downloading CLAP audio model..."
+        curl -L "${base_url}/clap_audio_model.onnx" -o "test/models/clap_audio_model.onnx"
+        echo "Downloading CLAP text model..."
+        curl -L "${base_url}/clap_text_model.onnx" -o "test/models/clap_text_model.onnx"
+        echo "CLAP models downloaded successfully"
+        ls -lh test/models/clap_*.onnx
 
     - name: Verify test files exist
       run: |

.gitignore

@@ -7,6 +7,7 @@ __pycache__/
 *.pyd
 venv/
 .venv/
+.venv-macos/
 env/
 
 # Local environment variables
@@ -33,4 +34,16 @@ htmlcov/
 
 # Large model files in query folder
 /query/*.pt
-/query/*.onnx
+/query/*.onnx
+
+
+# CLAMP3 weight files (large model files)
+/CLAMP3/weights_*.pth
+/CLAMP3/*.pth
+
+
+# Downloaded ONNX models (from run_worker_macos.sh or similar)
+/model/
+
+# Exported MuLan models
+mulan_model_export/