diff --git a/.dockerignore b/.dockerignore index a392053..9023a5a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,4 @@ -models/* \ No newline at end of file +models/* +.github/* +whispercpp/* +xttsv2_2.0.2/* \ No newline at end of file diff --git a/.github/workflows/publish-docker-dev.yml b/.github/workflows/publish-docker-dev.yml index 55f24c7..465c837 100644 --- a/.github/workflows/publish-docker-dev.yml +++ b/.github/workflows/publish-docker-dev.yml @@ -9,20 +9,14 @@ on: jobs: build-ezlocalai: runs-on: ubuntu-latest - strategy: - matrix: - include: - - name: "CPU" - dockerfile: "Dockerfile" - platforms: "linux/amd64" - tag_name: "dev" steps: - name: Checkout code uses: actions/checkout@v4 - name: Extract GitHub info run: | - echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed 's/[^a-zA-Z0-9._-]/-/g')" >> $GITHUB_ENV + echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed 's/[^a-zA-Z0-9._-]/-/g')" >> $GITHUB_ENV + echo "ORG_NAME=$(echo ${{ github.repository }} | cut -d'/' -f 1 | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV echo "GITHUB_USER=$(echo ${{ github.actor }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV echo "REPO_NAME=$(echo ${{ github.repository }} | cut -d'/' -f 2 | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV id: extract_branch @@ -41,15 +35,15 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: ./${{ matrix.dockerfile }} - platforms: ${{ matrix.platforms }} + file: ./Dockerfile + platforms: linux/amd64 push: true cache-from: type=gha cache-to: type=gha,mode=max tags: | - ghcr.io/devxt-llc/${{ env.REPO_NAME }}:${{ matrix.tag_name }} - ghcr.io/devxt-llc/${{ env.REPO_NAME }}:${{ matrix.tag_name }}-${{ env.BRANCH_NAME }} - ghcr.io/devxt-llc/${{ env.REPO_NAME }}:${{ matrix.tag_name }}-${{ env.BRANCH_NAME }}-${{ github.sha }} + ghcr.io/${{ env.ORG_NAME }}/${{ env.REPO_NAME }}:dev + ghcr.io/${{ env.ORG_NAME }}/${{ env.REPO_NAME }}:${{ env.BRANCH_NAME }} + ghcr.io/${{ env.ORG_NAME }}/${{ env.REPO_NAME }}:${{ env.BRANCH_NAME }}-${{ github.sha }} test-ezlocalai: uses: josh-xt/AGiXT/.github/workflows/operation-test-with-jupyter.yml@main diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index a4460b6..a520999 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -10,20 +10,14 @@ on: jobs: build-ezlocalai: runs-on: ubuntu-latest - strategy: - matrix: - include: - - name: "CPU" - dockerfile: "Dockerfile" - platforms: "linux/amd64" - tag_name: "latest" steps: - name: Checkout code uses: actions/checkout@v4 - name: Extract GitHub info run: | - echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed 's/[^a-zA-Z0-9._-]/-/g')" >> $GITHUB_ENV + echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed 's/[^a-zA-Z0-9._-]/-/g')" >> $GITHUB_ENV + echo "ORG_NAME=$(echo ${{ github.repository }} | cut -d'/' -f 1 | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV echo "GITHUB_USER=$(echo ${{ github.actor }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV echo "REPO_NAME=$(echo ${{ github.repository }} | cut -d'/' -f 2 | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV id: extract_branch @@ -48,8 +42,8 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: ./${{ matrix.dockerfile }} - platforms: ${{ matrix.platforms }} + file: ./Dockerfile + platforms: linux/amd64 push: true cache-from: type=gha cache-to: type=gha,mode=max @@ -57,12 +51,12 @@ jobs: ${{ vars.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:latest ${{ vars.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:${{ env.BRANCH_NAME }} ${{ vars.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:${{ env.BRANCH_NAME }}-${{ github.sha }} - ghcr.io/devxt-llc/${{ env.REPO_NAME }}:latest - ghcr.io/devxt-llc/${{ env.REPO_NAME }}:${{ env.BRANCH_NAME }} - ghcr.io/devxt-llc/${{ env.REPO_NAME }}:${{ env.BRANCH_NAME }}-${{ github.sha }} + ghcr.io/${{ env.ORG_NAME }}/${{ env.REPO_NAME }}:latest + ghcr.io/${{ env.ORG_NAME }}/${{ env.REPO_NAME }}:${{ env.BRANCH_NAME }} + ghcr.io/${{ env.ORG_NAME }}/${{ env.REPO_NAME }}:${{ env.BRANCH_NAME }}-${{ github.sha }} - name: Docker Hub Description - uses: peter-evans/dockerhub-description@v3.4.2 + uses: peter-evans/dockerhub-description@v4 with: username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/cuda-requirements.txt b/cuda-requirements.txt index 2424e6c..cfa7c6c 100644 --- a/cuda-requirements.txt +++ b/cuda-requirements.txt @@ -1,21 +1,21 @@ fastapi uvicorn -pydantic==2.5.3 +pydantic==2.6.3 requests==2.31.0 -tiktoken==0.5.2 +tiktoken==0.6.0 python-dotenv==1.0.1 beautifulsoup4==4.12.3 -faster-whisper==0.10.0 +faster-whisper==1.0.1 pydub==0.25.1 ffmpeg==1.4 -torch>=2.2.0+cu121 -torchaudio>=2.2.0+cu121 -transformers==4.37.2 +torch>=2.2.1+cu121 +torchaudio>=2.2.1+cu121 +transformers==4.38.2 TTS==0.22.0 sounddevice==0.4.6 -deepspeed==0.13.1 +deepspeed==0.13.4 webrtcvad==2.0.10 pyaudio==0.2.14 -pyngrok==7.1.0 +pyngrok==7.1.3 accelerate diffusers \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index c9906db..3dd4fc0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,20 +1,20 @@ fastapi uvicorn -pydantic==2.5.3 +pydantic==2.6.3 requests==2.31.0 -tiktoken==0.5.2 +tiktoken==0.6.0 python-dotenv==1.0.1 beautifulsoup4==4.12.3 -faster-whisper==0.10.0 +faster-whisper==1.0.1 pydub==0.25.1 ffmpeg==1.4 -torch==2.2.0 -torchaudio==2.2.0 -transformers==4.37.2 +torch==2.2.1 +torchaudio==2.2.1 +transformers==4.38.2 TTS==0.22.0 sounddevice==0.4.6 pyaudio==0.2.14 webrtcvad==2.0.10 -pyngrok==7.1.0 +pyngrok==7.1.3 accelerate==0.27.2 llama-cpp-python \ No newline at end of file