Merge pull request #26 from nsg/v1.55

bump V1.55.1
nsg · May 9, 2023 · 0a55a9b · 0a55a9b
2 parents 5968cf8 + 7de224a
commit 0a55a9b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -178,7 +178,7 @@ parts:
     plugin: npm
     npm-node-version: "16.19.1"
     source: https://github.com/immich-app/immich.git
-    source-tag: v1.54.1
+    source-tag: v1.55.1
     source-subdir: server
     override-build: |
       snapcraftctl set-version "$(git describe --tags)-dist1"
@@ -204,7 +204,7 @@ parts:
     plugin: npm
     npm-node-version: "16.19.1"
     source: https://github.com/immich-app/immich.git
-    source-tag: v1.54.1
+    source-tag: v1.55.1
     source-subdir: web
     override-build: |
       patch -p0 -i $SNAPCRAFT_PART_SRC/../../patches/src/001-version-announcement-box.patch -d $SNAPCRAFT_PART_BUILD
@@ -223,27 +223,25 @@ parts:
   machine-learning:
     plugin: python
     source: https://github.com/immich-app/immich.git
-    source-tag: v1.54.1
+    source-tag: v1.55.1
     source-subdir: machine-learning
     build-environment:
       - SNAPCRAFT_PYTHON_VENV_INTERP_PATH: /root/parts/machine-learning/install/bin/python3
     override-build: |
       snapcraftctl build
       pip install --pre torch  -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
-      pip install transformers tqdm numpy scikit-learn scipy nltk sentencepiece flask Pillow gunicorn
+      pip install transformers tqdm numpy scikit-learn scipy nltk sentencepiece fastapi Pillow uvicorn[standard]
       pip install --no-deps sentence-transformers
       mkdir -p $SNAPCRAFT_PART_INSTALL/usr/src/ml
       cp -r machine-learning/src $SNAPCRAFT_PART_INSTALL/usr/src/ml
-      cp machine-learning/gunicorn.conf.py $SNAPCRAFT_PART_INSTALL/usr/src/ml
-      sed 's/^worker_tmp_dir.*/worker_tmp_dir = "\/tmp"/' -i $SNAPCRAFT_PART_INSTALL/usr/src/ml/gunicorn.conf.py
     stage-packages:
       - libgomp1
 
   cli:
     plugin: npm
     npm-node-version: "16.19.1"
     source: https://github.com/immich-app/CLI.git
-    source-tag: v0.35.0
+    source-tag: v0.36.0
     override-build: |
       npm install
       npm run build

diff --git a/src/bin/immich-machine-learning b/src/bin/immich-machine-learning
@@ -9,4 +9,4 @@ export PYTHONUNBUFFERED=1
 banner
 
 cd $SNAP/usr/src/ml
-python3 $SNAP/bin/gunicorn src.main:server | grep -v "GET /ping"
+python3 $SNAP/usr/src/ml/src/main.py | grep -v "GET /ping"
diff --git a/update.sh b/update.sh
@@ -38,7 +38,6 @@ CHECK_FILES="
     nginx
     machine-learning/README.md
     machine-learning/Dockerfile
-    machine-learning/gunicorn.conf.py
     docker/example.env
     docker/docker-compose.yml
 "