From b50584d2da020d9f179f3cd4a57ed52c203df5bd Mon Sep 17 00:00:00 2001 From: Github Action Automation Date: Wed, 13 Sep 2023 12:03:54 +0000 Subject: [PATCH 1/2] Bump version to v1.78.0 --- VERSION | 2 +- parts/machine-learning/Makefile | 2 +- patches/Makefile | 2 +- snap/snapcraft.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 1ed23ab..26d8ec7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.77.0 +v1.78.0 diff --git a/parts/machine-learning/Makefile b/parts/machine-learning/Makefile index d1334d5..27cf350 100644 --- a/parts/machine-learning/Makefile +++ b/parts/machine-learning/Makefile @@ -1,4 +1,4 @@ -IMMICH_VERSION := v1.77.0 +IMMICH_VERSION := v1.78.0 # Use our own Python, over the older one in core20 export PATH := ${SNAPCRAFT_PART_BUILD}/../../dependencies/install/usr/local/bin:$(PATH) diff --git a/patches/Makefile b/patches/Makefile index 76d7c62..0119f14 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -1,4 +1,4 @@ -VERSION=v1.77.0 +VERSION=v1.78.0 SOURCE_FILE_PATH=https://raw.githubusercontent.com/immich-app/immich/${VERSION}/web/src/lib/components/shared-components/version-announcement-box.svelte download-patch: diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index db0f646..312eb2b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -182,7 +182,7 @@ parts: plugin: npm npm-node-version: "18.16.0" source: https://github.com/immich-app/immich.git - source-tag: v1.77.0 + source-tag: v1.78.0 source-subdir: server override-build: | snapcraftctl set-version "$(git describe --tags)-dist1" @@ -203,7 +203,7 @@ parts: plugin: npm npm-node-version: "18.16.0" source: https://github.com/immich-app/immich.git - source-tag: v1.77.0 + source-tag: v1.78.0 source-subdir: web override-build: | patch -p0 -i $SNAPCRAFT_PART_SRC/../../patches/src/001-version-announcement-box.patch -d $SNAPCRAFT_PART_BUILD From e5e12bbbf76f7cbb8dc4c491cb7dfb4651dd533e Mon Sep 17 00:00:00 2001 From: Stefan Berggren Date: Wed, 13 Sep 2023 19:40:55 +0200 Subject: [PATCH 2/2] Match upstream, increase ML worker timeout. --- parts/machine-learning/immich-machine-learning | 1 + src/bin/load-env | 1 + 2 files changed, 2 insertions(+) diff --git a/parts/machine-learning/immich-machine-learning b/parts/machine-learning/immich-machine-learning index ad4ab66..480e35c 100755 --- a/parts/machine-learning/immich-machine-learning +++ b/parts/machine-learning/immich-machine-learning @@ -14,4 +14,5 @@ python3 $SNAP/bin/gunicorn app.main:app \ -k uvicorn.workers.UvicornWorker \ -w $MACHINE_LEARNING_WORKERS \ -b $MACHINE_LEARNING_HOST:$MACHINE_LEARNING_PORT \ + -t $MACHINE_LEARNING_WORKER_TIMEOUT \ --log-config-json log_conf.json diff --git a/src/bin/load-env b/src/bin/load-env index 4a39964..11241a7 100755 --- a/src/bin/load-env +++ b/src/bin/load-env @@ -37,6 +37,7 @@ export MACHINE_LEARNING_CACHE_FOLDER="$SNAP_COMMON/cache" export MACHINE_LEARNING_HOST="0.0.0.0" export MACHINE_LEARNING_PORT=3003 export MACHINE_LEARNING_WORKERS=1 +export MACHINE_LEARNING_WORKER_TIMEOUT=120 export TYPESENSE_API_KEY="$(snapctl get typesense-key)" export TYPESENSE_DATA_DIR="$SNAP_COMMON/typesense"