chore(mobile): better second to first assets shown

* fix(mobile): video player not updating state

* unused code

.github/labeler.yml

@@ -0,0 +1,23 @@
+cli:
+- changed-files:
+  - any-glob-to-any-file: cli/**
+
+documentation:
+- changed-files:
+  - any-glob-to-any-file: docs/**
+
+🖥️web:
+- changed-files:
+  - any-glob-to-any-file: web/**
+
+📱mobile:
+- changed-files:
+  - any-glob-to-any-file: mobile/**
+
+🗄️server:
+- changed-files:
+  - any-glob-to-any-file: server/**
+
+🧠machine-learning:
+- changed-files:
+  - any-glob-to-any-file: machine-learning/**

.github/workflows/cli.yml

@@ -1,16 +1,17 @@
 name: CLI Build
 on:
-  workflow_dispatch:
   push:
     branches: [main]
     paths:
-      - "cli/**"
-      - ".github/workflows/cli.yml"
+      - 'cli/**'
+      - '.github/workflows/cli.yml'
   pull_request:
     branches: [main]
     paths:
-      - "cli/**"
-      - ".github/workflows/cli.yml"
+      - 'cli/**'
+      - '.github/workflows/cli.yml'
+  release:
+    types: [published]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -32,8 +33,8 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.x"
-          registry-url: "https://registry.npmjs.org"
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
       - name: Prepare SDK
         run: npm ci --prefix ../open-api/typescript-sdk/
       - name: Build SDK
@@ -41,7 +42,7 @@ jobs:
       - run: npm ci
       - run: npm run build
       - run: npm publish
-        if: ${{ github.event_name == 'workflow_dispatch' }}
+        if: ${{ github.event_name == 'release' }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
@@ -83,15 +84,15 @@ jobs:
           images: |
             name=ghcr.io/${{ github.repository_owner }}/immich-cli
           tags: |
-            type=raw,value=${{ steps.package-version.outputs.version }},enable=${{ github.event_name == 'workflow_dispatch' }}
-            type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
+            type=raw,value=${{ steps.package-version.outputs.version }},enable=${{ github.event_name == 'release' }}
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v5.4.0
         with:
           file: cli/Dockerfile
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name == 'workflow_dispatch' }}
+          push: ${{ github.event_name == 'release' }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: ${{ steps.metadata.outputs.tags }}

.github/workflows/docker.yml

@@ -115,7 +115,7 @@ jobs:
           fi
 
       - name: Build and push image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v5.4.0
         with:
           context: ${{ matrix.context }}
           file: ${{ matrix.file }}

.github/workflows/pr-labeler.yml

@@ -0,0 +1,12 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5

.github/workflows/pr-require-label.yml

@@ -1,13 +0,0 @@
-name: Enforce PR labels
-
-on:
-  pull_request:
-    types: [labeled, unlabeled, opened, edited, synchronize]
-jobs:
-  enforce-label:
-    name: Enforce label
-    runs-on: ubuntu-latest
-    steps:
-    - if: toJson(github.event.pull_request.labels) == '[]'
-      run: exit 1
-

Makefile

@@ -10,12 +10,6 @@ dev-update:
 dev-scale:
 	docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
 
-stage:
-	docker compose -f ./docker/docker-compose.staging.yml up --build -V --remove-orphans
-
-pull-stage:
-	docker compose -f ./docker/docker-compose.staging.yml pull
-
 .PHONY: e2e
 e2e:
 	docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans

cli/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.0",
+  "version": "2.2.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/cli",
-      "version": "2.2.0",
+      "version": "2.2.3",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "fast-glob": "^3.3.2",
@@ -47,14 +47,14 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.105.1",
+      "version": "1.106.3",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^20.12.13",
+        "@types/node": "^20.11.0",
         "typescript": "^5.3.3"
       }
     },

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.0",
+  "version": "2.2.3",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",

docker/docker-compose.dev.yml

@@ -103,7 +103,7 @@ services:
     ports:
       - 5432:5432
     healthcheck:
-      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT SUM(checksum_failures) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
+      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
       interval: 5m
       start_interval: 30s
       start_period: 5m

docker/docker-compose.prod.yml

@@ -61,7 +61,7 @@ services:
     ports:
       - 5432:5432
     healthcheck:
-      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT SUM(checksum_failures) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
+      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
       interval: 5m
       start_interval: 30s
       start_period: 5m

docker/docker-compose.yml

@@ -59,7 +59,7 @@ services:
     volumes:
       - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
     healthcheck:
-      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT SUM(checksum_failures) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
+      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
       interval: 5m
       start_interval: 30s
       start_period: 5m

docker/prometheus.yml

@@ -3,10 +3,10 @@ global:
   evaluation_interval: 15s
 
 scrape_configs:
-  - job_name: immich_server
+  - job_name: immich_api
     static_configs:
       - targets: ['immich-server:8081']
-  
+
   - job_name: immich_microservices
     static_configs:
-      - targets: ['immich-microservices:8081']
+      - targets: ['immich-server:8082']

docker/scripts/get-cpus.sh

@@ -43,7 +43,7 @@ if [ -n "${quota:-}" ] && [ -n "${period:-}" ]; then
         cpus=1
     fi
 else
-    cpus=$(grep -c processor /proc/cpuinfo)
+    cpus=$(grep -c ^processor /proc/cpuinfo)
 fi
 
 echo "$cpus"

docs/docs/administration/email-notification.mdx

@@ -0,0 +1,23 @@
+# Email Notifications
+
+Immich supports the option to send notifications via Email for the following events:
+
+- Creating a new user
+- Notifying a user when they get added to a shared album
+- Informing other users about the addition of new assets to a shared album
+
+## SMTP settings
+
+You can access the settings panel from the web at `Administration -> Settings -> Notification settings`
+
+Under Email, enter the following details to connect with SMTP servers.
+
+You can use the following [guide](/docs/guides/smtp-gmail) to use Gmail's SMTP server.
+
+<img src={require('./img/email-settings.png').default} width="80%" title="SMTP settings" />
+
+## User's notifications settings
+
+Users can manage their email notification settings from their account settings page on the web. They can choose to turn email notifications on or off for the following events:
+
+<img src={require('./img/user-notifications-settings.png').default} width="80%" title="User notification settings" />

docs/docs/administration/system-settings.md

@@ -10,6 +10,59 @@ Viewing and modifying the system settings is restricted to the Administrator.
 You can always return to the default settings by clicking the `Reset to default` button.
 :::
 
+## Authentication Settings
+
+Manage password, OAuth, and other authentication settings
+
+### OAuth Authentication
+
+Immich supports OAuth Authentication. Read more about this feature and its configuration [here](/docs/administration/oauth).
+
+### Password Authentication
+
+The administrator can choose to disable login with username and password for the entire instance. This means that **no one**, including the system administrator, will be able to log using this method. If [OAuth Authentication](/docs/administration/oauth) is also disabled, no users will be able to login using **any** method. Changing this setting does not affect existing sessions, just new login attempts.
+
+:::tip
+You can always use the [Server CLI](/docs/administration/server-commands) to re-enable password login.
+:::
+
+## Image Settings (thumbnails and previews)
+
+- Thumbnails - Used in the main timeline.
+- Previews - Used in the asset viewer.
+
+By default Immich creates 3 thumbnails for each asset,
+Blurred (thumbhash) , Small - thumbnails (webp) , and Large - previews (jpeg/webp), using these settings you can change the quality for the thumbnails and previews files that are created.
+
+**Thumbnail format**  
+Allows you to choose the type of format you want for the Thumbnail images, Webp produces smaller files than jpeg, but is slower to encode.
+
+:::tip
+You can read in detail about the advantages and disadvantages of using webp over jpeg on [Adobe's website](https://www.adobe.com/creativecloud/file-types/image/raster/webp-file.html)
+:::
+
+**Thumbnail resolution**  
+Used when viewing groups of photos (main timeline, album view, etc.). Higher resolutions can preserve more detail but take longer to encode, have larger file sizes, and can reduce app responsiveness.
+
+**Preview format**  
+Allows you to choose the type of format you want for the Preview images, Webp produces smaller files than jpeg, but is slower to encode.
+
+**Preview resolution**  
+Used when viewing a single photo and for machine learning. Higher resolutions can preserve more detail but take longer to encode, have larger file sizes, and can reduce app responsiveness.
+
+**Quality**  
+Image quality from 1-100. Higher is better for quality but produces larger files, this option affects the Preview and Thumbnail images.
+
+**Prefer wide gamut**  
+Use Display P3 for thumbnails. This better preserves the vibrance of images with wide colorspaces, but images may appear differently on old devices with an old browser version. sRGB images are kept as sRGB to avoid color shifts.
+
+**Prefer embedded preview**  
+Use embedded previews in RAW photos as the input to image processing when available. This can produce more accurate colors for some images, but the quality of the preview is camera-dependent and the image may have more compression artifacts.
+
+:::tip
+The default resolution for Large thumbnails can be lowered from 1440p (default) to 1080p or 720p to save storage space.
+:::
+
 ## Job Settings
 
 Using these settings, you can determine the amount of work that will run concurrently for each task in microservices. Some tasks can be set to higher values on computers with powerful hardware and storage with good I/O capabilities.
@@ -92,17 +145,9 @@ The map can be adjusted via [OpenMapTiles](https://openmaptiles.org/styles/) for
 
 Immich supports [Reverse Geocoding](/docs/features/reverse-geocoding) using data from the [GeoNames](https://www.geonames.org/) geographical database.
 
-## OAuth Authentication
+## Notification Settings
 
-Immich supports OAuth Authentication. Read more about this feature and its configuration [here](/docs/administration/oauth).
-
-## Password Authentication
-
-The administrator can choose to disable login with username and password for the entire instance. This means that **no one**, including the system administrator, will be able to log using this method. If [OAuth Authentication](/docs/administration/oauth) is also disabled, no users will be able to login using **any** method. Changing this setting does not affect existing sessions, just new login attempts.
-
-:::tip
-You can always use the [Server CLI](/docs/administration/server-commands) to re-enable password login.
-:::
+SMTP server setup, for user creation notifications, new albums, etc. More information can be found [here](/docs/administration/email-notification)
 
 ## Server Settings
 
@@ -130,27 +175,6 @@ p {
 }
 ```
 
-## Thumbnail Settings
-
-By default Immich creates 3 thumbnails for each asset,
-Blurred (thumbhash) , Small (webp) , and Large (jpeg), using these settings you can change the quality for the thumbnail files that are created.
-
-**Small thumbnail resolution**  
-Used when viewing groups of photos (main timeline, album view, etc.). Higher resolutions can preserve more detail but take longer to encode, have larger file sizes, and can reduce app responsiveness.
-
-**Large thumbnail resolution**  
-Used when viewing a single photo and for machine learning. Higher resolutions can preserve more detail but take longer to encode, have larger file sizes, and can reduce app responsiveness.
-
-**Quality**  
-Thumbnail quality from 1-100. Higher is better for quality but produces larger files.
-
-**Prefer wide gamut**  
-Use display p3 for thumbnails. This better preserves the vibrance of images with wide color spaces, but images may appear differently on old devices with an old browser version. Srgb images are kept as srgb to avoid color shifts.
-
-:::tip
-The default resolution for Large thumbnails can be lowered from 1440p (default) to 1080p or 720p to save storage space.
-:::
-
 ## Trash Settings
 
 In the system administrator's option to set a trash for deleted files, these files will remain in the trash until the deletion date 30 days (default) or as defined by the system administrator.

docs/docs/administration/user-management.mdx

@@ -13,6 +13,20 @@ Immich supports multiple users, each with their own library.
 
 <UserCreate />
 
+## Send new user email notification
+
+:::note
+This option is only available if an SMTP server has been configured in the administrator settings.
+:::
+
+Admin can send a welcome email if the Email option is set, you can learn here how to set up the SMTP server in Immich.
+
+<img
+  src={require('./img/send-user-email-notification.webp').default}
+  width="40%"
+  title="Send user email notification"
+/>
+
 ## Set Storage Quota For User
 
 Admin can specify the storage quota for the user as the instance's admin; once the limit is reached, the user won't be able to upload to the instance anymore.

docs/docs/features/hardware-transcoding.md

@@ -60,17 +60,17 @@ For RKMPP to work:
 #### Basic Setup
 
 1. If you do not already have it, download the latest [`hwaccel.transcoding.yml`][hw-file] file and ensure it's in the same folder as the `docker-compose.yml`.
-2. In the `docker-compose.yml` under `immich-microservices`, uncomment the `extends` section and change `cpu` to the appropriate backend.
+2. In the `docker-compose.yml` under `immich-server`, uncomment the `extends` section and change `cpu` to the appropriate backend.
 
 - For VAAPI on WSL2, be sure to use `vaapi-wsl` rather than `vaapi`
 
-3. Redeploy the `immich-microservices` container with these updated settings.
+3. Redeploy the `immich-server` container with these updated settings.
 4. In the Admin page under `Video transcoding settings`, change the hardware acceleration setting to the appropriate option and save.
 5. (Optional) If using a compatible backend, you may enable hardware decoding for optimal performance.
 
 #### Single Compose File
 
-Some platforms, including Unraid and Portainer, do not support multiple Compose files as of writing. As an alternative, you can "inline" the relevant contents of the [`hwaccel.transcoding.yml`][hw-file] file into the `immich-microservices` service directly.
+Some platforms, including Unraid and Portainer, do not support multiple Compose files as of writing. As an alternative, you can "inline" the relevant contents of the [`hwaccel.transcoding.yml`][hw-file] file into the `immich-server` service directly.
 
 For example, the `qsv` section in this file is:
 
@@ -79,21 +79,22 @@ devices:
   - /dev/dri:/dev/dri
 ```
 
-You can add this to the `immich-microservices` service instead of extending from `hwaccel.transcoding.yml`:
+You can add this to the `immich-server` service instead of extending from `hwaccel.transcoding.yml`:
 
 ```yaml
-immich-microservices:
-  container_name: immich_microservices
+immich-server:
+  container_name: immich_server
   image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
   # Note the lack of an `extends` section
   devices:
     - /dev/dri:/dev/dri
-  command: ['start.sh', 'microservices']
   volumes:
     - ${UPLOAD_LOCATION}:/usr/src/app/upload
     - /etc/localtime:/etc/localtime:ro
   env_file:
     - .env
+  ports:
+    - 2283:3001
   depends_on:
     - redis
     - database

docs/docs/guides/smtp-gmail.md

@@ -0,0 +1,20 @@
+# SMTP settings using Gmail
+
+This guide walks you through how to get the information you need to set up your Immich instance to send emails using Gmail's SMTP server.
+
+## Create an app password
+
+From your Google account settings
+
+- Add [2-Step Verification](https://support.google.com/accounts/answer/185839) to your Google account (Required)
+- [Create an app password](https://myaccount.google.com/apppasswords).
+
+At the end of creating your app passwords, a password will be displayed; save it, it will be used for the password field when setting up the SMTP server in Immich.
+
+<img src={require('./img/google-app-password.webp').default} title="Authorised redirect URIs" />
+
+## Entering the SMTP credential in Immich
+
+Entering your credential in Immich's email notification settings at `Administration -> Settings -> Notification Settings`
+
+<img src={require('./img/email-settings.png').default} width="80%" title="SMTP settings" />

docs/docs/install/environment-variables.md

@@ -38,17 +38,19 @@ Regardless of filesystem, it is not recommended to use a network share for your
 
 ## General
 
-| Variable                        | Description                                     |           Default            | Containers               | Workers            |
-| :------------------------------ | :---------------------------------------------- | :--------------------------: | :----------------------- | :----------------- |
-| `TZ`                            | Timezone                                        |                              | server                   | microservices      |
-| `IMMICH_ENV`                    | Environment (production, development)           |         `production`         | server, machine learning | api, microservices |
-| `IMMICH_LOG_LEVEL`              | Log Level (verbose, debug, log, warn, error)    |            `log`             | server, machine learning | api, microservices |
-| `IMMICH_MEDIA_LOCATION`         | Media Location                                  |   `./upload`<sup>\*1</sup>   | server                   | api, microservices |
-| `IMMICH_CONFIG_FILE`            | Path to config file                             |                              | server                   | api, microservices |
-| `IMMICH_WEB_ROOT`               | Path of root index.html                         |      `/usr/src/app/www`      | server                   | api                |
-| `IMMICH_REVERSE_GEOCODING_ROOT` | Path of reverse geocoding dump directory        |     `/usr/src/resources`     | server                   | microservices      |
-| `NO_COLOR`                      | Set to `true` to disable color-coded log output |           `false`            | server, machine learning |                    |
-| `CPU_CORES`                     | Amount of cores available to the immich server  | auto-detected cpu core count | server                   |                    |
+| Variable                            | Description                                     |           Default            | Containers               | Workers            |
+| :---------------------------------- | :---------------------------------------------- | :--------------------------: | :----------------------- | :----------------- |
+| `TZ`                                | Timezone                                        |                              | server                   | microservices      |
+| `IMMICH_ENV`                        | Environment (production, development)           |         `production`         | server, machine learning | api, microservices |
+| `IMMICH_LOG_LEVEL`                  | Log Level (verbose, debug, log, warn, error)    |            `log`             | server, machine learning | api, microservices |
+| `IMMICH_MEDIA_LOCATION`             | Media Location                                  |   `./upload`<sup>\*1</sup>   | server                   | api, microservices |
+| `IMMICH_CONFIG_FILE`                | Path to config file                             |                              | server                   | api, microservices |
+| `IMMICH_WEB_ROOT`                   | Path of root index.html                         |      `/usr/src/app/www`      | server                   | api                |
+| `IMMICH_REVERSE_GEOCODING_ROOT`     | Path of reverse geocoding dump directory        |     `/usr/src/resources`     | server                   | microservices      |
+| `NO_COLOR`                          | Set to `true` to disable color-coded log output |           `false`            | server, machine learning |                    |
+| `CPU_CORES`                         | Amount of cores available to the immich server  | auto-detected cpu core count | server                   |                    |
+| `IMMICH_API_METRICS_PORT`           | Port for the OTEL metrics                       |            `8081`            | server                   | api                |
+| `IMMICH_MICROSERVICES_METRICS_PORT` | Port for the OTEL metrics                       |            `8082`            | server                   | microservices      |
 
 \*1: With the default `WORKDIR` of `/usr/src/app`, this path will resolve to `/usr/src/app/upload`.
 It only need to be set if the Immich deployment method is changing.

docs/docusaurus.config.js

@@ -94,6 +94,10 @@ const config = {
           srcDark: 'img/immich-logo-inline-dark.png',
         },
         items: [
+          {
+            type: 'custom-versionSwitcher',
+            position: 'right',
+          },
           {
             to: '/docs/overview/introduction',
             position: 'right',

docs/src/components/version-switcher.tsx

@@ -0,0 +1,59 @@
+import '@docusaurus/theme-classic/lib/theme/Unlisted/index';
+import { useWindowSize } from '@docusaurus/theme-common';
+import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
+import React, { useEffect, useState } from 'react';
+
+export default function VersionSwitcher(): JSX.Element {
+  const [versions, setVersions] = useState([]);
+  const [label, setLabel] = useState('Versions');
+
+  const windowSize = useWindowSize();
+
+  useEffect(() => {
+    async function getVersions() {
+      try {
+        let baseUrl = 'https://immich.app';
+        if (window.location.origin === 'http://localhost:3005') {
+          baseUrl = window.location.origin;
+        }
+
+        const response = await fetch(`${baseUrl}/archived-versions.json`);
+
+        const archiveVersions = await response.json();
+
+        const allVersions = [
+          { label: 'Next', url: 'https://main.preview.immich.app' },
+          { label: 'Latest', url: 'https://immich.app' },
+          ...archiveVersions,
+        ];
+        setVersions(allVersions);
+
+        const activeVersion = allVersions.find((version) => new URL(version.url).origin === window.location.origin);
+        if (activeVersion) {
+          setLabel(activeVersion.label);
+        }
+      } catch (error) {
+        console.error('Failed to fetch versions', error);
+      }
+    }
+
+    if (versions.length === 0) {
+      getVersions();
+    }
+  }, []);
+
+  return (
+    versions.length > 0 && (
+      <DropdownNavbarItem
+        className="navbar__item"
+        label={label}
+        mobile={windowSize === 'mobile'}
+        items={versions.map(({ label, url }) => ({
+          label,
+          to: url,
+          target: '_self',
+        }))}
+      />
+    )
+  );
+}

docs/src/pages/roadmap.tsx

@@ -63,12 +63,14 @@ import {
   mdiVectorCombine,
   mdiVideo,
   mdiWeb,
+  mdiContentDuplicate,
 } from '@mdi/js';
 import Layout from '@theme/Layout';
 import React from 'react';
 import { Item, Timeline } from '../components/timeline';
 
 const releases = {
+  'v1.106.0': new Date(2024, 5, 11),
   'v1.104.0': new Date(2024, 4, 13),
   'v1.103.0': new Date(2024, 3, 29),
   'v1.102.0': new Date(2024, 3, 15),
@@ -216,13 +218,19 @@ const roadmap: Item[] = [
 ];
 
 const milestones: Item[] = [
-  // withRelease({
-  //   icon: mdiVectorCombine,
-  //   title: 'Container consolidation',
-  //   description:
-  //     'The microservices container can be run as a worker within the server image, allowing us to remove it from the default stack.',
-  //   release: 'v1.106.0',
-  // }),
+  withRelease({
+    icon: mdiContentDuplicate,
+    title: 'Similar image detection',
+    description: 'Detect duplicate assets that aren’t exactly identical',
+    release: 'v1.106.0',
+  }),
+  withRelease({
+    icon: mdiVectorCombine,
+    title: 'Container consolidation',
+    description:
+      'The microservices container can be run as a worker within the server image, allowing us to remove it from the default stack.',
+    release: 'v1.106.0',
+  }),
   withRelease({
     icon: mdiPencil,
     iconColor: 'saddlebrown',

docs/src/theme/NavbarItem/ComponentTypes.js

@@ -0,0 +1,7 @@
+import ComponentTypes from '@theme-original/NavbarItem/ComponentTypes';
+import VersionSwitcher from '@site/src/components/version-switcher';
+
+export default {
+  ...ComponentTypes,
+  'custom-versionSwitcher': VersionSwitcher,
+};

docs/static/archived-versions.json

@@ -0,0 +1,58 @@
+[
+  {
+    "label": "v1.106.3",
+    "url": "https://v1.106.3.archive.immich.app"
+  },
+  {
+    "label": "v1.106.2",
+    "url": "https://v1.106.2.archive.immich.app"
+  },
+  {
+    "label": "v1.106.1",
+    "url": "https://v1.106.1.archive.immich.app"
+  },
+  {
+    "label": "v1.105.1",
+    "url": "https://v1.105.1.archive.immich.app/"
+  },
+  {
+    "label": "v1.105.0",
+    "url": "https://v1.105.0.archive.immich.app/"
+  },
+  {
+    "label": "v1.104.0",
+    "url": "https://v1.104.0.archive.immich.app/"
+  },
+  {
+    "label": "v1.103.1",
+    "url": "https://v1.103.1.archive.immich.app/"
+  },
+  {
+    "label": "v1.103.0",
+    "url": "https://v1.103.0.archive.immich.app/"
+  },
+  {
+    "label": "v1.102.3",
+    "url": "https://v1.102.3.archive.immich.app/"
+  },
+  {
+    "label": "v1.102.2",
+    "url": "https://v1.102.2.archive.immich.app/"
+  },
+  {
+    "label": "v1.102.1",
+    "url": "https://v1.102.1.archive.immich.app/"
+  },
+  {
+    "label": "v1.102.0",
+    "url": "https://v1.102.0.archive.immich.app/"
+  },
+  {
+    "label": "v1.101.0",
+    "url": "https://v1.101.0.archive.immich.app/"
+  },
+  {
+    "label": "v1.100.0",
+    "url": "https://v1.100.0.archive.immich.app/"
+  }
+]

e2e/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "immich-e2e",
-  "version": "1.105.1",
+  "version": "1.106.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich-e2e",
-      "version": "1.105.1",
+      "version": "1.106.3",
       "license": "GNU Affero General Public License version 3",
       "devDependencies": {
         "@immich/cli": "file:../cli",
@@ -39,7 +39,7 @@
     },
     "../cli": {
       "name": "@immich/cli",
-      "version": "2.2.0",
+      "version": "2.2.3",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
@@ -81,14 +81,14 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.105.1",
+      "version": "1.106.3",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^20.12.13",
+        "@types/node": "^20.11.0",
         "typescript": "^5.3.3"
       }
     },

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "1.105.1",
+  "version": "1.106.3",
   "description": "",
   "main": "index.js",
   "type": "module",

e2e/src/api/specs/asset.e2e-spec.ts

@@ -1148,4 +1148,29 @@ describe('/asset', () => {
       expect(video.checksum).toStrictEqual(checksum);
     });
   });
+
+  describe('POST /assets/exist', () => {
+    it('ignores invalid deviceAssetIds', async () => {
+      const response = await utils.checkExistingAssets(user1.accessToken, {
+        deviceId: 'test-assets-exist',
+        deviceAssetIds: ['invalid', 'INVALID'],
+      });
+
+      expect(response.existingIds).toHaveLength(0);
+    });
+
+    it('returns the IDs of existing assets', async () => {
+      await utils.createAsset(user1.accessToken, {
+        deviceId: 'test-assets-exist',
+        deviceAssetId: 'test-asset-0',
+      });
+
+      const response = await utils.checkExistingAssets(user1.accessToken, {
+        deviceId: 'test-assets-exist',
+        deviceAssetIds: ['test-asset-0'],
+      });
+
+      expect(response.existingIds).toEqual(['test-asset-0']);
+    });
+  });
 });

e2e/src/api/specs/library.e2e-spec.ts

@@ -1,4 +1,11 @@
-import { LibraryResponseDto, LoginResponseDto, ScanLibraryDto, getAllLibraries, scanLibrary } from '@immich/sdk';
+import {
+  LibraryResponseDto,
+  LoginResponseDto,
+  ScanLibraryDto,
+  getAllLibraries,
+  removeOfflineFiles,
+  scanLibrary,
+} from '@immich/sdk';
 import { cpSync, existsSync } from 'node:fs';
 import { Socket } from 'socket.io-client';
 import { userDto, uuidDto } from 'src/fixtures';
@@ -384,6 +391,51 @@ describe('/libraries', () => {
       );
     });
 
+    it('should not try to delete offline files', async () => {
+      utils.createImageFile(`${testAssetDir}/temp/offline1/assetA.png`);
+
+      const library = await utils.createLibrary(admin.accessToken, {
+        ownerId: admin.userId,
+        importPaths: [`${testAssetDirInternal}/temp/offline1`],
+      });
+
+      await scan(admin.accessToken, library.id);
+      await utils.waitForQueueFinish(admin.accessToken, 'library');
+
+      const { assets: initialAssets } = await utils.metadataSearch(admin.accessToken, { libraryId: library.id });
+      expect(initialAssets).toEqual({
+        count: 1,
+        total: 1,
+        facets: [],
+        items: [expect.objectContaining({ originalFileName: 'assetA.png' })],
+        nextPage: null,
+      });
+
+      utils.removeImageFile(`${testAssetDir}/temp/offline1/assetA.png`);
+
+      await scan(admin.accessToken, library.id);
+      await utils.waitForQueueFinish(admin.accessToken, 'library');
+
+      const { assets: offlineAssets } = await utils.metadataSearch(admin.accessToken, {
+        libraryId: library.id,
+        isOffline: true,
+      });
+      expect(offlineAssets).toEqual({
+        count: 1,
+        total: 1,
+        facets: [],
+        items: [expect.objectContaining({ originalFileName: 'assetA.png' })],
+        nextPage: null,
+      });
+
+      utils.createImageFile(`${testAssetDir}/temp/offline1/assetA.png`);
+      await removeOfflineFiles({ id: library.id }, { headers: asBearerAuth(admin.accessToken) });
+      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.waitForWebsocketEvent({ event: 'assetDelete', total: 1 });
+
+      expect(existsSync(`${testAssetDir}/temp/offline1/assetA.png`)).toBe(true);
+    });
+
     it('should scan new files', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
@@ -507,10 +559,10 @@ describe('/libraries', () => {
     it('should remove offline files', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        importPaths: [`${testAssetDirInternal}/temp`],
+        importPaths: [`${testAssetDirInternal}/temp/offline2`],
       });
 
-      utils.createImageFile(`${testAssetDir}/temp/directoryA/assetB.png`);
+      utils.createImageFile(`${testAssetDir}/temp/offline2/assetA.png`);
 
       await scan(admin.accessToken, library.id);
       await utils.waitForQueueFinish(admin.accessToken, 'library');
@@ -518,9 +570,9 @@ describe('/libraries', () => {
       const { assets: initialAssets } = await utils.metadataSearch(admin.accessToken, {
         libraryId: library.id,
       });
-      expect(initialAssets.count).toBe(3);
+      expect(initialAssets.count).toBe(1);
 
-      utils.removeImageFile(`${testAssetDir}/temp/directoryA/assetB.png`);
+      utils.removeImageFile(`${testAssetDir}/temp/offline2/assetA.png`);
 
       await scan(admin.accessToken, library.id);
       await utils.waitForQueueFinish(admin.accessToken, 'library');
@@ -541,7 +593,7 @@ describe('/libraries', () => {
 
       const { assets } = await utils.metadataSearch(admin.accessToken, { libraryId: library.id });
 
-      expect(assets.count).toBe(2);
+      expect(assets.count).toBe(0);
     });
 
     it('should not remove online files', async () => {

e2e/src/utils.ts

@@ -3,6 +3,7 @@ import {
   AssetMediaCreateDto,
   AssetMediaResponseDto,
   AssetResponseDto,
+  CheckExistingAssetsDto,
   CreateAlbumDto,
   CreateLibraryDto,
   MetadataSearchDto,
@@ -10,6 +11,7 @@ import {
   SharedLinkCreateDto,
   UserAdminCreateDto,
   ValidateLibraryDto,
+  checkExistingAssets,
   createAlbum,
   createApiKey,
   createLibrary,
@@ -374,6 +376,9 @@ export const utils = {
 
   getAssetInfo: (accessToken: string, id: string) => getAssetInfo({ id }, { headers: asBearerAuth(accessToken) }),
 
+  checkExistingAssets: (accessToken: string, checkExistingAssetsDto: CheckExistingAssetsDto) =>
+    checkExistingAssets({ checkExistingAssetsDto }, { headers: asBearerAuth(accessToken) }),
+
   metadataSearch: async (accessToken: string, dto: MetadataSearchDto) => {
     return searchMetadata({ metadataSearchDto: dto }, { headers: asBearerAuth(accessToken) });
   },

machine-learning/poetry.lock

@@ -1236,13 +1236,13 @@ socks = ["socksio (==1.*)"]
 
 [[package]]
 name = "huggingface-hub"
-version = "0.23.2"
+version = "0.23.3"
 description = "Client library to download and publish models, datasets and other repos on the huggingface.co hub"
 optional = false
 python-versions = ">=3.8.0"
 files = [
-    {file = "huggingface_hub-0.23.2-py3-none-any.whl", hash = "sha256:48727a16e704d409c4bb5913613308499664f22a99743435dc3a13b23c485827"},
-    {file = "huggingface_hub-0.23.2.tar.gz", hash = "sha256:f6829b62d5fdecb452a76fdbec620cba4c1573655a8d710c1df71735fd9edbd2"},
+    {file = "huggingface_hub-0.23.3-py3-none-any.whl", hash = "sha256:22222c41223f1b7c209ae5511d2d82907325a0e3cdbce5f66949d43c598ff3bc"},
+    {file = "huggingface_hub-0.23.3.tar.gz", hash = "sha256:1a1118a0b3dea3bab6c325d71be16f5ffe441d32f3ac7c348d6875911b694b5b"},
 ]
 
 [package.dependencies]
@@ -2054,18 +2054,18 @@ sympy = "*"
 
 [[package]]
 name = "opencv-python-headless"
-version = "4.9.0.80"
+version = "4.10.0.82"
 description = "Wrapper package for OpenCV python bindings."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "opencv-python-headless-4.9.0.80.tar.gz", hash = "sha256:71a4cd8cf7c37122901d8e81295db7fb188730e33a0e40039a4e59c1030b0958"},
-    {file = "opencv_python_headless-4.9.0.80-cp37-abi3-macosx_10_16_x86_64.whl", hash = "sha256:2ea8a2edc4db87841991b2fbab55fc07b97ecb602e0f47d5d485bd75cee17c1a"},
-    {file = "opencv_python_headless-4.9.0.80-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:e0ee54e27be493e8f7850847edae3128e18b540dac1d7b2e4001b8944e11e1c6"},
-    {file = "opencv_python_headless-4.9.0.80-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:57ce2865e8fec431c6f97a81e9faaf23fa5be61011d0a75ccf47a3c0d65fa73d"},
-    {file = "opencv_python_headless-4.9.0.80-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:976656362d68d9f40a5c66f83901430538002465f7db59142784f3893918f3df"},
-    {file = "opencv_python_headless-4.9.0.80-cp37-abi3-win32.whl", hash = "sha256:11e3849d83e6651d4e7699aadda9ec7ed7c38957cbbcb99db074f2a2d2de9670"},
-    {file = "opencv_python_headless-4.9.0.80-cp37-abi3-win_amd64.whl", hash = "sha256:a8056c2cb37cd65dfcdf4153ca16f7362afcf3a50d600d6bb69c660fc61ee29c"},
+    {file = "opencv-python-headless-4.10.0.82.tar.gz", hash = "sha256:de9e742c1b9540816fbd115b0b03841d41ed0c65566b0d7a5371f98b131b7e6d"},
+    {file = "opencv_python_headless-4.10.0.82-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:a09ed50ba21cc5bf5d436cb0e784ad09c692d6b1d1454252772f6c8f2c7b4088"},
+    {file = "opencv_python_headless-4.10.0.82-cp37-abi3-macosx_12_0_x86_64.whl", hash = "sha256:977a5fd21e1fe0d3d2134887db4441f8725abeae95150126302f31fcd9f548fa"},
+    {file = "opencv_python_headless-4.10.0.82-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:db4ec6755838b0be12510bfc9ffb014779c612418f11f4f7e6f505c36124a3aa"},
+    {file = "opencv_python_headless-4.10.0.82-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10a37fa5276967ecf6eb297295b16b28b7a2eb3b568ca0ee469fb1a5954de298"},
+    {file = "opencv_python_headless-4.10.0.82-cp37-abi3-win32.whl", hash = "sha256:94736e9b322d13db4768fd35588ad5e8995e78e207263076bfbee18aac835ad5"},
+    {file = "opencv_python_headless-4.10.0.82-cp37-abi3-win_amd64.whl", hash = "sha256:c1822fa23d1641c0249ed5eb906f4c385f7959ff1bd601a776d56b0c18914af4"},
 ]
 
 [package.dependencies]
@@ -2438,13 +2438,13 @@ files = [
 
 [[package]]
 name = "pytest"
-version = "8.2.1"
+version = "8.2.2"
 description = "pytest: simple powerful testing with Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pytest-8.2.1-py3-none-any.whl", hash = "sha256:faccc5d332b8c3719f40283d0d44aa5cf101cec36f88cde9ed8f2bc0538612b1"},
-    {file = "pytest-8.2.1.tar.gz", hash = "sha256:5046e5b46d8e4cac199c373041f26be56fdb81eb4e67dc11d4e10811fc3408fd"},
+    {file = "pytest-8.2.2-py3-none-any.whl", hash = "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343"},
+    {file = "pytest-8.2.2.tar.gz", hash = "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977"},
 ]
 
 [package.dependencies]
@@ -2799,28 +2799,28 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"]
 
 [[package]]
 name = "ruff"
-version = "0.4.7"
+version = "0.4.8"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "ruff-0.4.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:e089371c67892a73b6bb1525608e89a2aca1b77b5440acf7a71dda5dac958f9e"},
-    {file = "ruff-0.4.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:10f973d521d910e5f9c72ab27e409e839089f955be8a4c8826601a6323a89753"},
-    {file = "ruff-0.4.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:59c3d110970001dfa494bcd95478e62286c751126dfb15c3c46e7915fc49694f"},
-    {file = "ruff-0.4.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fa9773c6c00f4958f73b317bc0fd125295110c3776089f6ef318f4b775f0abe4"},
-    {file = "ruff-0.4.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07fc80bbb61e42b3b23b10fda6a2a0f5a067f810180a3760c5ef1b456c21b9db"},
-    {file = "ruff-0.4.7-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:fa4dafe3fe66d90e2e2b63fa1591dd6e3f090ca2128daa0be33db894e6c18648"},
-    {file = "ruff-0.4.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a7c0083febdec17571455903b184a10026603a1de078428ba155e7ce9358c5f6"},
-    {file = "ruff-0.4.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ad1b20e66a44057c326168437d680a2166c177c939346b19c0d6b08a62a37589"},
-    {file = "ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cbf5d818553add7511c38b05532d94a407f499d1a76ebb0cad0374e32bc67202"},
-    {file = "ruff-0.4.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:50e9651578b629baec3d1513b2534de0ac7ed7753e1382272b8d609997e27e83"},
-    {file = "ruff-0.4.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8874a9df7766cb956b218a0a239e0a5d23d9e843e4da1e113ae1d27ee420877a"},
-    {file = "ruff-0.4.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:b9de9a6e49f7d529decd09381c0860c3f82fa0b0ea00ea78409b785d2308a567"},
-    {file = "ruff-0.4.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:13a1768b0691619822ae6d446132dbdfd568b700ecd3652b20d4e8bc1e498f78"},
-    {file = "ruff-0.4.7-py3-none-win32.whl", hash = "sha256:769e5a51df61e07e887b81e6f039e7ed3573316ab7dd9f635c5afaa310e4030e"},
-    {file = "ruff-0.4.7-py3-none-win_amd64.whl", hash = "sha256:9e3ab684ad403a9ed1226894c32c3ab9c2e0718440f6f50c7c5829932bc9e054"},
-    {file = "ruff-0.4.7-py3-none-win_arm64.whl", hash = "sha256:10f2204b9a613988e3484194c2c9e96a22079206b22b787605c255f130db5ed7"},
-    {file = "ruff-0.4.7.tar.gz", hash = "sha256:2331d2b051dc77a289a653fcc6a42cce357087c5975738157cd966590b18b5e1"},
+    {file = "ruff-0.4.8-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:7663a6d78f6adb0eab270fa9cf1ff2d28618ca3a652b60f2a234d92b9ec89066"},
+    {file = "ruff-0.4.8-py3-none-macosx_11_0_arm64.whl", hash = "sha256:eeceb78da8afb6de0ddada93112869852d04f1cd0f6b80fe464fd4e35c330913"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aad360893e92486662ef3be0a339c5ca3c1b109e0134fcd37d534d4be9fb8de3"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:284c2e3f3396fb05f5f803c9fffb53ebbe09a3ebe7dda2929ed8d73ded736deb"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a7354f921e3fbe04d2a62d46707e569f9315e1a613307f7311a935743c51a764"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:72584676164e15a68a15778fd1b17c28a519e7a0622161eb2debdcdabdc71883"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9678d5c9b43315f323af2233a04d747409d1e3aa6789620083a82d1066a35199"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704977a658131651a22b5ebeb28b717ef42ac6ee3b11e91dc87b633b5d83142b"},
+    {file = "ruff-0.4.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d05f8d6f0c3cce5026cecd83b7a143dcad503045857bc49662f736437380ad45"},
+    {file = "ruff-0.4.8-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6ea874950daca5697309d976c9afba830d3bf0ed66887481d6bca1673fc5b66a"},
+    {file = "ruff-0.4.8-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:fc95aac2943ddf360376be9aa3107c8cf9640083940a8c5bd824be692d2216dc"},
+    {file = "ruff-0.4.8-py3-none-musllinux_1_2_i686.whl", hash = "sha256:384154a1c3f4bf537bac69f33720957ee49ac8d484bfc91720cc94172026ceed"},
+    {file = "ruff-0.4.8-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:e9d5ce97cacc99878aa0d084c626a15cd21e6b3d53fd6f9112b7fc485918e1fa"},
+    {file = "ruff-0.4.8-py3-none-win32.whl", hash = "sha256:6d795d7639212c2dfd01991259460101c22aabf420d9b943f153ab9d9706e6a9"},
+    {file = "ruff-0.4.8-py3-none-win_amd64.whl", hash = "sha256:e14a3a095d07560a9d6769a72f781d73259655919d9b396c650fc98a8157555d"},
+    {file = "ruff-0.4.8-py3-none-win_arm64.whl", hash = "sha256:14019a06dbe29b608f6b7cbcec300e3170a8d86efaddb7b23405cb7f7dcaf780"},
+    {file = "ruff-0.4.8.tar.gz", hash = "sha256:16d717b1d57b2e2fd68bd0bf80fb43931b79d05a7131aa477d66fc40fbd86268"},
 ]
 
 [[package]]

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.105.1"
+version = "1.106.3"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"

misc/release/archive-version.js

@@ -0,0 +1,17 @@
+#! /usr/bin/env node
+const { readFileSync, writeFileSync } = require('node:fs');
+
+const nextVersion = process.argv[2];
+if (!nextVersion) {
+  console.log('Usage: archive-version.js <version>');
+  process.exit(1);
+}
+
+const filename = './docs/static/archived-versions.json';
+const oldVersions = JSON.parse(readFileSync(filename));
+const newVersions = [
+  { label: `v${nextVersion}`, url: `https://v${nextVersion}.archive.immich.app` },
+  ...oldVersions,
+];
+
+writeFileSync(filename, JSON.stringify(newVersions, null, 2) + '\n');

misc/release/pump-version.sh

@@ -66,10 +66,12 @@ if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then
   npm --prefix server run build
   make open-api
   npm --prefix open-api/typescript-sdk version "$SERVER_PUMP"
-  npm --prefix web version "$SERVER_PUMP"
-  npm --prefix e2e version "$SERVER_PUMP"
-  npm --prefix web i --package-lock-only
+  # TODO use $SERVER_PUMP once we pass 2.2.x
+  npm --prefix cli version patch
   npm --prefix cli i --package-lock-only
+  npm --prefix web version "$SERVER_PUMP"
+  npm --prefix web i --package-lock-only
+  npm --prefix e2e version "$SERVER_PUMP"
   npm --prefix e2e i --package-lock-only
   poetry --directory machine-learning version "$SERVER_PUMP"
 fi
@@ -83,4 +85,6 @@ sed -i "s/version_number: \"$CURRENT_SERVER\"$/version_number: \"$NEXT_SERVER\"/
 sed -i "s/\"android\.injected\.version\.code\" => $CURRENT_MOBILE,/\"android\.injected\.version\.code\" => $NEXT_MOBILE,/" mobile/android/fastlane/Fastfile
 sed -i "s/^version: $CURRENT_SERVER+$CURRENT_MOBILE$/version: $NEXT_SERVER+$NEXT_MOBILE/" mobile/pubspec.yaml
 
+./misc/release/archive-version.js "$NEXT_SERVER"
+
 echo "IMMICH_VERSION=v$NEXT_SERVER" >>"$GITHUB_ENV"

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 140,
-        "android.injected.version.name" => "1.105.1",
+        "android.injected.version.code" => 143,
+        "android.injected.version.name" => "1.106.3",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/android/fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000374">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000381">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="84.292464">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="52.832426">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="33.336934">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="27.616558">
         
       </testcase>
     

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -383,7 +383,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 157;
+				CURRENT_PROJECT_VERSION = 160;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -525,7 +525,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 157;
+				CURRENT_PROJECT_VERSION = 160;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -553,7 +553,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 157;
+				CURRENT_PROJECT_VERSION = 160;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

mobile/ios/Runner/Info.plist

@@ -58,11 +58,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.105.0</string>
+    <string>1.106.3</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>157</string>
+    <string>160</string>
     <key>FLTEnableImpeller</key>
     <true />
     <key>ITSAppUsesNonExemptEncryption</key>

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-      version_number: "1.105.1"
+      version_number: "1.106.3"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/ios/fastlane/report.xml

@@ -5,32 +5,32 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.020864">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000491">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.917777">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="39.414297">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="5.283943">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="32.521647">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.944748">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.511733">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: build_app" time="215.971639">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="202.628277">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="76.674601">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="73.861852">
         
       </testcase>
     

mobile/lib/pages/common/video_viewer.page.dart

@@ -75,9 +75,7 @@ class VideoViewerPage extends HookConsumerWidget {
     // Also sets the error if there is an error in the playback
     void updateVideoPlayback() {
       final videoPlayback = VideoPlaybackValue.fromController(controller);
-      if (!loopVideo) {
-        ref.read(videoPlaybackValueProvider.notifier).value = videoPlayback;
-      }
+      ref.read(videoPlaybackValueProvider.notifier).value = videoPlayback;
       final state = videoPlayback.state;
 
       // Enable the WakeLock while the video is playing
@@ -110,7 +108,9 @@ class VideoViewerPage extends HookConsumerWidget {
         }
 
         // Subscribes to listener
-        controller.addListener(updateVideoPlayback);
+        Future.microtask(() {
+          controller.addListener(updateVideoPlayback);
+        });
         return () {
           // Removes listener when we dispose
           controller.removeListener(updateVideoPlayback);

mobile/lib/pages/login/login.page.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/widgets/forms/login_form.dart';
+import 'package:immich_mobile/widgets/forms/login/login_form.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 

mobile/lib/providers/asset.provider.dart

@@ -50,8 +50,19 @@ class AssetNotifier extends StateNotifier<bool> {
         await clearAssetsAndAlbums(_db);
         log.info("Manual refresh requested, cleared assets and albums from db");
       }
+
       final bool changedUsers = await _userService.refreshUsers();
+
+      final assetCount = await _db.assets.count();
+
+      if (assetCount == 0) {
+        debugPrint("First sync, refreshing all assets");
+        await _assetService.refreshRemoteAssets(firstSync: true);
+        debugPrint("First sync, DONE refreshing all assets");
+      }
+      debugPrint("First sync, CONTINUE refreshing all assets");
       final bool newRemote = await _assetService.refreshRemoteAssets();
+
       final bool newLocal = await _albumService.refreshDeviceAlbums();
       debugPrint(
         "changedUsers: $changedUsers, newRemote: $newRemote, newLocal: $newLocal",

mobile/lib/providers/asset_viewer/video_player_controller_provider.dart

@@ -31,6 +31,9 @@ Future<VideoPlayerController> videoPlayerController(
     controller = VideoPlayerController.networkUrl(
       url,
       httpHeaders: {"x-immich-user-token": accessToken},
+      videoPlayerOptions: asset.livePhotoVideoId != null
+          ? VideoPlayerOptions(mixWithOthers: true)
+          : VideoPlayerOptions(mixWithOthers: false),
     );
   }
 

mobile/lib/providers/asset_viewer/video_player_controller_provider.g.dart

@@ -7,7 +7,7 @@ part of 'video_player_controller_provider.dart';
 // **************************************************************************
 
 String _$videoPlayerControllerHash() =>
-    r'40b31f7b1a73fab84c311b0f06bedf5322143cd9';
+    r'642469a44287188a7c301f5cad3df3e23c84d85c';
 
 /// Copied from Dart SDK
 class _SystemHash {

mobile/lib/providers/asset_viewer/video_player_controls_provider.dart

@@ -93,4 +93,18 @@ class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
       pause: !state.pause,
     );
   }
+
+  void restart() {
+    state = VideoPlaybackControls(
+      position: 0,
+      mute: state.mute,
+      pause: true,
+    );
+
+    state = VideoPlaybackControls(
+      position: 0,
+      mute: state.mute,
+      pause: false,
+    );
+  }
 }

mobile/lib/providers/map/map_state.provider.g.dart

@@ -6,7 +6,7 @@ part of 'map_state.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$mapStateNotifierHash() => r'87a8623f726d438d115d5a15609c71372726ee2f';
+String _$mapStateNotifierHash() => r'31fafe17aa85c48379a22ed3db3cc94af59ce5b8';
 
 /// See also [MapStateNotifier].
 @ProviderFor(MapStateNotifier)

mobile/lib/services/asset.service.dart

@@ -43,7 +43,7 @@ class AssetService {
 
   /// Checks the server for updated assets and updates the local database if
   /// required. Returns `true` if there were any changes.
-  Future<bool> refreshRemoteAssets() async {
+  Future<bool> refreshRemoteAssets({bool firstSync = false}) async {
     final syncedUserIds = await _db.eTags.where().idProperty().findAll();
     final List<User> syncedUsers = syncedUserIds.isEmpty
         ? []
@@ -57,6 +57,7 @@ class AssetService {
       getChangedAssets: _getRemoteAssetChanges,
       loadAssets: _getRemoteAssets,
       refreshUsers: _userService.getUsersFromServer,
+      firstSync: firstSync,
     );
     debugPrint("refreshRemoteAssets full took ${sw.elapsedMilliseconds}ms");
     return changes;
@@ -97,11 +98,14 @@ class AssetService {
   }
 
   /// Returns `null` if the server state did not change, else list of assets
-  Future<List<Asset>?> _getRemoteAssets(User user, DateTime until) async {
-    const int chunkSize = 10000;
+  Future<List<Asset>?> _getRemoteAssets(
+    User user,
+    DateTime until,
+    bool firstSync,
+  ) async {
+    int chunkSize = firstSync ? 1000 : 10000;
     try {
       final List<Asset> allAssets = [];
-      DateTime? lastCreationDate;
       String? lastId;
       // will break on error or once all assets are loaded
       while (true) {
@@ -109,16 +113,23 @@ class AssetService {
           limit: chunkSize,
           updatedUntil: until,
           lastId: lastId,
-          lastCreationDate: lastCreationDate,
           userId: user.id,
         );
+        log.fine("Requesting $chunkSize assets from $lastId");
         final List<AssetResponseDto>? assets =
             await _apiService.syncApi.getFullSyncForUser(dto);
         if (assets == null) return null;
+        log.fine(
+          "Received ${assets.length} assets from ${assets.firstOrNull?.id} to ${assets.lastOrNull?.id}",
+        );
         allAssets.addAll(assets.map(Asset.remote));
-        if (assets.isEmpty) break;
-        lastCreationDate = assets.last.fileCreatedAt;
+        if (assets.length != chunkSize) break;
         lastId = assets.last.id;
+
+        if (firstSync) {
+          // first sync only loads the first chunk
+          break;
+        }
       }
       return allAssets;
     } catch (error, stack) {

mobile/lib/services/sync.service.dart

@@ -46,14 +46,18 @@ class SyncService {
       List<User> users,
       DateTime since,
     ) getChangedAssets,
-    required FutureOr<List<Asset>?> Function(User user, DateTime until)
-        loadAssets,
+    required FutureOr<List<Asset>?> Function(
+      User user,
+      DateTime until,
+      bool firstSync,
+    ) loadAssets,
     required FutureOr<List<User>?> Function() refreshUsers,
+    required bool firstSync,
   }) =>
       _lock.run(
         () async =>
             await _syncRemoteAssetChanges(users, getChangedAssets) ??
-            await _syncRemoteAssetsFull(refreshUsers, loadAssets),
+            await _syncRemoteAssetsFull(refreshUsers, loadAssets, firstSync),
       );
 
   /// Syncs remote albums to the database
@@ -212,7 +216,9 @@ class SyncService {
   /// Syncs assets by loading and comparing all assets from the server.
   Future<bool> _syncRemoteAssetsFull(
     FutureOr<List<User>?> Function() refreshUsers,
-    FutureOr<List<Asset>?> Function(User user, DateTime until) loadAssets,
+    FutureOr<List<Asset>?> Function(User user, DateTime until, bool firstSync)
+        loadAssets,
+    bool firstSync,
   ) async {
     final serverUsers = await refreshUsers();
     if (serverUsers == null) {
@@ -228,17 +234,19 @@ class SyncService {
         .findAll();
     bool changes = false;
     for (User u in users) {
-      changes |= await _syncRemoteAssetsForUser(u, loadAssets);
+      changes |= await _syncRemoteAssetsForUser(u, loadAssets, firstSync);
     }
     return changes;
   }
 
   Future<bool> _syncRemoteAssetsForUser(
     User user,
-    FutureOr<List<Asset>?> Function(User user, DateTime until) loadAssets,
+    FutureOr<List<Asset>?> Function(User user, DateTime until, bool firstSync)
+        loadAssets,
+    bool firstSync,
   ) async {
     final DateTime now = DateTime.now().toUtc();
-    final List<Asset>? remote = await loadAssets(user, now);
+    final List<Asset>? remote = await loadAssets(user, now, firstSync);
     if (remote == null) {
       return false;
     }

mobile/lib/utils/version_compatibility.dart

@@ -0,0 +1,17 @@
+String? getVersionCompatibilityMessage(
+  int appMajor,
+  int appMinor,
+  int serverMajor,
+  int serverMinor,
+) {
+  if (serverMajor != appMajor) {
+    return 'Your app major version is not compatible with the server!';
+  }
+
+  // Add latest compat info up top
+  if (serverMinor < 106 && appMinor >= 106) {
+    return 'Your app minor version is not compatible with the server! Please update your server to version v1.106.0 or newer to login';
+  }
+
+  return null;
+}

mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart

@@ -64,6 +64,8 @@ class CustomVideoPlayerControls extends HookConsumerWidget {
       final state = ref.read(videoPlaybackValueProvider).state;
       if (state == VideoPlaybackState.playing) {
         ref.read(videoPlayerControlsProvider.notifier).pause();
+      } else if (state == VideoPlaybackState.completed) {
+        ref.read(videoPlayerControlsProvider.notifier).restart();
       } else {
         ref.read(videoPlayerControlsProvider.notifier).play();
       }

mobile/lib/widgets/forms/login/email_input.dart

@@ -0,0 +1,49 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+class EmailInput extends StatelessWidget {
+  final TextEditingController controller;
+  final FocusNode? focusNode;
+  final Function()? onSubmit;
+
+  const EmailInput({
+    super.key,
+    required this.controller,
+    this.focusNode,
+    this.onSubmit,
+  });
+
+  String? _validateInput(String? email) {
+    if (email == null || email == '') return null;
+    if (email.endsWith(' ')) return 'login_form_err_trailing_whitespace'.tr();
+    if (email.startsWith(' ')) return 'login_form_err_leading_whitespace'.tr();
+    if (email.contains(' ') || !email.contains('@')) {
+      return 'login_form_err_invalid_email'.tr();
+    }
+    return null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return TextFormField(
+      autofocus: true,
+      controller: controller,
+      decoration: InputDecoration(
+        labelText: 'login_form_label_email'.tr(),
+        border: const OutlineInputBorder(),
+        hintText: 'login_form_email_hint'.tr(),
+        hintStyle: const TextStyle(
+          fontWeight: FontWeight.normal,
+          fontSize: 14,
+        ),
+      ),
+      validator: _validateInput,
+      autovalidateMode: AutovalidateMode.always,
+      autofillHints: const [AutofillHints.email],
+      keyboardType: TextInputType.emailAddress,
+      onFieldSubmitted: (_) => onSubmit?.call(),
+      focusNode: focusNode,
+      textInputAction: TextInputAction.next,
+    );
+  }
+}

mobile/lib/widgets/forms/login/loading_icon.dart

@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+
+class LoadingIcon extends StatelessWidget {
+  const LoadingIcon({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Padding(
+      padding: EdgeInsets.only(top: 18.0),
+      child: SizedBox(
+        width: 24,
+        height: 24,
+        child: FittedBox(
+          child: CircularProgressIndicator(
+            strokeWidth: 2,
+          ),
+        ),
+      ),
+    );
+  }
+}

mobile/lib/widgets/forms/login/login_button.dart

@@ -0,0 +1,27 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class LoginButton extends ConsumerWidget {
+  final Function() onPressed;
+
+  const LoginButton({
+    super.key,
+    required this.onPressed,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return ElevatedButton.icon(
+      style: ElevatedButton.styleFrom(
+        padding: const EdgeInsets.symmetric(vertical: 12),
+      ),
+      onPressed: onPressed,
+      icon: const Icon(Icons.login_rounded),
+      label: const Text(
+        "login_form_button_text",
+        style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+      ).tr(),
+    );
+  }
+}

mobile/lib/widgets/forms/login/login_form.dart

@@ -15,11 +15,19 @@ import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/authentication.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/utils/version_compatibility.dart';
 import 'package:immich_mobile/widgets/common/immich_logo.dart';
 import 'package:immich_mobile/widgets/common/immich_title_text.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
+import 'package:immich_mobile/widgets/forms/login/email_input.dart';
+import 'package:immich_mobile/widgets/forms/login/loading_icon.dart';
+import 'package:immich_mobile/widgets/forms/login/login_button.dart';
+import 'package:immich_mobile/widgets/forms/login/o_auth_login_button.dart';
+import 'package:immich_mobile/widgets/forms/login/password_input.dart';
+import 'package:immich_mobile/widgets/forms/login/server_endpoint_input.dart';
 import 'package:openapi/api.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 class LoginForm extends HookConsumerWidget {
@@ -45,9 +53,31 @@ class LoginForm extends HookConsumerWidget {
     final logoAnimationController = useAnimationController(
       duration: const Duration(seconds: 60),
     )..repeat();
+    final serverInfo = ref.watch(serverInfoProvider);
+    final warningMessage = useState<String?>(null);
 
     final ValueNotifier<String?> serverEndpoint = useState<String?>(null);
 
+    checkVersionMismatch() async {
+      try {
+        final packageInfo = await PackageInfo.fromPlatform();
+        final appVersion = packageInfo.version;
+        final appMajorVersion = int.parse(appVersion.split('.')[0]);
+        final appMinorVersion = int.parse(appVersion.split('.')[1]);
+        final serverMajorVersion = serverInfo.serverVersion.major;
+        final serverMinorVersion = serverInfo.serverVersion.minor;
+
+        warningMessage.value = getVersionCompatibilityMessage(
+          appMajorVersion,
+          appMinorVersion,
+          serverMajorVersion,
+          serverMinorVersion,
+        );
+      } catch (error) {
+        warningMessage.value = 'Error checking version compatibility';
+      }
+    }
+
     /// Fetch the server login credential and enables oAuth login if necessary
     /// Returns true if successful, false otherwise
     Future<bool> getServerLoginCredential() async {
@@ -308,11 +338,40 @@ class LoginForm extends HookConsumerWidget {
       );
     }
 
+    buildVersionCompatWarning() {
+      checkVersionMismatch();
+
+      if (warningMessage.value == null) {
+        return const SizedBox.shrink();
+      }
+
+      return Padding(
+        padding: const EdgeInsets.only(bottom: 8.0),
+        child: Container(
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            color:
+                context.isDarkTheme ? Colors.red.shade700 : Colors.red.shade100,
+            borderRadius: BorderRadius.circular(8),
+            border: Border.all(
+              color:
+                  context.isDarkTheme ? Colors.red.shade900 : Colors.red[200]!,
+            ),
+          ),
+          child: Text(
+            warningMessage.value!,
+            textAlign: TextAlign.center,
+          ),
+        ),
+      );
+    }
+
     buildLogin() {
       return AutofillGroup(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
+            buildVersionCompatWarning(),
             Text(
               sanitizeUrl(serverEndpointController.text),
               style: context.textTheme.displaySmall,
@@ -416,7 +475,6 @@ class LoginForm extends HookConsumerWidget {
                       ),
                     ],
                   ),
-                  const SizedBox(height: 18),
 
                   // Note: This used to have an AnimatedSwitcher, but was removed
                   // because of https://github.com/flutter/flutter/issues/120874
@@ -430,218 +488,3 @@ class LoginForm extends HookConsumerWidget {
     );
   }
 }
-
-class ServerEndpointInput extends StatelessWidget {
-  final TextEditingController controller;
-  final FocusNode focusNode;
-  final Function()? onSubmit;
-
-  const ServerEndpointInput({
-    super.key,
-    required this.controller,
-    required this.focusNode,
-    this.onSubmit,
-  });
-
-  String? _validateInput(String? url) {
-    if (url == null || url.isEmpty) return null;
-
-    final parsedUrl = Uri.tryParse(sanitizeUrl(url));
-    if (parsedUrl == null ||
-        !parsedUrl.isAbsolute ||
-        !parsedUrl.scheme.startsWith("http") ||
-        parsedUrl.host.isEmpty) {
-      return 'login_form_err_invalid_url'.tr();
-    }
-
-    return null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return TextFormField(
-      controller: controller,
-      decoration: InputDecoration(
-        labelText: 'login_form_endpoint_url'.tr(),
-        border: const OutlineInputBorder(),
-        hintText: 'login_form_endpoint_hint'.tr(),
-        errorMaxLines: 4,
-      ),
-      validator: _validateInput,
-      autovalidateMode: AutovalidateMode.always,
-      focusNode: focusNode,
-      autofillHints: const [AutofillHints.url],
-      keyboardType: TextInputType.url,
-      autocorrect: false,
-      onFieldSubmitted: (_) => onSubmit?.call(),
-      textInputAction: TextInputAction.go,
-    );
-  }
-}
-
-class EmailInput extends StatelessWidget {
-  final TextEditingController controller;
-  final FocusNode? focusNode;
-  final Function()? onSubmit;
-
-  const EmailInput({
-    super.key,
-    required this.controller,
-    this.focusNode,
-    this.onSubmit,
-  });
-
-  String? _validateInput(String? email) {
-    if (email == null || email == '') return null;
-    if (email.endsWith(' ')) return 'login_form_err_trailing_whitespace'.tr();
-    if (email.startsWith(' ')) return 'login_form_err_leading_whitespace'.tr();
-    if (email.contains(' ') || !email.contains('@')) {
-      return 'login_form_err_invalid_email'.tr();
-    }
-    return null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return TextFormField(
-      autofocus: true,
-      controller: controller,
-      decoration: InputDecoration(
-        labelText: 'login_form_label_email'.tr(),
-        border: const OutlineInputBorder(),
-        hintText: 'login_form_email_hint'.tr(),
-        hintStyle: const TextStyle(
-          fontWeight: FontWeight.normal,
-          fontSize: 14,
-        ),
-      ),
-      validator: _validateInput,
-      autovalidateMode: AutovalidateMode.always,
-      autofillHints: const [AutofillHints.email],
-      keyboardType: TextInputType.emailAddress,
-      onFieldSubmitted: (_) => onSubmit?.call(),
-      focusNode: focusNode,
-      textInputAction: TextInputAction.next,
-    );
-  }
-}
-
-class PasswordInput extends HookConsumerWidget {
-  final TextEditingController controller;
-  final FocusNode? focusNode;
-  final Function()? onSubmit;
-
-  const PasswordInput({
-    super.key,
-    required this.controller,
-    this.focusNode,
-    this.onSubmit,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isPasswordVisible = useState<bool>(false);
-
-    return TextFormField(
-      obscureText: !isPasswordVisible.value,
-      controller: controller,
-      decoration: InputDecoration(
-        labelText: 'login_form_label_password'.tr(),
-        border: const OutlineInputBorder(),
-        hintText: 'login_form_password_hint'.tr(),
-        hintStyle: const TextStyle(
-          fontWeight: FontWeight.normal,
-          fontSize: 14,
-        ),
-        suffixIcon: IconButton(
-          onPressed: () => isPasswordVisible.value = !isPasswordVisible.value,
-          icon: Icon(
-            isPasswordVisible.value
-                ? Icons.visibility_off_sharp
-                : Icons.visibility_sharp,
-          ),
-        ),
-      ),
-      autofillHints: const [AutofillHints.password],
-      keyboardType: TextInputType.text,
-      onFieldSubmitted: (_) => onSubmit?.call(),
-      focusNode: focusNode,
-      textInputAction: TextInputAction.go,
-    );
-  }
-}
-
-class LoginButton extends ConsumerWidget {
-  final Function() onPressed;
-
-  const LoginButton({
-    super.key,
-    required this.onPressed,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return ElevatedButton.icon(
-      style: ElevatedButton.styleFrom(
-        padding: const EdgeInsets.symmetric(vertical: 12),
-      ),
-      onPressed: onPressed,
-      icon: const Icon(Icons.login_rounded),
-      label: const Text(
-        "login_form_button_text",
-        style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
-      ).tr(),
-    );
-  }
-}
-
-class OAuthLoginButton extends ConsumerWidget {
-  final TextEditingController serverEndpointController;
-  final ValueNotifier<bool> isLoading;
-  final String buttonLabel;
-  final Function() onPressed;
-
-  const OAuthLoginButton({
-    super.key,
-    required this.serverEndpointController,
-    required this.isLoading,
-    required this.buttonLabel,
-    required this.onPressed,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return ElevatedButton.icon(
-      style: ElevatedButton.styleFrom(
-        backgroundColor: context.primaryColor.withAlpha(230),
-        padding: const EdgeInsets.symmetric(vertical: 12),
-      ),
-      onPressed: onPressed,
-      icon: const Icon(Icons.pin_rounded),
-      label: Text(
-        buttonLabel,
-        style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
-      ),
-    );
-  }
-}
-
-class LoadingIcon extends StatelessWidget {
-  const LoadingIcon({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return const Padding(
-      padding: EdgeInsets.only(top: 18.0),
-      child: SizedBox(
-        width: 24,
-        height: 24,
-        child: FittedBox(
-          child: CircularProgressIndicator(
-            strokeWidth: 2,
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/lib/widgets/forms/login/o_auth_login_button.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+
+class OAuthLoginButton extends ConsumerWidget {
+  final TextEditingController serverEndpointController;
+  final ValueNotifier<bool> isLoading;
+  final String buttonLabel;
+  final Function() onPressed;
+
+  const OAuthLoginButton({
+    super.key,
+    required this.serverEndpointController,
+    required this.isLoading,
+    required this.buttonLabel,
+    required this.onPressed,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return ElevatedButton.icon(
+      style: ElevatedButton.styleFrom(
+        backgroundColor: context.primaryColor.withAlpha(230),
+        padding: const EdgeInsets.symmetric(vertical: 12),
+      ),
+      onPressed: onPressed,
+      icon: const Icon(Icons.pin_rounded),
+      label: Text(
+        buttonLabel,
+        style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+      ),
+    );
+  }
+}

mobile/lib/widgets/forms/login/password_input.dart

@@ -0,0 +1,49 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class PasswordInput extends HookConsumerWidget {
+  final TextEditingController controller;
+  final FocusNode? focusNode;
+  final Function()? onSubmit;
+
+  const PasswordInput({
+    super.key,
+    required this.controller,
+    this.focusNode,
+    this.onSubmit,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isPasswordVisible = useState<bool>(false);
+
+    return TextFormField(
+      obscureText: !isPasswordVisible.value,
+      controller: controller,
+      decoration: InputDecoration(
+        labelText: 'login_form_label_password'.tr(),
+        border: const OutlineInputBorder(),
+        hintText: 'login_form_password_hint'.tr(),
+        hintStyle: const TextStyle(
+          fontWeight: FontWeight.normal,
+          fontSize: 14,
+        ),
+        suffixIcon: IconButton(
+          onPressed: () => isPasswordVisible.value = !isPasswordVisible.value,
+          icon: Icon(
+            isPasswordVisible.value
+                ? Icons.visibility_off_sharp
+                : Icons.visibility_sharp,
+          ),
+        ),
+      ),
+      autofillHints: const [AutofillHints.password],
+      keyboardType: TextInputType.text,
+      onFieldSubmitted: (_) => onSubmit?.call(),
+      focusNode: focusNode,
+      textInputAction: TextInputAction.go,
+    );
+  }
+}

mobile/lib/widgets/forms/login/server_endpoint_input.dart

@@ -0,0 +1,54 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/utils/url_helper.dart';
+
+class ServerEndpointInput extends StatelessWidget {
+  final TextEditingController controller;
+  final FocusNode focusNode;
+  final Function()? onSubmit;
+
+  const ServerEndpointInput({
+    super.key,
+    required this.controller,
+    required this.focusNode,
+    this.onSubmit,
+  });
+
+  String? _validateInput(String? url) {
+    if (url == null || url.isEmpty) return null;
+
+    final parsedUrl = Uri.tryParse(sanitizeUrl(url));
+    if (parsedUrl == null ||
+        !parsedUrl.isAbsolute ||
+        !parsedUrl.scheme.startsWith("http") ||
+        parsedUrl.host.isEmpty) {
+      return 'login_form_err_invalid_url'.tr();
+    }
+
+    return null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(top: 16.0),
+      child: TextFormField(
+        controller: controller,
+        decoration: InputDecoration(
+          labelText: 'login_form_endpoint_url'.tr(),
+          border: const OutlineInputBorder(),
+          hintText: 'login_form_endpoint_hint'.tr(),
+          errorMaxLines: 4,
+        ),
+        validator: _validateInput,
+        autovalidateMode: AutovalidateMode.always,
+        focusNode: focusNode,
+        autofillHints: const [AutofillHints.url],
+        keyboardType: TextInputType.url,
+        autocorrect: false,
+        onFieldSubmitted: (_) => onSubmit?.call(),
+        textInputAction: TextInputAction.go,
+      ),
+    );
+  }
+}

mobile/openapi/README.md

@@ -3,7 +3,7 @@ Immich API
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.105.1
+- API version: 1.106.3
 - Generator version: 7.5.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 

mobile/openapi/lib/model/asset_full_sync_dto.dart

@@ -13,21 +13,12 @@ part of openapi.api;
 class AssetFullSyncDto {
   /// Returns a new [AssetFullSyncDto] instance.
   AssetFullSyncDto({
-    this.lastCreationDate,
     this.lastId,
     required this.limit,
     required this.updatedUntil,
     this.userId,
   });
 
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  DateTime? lastCreationDate;
-
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
@@ -51,7 +42,6 @@ class AssetFullSyncDto {
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is AssetFullSyncDto &&
-    other.lastCreationDate == lastCreationDate &&
     other.lastId == lastId &&
     other.limit == limit &&
     other.updatedUntil == updatedUntil &&
@@ -60,22 +50,16 @@ class AssetFullSyncDto {
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (lastCreationDate == null ? 0 : lastCreationDate!.hashCode) +
     (lastId == null ? 0 : lastId!.hashCode) +
     (limit.hashCode) +
     (updatedUntil.hashCode) +
     (userId == null ? 0 : userId!.hashCode);
 
   @override
-  String toString() => 'AssetFullSyncDto[lastCreationDate=$lastCreationDate, lastId=$lastId, limit=$limit, updatedUntil=$updatedUntil, userId=$userId]';
+  String toString() => 'AssetFullSyncDto[lastId=$lastId, limit=$limit, updatedUntil=$updatedUntil, userId=$userId]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.lastCreationDate != null) {
-      json[r'lastCreationDate'] = this.lastCreationDate!.toUtc().toIso8601String();
-    } else {
-    //  json[r'lastCreationDate'] = null;
-    }
     if (this.lastId != null) {
       json[r'lastId'] = this.lastId;
     } else {
@@ -99,7 +83,6 @@ class AssetFullSyncDto {
       final json = value.cast<String, dynamic>();
 
       return AssetFullSyncDto(
-        lastCreationDate: mapDateTime(json, r'lastCreationDate', r''),
         lastId: mapValueOfType<String>(json, r'lastId'),
         limit: mapValueOfType<int>(json, r'limit')!,
         updatedUntil: mapDateTime(json, r'updatedUntil', r'')!,

mobile/openapi/lib/model/duplicate_detection_config.dart

@@ -53,7 +53,7 @@ class DuplicateDetectionConfig {
 
       return DuplicateDetectionConfig(
         enabled: mapValueOfType<bool>(json, r'enabled')!,
-        maxDistance: mapValueOfType<double>(json, r'maxDistance')!,
+        maxDistance: (mapValueOfType<num>(json, r'maxDistance')!).toDouble(),
       );
     }
     return null;

mobile/openapi/lib/model/facial_recognition_config.dart

@@ -74,9 +74,9 @@ class FacialRecognitionConfig {
 
       return FacialRecognitionConfig(
         enabled: mapValueOfType<bool>(json, r'enabled')!,
-        maxDistance: mapValueOfType<double>(json, r'maxDistance')!,
+        maxDistance: (mapValueOfType<num>(json, r'maxDistance')!).toDouble(),
         minFaces: mapValueOfType<int>(json, r'minFaces')!,
-        minScore: mapValueOfType<double>(json, r'minScore')!,
+        minScore: (mapValueOfType<num>(json, r'minScore')!).toDouble(),
         modelName: mapValueOfType<String>(json, r'modelName')!,
       );
     }

mobile/openapi/lib/model/server_storage_response_dto.dart

@@ -84,7 +84,7 @@ class ServerStorageResponseDto {
         diskAvailableRaw: mapValueOfType<int>(json, r'diskAvailableRaw')!,
         diskSize: mapValueOfType<String>(json, r'diskSize')!,
         diskSizeRaw: mapValueOfType<int>(json, r'diskSizeRaw')!,
-        diskUsagePercentage: mapValueOfType<double>(json, r'diskUsagePercentage')!,
+        diskUsagePercentage: (mapValueOfType<num>(json, r'diskUsagePercentage')!).toDouble(),
         diskUse: mapValueOfType<String>(json, r'diskUse')!,
         diskUseRaw: mapValueOfType<int>(json, r'diskUseRaw')!,
       );

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: 'none'
-version: 1.105.1+140
+version: 1.106.3+143
 
 environment:
   sdk: '>=3.3.0 <4.0.0'

mobile/test/modules/shared/sync_service_test.dart

@@ -78,8 +78,9 @@ void main() {
       final bool c1 = await s.syncRemoteAssetsToDb(
         users: [owner],
         getChangedAssets: _failDiff,
-        loadAssets: (u, d) => remoteAssets,
+        loadAssets: (u, d, firstSync) => remoteAssets,
         refreshUsers: () => [owner],
+        firstSync: false,
       );
       expect(c1, isFalse);
       expect(db.assets.countSync(), 5);
@@ -99,8 +100,9 @@ void main() {
       final bool c1 = await s.syncRemoteAssetsToDb(
         users: [owner],
         getChangedAssets: _failDiff,
-        loadAssets: (u, d) => remoteAssets,
+        loadAssets: (u, d, firstSync) => remoteAssets,
         refreshUsers: () => [owner],
+        firstSync: false,
       );
       expect(c1, isTrue);
       expect(db.assets.countSync(), 7);
@@ -120,16 +122,18 @@ void main() {
       final bool c1 = await s.syncRemoteAssetsToDb(
         users: [owner],
         getChangedAssets: _failDiff,
-        loadAssets: (u, d) => remoteAssets,
+        loadAssets: (u, d, firstSync) => remoteAssets,
         refreshUsers: () => [owner],
+        firstSync: false,
       );
       expect(c1, isTrue);
       expect(db.assets.countSync(), 8);
       final bool c2 = await s.syncRemoteAssetsToDb(
         users: [owner],
         getChangedAssets: _failDiff,
-        loadAssets: (u, d) => remoteAssets,
+        loadAssets: (u, d, firstSync) => remoteAssets,
         refreshUsers: () => [owner],
+        firstSync: false,
       );
       expect(c2, isFalse);
       expect(db.assets.countSync(), 8);
@@ -137,8 +141,9 @@ void main() {
       final bool c3 = await s.syncRemoteAssetsToDb(
         users: [owner],
         getChangedAssets: _failDiff,
-        loadAssets: (u, d) => remoteAssets,
+        loadAssets: (u, d, firstSync) => remoteAssets,
         refreshUsers: () => [owner],
+        firstSync: false,
       );
       expect(c3, isTrue);
       expect(db.assets.countSync(), 7);
@@ -147,8 +152,9 @@ void main() {
       final bool c4 = await s.syncRemoteAssetsToDb(
         users: [owner],
         getChangedAssets: _failDiff,
-        loadAssets: (u, d) => remoteAssets,
+        loadAssets: (u, d, firstSync) => remoteAssets,
         refreshUsers: () => [owner],
+        firstSync: false,
       );
       expect(c4, isTrue);
       expect(db.assets.countSync(), 9);
@@ -166,8 +172,9 @@ void main() {
       final bool c = await s.syncRemoteAssetsToDb(
         users: [owner],
         getChangedAssets: (user, since) async => (toUpsert, toDelete),
-        loadAssets: (user, date) => throw Exception(),
+        loadAssets: (user, date, firstSync) => throw Exception(),
         refreshUsers: () => throw Exception(),
+        firstSync: false,
       );
       expect(c, isTrue);
       expect(db.assets.countSync(), 6);

mobile/test/modules/utils/version_compatibility_test.dart

@@ -0,0 +1,35 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/utils/version_compatibility.dart';
+
+void main() {
+  test('getVersionCompatibilityMessage', () {
+    String? result;
+
+    result = getVersionCompatibilityMessage(1, 0, 2, 0);
+    expect(
+      result,
+      'Your app major version is not compatible with the server!',
+    );
+
+    result = getVersionCompatibilityMessage(1, 106, 1, 105);
+    expect(
+      result,
+      'Your app minor version is not compatible with the server! Please update your server to version v1.106.0 or newer to login',
+    );
+
+    result = getVersionCompatibilityMessage(1, 107, 1, 105);
+    expect(
+      result,
+      'Your app minor version is not compatible with the server! Please update your server to version v1.106.0 or newer to login',
+    );
+
+    result = getVersionCompatibilityMessage(1, 106, 1, 106);
+    expect(result, null);
+
+    result = getVersionCompatibilityMessage(1, 107, 1, 106);
+    expect(result, null);
+
+    result = getVersionCompatibilityMessage(1, 107, 1, 108);
+    expect(result, null);
+  });
+}

open-api/immich-openapi-specs.json

@@ -6735,7 +6735,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.105.1",
+    "version": "1.106.3",
     "contact": {}
   },
   "tags": [],
@@ -7432,10 +7432,6 @@
       },
       "AssetFullSyncDto": {
         "properties": {
-          "lastCreationDate": {
-            "format": "date-time",
-            "type": "string"
-          },
           "lastId": {
             "format": "uuid",
             "type": "string"
@@ -8150,7 +8146,7 @@
             "type": "boolean"
           },
           "maxDistance": {
-            "format": "float",
+            "format": "double",
             "maximum": 0.1,
             "minimum": 0.001,
             "type": "number"
@@ -8351,7 +8347,7 @@
             "type": "boolean"
           },
           "maxDistance": {
-            "format": "float",
+            "format": "double",
             "maximum": 2,
             "minimum": 0,
             "type": "number"
@@ -8361,7 +8357,7 @@
             "type": "integer"
           },
           "minScore": {
-            "format": "float",
+            "format": "double",
             "maximum": 1,
             "minimum": 0,
             "type": "number"
@@ -9801,7 +9797,7 @@
             "type": "integer"
           },
           "diskUsagePercentage": {
-            "format": "float",
+            "format": "double",
             "type": "number"
           },
           "diskUse": {

open-api/typescript-sdk/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@immich/sdk",
-  "version": "1.105.1",
+  "version": "1.106.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/sdk",
-      "version": "1.105.1",
+      "version": "1.106.3",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"

open-api/typescript-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "1.105.1",
+  "version": "1.106.3",
   "description": "Auto-generated TypeScript SDK for the Immich API",
   "type": "module",
   "main": "./build/index.js",

open-api/typescript-sdk/src/fetch-client.ts

@@ -1,6 +1,6 @@
 /**
  * Immich
- * 1.105.1
+ * 1.106.3
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */
@@ -904,7 +904,6 @@ export type AssetDeltaSyncResponseDto = {
     upserted: AssetResponseDto[];
 };
 export type AssetFullSyncDto = {
-    lastCreationDate?: string;
     lastId?: string;
     limit: number;
     updatedUntil: string;

renovate.json

@@ -69,7 +69,7 @@
       "schedule": "on tuesday"
     }
   ],
-  "ignorePaths": ["mobile/openapi/pubspec.yaml"],
+  "ignorePaths": ["mobile/openapi/pubspec.yaml", "mobile/ios", "mobile/android"],
   "ignoreDeps": ["http", "intl"],
   "labels": ["dependencies", "renovate"]
 }

server/Dockerfile

@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:20240604@sha256:bb31fafb1e8fcb4338c2f7a8f424da3d9c5cf6dd6bdb266c54477c795dd07819 as dev
+FROM ghcr.io/immich-app/base-server-dev:20240611@sha256:2047ec0f857a800675379c65404dfdf4ac02ab7684c759916e3256d3d9566027 as dev
 
 RUN apt-get install --no-install-recommends -yqq tini
 WORKDIR /usr/src/app
@@ -41,7 +41,7 @@ RUN npm run build
 
 
 # prod build
-FROM ghcr.io/immich-app/base-server-prod:20240604@sha256:481ea3ee56fb0e130804fec25c124d28477f10f8a01f7d06fb2e3f85c181bbb9
+FROM ghcr.io/immich-app/base-server-prod:20240611@sha256:efd32a2af6e7ace8bcea1e94115fe95a971fe1d1fef7e667ff6e77364ce51c46
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \

server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "immich",
-  "version": "1.105.1",
+  "version": "1.106.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "immich",
-      "version": "1.105.1",
+      "version": "1.106.3",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@nestjs/bullmq": "^10.0.1",
@@ -76,7 +76,6 @@
         "@types/cookie-parser": "^1.4.3",
         "@types/express": "^4.17.17",
         "@types/fluent-ffmpeg": "^2.1.21",
-        "@types/imagemin": "^8.0.1",
         "@types/js-yaml": "^4.0.9",
         "@types/lodash": "^4.14.197",
         "@types/mock-fs": "^4.13.1",
@@ -5790,15 +5789,6 @@
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz",
       "integrity": "sha512-lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg=="
     },
-    "node_modules/@types/imagemin": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@types/imagemin/-/imagemin-8.0.5.tgz",
-      "integrity": "sha512-tah3dm+5sG+fEDAz6CrQ5evuEaPX9K6DF3E5a01MPOKhA2oGBoC+oA5EJzSugB905sN4DE19EDzldT2Cld2g6Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/inquirer": {
       "version": "8.2.6",
       "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.6.tgz",
@@ -20214,15 +20204,6 @@
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz",
       "integrity": "sha512-lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg=="
     },
-    "@types/imagemin": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@types/imagemin/-/imagemin-8.0.5.tgz",
-      "integrity": "sha512-tah3dm+5sG+fEDAz6CrQ5evuEaPX9K6DF3E5a01MPOKhA2oGBoC+oA5EJzSugB905sN4DE19EDzldT2Cld2g6Q==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/inquirer": {
       "version": "8.2.6",
       "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.6.tgz",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "1.105.1",
+  "version": "1.106.3",
   "description": "",
   "author": "",
   "private": true,
@@ -102,7 +102,6 @@
     "@types/cookie-parser": "^1.4.3",
     "@types/express": "^4.17.17",
     "@types/fluent-ffmpeg": "^2.1.21",
-    "@types/imagemin": "^8.0.1",
     "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.14.197",
     "@types/mock-fs": "^4.13.1",

server/src/config.ts

@@ -374,7 +374,8 @@ export const immichAppConfig: ConfigModuleOptions = {
     DB_SKIP_MIGRATIONS: Joi.boolean().optional().default(false),
 
     IMMICH_PORT: Joi.number().optional(),
-    IMMICH_METRICS_PORT: Joi.number().optional(),
+    IMMICH_API_METRICS_PORT: Joi.number().optional(),
+    IMMICH_MICROSERVICES_METRICS_PORT: Joi.number().optional(),
 
     IMMICH_METRICS: Joi.boolean().optional().default(false),
     IMMICH_HOST_METRICS: Joi.boolean().optional().default(false),

server/src/cores/storage.core.ts

@@ -254,7 +254,7 @@ export class StorageCore {
       this.logger.warn(`Unable to complete move. File size mismatch: ${newPathSize} !== ${oldPathSize}`);
       return false;
     }
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: true });
     if (assetInfo && config.storageTemplate.hashVerificationEnabled) {
       const { checksum } = assetInfo;
       const newChecksum = await this.cryptoRepository.hashFile(newPath);

server/src/cores/system-config.core.ts

@@ -42,8 +42,8 @@ export class SystemConfigCore {
     instance = null;
   }
 
-  async getConfig(force = false): Promise<SystemConfig> {
-    if (force || !this.config) {
+  async getConfig({ withCache }: { withCache: boolean }): Promise<SystemConfig> {
+    if (!withCache || !this.config) {
       const lastUpdated = this.lastUpdated;
       await this.asyncLock.acquire(DatabaseLock[DatabaseLock.GetSystemConfig], async () => {
         if (lastUpdated === this.lastUpdated) {
@@ -74,13 +74,13 @@ export class SystemConfigCore {
 
     await this.repository.set(SystemMetadataKey.SYSTEM_CONFIG, partialConfig);
 
-    const config = await this.getConfig(true);
+    const config = await this.getConfig({ withCache: false });
     this.config$.next(config);
     return config;
   }
 
   async refreshConfig() {
-    const newConfig = await this.getConfig(true);
+    const newConfig = await this.getConfig({ withCache: false });
     this.config$.next(newConfig);
   }
 

server/src/dtos/asset-response.dto.ts

@@ -127,10 +127,10 @@ export function mapAsset(entity: AssetEntity, options: AssetMapOptions = {}): As
     stackParentId: withStack ? entity.stack?.primaryAssetId : undefined,
     stack: withStack
       ? entity.stack?.assets
-          .filter((a) => a.id !== entity.stack?.primaryAssetId)
-          .map((a) => mapAsset(a, { stripMetadata, auth: options.auth }))
+          ?.filter((a) => a.id !== entity.stack?.primaryAssetId)
+          ?.map((a) => mapAsset(a, { stripMetadata, auth: options.auth }))
       : undefined,
-    stackCount: entity.stack?.assets?.length ?? null,
+    stackCount: entity.stack?.assetCount ?? entity.stack?.assets?.length ?? null,
     isOffline: entity.isOffline,
     hasMetadata: true,
     duplicateId: entity.duplicateId,

server/src/dtos/model-config.dto.ts

@@ -21,7 +21,7 @@ export class DuplicateDetectionConfig extends TaskConfig {
   @Min(0.001)
   @Max(0.1)
   @Type(() => Number)
-  @ApiProperty({ type: 'number', format: 'float' })
+  @ApiProperty({ type: 'number', format: 'double' })
   maxDistance!: number;
 }
 
@@ -30,14 +30,14 @@ export class FacialRecognitionConfig extends ModelConfig {
   @Min(0)
   @Max(1)
   @Type(() => Number)
-  @ApiProperty({ type: 'number', format: 'float' })
+  @ApiProperty({ type: 'number', format: 'double' })
   minScore!: number;
 
   @IsNumber()
   @Min(0)
   @Max(2)
   @Type(() => Number)
-  @ApiProperty({ type: 'number', format: 'float' })
+  @ApiProperty({ type: 'number', format: 'double' })
   maxDistance!: number;
 
   @IsNumber()

server/src/dtos/server-info.dto.ts

@@ -21,7 +21,7 @@ export class ServerStorageResponseDto {
   @ApiProperty({ type: 'integer', format: 'int64' })
   diskAvailableRaw!: number;
 
-  @ApiProperty({ type: 'number', format: 'float' })
+  @ApiProperty({ type: 'number', format: 'double' })
   diskUsagePercentage!: number;
 }
 

server/src/dtos/sync.dto.ts

@@ -7,9 +7,6 @@ export class AssetFullSyncDto {
   @ValidateUUID({ optional: true })
   lastId?: string;
 
-  @ValidateDate({ optional: true })
-  lastCreationDate?: Date;
-
   @ValidateDate()
   updatedUntil!: Date;
 

server/src/entities/asset-stack.entity.ts

@@ -16,4 +16,6 @@ export class AssetStackEntity {
 
   @Column({ nullable: false })
   primaryAssetId!: string;
+
+  assetCount?: number;
 }

server/src/interfaces/asset.interface.ts

@@ -122,7 +122,6 @@ export interface AssetExploreOptions extends AssetExploreFieldOptions {
 
 export interface AssetFullSyncOptions {
   ownerId: string;
-  lastCreationDate?: Date;
   lastId?: string;
   updatedUntil: Date;
   limit: number;
@@ -157,7 +156,7 @@ export interface IAssetRepository {
   getByChecksums(userId: string, checksums: Buffer[]): Promise<AssetEntity[]>;
   getUploadAssetIdByChecksum(ownerId: string, checksum: Buffer): Promise<string | undefined>;
   getByAlbumId(pagination: PaginationOptions, albumId: string): Paginated<AssetEntity>;
-  getByDeviceIds(ownerId: string, deviceId: string, deviceAssetIds: string[]): Promise<AssetEntity[]>;
+  getByDeviceIds(ownerId: string, deviceId: string, deviceAssetIds: string[]): Promise<string[]>;
   getByUserId(pagination: PaginationOptions, userId: string, options?: AssetSearchOptions): Paginated<AssetEntity>;
   getById(
     id: string,

server/src/interfaces/job.interface.ts

@@ -120,6 +120,10 @@ export interface IEntityJob extends IBaseJob {
   source?: 'upload' | 'sidecar-write' | 'copy';
 }
 
+export interface IAssetDeleteJob extends IEntityJob {
+  deleteOnDisk: boolean;
+}
+
 export interface ILibraryFileJob extends IEntityJob {
   ownerId: string;
   assetPath: string;
@@ -246,7 +250,7 @@ export type JobItem =
 
   // Asset Deletion
   | { name: JobName.PERSON_CLEANUP; data?: IBaseJob }
-  | { name: JobName.ASSET_DELETION; data: IEntityJob }
+  | { name: JobName.ASSET_DELETION; data: IAssetDeleteJob }
   | { name: JobName.ASSET_DELETION_CHECK; data?: IBaseJob }
 
   // Library Management

server/src/queries/asset.repository.sql

@@ -1049,50 +1049,18 @@ SELECT
   "exifInfo"."bitsPerSample" AS "exifInfo_bitsPerSample",
   "exifInfo"."fps" AS "exifInfo_fps",
   "stack"."id" AS "stack_id",
-  "stack"."primaryAssetId" AS "stack_primaryAssetId",
-  "stackedAssets"."id" AS "stackedAssets_id",
-  "stackedAssets"."deviceAssetId" AS "stackedAssets_deviceAssetId",
-  "stackedAssets"."ownerId" AS "stackedAssets_ownerId",
-  "stackedAssets"."libraryId" AS "stackedAssets_libraryId",
-  "stackedAssets"."deviceId" AS "stackedAssets_deviceId",
-  "stackedAssets"."type" AS "stackedAssets_type",
-  "stackedAssets"."originalPath" AS "stackedAssets_originalPath",
-  "stackedAssets"."previewPath" AS "stackedAssets_previewPath",
-  "stackedAssets"."thumbnailPath" AS "stackedAssets_thumbnailPath",
-  "stackedAssets"."thumbhash" AS "stackedAssets_thumbhash",
-  "stackedAssets"."encodedVideoPath" AS "stackedAssets_encodedVideoPath",
-  "stackedAssets"."createdAt" AS "stackedAssets_createdAt",
-  "stackedAssets"."updatedAt" AS "stackedAssets_updatedAt",
-  "stackedAssets"."deletedAt" AS "stackedAssets_deletedAt",
-  "stackedAssets"."fileCreatedAt" AS "stackedAssets_fileCreatedAt",
-  "stackedAssets"."localDateTime" AS "stackedAssets_localDateTime",
-  "stackedAssets"."fileModifiedAt" AS "stackedAssets_fileModifiedAt",
-  "stackedAssets"."isFavorite" AS "stackedAssets_isFavorite",
-  "stackedAssets"."isArchived" AS "stackedAssets_isArchived",
-  "stackedAssets"."isExternal" AS "stackedAssets_isExternal",
-  "stackedAssets"."isOffline" AS "stackedAssets_isOffline",
-  "stackedAssets"."checksum" AS "stackedAssets_checksum",
-  "stackedAssets"."duration" AS "stackedAssets_duration",
-  "stackedAssets"."isVisible" AS "stackedAssets_isVisible",
-  "stackedAssets"."livePhotoVideoId" AS "stackedAssets_livePhotoVideoId",
-  "stackedAssets"."originalFileName" AS "stackedAssets_originalFileName",
-  "stackedAssets"."sidecarPath" AS "stackedAssets_sidecarPath",
-  "stackedAssets"."stackId" AS "stackedAssets_stackId",
-  "stackedAssets"."duplicateId" AS "stackedAssets_duplicateId"
+  "stack"."primaryAssetId" AS "stack_primaryAssetId"
 FROM
   "assets" "asset"
   LEFT JOIN "exif" "exifInfo" ON "exifInfo"."assetId" = "asset"."id"
   LEFT JOIN "asset_stack" "stack" ON "stack"."id" = "asset"."stackId"
-  LEFT JOIN "assets" "stackedAssets" ON "stackedAssets"."stackId" = "stack"."id"
-  AND ("stackedAssets"."deletedAt" IS NULL)
 WHERE
   "asset"."isVisible" = true
   AND "asset"."ownerId" IN ($1)
-  AND ("asset"."fileCreatedAt", "asset"."id") < ($2, $3)
-  AND "asset"."updatedAt" <= $4
+  AND "asset"."id" > $2
+  AND "asset"."updatedAt" <= $3
 ORDER BY
-  "asset"."fileCreatedAt" DESC,
-  "asset"."id" DESC
+  "asset"."id" ASC
 LIMIT
   10
 
@@ -1156,42 +1124,11 @@ SELECT
   "exifInfo"."bitsPerSample" AS "exifInfo_bitsPerSample",
   "exifInfo"."fps" AS "exifInfo_fps",
   "stack"."id" AS "stack_id",
-  "stack"."primaryAssetId" AS "stack_primaryAssetId",
-  "stackedAssets"."id" AS "stackedAssets_id",
-  "stackedAssets"."deviceAssetId" AS "stackedAssets_deviceAssetId",
-  "stackedAssets"."ownerId" AS "stackedAssets_ownerId",
-  "stackedAssets"."libraryId" AS "stackedAssets_libraryId",
-  "stackedAssets"."deviceId" AS "stackedAssets_deviceId",
-  "stackedAssets"."type" AS "stackedAssets_type",
-  "stackedAssets"."originalPath" AS "stackedAssets_originalPath",
-  "stackedAssets"."previewPath" AS "stackedAssets_previewPath",
-  "stackedAssets"."thumbnailPath" AS "stackedAssets_thumbnailPath",
-  "stackedAssets"."thumbhash" AS "stackedAssets_thumbhash",
-  "stackedAssets"."encodedVideoPath" AS "stackedAssets_encodedVideoPath",
-  "stackedAssets"."createdAt" AS "stackedAssets_createdAt",
-  "stackedAssets"."updatedAt" AS "stackedAssets_updatedAt",
-  "stackedAssets"."deletedAt" AS "stackedAssets_deletedAt",
-  "stackedAssets"."fileCreatedAt" AS "stackedAssets_fileCreatedAt",
-  "stackedAssets"."localDateTime" AS "stackedAssets_localDateTime",
-  "stackedAssets"."fileModifiedAt" AS "stackedAssets_fileModifiedAt",
-  "stackedAssets"."isFavorite" AS "stackedAssets_isFavorite",
-  "stackedAssets"."isArchived" AS "stackedAssets_isArchived",
-  "stackedAssets"."isExternal" AS "stackedAssets_isExternal",
-  "stackedAssets"."isOffline" AS "stackedAssets_isOffline",
-  "stackedAssets"."checksum" AS "stackedAssets_checksum",
-  "stackedAssets"."duration" AS "stackedAssets_duration",
-  "stackedAssets"."isVisible" AS "stackedAssets_isVisible",
-  "stackedAssets"."livePhotoVideoId" AS "stackedAssets_livePhotoVideoId",
-  "stackedAssets"."originalFileName" AS "stackedAssets_originalFileName",
-  "stackedAssets"."sidecarPath" AS "stackedAssets_sidecarPath",
-  "stackedAssets"."stackId" AS "stackedAssets_stackId",
-  "stackedAssets"."duplicateId" AS "stackedAssets_duplicateId"
+  "stack"."primaryAssetId" AS "stack_primaryAssetId"
 FROM
   "assets" "asset"
   LEFT JOIN "exif" "exifInfo" ON "exifInfo"."assetId" = "asset"."id"
   LEFT JOIN "asset_stack" "stack" ON "stack"."id" = "asset"."stackId"
-  LEFT JOIN "assets" "stackedAssets" ON "stackedAssets"."stackId" = "stack"."id"
-  AND ("stackedAssets"."deletedAt" IS NULL)
 WHERE
   "asset"."isVisible" = true
   AND "asset"."ownerId" IN ($1)

server/src/repositories/asset.repository.ts

@@ -155,8 +155,8 @@ export class AssetRepository implements IAssetRepository {
     });
   }
 
-  getByDeviceIds(ownerId: string, deviceId: string, deviceAssetIds: string[]): Promise<AssetEntity[]> {
-    return this.repository.find({
+  async getByDeviceIds(ownerId: string, deviceId: string, deviceAssetIds: string[]): Promise<string[]> {
+    const assets = await this.repository.find({
       select: { deviceAssetId: true },
       where: {
         deviceAssetId: In(deviceAssetIds),
@@ -165,6 +165,8 @@ export class AssetRepository implements IAssetRepository {
       },
       withDeleted: true,
     });
+
+    return assets.map((asset) => asset.deviceAssetId);
   }
 
   getByUserId(
@@ -763,36 +765,40 @@ export class AssetRepository implements IAssetRepository {
     ],
   })
   getAllForUserFullSync(options: AssetFullSyncOptions): Promise<AssetEntity[]> {
-    const { ownerId, lastCreationDate, lastId, updatedUntil, limit } = options;
+    const { ownerId, lastId, updatedUntil, limit } = options;
     const builder = this.getBuilder({
       userIds: [ownerId],
-      exifInfo: true, // also joins stack information
+      exifInfo: false, // need to do this manually because `exifInfo: true` also loads stacked assets messing with `limit`
       withStacked: false, // return all assets individually as expected by the app
-    });
+    })
+      .leftJoinAndSelect('asset.exifInfo', 'exifInfo')
+      .leftJoinAndSelect('asset.stack', 'stack')
+      .loadRelationCountAndMap('stack.assetCount', 'stack.assets', 'stackedAssetsCount');
 
-    if (lastCreationDate !== undefined && lastId !== undefined) {
-      builder.andWhere('(asset.fileCreatedAt, asset.id) < (:lastCreationDate, :lastId)', {
-        lastCreationDate,
-        lastId,
-      });
+    if (lastId !== undefined) {
+      builder.andWhere('asset.id > :lastId', { lastId });
     }
-
-    return builder
+    builder
       .andWhere('asset.updatedAt <= :updatedUntil', { updatedUntil })
-      .orderBy('asset.fileCreatedAt', 'DESC')
-      .addOrderBy('asset.id', 'DESC')
-      .limit(limit)
-      .withDeleted()
-      .getMany();
+      .orderBy('asset.id', 'ASC')
+      .limit(limit) // cannot use `take` for performance reasons
+      .withDeleted();
+    return builder.getMany();
   }
 
   @GenerateSql({ params: [{ userIds: [DummyValue.UUID], updatedAfter: DummyValue.DATE }] })
   getChangedDeltaSync(options: AssetDeltaSyncOptions): Promise<AssetEntity[]> {
-    const builder = this.getBuilder({ userIds: options.userIds, exifInfo: true, withStacked: false })
+    const builder = this.getBuilder({
+      userIds: options.userIds,
+      exifInfo: false, // need to do this manually because `exifInfo: true` also loads stacked assets messing with `limit`
+      withStacked: false, // return all assets individually as expected by the app
+    })
+      .leftJoinAndSelect('asset.exifInfo', 'exifInfo')
+      .leftJoinAndSelect('asset.stack', 'stack')
+      .loadRelationCountAndMap('stack.assetCount', 'stack.assets', 'stackedAssetsCount')
       .andWhere({ updatedAt: MoreThan(options.updatedAfter) })
-      .limit(options.limit)
+      .limit(options.limit) // cannot use `take` for performance reasons
       .withDeleted();
-
     return builder.getMany();
   }
 }

server/src/repositories/media.repository.ts

@@ -45,7 +45,7 @@ export class MediaRepository implements IMediaRepository {
   }
 
   async generateThumbnail(input: string | Buffer, output: string, options: ThumbnailOptions): Promise<void> {
-    const pipeline = sharp(input, { failOn: 'none' })
+    const pipeline = sharp(input, { failOn: 'none', limitInputPixels: false })
       .pipelineColorspace(options.colorspace === Colorspace.SRGB ? 'srgb' : 'rgb16')
       .rotate();
 

server/src/repositories/metadata.repository.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
-import { DefaultExiftoolArgs, DefaultReadTaskOptions, ExifTool, Tags } from 'exiftool-vendored';
+import { DefaultReadTaskOptions, Tags, exiftool } from 'exiftool-vendored';
 import geotz from 'geo-tz';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { ExifEntity } from 'src/entities/exif.entity';
@@ -21,23 +21,18 @@ export class MetadataRepository implements IMetadataRepository {
   ) {
     this.logger.setContext(MetadataRepository.name);
   }
-  private exiftool: ExifTool = this.initExiftool();
 
   async teardown() {
-    await this.exiftool.end();
-  }
-
-  private initExiftool() {
-    // Enable exiftool LFS to parse metadata for files larger than 2GB.
-    const exiftoolArgs = ['-api', 'largefilesupport=1', ...DefaultExiftoolArgs];
-    return new ExifTool({ exiftoolArgs });
+    await exiftool.end();
   }
 
   readTags(path: string): Promise<ImmichTags | null> {
-    return this.exiftool
+    return exiftool
       .read(path, undefined, {
         ...DefaultReadTaskOptions,
 
+        // Enable exiftool LFS to parse metadata for files larger than 2GB.
+        optionalArgs: ['-api', 'largefilesupport=1'],
         defaultVideosToUTC: true,
         backfillTimezones: true,
         inferTimezoneFromDatestamps: true,
@@ -53,12 +48,12 @@ export class MetadataRepository implements IMetadataRepository {
   }
 
   extractBinaryTag(path: string, tagName: string): Promise<Buffer> {
-    return this.exiftool.extractBinaryTagToBuffer(tagName, path);
+    return exiftool.extractBinaryTagToBuffer(tagName, path);
   }
 
   async writeTags(path: string, tags: Partial<Tags>): Promise<void> {
     try {
-      await this.exiftool.write(path, tags, ['-overwrite_original']);
+      await exiftool.write(path, tags, ['-overwrite_original']);
     } catch (error) {
       this.logger.warn(`Error writing exif data (${path}): ${error}`);
     }

server/src/services/asset-media.service.ts

@@ -277,14 +277,12 @@ export class AssetMediaService {
     auth: AuthDto,
     checkExistingAssetsDto: CheckExistingAssetsDto,
   ): Promise<CheckExistingAssetsResponseDto> {
-    const assets = await this.assetRepository.getByDeviceIds(
+    const existingIds = await this.assetRepository.getByDeviceIds(
       auth.user.id,
       checkExistingAssetsDto.deviceId,
       checkExistingAssetsDto.deviceAssetIds,
     );
-    return {
-      existingIds: assets.map((asset) => asset.id),
-    };
+    return { existingIds };
   }
 
   async bulkUploadCheck(auth: AuthDto, dto: AssetBulkUploadCheckDto): Promise<AssetBulkUploadCheckResponseDto> {

server/src/services/asset.service.spec.ts

@@ -389,8 +389,8 @@ describe(AssetService.name, () => {
       await sut.deleteAll(authStub.user1, { ids: ['asset1', 'asset2'], force: true });
 
       expect(jobMock.queueAll).toHaveBeenCalledWith([
-        { name: JobName.ASSET_DELETION, data: { id: 'asset1' } },
-        { name: JobName.ASSET_DELETION, data: { id: 'asset2' } },
+        { name: JobName.ASSET_DELETION, data: { id: 'asset1', deleteOnDisk: true } },
+        { name: JobName.ASSET_DELETION, data: { id: 'asset2', deleteOnDisk: true } },
       ]);
     });
 
@@ -410,7 +410,7 @@ describe(AssetService.name, () => {
 
       assetMock.getById.mockResolvedValue(assetWithFace);
 
-      await sut.handleAssetDeletion({ id: assetWithFace.id });
+      await sut.handleAssetDeletion({ id: assetWithFace.id, deleteOnDisk: true });
 
       expect(jobMock.queue.mock.calls).toEqual([
         [
@@ -435,7 +435,7 @@ describe(AssetService.name, () => {
     it('should update stack primary asset if deleted asset was primary asset in a stack', async () => {
       assetMock.getById.mockResolvedValue(assetStub.primaryImage as AssetEntity);
 
-      await sut.handleAssetDeletion({ id: assetStub.primaryImage.id });
+      await sut.handleAssetDeletion({ id: assetStub.primaryImage.id, deleteOnDisk: true });
 
       expect(assetStackMock.update).toHaveBeenCalledWith({
         id: 'stack-1',
@@ -446,10 +446,21 @@ describe(AssetService.name, () => {
     it('should delete a live photo', async () => {
       assetMock.getById.mockResolvedValue(assetStub.livePhotoStillAsset);
 
-      await sut.handleAssetDeletion({ id: assetStub.livePhotoStillAsset.id });
+      await sut.handleAssetDeletion({
+        id: assetStub.livePhotoStillAsset.id,
+        deleteOnDisk: true,
+      });
 
       expect(jobMock.queue.mock.calls).toEqual([
-        [{ name: JobName.ASSET_DELETION, data: { id: assetStub.livePhotoMotionAsset.id } }],
+        [
+          {
+            name: JobName.ASSET_DELETION,
+            data: {
+              id: assetStub.livePhotoMotionAsset.id,
+              deleteOnDisk: true,
+            },
+          },
+        ],
         [
           {
             name: JobName.DELETE_FILES,
@@ -463,7 +474,7 @@ describe(AssetService.name, () => {
 
     it('should update usage', async () => {
       assetMock.getById.mockResolvedValue(assetStub.image);
-      await sut.handleAssetDeletion({ id: assetStub.image.id });
+      await sut.handleAssetDeletion({ id: assetStub.image.id, deleteOnDisk: true });
       expect(userMock.updateUsage).toHaveBeenCalledWith(assetStub.image.ownerId, -5000);
     });
   });

server/src/services/asset.service.ts

@@ -27,7 +27,7 @@ import { IAssetStackRepository } from 'src/interfaces/asset-stack.interface';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
 import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
 import {
-  IEntityJob,
+  IAssetDeleteJob,
   IJobRepository,
   ISidecarWriteJob,
   JOBS_ASSET_PAGINATION_SIZE,
@@ -245,7 +245,7 @@ export class AssetService {
   }
 
   async handleAssetDeletionCheck(): Promise<JobStatus> {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     const trashedDays = config.trash.enabled ? config.trash.days : 0;
     const trashedBefore = DateTime.now()
       .minus(Duration.fromObject({ days: trashedDays }))
@@ -256,15 +256,21 @@ export class AssetService {
 
     for await (const assets of assetPagination) {
       await this.jobRepository.queueAll(
-        assets.map((asset) => ({ name: JobName.ASSET_DELETION, data: { id: asset.id } })),
+        assets.map((asset) => ({
+          name: JobName.ASSET_DELETION,
+          data: {
+            id: asset.id,
+            deleteOnDisk: true,
+          },
+        })),
       );
     }
 
     return JobStatus.SUCCESS;
   }
 
-  async handleAssetDeletion(job: IEntityJob): Promise<JobStatus> {
-    const { id } = job;
+  async handleAssetDeletion(job: IAssetDeleteJob): Promise<JobStatus> {
+    const { id, deleteOnDisk } = job;
 
     const asset = await this.assetRepository.getById(id, {
       faces: {
@@ -301,12 +307,14 @@ export class AssetService {
 
     // TODO refactor this to use cascades
     if (asset.livePhotoVideoId) {
-      await this.jobRepository.queue({ name: JobName.ASSET_DELETION, data: { id: asset.livePhotoVideoId } });
+      await this.jobRepository.queue({
+        name: JobName.ASSET_DELETION,
+        data: { id: asset.livePhotoVideoId, deleteOnDisk },
+      });
     }
 
     const files = [asset.thumbnailPath, asset.previewPath, asset.encodedVideoPath];
-    // skip originals if the user deleted the whole library
-    if (!asset.library?.deletedAt) {
+    if (deleteOnDisk) {
       files.push(asset.sidecarPath, asset.originalPath);
     }
 
@@ -321,7 +329,12 @@ export class AssetService {
     await this.access.requirePermission(auth, Permission.ASSET_DELETE, ids);
 
     if (force) {
-      await this.jobRepository.queueAll(ids.map((id) => ({ name: JobName.ASSET_DELETION, data: { id } })));
+      await this.jobRepository.queueAll(
+        ids.map((id) => ({
+          name: JobName.ASSET_DELETION,
+          data: { id, deleteOnDisk: true },
+        })),
+      );
     } else {
       await this.assetRepository.softDeleteAll(ids);
       this.eventRepository.clientSend(ClientEvent.ASSET_TRASH, auth.user.id, ids);

server/src/services/auth.service.ts

@@ -77,7 +77,7 @@ export class AuthService {
   }
 
   async login(dto: LoginCredentialDto, details: LoginDetails) {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     if (!config.passwordLogin.enabled) {
       throw new UnauthorizedException('Password login has been disabled');
     }
@@ -174,7 +174,7 @@ export class AuthService {
   }
 
   async authorize(dto: OAuthConfigDto): Promise<OAuthAuthorizeResponseDto> {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     if (!config.oauth.enabled) {
       throw new BadRequestException('OAuth is not enabled');
     }
@@ -190,7 +190,7 @@ export class AuthService {
   }
 
   async callback(dto: OAuthCallbackDto, loginDetails: LoginDetails) {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     const profile = await this.getOAuthProfile(config, dto.url);
     this.logger.debug(`Logging in with OAuth: ${JSON.stringify(profile)}`);
     let user = await this.userRepository.getByOAuthId(profile.sub);
@@ -242,7 +242,7 @@ export class AuthService {
   }
 
   async link(auth: AuthDto, dto: OAuthCallbackDto): Promise<UserAdminResponseDto> {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     const { sub: oauthId } = await this.getOAuthProfile(config, dto.url);
     const duplicate = await this.userRepository.getByOAuthId(oauthId);
     if (duplicate && duplicate.id !== auth.user.id) {
@@ -264,7 +264,7 @@ export class AuthService {
       return LOGIN_URL;
     }
 
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     if (!config.oauth.enabled) {
       return LOGIN_URL;
     }

server/src/services/cli.service.ts

@@ -42,25 +42,25 @@ export class CliService {
   }
 
   async disablePasswordLogin(): Promise<void> {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     config.passwordLogin.enabled = false;
     await this.configCore.updateConfig(config);
   }
 
   async enablePasswordLogin(): Promise<void> {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     config.passwordLogin.enabled = true;
     await this.configCore.updateConfig(config);
   }
 
   async disableOAuthLogin(): Promise<void> {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     config.oauth.enabled = false;
     await this.configCore.updateConfig(config);
   }
 
   async enableOAuthLogin(): Promise<void> {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     config.oauth.enabled = true;
     await this.configCore.updateConfig(config);
   }

server/src/services/duplicate.service.ts

@@ -43,7 +43,7 @@ export class DuplicateService {
   }
 
   async handleQueueSearchDuplicates({ force }: IBaseJob): Promise<JobStatus> {
-    const { machineLearning } = await this.configCore.getConfig();
+    const { machineLearning } = await this.configCore.getConfig({ withCache: false });
     if (!isDuplicateDetectionEnabled(machineLearning)) {
       return JobStatus.SKIPPED;
     }
@@ -64,7 +64,7 @@ export class DuplicateService {
   }
 
   async handleSearchDuplicates({ id }: IEntityJob): Promise<JobStatus> {
-    const { machineLearning } = await this.configCore.getConfig();
+    const { machineLearning } = await this.configCore.getConfig({ withCache: true });
     if (!isDuplicateDetectionEnabled(machineLearning)) {
       return JobStatus.SKIPPED;
     }

server/src/services/job.service.ts

@@ -150,7 +150,7 @@ export class JobService {
   }
 
   async init(jobHandlers: Record<JobName, JobHandler>) {
-    const config = await this.configCore.getConfig();
+    const config = await this.configCore.getConfig({ withCache: false });
     for (const queueName of Object.values(QueueName)) {
       let concurrency = 1;