refactor(web): rename loadMonthGroup to loadSegment API

2025-12-07 21:30:59 -08:00 · 2025-09-18 14:41:41 +00:00
95 changed files with 1810 additions and 9885 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,8 @@
    "immich-server",
    "redis",
    "database",
-    "immich-machine-learning"
+    "immich-machine-learning",
+    "init"
  ],
  "dockerComposeFile": [
    "../docker/docker-compose.dev.yml",
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ mobile/libisar.dylib
 mobile/openapi/test
 mobile/openapi/doc
 mobile/openapi/.openapi-generator/FILES
-mobile/ios/build

 open-api/typescript-sdk/build
 mobile/android/fastlane/report.xml
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -169,6 +169,8 @@ Redis (Sentinel) URL example JSON before encoding:
 | `MACHINE_LEARNING_ANN_TUNING_LEVEL`                         | ARM-NN GPU tuning level (1: rapid, 2: normal, 3: exhaustive)                                        |               `2`               | machine learning |
 | `MACHINE_LEARNING_DEVICE_IDS`<sup>\*4</sup>                 | Device IDs to use in multi-GPU environments                                                         |               `0`               | machine learning |
 | `MACHINE_LEARNING_MAX_BATCH_SIZE__FACIAL_RECOGNITION`       | Set the maximum number of faces that will be processed at once by the facial recognition model      |  None (`1` if using OpenVINO)   | machine learning |
+| `MACHINE_LEARNING_PING_TIMEOUT`                             | How long (ms) to wait for a PING response when checking if an ML server is available                |             `2000`              | server           |
+| `MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME`                | How long to ignore ML servers that are offline before trying again                                  |             `30000`             | server           |
 | `MACHINE_LEARNING_RKNN`                                     | Enable RKNN hardware acceleration if supported                                                      |             `True`              | machine learning |
 | `MACHINE_LEARNING_RKNN_THREADS`                             | How many threads of RKNN runtime should be spinned up while inferencing.                            |               `1`               | machine learning |

--- a/i18n/en.json
+++ b/i18n/en.json
@@ -123,13 +123,6 @@
    "logging_enable_description": "Enable logging",
    "logging_level_description": "When enabled, what log level to use.",
    "logging_settings": "Logging",
-    "machine_learning_availability_checks": "Availability checks",
-    "machine_learning_availability_checks_description": "Automatically detect and prefer available machine learning servers",
-    "machine_learning_availability_checks_enabled": "Enable availability checks",
-    "machine_learning_availability_checks_interval": "Check interval",
-    "machine_learning_availability_checks_interval_description": "Interval in milliseconds between availability checks",
-    "machine_learning_availability_checks_timeout": "Request timeout",
-    "machine_learning_availability_checks_timeout_description": "Timeout in milliseconds for availability checks",
    "machine_learning_clip_model": "CLIP model",
    "machine_learning_clip_model_description": "The name of a CLIP model listed <link>here</link>. Note that you must re-run the 'Smart Search' job for all images upon changing a model.",
    "machine_learning_duplicate_detection": "Duplicate Detection",
@@ -920,7 +913,6 @@
    "cant_get_number_of_comments": "Can't get number of comments",
    "cant_search_people": "Can't search people",
    "cant_search_places": "Can't search places",
-    "clipboard_unsupported_mime_type": "The system clipboard does not support copying this type of content: {mimeType}",
    "error_adding_assets_to_album": "Error adding assets to album",
    "error_adding_users_to_album": "Error adding users to album",
    "error_deleting_shared_user": "Error deleting shared user",
@@ -1924,7 +1916,6 @@
  "stacktrace": "Stacktrace",
  "start": "Start",
  "start_date": "Start date",
-  "start_date_before_end_date": "Start date must be before end date",
  "state": "State",
  "status": "Status",
  "stop_casting": "Stop casting",
--- a/mise.lock
+++ b/mise.lock
@@ -0,0 +1,34 @@
+[tools.dart]
+version = "3.8.2"
+backend = "asdf:dart"
+
+[tools.flutter]
+version = "3.35.3-stable"
+backend = "asdf:flutter"
+
+[tools."github:CQLabs/homebrew-dcm"]
+version = "1.31.4"
+backend = "github:CQLabs/homebrew-dcm"
+
+[tools."github:CQLabs/homebrew-dcm".platforms.linux-x64]
+checksum = "blake3:e9df5b765df327e1248fccf2c6165a89d632a065667f99c01765bf3047b94955"
+size = 8821083
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.31.4/dcm-linux-x64-release.zip"
+
+[tools.node]
+version = "22.18.0"
+backend = "core:node"
+
+[tools.node.platforms.linux-x64]
+checksum = "sha256:a2e703725d8683be86bb5da967bf8272f4518bdaf10f21389e2b2c9eaeae8c8a"
+size = 54824343
+url = "https://nodejs.org/dist/v22.18.0/node-v22.18.0-linux-x64.tar.gz"
+
+[tools.pnpm]
+version = "10.14.0"
+backend = "aqua:pnpm/pnpm"
+
+[tools.pnpm.platforms.linux-x64]
+checksum = "blake3:13dfa46b7173d3cad3bad60a756a492ecf0bce48b23eb9f793e7ccec5a09b46d"
+size = 66231525
+url = "https://github.com/pnpm/pnpm/releases/download/v10.14.0/pnpm-linux-x64"
--- a/mise.toml
+++ b/mise.toml
@@ -1,7 +1,7 @@
 [tools]
 node = "22.19.0"
 flutter = "3.35.4"
-pnpm = "10.15.1"
+pnpm = "10.14.0"
 dart = "3.8.2"

 [tools."github:CQLabs/homebrew-dcm"]
@@ -11,6 +11,7 @@ postinstall = "chmod +x $MISE_TOOL_INSTALL_PATH/dcm"

 [settings]
 experimental = true
+lockfile = true
 pin = true

 # .github
--- a/mobile/drift_schemas/main/drift_schema_v11.json
+++ b/mobile/drift_schemas/main/drift_schema_v11.json
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 77;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -133,8 +133,6 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -521,10 +519,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -553,10 +555,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
--- a/mobile/lib/infrastructure/entities/local_album_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_album_asset.entity.dart
@@ -10,9 +10,6 @@ class LocalAlbumAssetEntity extends Table with DriftDefaultsMixin {

  TextColumn get albumId => text().references(LocalAlbumEntity, #id, onDelete: KeyAction.cascade)();

-  // Used for mark & sweep
-  BoolColumn get marker_ => boolean().nullable()();
-
  @override
  Set<Column> get primaryKey => {assetId, albumId};
 }
--- a/mobile/lib/infrastructure/entities/local_album_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_album_asset.entity.drift.dart
@@ -15,13 +15,11 @@ typedef $$LocalAlbumAssetEntityTableCreateCompanionBuilder =
    i1.LocalAlbumAssetEntityCompanion Function({
      required String assetId,
      required String albumId,
-      i0.Value<bool?> marker_,
    });
 typedef $$LocalAlbumAssetEntityTableUpdateCompanionBuilder =
    i1.LocalAlbumAssetEntityCompanion Function({
      i0.Value<String> assetId,
      i0.Value<String> albumId,
-      i0.Value<bool?> marker_,
    });

 final class $$LocalAlbumAssetEntityTableReferences
@@ -115,11 +113,6 @@ class $$LocalAlbumAssetEntityTableFilterComposer
    super.$addJoinBuilderToRootComposer,
    super.$removeJoinBuilderFromRootComposer,
  });
-  i0.ColumnFilters<bool> get marker_ => $composableBuilder(
-    column: $table.marker_,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
  i3.$$LocalAssetEntityTableFilterComposer get assetId {
    final i3.$$LocalAssetEntityTableFilterComposer composer = $composerBuilder(
      composer: this,
@@ -184,11 +177,6 @@ class $$LocalAlbumAssetEntityTableOrderingComposer
    super.$addJoinBuilderToRootComposer,
    super.$removeJoinBuilderFromRootComposer,
  });
-  i0.ColumnOrderings<bool> get marker_ => $composableBuilder(
-    column: $table.marker_,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
  i3.$$LocalAssetEntityTableOrderingComposer get assetId {
    final i3.$$LocalAssetEntityTableOrderingComposer composer =
        $composerBuilder(
@@ -255,9 +243,6 @@ class $$LocalAlbumAssetEntityTableAnnotationComposer
    super.$addJoinBuilderToRootComposer,
    super.$removeJoinBuilderFromRootComposer,
  });
-  i0.GeneratedColumn<bool> get marker_ =>
-      $composableBuilder(column: $table.marker_, builder: (column) => column);
-
  i3.$$LocalAssetEntityTableAnnotationComposer get assetId {
    final i3.$$LocalAssetEntityTableAnnotationComposer composer =
        $composerBuilder(
@@ -359,22 +344,16 @@ class $$LocalAlbumAssetEntityTableTableManager
              ({
                i0.Value<String> assetId = const i0.Value.absent(),
                i0.Value<String> albumId = const i0.Value.absent(),
-                i0.Value<bool?> marker_ = const i0.Value.absent(),
              }) => i1.LocalAlbumAssetEntityCompanion(
                assetId: assetId,
                albumId: albumId,
-                marker_: marker_,
              ),
          createCompanionCallback:
-              ({
-                required String assetId,
-                required String albumId,
-                i0.Value<bool?> marker_ = const i0.Value.absent(),
-              }) => i1.LocalAlbumAssetEntityCompanion.insert(
-                assetId: assetId,
-                albumId: albumId,
-                marker_: marker_,
-              ),
+              ({required String assetId, required String albumId}) =>
+                  i1.LocalAlbumAssetEntityCompanion.insert(
+                    assetId: assetId,
+                    albumId: albumId,
+                  ),
          withReferenceMapper: (p0) => p0
              .map(
                (e) => (
@@ -498,22 +477,8 @@ class $LocalAlbumAssetEntityTable extends i2.LocalAlbumAssetEntity
      'REFERENCES local_album_entity (id) ON DELETE CASCADE',
    ),
  );
-  static const i0.VerificationMeta _marker_Meta = const i0.VerificationMeta(
-    'marker_',
-  );
  @override
-  late final i0.GeneratedColumn<bool> marker_ = i0.GeneratedColumn<bool>(
-    'marker',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.bool,
-    requiredDuringInsert: false,
-    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-      'CHECK ("marker" IN (0, 1))',
-    ),
-  );
-  @override
-  List<i0.GeneratedColumn> get $columns => [assetId, albumId, marker_];
+  List<i0.GeneratedColumn> get $columns => [assetId, albumId];
  @override
  String get aliasedName => _alias ?? actualTableName;
  @override
@@ -542,12 +507,6 @@ class $LocalAlbumAssetEntityTable extends i2.LocalAlbumAssetEntity
    } else if (isInserting) {
      context.missing(_albumIdMeta);
    }
-    if (data.containsKey('marker')) {
-      context.handle(
-        _marker_Meta,
-        marker_.isAcceptableOrUnknown(data['marker']!, _marker_Meta),
-      );
-    }
    return context;
  }

@@ -568,10 +527,6 @@ class $LocalAlbumAssetEntityTable extends i2.LocalAlbumAssetEntity
        i0.DriftSqlType.string,
        data['${effectivePrefix}album_id'],
      )!,
-      marker_: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.bool,
-        data['${effectivePrefix}marker'],
-      ),
    );
  }

@@ -590,20 +545,15 @@ class LocalAlbumAssetEntityData extends i0.DataClass
    implements i0.Insertable<i1.LocalAlbumAssetEntityData> {
  final String assetId;
  final String albumId;
-  final bool? marker_;
  const LocalAlbumAssetEntityData({
    required this.assetId,
    required this.albumId,
-    this.marker_,
  });
  @override
  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
    final map = <String, i0.Expression>{};
    map['asset_id'] = i0.Variable<String>(assetId);
    map['album_id'] = i0.Variable<String>(albumId);
-    if (!nullToAbsent || marker_ != null) {
-      map['marker'] = i0.Variable<bool>(marker_);
-    }
    return map;
  }

@@ -615,7 +565,6 @@ class LocalAlbumAssetEntityData extends i0.DataClass
    return LocalAlbumAssetEntityData(
      assetId: serializer.fromJson<String>(json['assetId']),
      albumId: serializer.fromJson<String>(json['albumId']),
-      marker_: serializer.fromJson<bool?>(json['marker_']),
    );
  }
  @override
@@ -624,26 +573,20 @@ class LocalAlbumAssetEntityData extends i0.DataClass
    return <String, dynamic>{
      'assetId': serializer.toJson<String>(assetId),
      'albumId': serializer.toJson<String>(albumId),
-      'marker_': serializer.toJson<bool?>(marker_),
    };
  }

-  i1.LocalAlbumAssetEntityData copyWith({
-    String? assetId,
-    String? albumId,
-    i0.Value<bool?> marker_ = const i0.Value.absent(),
-  }) => i1.LocalAlbumAssetEntityData(
-    assetId: assetId ?? this.assetId,
-    albumId: albumId ?? this.albumId,
-    marker_: marker_.present ? marker_.value : this.marker_,
-  );
+  i1.LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      i1.LocalAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
  LocalAlbumAssetEntityData copyWithCompanion(
    i1.LocalAlbumAssetEntityCompanion data,
  ) {
    return LocalAlbumAssetEntityData(
      assetId: data.assetId.present ? data.assetId.value : this.assetId,
      albumId: data.albumId.present ? data.albumId.value : this.albumId,
-      marker_: data.marker_.present ? data.marker_.value : this.marker_,
    );
  }

@@ -651,60 +594,51 @@ class LocalAlbumAssetEntityData extends i0.DataClass
  String toString() {
    return (StringBuffer('LocalAlbumAssetEntityData(')
          ..write('assetId: $assetId, ')
-          ..write('albumId: $albumId, ')
-          ..write('marker_: $marker_')
+          ..write('albumId: $albumId')
          ..write(')'))
        .toString();
  }

  @override
-  int get hashCode => Object.hash(assetId, albumId, marker_);
+  int get hashCode => Object.hash(assetId, albumId);
  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
      (other is i1.LocalAlbumAssetEntityData &&
          other.assetId == this.assetId &&
-          other.albumId == this.albumId &&
-          other.marker_ == this.marker_);
+          other.albumId == this.albumId);
 }

 class LocalAlbumAssetEntityCompanion
    extends i0.UpdateCompanion<i1.LocalAlbumAssetEntityData> {
  final i0.Value<String> assetId;
  final i0.Value<String> albumId;
-  final i0.Value<bool?> marker_;
  const LocalAlbumAssetEntityCompanion({
    this.assetId = const i0.Value.absent(),
    this.albumId = const i0.Value.absent(),
-    this.marker_ = const i0.Value.absent(),
  });
  LocalAlbumAssetEntityCompanion.insert({
    required String assetId,
    required String albumId,
-    this.marker_ = const i0.Value.absent(),
  }) : assetId = i0.Value(assetId),
       albumId = i0.Value(albumId);
  static i0.Insertable<i1.LocalAlbumAssetEntityData> custom({
    i0.Expression<String>? assetId,
    i0.Expression<String>? albumId,
-    i0.Expression<bool>? marker_,
  }) {
    return i0.RawValuesInsertable({
      if (assetId != null) 'asset_id': assetId,
      if (albumId != null) 'album_id': albumId,
-      if (marker_ != null) 'marker': marker_,
    });
  }

  i1.LocalAlbumAssetEntityCompanion copyWith({
    i0.Value<String>? assetId,
    i0.Value<String>? albumId,
-    i0.Value<bool?>? marker_,
  }) {
    return i1.LocalAlbumAssetEntityCompanion(
      assetId: assetId ?? this.assetId,
      albumId: albumId ?? this.albumId,
-      marker_: marker_ ?? this.marker_,
    );
  }

@@ -717,9 +651,6 @@ class LocalAlbumAssetEntityCompanion
    if (albumId.present) {
      map['album_id'] = i0.Variable<String>(albumId.value);
    }
-    if (marker_.present) {
-      map['marker'] = i0.Variable<bool>(marker_.value);
-    }
    return map;
  }

@@ -727,8 +658,7 @@ class LocalAlbumAssetEntityCompanion
  String toString() {
    return (StringBuffer('LocalAlbumAssetEntityCompanion(')
          ..write('assetId: $assetId, ')
-          ..write('albumId: $albumId, ')
-          ..write('marker_: $marker_')
+          ..write('albumId: $albumId')
          ..write(')'))
        .toString();
  }
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -93,7 +93,7 @@ class Drift extends $Drift implements IDatabaseRepository {
  }

  @override
-  int get schemaVersion => 11;
+  int get schemaVersion => 10;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -156,9 +156,6 @@ class Drift extends $Drift implements IDatabaseRepository {
            await m.addColumn(v10.userEntity, v10.userEntity.avatarColor);
            await m.alterTable(TableMigration(v10.userEntity));
          },
-          from10To11: (m, v11) async {
-            await m.addColumn(v11.localAlbumAssetEntity, v11.localAlbumAssetEntity.marker_);
-          },
        ),
      );

--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -4270,395 +4270,6 @@ i1.GeneratedColumn<String> _column_94(String aliasedName) =>
      true,
      type: i1.DriftSqlType.string,
    );
-
-final class Schema11 extends i0.VersionedSchema {
-  Schema11({required super.database}) : super(version: 11);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAssetChecksum,
-    idxRemoteAssetOwnerChecksum,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    idxLatLng,
-  ];
-  late final Shape20 userEntity = Shape20(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_84,
-        _column_85,
-        _column_91,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape17 remoteAssetEntity = Shape17(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_13,
-        _column_14,
-        _column_15,
-        _column_16,
-        _column_17,
-        _column_18,
-        _column_19,
-        _column_20,
-        _column_21,
-        _column_86,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape3 stackEntity = Shape3(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape2 localAssetEntity = Shape2(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_22,
-        _column_14,
-        _column_23,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape9 remoteAlbumEntity = Shape9(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_56,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_57,
-        _column_58,
-        _column_59,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape19 localAlbumEntity = Shape19(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_5,
-        _column_31,
-        _column_32,
-        _column_90,
-        _column_33,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape22 localAlbumAssetEntity = Shape22(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_34, _column_35, _column_33],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
-    'idx_remote_asset_owner_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  late final Shape21 authUserEntity = Shape21(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_2,
-        _column_84,
-        _column_85,
-        _column_92,
-        _column_93,
-        _column_7,
-        _column_94,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_25, _column_26, _column_27],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape5 partnerEntity = Shape5(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_28, _column_29, _column_30],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape8 remoteExifEntity = Shape8(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_37,
-        _column_38,
-        _column_39,
-        _column_40,
-        _column_41,
-        _column_11,
-        _column_10,
-        _column_42,
-        _column_43,
-        _column_44,
-        _column_45,
-        _column_46,
-        _column_47,
-        _column_48,
-        _column_49,
-        _column_50,
-        _column_51,
-        _column_52,
-        _column_53,
-        _column_54,
-        _column_55,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_36, _column_60],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_60, _column_25, _column_61],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape11 memoryEntity = Shape11(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_18,
-        _column_15,
-        _column_8,
-        _column_62,
-        _column_63,
-        _column_64,
-        _column_65,
-        _column_66,
-        _column_67,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_36, _column_68],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape14 personEntity = Shape14(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_1,
-        _column_69,
-        _column_71,
-        _column_72,
-        _column_73,
-        _column_74,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape15 assetFaceEntity = Shape15(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_36,
-        _column_76,
-        _column_77,
-        _column_78,
-        _column_79,
-        _column_80,
-        _column_81,
-        _column_82,
-        _column_83,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_87, _column_88, _column_89],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-}
-
-class Shape22 extends i0.VersionedTable {
-  Shape22({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get albumId =>
-      columnsByName['album_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get marker_ =>
-      columnsByName['marker']! as i1.GeneratedColumn<bool>;
-}
-
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -4669,7 +4280,6 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
  required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
  required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
-  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -4718,11 +4328,6 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from9To10(migrator, schema);
        return 10;
-      case 10:
-        final schema = Schema11(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from10To11(migrator, schema);
-        return 11;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -4739,7 +4344,6 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
  required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
  required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
-  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -4751,6 +4355,5 @@ i1.OnUpgrade stepByStep({
    from7To8: from7To8,
    from8To9: from8To9,
    from9To10: from9To10,
-    from10To11: from10To11,
  ),
 );
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -72,33 +72,17 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
      return Future.value();
    }

-    return _db.transaction(() async {
-      await _db.managers.localAlbumAssetEntity
-          .filter((row) => row.albumId.id.equals(albumId))
-          .update((album) => album(marker_: const Value(true)));
-
-      await _db.batch((batch) {
-        for (final assetId in assetIdsToKeep) {
-          batch.update(
-            _db.localAlbumAssetEntity,
-            const LocalAlbumAssetEntityCompanion(marker_: Value(null)),
-            where: (row) => row.assetId.equals(assetId) & row.albumId.equals(albumId),
-          );
-        }
-      });
-
-      final query = _db.localAssetEntity.delete()
-        ..where(
-          (row) => row.id.isInQuery(
-            _db.localAlbumAssetEntity.selectOnly()
-              ..addColumns([_db.localAlbumAssetEntity.assetId])
-              ..where(
-                _db.localAlbumAssetEntity.albumId.equals(albumId) & _db.localAlbumAssetEntity.marker_.isNotNull(),
-              ),
-          ),
-        );
-      await query.go();
+    final deleteSmt = _db.localAssetEntity.delete();
+    deleteSmt.where((localAsset) {
+      final subQuery = _db.localAlbumAssetEntity.selectOnly()
+        ..addColumns([_db.localAlbumAssetEntity.assetId])
+        ..join([innerJoin(_db.localAlbumEntity, _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id))]);
+      subQuery.where(
+        _db.localAlbumEntity.id.equals(albumId) & _db.localAlbumAssetEntity.assetId.isNotIn(assetIdsToKeep),
+      );
+      return localAsset.id.isInQuery(subQuery);
    });
+    await deleteSmt.go();
  }

  Future<void> upsert(
@@ -214,9 +198,10 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
      // List<String>
      await _db.batch((batch) async {
        assetAlbums.cast<String, List<Object?>>().forEach((assetId, albumIds) {
-          for (final albumId in albumIds.cast<String?>().nonNulls) {
-            batch.deleteWhere(_db.localAlbumAssetEntity, (f) => f.albumId.equals(albumId) & f.assetId.equals(assetId));
-          }
+          batch.deleteWhere(
+            _db.localAlbumAssetEntity,
+            (f) => f.albumId.isNotIn(albumIds.cast<String?>().nonNulls) & f.assetId.equals(assetId),
+          );
        });
      });
      await _db.batch((batch) async {
@@ -303,14 +288,12 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {

    return transaction(() async {
      if (assetsToUnLink.isNotEmpty) {
-        await _db.batch((batch) {
-          for (final assetId in assetsToUnLink) {
-            batch.deleteWhere(
-              _db.localAlbumAssetEntity,
-              (row) => row.assetId.equals(assetId) & row.albumId.equals(albumId),
-            );
-          }
-        });
+        await _db.batch(
+          (batch) => batch.deleteWhere(
+            _db.localAlbumAssetEntity,
+            (f) => f.assetId.isIn(assetsToUnLink) & f.albumId.equals(albumId),
+          ),
+        );
      }

      await _deleteAssets(assetsToDelete);
@@ -337,9 +320,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
    }

    return _db.batch((batch) {
-      for (final id in ids) {
-        batch.deleteWhere(_db.localAssetEntity, (row) => row.id.equals(id));
-      }
+      batch.deleteWhere(_db.localAssetEntity, (f) => f.id.isIn(ids));
    });
  }

--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -57,8 +58,8 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
    }

    return _db.batch((batch) {
-      for (final id in ids) {
-        batch.deleteWhere(_db.localAssetEntity, (e) => e.id.equals(id));
+      for (final slice in ids.slices(32000)) {
+        batch.deleteWhere(_db.localAssetEntity, (e) => e.id.isIn(slice));
      }
    });
  }
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -166,15 +166,8 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
    );
  }

-  Future<void> removeAssets(String albumId, List<String> assetIds) {
-    return _db.batch((batch) {
-      for (final assetId in assetIds) {
-        batch.deleteWhere(
-          _db.remoteAlbumAssetEntity,
-          (row) => row.albumId.equals(albumId) & row.assetId.equals(assetId),
-        );
-      }
-    });
+  Future<int> removeAssets(String albumId, List<String> assetIds) {
+    return _db.remoteAlbumAssetEntity.deleteWhere((tbl) => tbl.albumId.equals(albumId) & tbl.assetId.isIn(assetIds));
  }

  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -160,11 +160,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
  }

  Future<void> delete(List<String> ids) {
-    return _db.batch((batch) {
-      for (final id in ids) {
-        batch.deleteWhere(_db.remoteAssetEntity, (row) => row.id.equals(id));
-      }
-    });
+    return _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(ids));
  }

  Future<void> updateLocation(List<String> ids, LatLng location) {
@@ -203,11 +199,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
          .map((row) => row.id)
          .get();

-      await _db.batch((batch) {
-        for (final stackId in stackIds) {
-          batch.deleteWhere(_db.stackEntity, (row) => row.id.equals(stackId));
-        }
-      });
+      await _db.stackEntity.deleteWhere((row) => row.id.isIn(stackIds));

      await _db.batch((batch) {
        final companion = StackEntityCompanion(ownerId: Value(userId), primaryAssetId: Value(stack.primaryAssetId));
@@ -227,21 +219,15 @@ class RemoteAssetRepository extends DriftDatabaseRepository {

  Future<void> unStack(List<String> stackIds) {
    return _db.transaction(() async {
-      await _db.batch((batch) {
-        for (final stackId in stackIds) {
-          batch.deleteWhere(_db.stackEntity, (row) => row.id.equals(stackId));
-        }
-      });
+      await _db.stackEntity.deleteWhere((row) => row.id.isIn(stackIds));

      // TODO: delete this after adding foreign key on stackId
      await _db.batch((batch) {
-        for (final stackId in stackIds) {
-          batch.update(
-            _db.remoteAssetEntity,
-            const RemoteAssetEntityCompanion(stackId: Value(null)),
-            where: (e) => e.stackId.equals(stackId),
-          );
-        }
+        batch.update(
+          _db.remoteAssetEntity,
+          const RemoteAssetEntityCompanion(stackId: Value(null)),
+          where: (e) => e.stackId.isIn(stackIds),
+        );
      });
    });
  }
--- a/mobile/lib/infrastructure/repositories/search_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/search_api.repository.dart
@@ -33,7 +33,7 @@ class SearchApiRepository extends ApiRepository {
          personIds: filter.people.map((e) => e.id).toList(),
          type: type,
          page: page,
-          size: 100,
+          size: 1000,
        ),
      );
    }
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -93,11 +93,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteUsersV1(Iterable<SyncUserDeleteV1> data) async {
    try {
-      await _db.batch((batch) {
-        for (final user in data) {
-          batch.deleteWhere(_db.userEntity, (row) => row.id.equals(user.userId));
-        }
-      });
+      await _db.userEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.userId)));
    } catch (error, stack) {
      _logger.severe('Error: SyncUserDeleteV1', error, stack);
      rethrow;
@@ -162,11 +158,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteAssetsV1(Iterable<SyncAssetDeleteV1> data, {String debugLabel = 'user'}) async {
    try {
-      await _db.batch((batch) {
-        for (final asset in data) {
-          batch.deleteWhere(_db.remoteAssetEntity, (row) => row.id.equals(asset.assetId));
-        }
-      });
+      await _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.assetId)));
    } catch (error, stack) {
      _logger.severe('Error: deleteAssetsV1 - $debugLabel', error, stack);
      rethrow;
@@ -251,11 +243,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
    try {
-      await _db.batch((batch) {
-        for (final album in data) {
-          batch.deleteWhere(_db.remoteAlbumEntity, (row) => row.id.equals(album.albumId));
-        }
-      });
+      await _db.remoteAlbumEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
    } catch (error, stack) {
      _logger.severe('Error: deleteAlbumsV1', error, stack);
      rethrow;
@@ -391,11 +379,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteMemoriesV1(Iterable<SyncMemoryDeleteV1> data) async {
    try {
-      await _db.batch((batch) {
-        for (final memory in data) {
-          batch.deleteWhere(_db.memoryEntity, (row) => row.id.equals(memory.memoryId));
-        }
-      });
+      await _db.memoryEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.memoryId)));
    } catch (error, stack) {
      _logger.severe('Error: deleteMemoriesV1', error, stack);
      rethrow;
@@ -459,11 +443,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {

  Future<void> deleteStacksV1(Iterable<SyncStackDeleteV1> data, {String debugLabel = 'user'}) async {
    try {
-      await _db.batch((batch) {
-        for (final stack in data) {
-          batch.deleteWhere(_db.stackEntity, (row) => row.id.equals(stack.stackId));
-        }
-      });
+      await _db.stackEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.stackId)));
    } catch (error, stack) {
      _logger.severe('Error: deleteStacksV1 - $debugLabel', error, stack);
      rethrow;
--- a/mobile/lib/pages/backup/drift_backup.page.dart
+++ b/mobile/lib/pages/backup/drift_backup.page.dart
@@ -12,7 +12,6 @@ import 'package:immich_mobile/presentation/widgets/backup/backup_toggle_button.w
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
@@ -34,14 +33,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
      return;
    }

-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-      await ref.read(backgroundSyncProvider).syncRemote();
-
-      if (mounted) {
-        await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-      }
-    });
+    ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
  }

  @override
@@ -52,6 +44,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
        .toList();

    final backupNotifier = ref.read(driftBackupProvider.notifier);
+    final backgroundManager = ref.read(backgroundSyncProvider);

    Future<void> startBackup() async {
      final currentUser = Store.tryGet(StoreKey.currentUser);
@@ -59,6 +52,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
        return;
      }

+      await backgroundManager.syncRemote();
      await backupNotifier.getBackupStatus(currentUser.id);
      await backupNotifier.startBackup(currentUser.id);
    }
@@ -241,13 +235,11 @@ class _BackupCard extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final backupCount = ref.watch(driftBackupProvider.select((p) => p.backupCount));
-    final syncStatus = ref.watch(syncStatusProvider);

    return BackupInfoCard(
      title: "backup_controller_page_backup".tr(),
      subtitle: "backup_controller_page_backup_sub".tr(),
      info: backupCount.toString(),
-      isLoading: syncStatus.isRemoteSyncing,
    );
  }
 }
@@ -258,13 +250,10 @@ class _RemainderCard extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final remainderCount = ref.watch(driftBackupProvider.select((p) => p.remainderCount));
-    final syncStatus = ref.watch(syncStatusProvider);
-
    return BackupInfoCard(
      title: "backup_controller_page_remainder".tr(),
      subtitle: "backup_controller_page_remainder_sub".tr(),
      info: remainderCount.toString(),
-      isLoading: syncStatus.isRemoteSyncing,
      onTap: () => context.pushRoute(const DriftBackupAssetDetailRoute()),
    );
  }
--- a/mobile/lib/presentation/pages/download_info.page.dart
+++ b/mobile/lib/presentation/pages/download_info.page.dart
@@ -1,57 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/pages/common/download_panel.dart';
-import 'package:immich_mobile/providers/asset_viewer/download.provider.dart';
-
-@RoutePage()
-class DownloadInfoPage extends ConsumerWidget {
-  const DownloadInfoPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final tasks = ref.watch(downloadStateProvider.select((state) => state.taskProgress)).entries.toList();
-
-    onCancelDownload(String id) {
-      ref.watch(downloadStateProvider.notifier).cancelDownload(id);
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text("download".t(context: context)),
-        actions: [],
-      ),
-      body: ListView.builder(
-        physics: const ClampingScrollPhysics(),
-        shrinkWrap: true,
-        itemCount: tasks.length,
-        itemBuilder: (context, index) {
-          final task = tasks[index];
-          return Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-            child: DownloadTaskTile(
-              progress: task.value.progress,
-              fileName: task.value.fileName,
-              status: task.value.status,
-              onCancelDownload: () => onCancelDownload(task.key),
-            ),
-          );
-        },
-      ),
-      persistentFooterButtons: [
-        OutlinedButton(
-          onPressed: () {
-            tasks.map((e) => e.key).forEach(onCancelDownload);
-          },
-          style: OutlinedButton.styleFrom(side: BorderSide(color: context.colorScheme.primary)),
-          child: Text(
-            'clear_all'.t(context: context),
-            style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.primary),
-          ),
-        ),
-      ],
-    );
-  }
-}
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -633,7 +633,7 @@ class _SearchResultGrid extends ConsumerWidget {
            groupBy: GroupAssetsBy.none,
            appBar: null,
            bottomSheet: const GeneralBottomSheet(minChildSize: 0.20),
-            snapToMonth: false,
+            withScrubber: false,
          ),
        ),
      ),
--- a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
@@ -1,45 +1,54 @@
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class DownloadActionButton extends ConsumerWidget {
  final ActionSource source;
-  final bool menuItem;
-  const DownloadActionButton({super.key, required this.source, this.menuItem = false});

-  void _onTap(BuildContext context, WidgetRef ref, BackgroundSyncManager backgroundSyncManager) async {
+  const DownloadActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
    if (!context.mounted) {
      return;
    }

-    try {
-      await ref.read(actionProvider.notifier).downloadAll(source);
+    final result = await ref.read(actionProvider.notifier).downloadAll(source);
+    ref.read(multiSelectProvider.notifier).reset();

-      Future.delayed(const Duration(seconds: 1), () async {
-        await backgroundSyncManager.syncLocal();
-        await backgroundSyncManager.hashAssets();
-      });
-    } finally {
-      ref.read(multiSelectProvider.notifier).reset();
+    if (!context.mounted) {
+      return;
+    }
+
+    if (!result.success) {
+      ImmichToast.show(
+        context: context,
+        msg: 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: ToastType.error,
+      );
+    } else if (result.count > 0) {
+      ImmichToast.show(
+        context: context,
+        msg: 'download_action_prompt'.t(context: context, args: {'count': result.count.toString()}),
+        gravity: ToastGravity.BOTTOM,
+        toastType: ToastType.success,
+      );
    }
  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final backgroundManager = ref.watch(backgroundSyncProvider);
-
    return BaseActionButton(
      iconData: Icons.download,
      maxWidth: 95,
      label: "download".t(context: context),
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref, backgroundManager),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/download_status_floating_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/download_status_floating_button.widget.dart
@@ -1,64 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/asset_viewer/download.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-class DownloadStatusFloatingButton extends ConsumerWidget {
-  const DownloadStatusFloatingButton({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final shouldShow = ref.watch(downloadStateProvider.select((state) => state.showProgress));
-    final itemCount = ref.watch(downloadStateProvider.select((state) => state.taskProgress.length));
-    final isDownloading = ref
-        .watch(downloadStateProvider.select((state) => state.taskProgress))
-        .values
-        .where((element) => element.progress != 1)
-        .isNotEmpty;
-
-    return shouldShow
-        ? Badge.count(
-            count: itemCount,
-            textColor: context.colorScheme.onPrimary,
-            backgroundColor: context.colorScheme.primary,
-            child: FloatingActionButton(
-              shape: RoundedRectangleBorder(
-                borderRadius: const BorderRadius.all(Radius.circular(20)),
-                side: BorderSide(color: context.colorScheme.outlineVariant, width: 1),
-              ),
-              backgroundColor: context.isDarkTheme
-                  ? context.colorScheme.surfaceContainer
-                  : context.colorScheme.surfaceBright,
-              elevation: 2,
-              onPressed: () {
-                context.pushRoute(const DownloadInfoRoute());
-              },
-              child: Stack(
-                alignment: AlignmentDirectional.center,
-                children: [
-                  isDownloading
-                      ? Icon(Icons.downloading_rounded, color: context.colorScheme.primary, size: 28)
-                      : Icon(
-                          Icons.download_done,
-                          color: context.isDarkTheme ? Colors.green[200] : Colors.green[400],
-                          size: 28,
-                        ),
-                  if (isDownloading)
-                    const SizedBox(
-                      height: 31,
-                      width: 31,
-                      child: CircularProgressIndicator(
-                        strokeWidth: 2,
-                        backgroundColor: Colors.transparent,
-                        value: null, // Indeterminate progress
-                      ),
-                    ),
-                ],
-              ),
-            ),
-          )
-        : const SizedBox.shrink();
-  }
-}
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -12,7 +12,6 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/download_status_floating_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
@@ -650,25 +649,20 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
        appBar: const ViewerTopAppBar(),
        extendBody: true,
        extendBodyBehindAppBar: true,
-        floatingActionButton: const DownloadStatusFloatingButton(),
-        body: Stack(
-          children: [
-            PhotoViewGallery.builder(
-              gaplessPlayback: true,
-              loadingBuilder: _placeholderBuilder,
-              pageController: pageController,
-              scrollPhysics: CurrentPlatform.isIOS
-                  ? const FastScrollPhysics() // Use bouncing physics for iOS
-                  : const FastClampingScrollPhysics(), // Use heavy physics for Android
-              itemCount: totalAssets,
-              onPageChanged: _onPageChanged,
-              onPageBuild: _onPageBuild,
-              scaleStateChangedCallback: _onScaleStateChanged,
-              builder: _assetBuilder,
-              backgroundDecoration: BoxDecoration(color: backgroundColor),
-              enablePanAlways: true,
-            ),
-          ],
+        body: PhotoViewGallery.builder(
+          gaplessPlayback: true,
+          loadingBuilder: _placeholderBuilder,
+          pageController: pageController,
+          scrollPhysics: CurrentPlatform.isIOS
+              ? const FastScrollPhysics() // Use bouncing physics for iOS
+              : const FastClampingScrollPhysics(), // Use heavy physics for Android
+          itemCount: totalAssets,
+          onPageChanged: _onPageChanged,
+          onPageBuild: _onPageBuild,
+          scaleStateChangedCallback: _onScaleStateChanged,
+          builder: _assetBuilder,
+          backgroundDecoration: BoxDecoration(color: backgroundColor),
+          enablePanAlways: true,
        ),
        bottomNavigationBar: showingBottomSheet
            ? const SizedBox.shrink()
--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -8,7 +8,6 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
@@ -57,7 +56,6 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));

    final actions = <Widget>[
-      if (asset.hasRemote) const DownloadActionButton(source: ActionSource.viewer, menuItem: true),
      if (isCasting || (asset.hasRemote)) const CastActionButton(menuItem: true),
      if (album != null && album.isActivityEnabled && album.isShared)
        IconButton(
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -101,6 +101,7 @@ class _FixedSegmentRow extends ConsumerWidget {
    if (isScrubbing) {
      return _buildPlaceholder(context);
    }
+
    if (timelineService.hasRange(assetIndex, assetCount)) {
      return _buildAssetRow(context, timelineService.getAssets(assetIndex, assetCount), timelineService);
    }
--- a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
@@ -11,7 +11,6 @@ import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/utils/debounce.dart';
 import 'package:intl/intl.dart' hide TextDirection;

 /// A widget that will display a BoxScrollView with a ScrollThumb that can be dragged
@@ -31,11 +30,6 @@ class Scrubber extends ConsumerStatefulWidget {

  final double? monthSegmentSnappingOffset;

-  final bool snapToMonth;
-
-  /// Whether an app bar is present, affects coordinate calculations
-  final bool hasAppBar;
-
  Scrubber({
    super.key,
    Key? scrollThumbKey,
@@ -44,8 +38,6 @@ class Scrubber extends ConsumerStatefulWidget {
    this.topPadding = 0,
    this.bottomPadding = 0,
    this.monthSegmentSnappingOffset,
-    this.snapToMonth = true,
-    this.hasAppBar = true,
    required this.child,
  }) : assert(child.scrollDirection == Axis.vertical);

@@ -89,8 +81,6 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
  bool _isDragging = false;
  List<_Segment> _segments = [];
  int _monthCount = 0;
-  DateTime? _currentScrubberDate;
-  Debouncer? _scrubberDebouncer;

  late AnimationController _thumbAnimationController;
  Timer? _fadeOutTimer;
@@ -143,7 +133,6 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
    _thumbAnimationController.dispose();
    _labelAnimationController.dispose();
    _fadeOutTimer?.cancel();
-    _scrubberDebouncer?.dispose();
    super.dispose();
  }

@@ -187,25 +176,11 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
    return false;
  }

-  void _onScrubberDateChanged(DateTime date) {
-    if (_currentScrubberDate != date) {
-      // Date changed, immediately set scrubbing to true
-      _currentScrubberDate = date;
-      ref.read(timelineStateProvider.notifier).setScrubbing(true);
-
-      // Initialize debouncer if needed
-      _scrubberDebouncer ??= Debouncer(interval: const Duration(milliseconds: 50));
-
-      // Debounce setting scrubbing to false
-      _scrubberDebouncer!.run(() {
-        if (_currentScrubberDate == date) {
-          ref.read(timelineStateProvider.notifier).setScrubbing(false);
-        }
-      });
-    }
-  }
-
  void _onDragStart(DragStartDetails _) {
+    if (_monthCount >= kMinMonthsToEnableScrubberSnap) {
+      ref.read(timelineStateProvider.notifier).setScrubbing(true);
+    }
+
    setState(() {
      _isDragging = true;
      _labelAnimationController.forward();
@@ -231,15 +206,10 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
      if (_lastLabel != label) {
        ref.read(hapticFeedbackProvider.notifier).selectionClick();
        _lastLabel = label;
-
-        // Notify timeline state of the new scrubber date position
-        if (_monthCount >= kMinMonthsToEnableScrubberSnap) {
-          _onScrubberDateChanged(nearestMonthSegment.date);
-        }
      }
    }

-    if (_monthCount < kMinMonthsToEnableScrubberSnap || !widget.snapToMonth) {
+    if (_monthCount < kMinMonthsToEnableScrubberSnap) {
      // If there are less than kMinMonthsToEnableScrubberSnap months, we don't need to snap to segments
      setState(() {
        _thumbTopOffset = dragPosition;
@@ -266,28 +236,14 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
  /// - If user drags to global Y position that's 100 pixels from the top
  /// - The relative position would be 100 - 50 = 50 (50 pixels into the scrubber area)
  double _calculateDragPosition(DragUpdateDetails details) {
-    if (widget.hasAppBar) {
-      final dragAreaTop = widget.topPadding;
-      final dragAreaBottom = widget.timelineHeight - widget.bottomPadding;
-      final dragAreaHeight = dragAreaBottom - dragAreaTop;
-
-      final relativePosition = details.globalPosition.dy - dragAreaTop;
-
-      // Make sure the position stays within the scrubber's bounds
-      return relativePosition.clamp(0.0, dragAreaHeight);
-    }
-
-    // Get the local position relative to the gesture detector
-    final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
-    if (renderBox != null) {
-      final localPosition = renderBox.globalToLocal(details.globalPosition);
-      return localPosition.dy.clamp(0.0, _scrubberHeight);
-    }
-
-    // Fallback to current logic if render box is not available
    final dragAreaTop = widget.topPadding;
+    final dragAreaBottom = widget.timelineHeight - widget.bottomPadding;
+    final dragAreaHeight = dragAreaBottom - dragAreaTop;
+
    final relativePosition = details.globalPosition.dy - dragAreaTop;
-    return relativePosition.clamp(0.0, _scrubberHeight);
+
+    // Make sure the position stays within the scrubber's bounds
+    return relativePosition.clamp(0.0, dragAreaHeight);
  }

  /// Find the segment closest to the given position
@@ -338,18 +294,12 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
  }

  void _onDragEnd(DragEndDetails _) {
+    ref.read(timelineStateProvider.notifier).setScrubbing(false);
    _labelAnimationController.reverse();
    setState(() {
      _isDragging = false;
    });

-    ref.read(timelineStateProvider.notifier).setScrubbing(false);
-
-    // Reset scrubber tracking when drag ends
-    _currentScrubberDate = null;
-    _scrubberDebouncer?.dispose();
-    _scrubberDebouncer = null;
-
    _resetThumbTimer();
  }

--- a/mobile/lib/presentation/widgets/timeline/timeline.state.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
@@ -72,6 +72,8 @@ class TimelineState {
 }

 class TimelineStateNotifier extends Notifier<TimelineState> {
+  TimelineStateNotifier();
+
  void setScrubbing(bool isScrubbing) {
    state = state.copyWith(isScrubbing: isScrubbing);
  }
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -14,7 +14,6 @@ import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/download_status_floating_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
@@ -39,7 +38,6 @@ class Timeline extends StatelessWidget {
    this.bottomSheet = const GeneralBottomSheet(minChildSize: 0.18),
    this.groupBy,
    this.withScrubber = true,
-    this.snapToMonth = true,
  });

  final Widget? topSliverWidget;
@@ -50,13 +48,11 @@ class Timeline extends StatelessWidget {
  final bool withStack;
  final GroupAssetsBy? groupBy;
  final bool withScrubber;
-  final bool snapToMonth;

  @override
  Widget build(BuildContext context) {
    return Scaffold(
      resizeToAvoidBottomInset: false,
-      floatingActionButton: const DownloadStatusFloatingButton(),
      body: LayoutBuilder(
        builder: (_, constraints) => ProviderScope(
          overrides: [
@@ -77,7 +73,6 @@ class Timeline extends StatelessWidget {
            appBar: appBar,
            bottomSheet: bottomSheet,
            withScrubber: withScrubber,
-            snapToMonth: snapToMonth,
          ),
        ),
      ),
@@ -92,7 +87,6 @@ class _SliverTimeline extends ConsumerStatefulWidget {
    this.appBar,
    this.bottomSheet,
    this.withScrubber = true,
-    this.snapToMonth = true,
  });

  final Widget? topSliverWidget;
@@ -100,7 +94,6 @@ class _SliverTimeline extends ConsumerStatefulWidget {
  final Widget? appBar;
  final Widget? bottomSheet;
  final bool withScrubber;
-  final bool snapToMonth;

  @override
  ConsumerState createState() => _SliverTimelineState();
@@ -316,13 +309,11 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
          final Widget timeline;
          if (widget.withScrubber) {
            timeline = Scrubber(
-              snapToMonth: widget.snapToMonth,
              layoutSegments: segments,
              timelineHeight: maxHeight,
              topPadding: topPadding,
              bottomPadding: bottomPadding,
              monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
-              hasAppBar: widget.appBar != null,
              child: grid,
            );
          } else {
--- a/mobile/lib/providers/backup/drift_backup.provider.dart
+++ b/mobile/lib/providers/backup/drift_backup.provider.dart
@@ -235,9 +235,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
    switch (update.status) {
      case TaskStatus.complete:
        if (update.task.group == kBackupGroup) {
-          if (update.responseStatusCode == 201) {
-            state = state.copyWith(backupCount: state.backupCount + 1, remainderCount: state.remainderCount - 1);
-          }
+          state = state.copyWith(backupCount: state.backupCount + 1, remainderCount: state.remainderCount - 1);
        }

        // Remove the completed task from the upload items
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -356,6 +356,7 @@ class ActionNotifier extends Notifier<void> {

  Future<ActionResult> downloadAll(ActionSource source) async {
    final assets = _getAssets(source).whereType<RemoteAsset>().toList(growable: false);
+
    try {
      final didEnqueue = await _service.downloadAll(assets);
      final enqueueCount = didEnqueue.where((e) => e).length;
--- a/mobile/lib/repositories/download.repository.dart
+++ b/mobile/lib/repositories/download.repository.dart
@@ -90,11 +90,7 @@ class DownloadRepository {
      final isVideo = asset.isVideo;
      final url = getOriginalUrlForRemoteId(id);

-      // on iOS it cannot link the image, check if the filename has .MP extension
-      // to avoid downloading the video part
-      final isAndroidMotionPhoto = asset.name.contains(".MP");
-
-      if (Platform.isAndroid || livePhotoVideoId == null || isVideo || isAndroidMotionPhoto) {
+      if (Platform.isAndroid || livePhotoVideoId == null || isVideo) {
        tasks[taskIndex++] = DownloadTask(
          taskId: id,
          url: url,
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -81,7 +81,6 @@ import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
-import 'package:immich_mobile/presentation/pages/download_info.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_activities.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album_options.page.dart';
@@ -346,7 +345,6 @@ class AppRouter extends RootStackRouter {
    AutoRoute(page: DriftActivitiesRoute.page, guards: [_authGuard, _duplicateGuard]),
    AutoRoute(page: DriftBackupAssetDetailRoute.page, guards: [_authGuard, _duplicateGuard]),
    AutoRoute(page: AssetTroubleshootRoute.page, guards: [_authGuard, _duplicateGuard]),
-    AutoRoute(page: DownloadInfoRoute.page, guards: [_authGuard, _duplicateGuard]),
    // required to handle all deeplinks in deep_link.service.dart
    // auto_route_library#1722
    RedirectRoute(path: '*', redirectTo: '/'),
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -688,22 +688,6 @@ class CropImageRouteArgs {
  }
 }

-/// generated route for
-/// [DownloadInfoPage]
-class DownloadInfoRoute extends PageRouteInfo<void> {
-  const DownloadInfoRoute({List<PageRouteInfo>? children})
-    : super(DownloadInfoRoute.name, initialChildren: children);
-
-  static const String name = 'DownloadInfoRoute';
-
-  static PageInfo page = PageInfo(
-    name,
-    builder: (data) {
-      return const DownloadInfoPage();
-    },
-  );
-}
-
 /// generated route for
 /// [DriftActivitiesPage]
 class DriftActivitiesRoute extends PageRouteInfo<void> {
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -1,6 +1,7 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/repositories/download.repository.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
@@ -10,7 +11,6 @@ import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
-import 'package:immich_mobile/repositories/download.repository.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/date_time_picker.dart';
@@ -199,11 +199,14 @@ class ActionService {
  }

  Future<int> removeFromAlbum(List<String> remoteIds, String albumId) async {
+    int removedCount = 0;
    final result = await _albumApiRepository.removeAssets(albumId, remoteIds);
+
    if (result.removed.isNotEmpty) {
-      await _remoteAlbumRepository.removeAssets(albumId, result.removed);
+      removedCount = await _remoteAlbumRepository.removeAssets(albumId, result.removed);
    }
-    return result.removed.length;
+
+    return removedCount;
  }

  Future<bool> updateDescription(String assetId, String description) async {
--- a/mobile/lib/widgets/backup/backup_info_card.dart
+++ b/mobile/lib/widgets/backup/backup_info_card.dart
@@ -8,17 +8,8 @@ class BackupInfoCard extends StatelessWidget {
  final String title;
  final String subtitle;
  final String info;
-
  final VoidCallback? onTap;
-  final bool isLoading;
-  const BackupInfoCard({
-    super.key,
-    required this.title,
-    required this.subtitle,
-    required this.info,
-    this.onTap,
-    this.isLoading = false,
-  });
+  const BackupInfoCard({super.key, required this.title, required this.subtitle, required this.info, this.onTap});

  @override
  Widget build(BuildContext context) {
@@ -47,36 +38,8 @@ class BackupInfoCard extends StatelessWidget {
            trailing: Column(
              mainAxisAlignment: MainAxisAlignment.center,
              children: [
-                Stack(
-                  children: [
-                    Text(
-                      info,
-                      style: context.textTheme.titleLarge?.copyWith(
-                        color: context.colorScheme.onSurface.withAlpha(isLoading ? 50 : 255),
-                      ),
-                    ),
-                    if (isLoading)
-                      Positioned.fill(
-                        child: Align(
-                          alignment: Alignment.center,
-                          child: SizedBox(
-                            width: 16,
-                            height: 16,
-                            child: CircularProgressIndicator(
-                              strokeWidth: 2,
-                              color: context.colorScheme.onSurface.withAlpha(150),
-                            ),
-                          ),
-                        ),
-                      ),
-                  ],
-                ),
-                Text(
-                  "backup_info_card_assets",
-                  style: context.textTheme.labelLarge?.copyWith(
-                    color: context.colorScheme.onSurface.withAlpha(isLoading ? 50 : 255),
-                  ),
-                ).tr(),
+                Text(info, style: context.textTheme.titleLarge),
+                Text("backup_info_card_assets", style: context.textTheme.labelLarge).tr(),
              ],
            ),
          ),
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -393,7 +393,6 @@ Class | Method | HTTP request | Description
 - [LoginCredentialDto](doc//LoginCredentialDto.md)
 - [LoginResponseDto](doc//LoginResponseDto.md)
 - [LogoutResponseDto](doc//LogoutResponseDto.md)
- - [MachineLearningAvailabilityChecksDto](doc//MachineLearningAvailabilityChecksDto.md)
 - [ManualJobName](doc//ManualJobName.md)
 - [MapMarkerResponseDto](doc//MapMarkerResponseDto.md)
 - [MapReverseGeocodeResponseDto](doc//MapReverseGeocodeResponseDto.md)
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -164,7 +164,6 @@ part 'model/log_level.dart';
 part 'model/login_credential_dto.dart';
 part 'model/login_response_dto.dart';
 part 'model/logout_response_dto.dart';
-part 'model/machine_learning_availability_checks_dto.dart';
 part 'model/manual_job_name.dart';
 part 'model/map_marker_response_dto.dart';
 part 'model/map_reverse_geocode_response_dto.dart';
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -382,8 +382,6 @@ class ApiClient {
          return LoginResponseDto.fromJson(value);
        case 'LogoutResponseDto':
          return LogoutResponseDto.fromJson(value);
-        case 'MachineLearningAvailabilityChecksDto':
-          return MachineLearningAvailabilityChecksDto.fromJson(value);
        case 'ManualJobName':
          return ManualJobNameTypeTransformer().decode(value);
        case 'MapMarkerResponseDto':
--- a/mobile/openapi/lib/model/machine_learning_availability_checks_dto.dart
+++ b/mobile/openapi/lib/model/machine_learning_availability_checks_dto.dart
@@ -1,115 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class MachineLearningAvailabilityChecksDto {
-  /// Returns a new [MachineLearningAvailabilityChecksDto] instance.
-  MachineLearningAvailabilityChecksDto({
-    required this.enabled,
-    required this.interval,
-    required this.timeout,
-  });
-
-  bool enabled;
-
-  num interval;
-
-  num timeout;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MachineLearningAvailabilityChecksDto &&
-    other.enabled == enabled &&
-    other.interval == interval &&
-    other.timeout == timeout;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (enabled.hashCode) +
-    (interval.hashCode) +
-    (timeout.hashCode);
-
-  @override
-  String toString() => 'MachineLearningAvailabilityChecksDto[enabled=$enabled, interval=$interval, timeout=$timeout]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'enabled'] = this.enabled;
-      json[r'interval'] = this.interval;
-      json[r'timeout'] = this.timeout;
-    return json;
-  }
-
-  /// Returns a new [MachineLearningAvailabilityChecksDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static MachineLearningAvailabilityChecksDto? fromJson(dynamic value) {
-    upgradeDto(value, "MachineLearningAvailabilityChecksDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return MachineLearningAvailabilityChecksDto(
-        enabled: mapValueOfType<bool>(json, r'enabled')!,
-        interval: num.parse('${json[r'interval']}'),
-        timeout: num.parse('${json[r'timeout']}'),
-      );
-    }
-    return null;
-  }
-
-  static List<MachineLearningAvailabilityChecksDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <MachineLearningAvailabilityChecksDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = MachineLearningAvailabilityChecksDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, MachineLearningAvailabilityChecksDto> mapFromJson(dynamic json) {
-    final map = <String, MachineLearningAvailabilityChecksDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = MachineLearningAvailabilityChecksDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of MachineLearningAvailabilityChecksDto-objects as value to a dart map
-  static Map<String, List<MachineLearningAvailabilityChecksDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<MachineLearningAvailabilityChecksDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = MachineLearningAvailabilityChecksDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'enabled',
-    'interval',
-    'timeout',
-  };
-}
-
--- a/mobile/openapi/lib/model/system_config_machine_learning_dto.dart
+++ b/mobile/openapi/lib/model/system_config_machine_learning_dto.dart
@@ -13,16 +13,14 @@ part of openapi.api;
 class SystemConfigMachineLearningDto {
  /// Returns a new [SystemConfigMachineLearningDto] instance.
  SystemConfigMachineLearningDto({
-    required this.availabilityChecks,
    required this.clip,
    required this.duplicateDetection,
    required this.enabled,
    required this.facialRecognition,
+    this.url,
    this.urls = const [],
  });

-  MachineLearningAvailabilityChecksDto availabilityChecks;
-
  CLIPConfig clip;

  DuplicateDetectionConfig duplicateDetection;
@@ -31,37 +29,50 @@ class SystemConfigMachineLearningDto {

  FacialRecognitionConfig facialRecognition;

+  /// This property was deprecated in v1.122.0
+  ///
+  /// 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.
+  ///
+  String? url;
+
  List<String> urls;

  @override
  bool operator ==(Object other) => identical(this, other) || other is SystemConfigMachineLearningDto &&
-    other.availabilityChecks == availabilityChecks &&
    other.clip == clip &&
    other.duplicateDetection == duplicateDetection &&
    other.enabled == enabled &&
    other.facialRecognition == facialRecognition &&
+    other.url == url &&
    _deepEquality.equals(other.urls, urls);

  @override
  int get hashCode =>
    // ignore: unnecessary_parenthesis
-    (availabilityChecks.hashCode) +
    (clip.hashCode) +
    (duplicateDetection.hashCode) +
    (enabled.hashCode) +
    (facialRecognition.hashCode) +
+    (url == null ? 0 : url!.hashCode) +
    (urls.hashCode);

  @override
-  String toString() => 'SystemConfigMachineLearningDto[availabilityChecks=$availabilityChecks, clip=$clip, duplicateDetection=$duplicateDetection, enabled=$enabled, facialRecognition=$facialRecognition, urls=$urls]';
+  String toString() => 'SystemConfigMachineLearningDto[clip=$clip, duplicateDetection=$duplicateDetection, enabled=$enabled, facialRecognition=$facialRecognition, url=$url, urls=$urls]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
-      json[r'availabilityChecks'] = this.availabilityChecks;
      json[r'clip'] = this.clip;
      json[r'duplicateDetection'] = this.duplicateDetection;
      json[r'enabled'] = this.enabled;
      json[r'facialRecognition'] = this.facialRecognition;
+    if (this.url != null) {
+      json[r'url'] = this.url;
+    } else {
+    //  json[r'url'] = null;
+    }
      json[r'urls'] = this.urls;
    return json;
  }
@@ -75,11 +86,11 @@ class SystemConfigMachineLearningDto {
      final json = value.cast<String, dynamic>();

      return SystemConfigMachineLearningDto(
-        availabilityChecks: MachineLearningAvailabilityChecksDto.fromJson(json[r'availabilityChecks'])!,
        clip: CLIPConfig.fromJson(json[r'clip'])!,
        duplicateDetection: DuplicateDetectionConfig.fromJson(json[r'duplicateDetection'])!,
        enabled: mapValueOfType<bool>(json, r'enabled')!,
        facialRecognition: FacialRecognitionConfig.fromJson(json[r'facialRecognition'])!,
+        url: mapValueOfType<String>(json, r'url'),
        urls: json[r'urls'] is Iterable
            ? (json[r'urls'] as Iterable).cast<String>().toList(growable: false)
            : const [],
@@ -130,7 +141,6 @@ class SystemConfigMachineLearningDto {

  /// The list of required keys that must be present in a JSON.
  static const requiredKeys = <String>{
-    'availabilityChecks',
    'clip',
    'duplicateDetection',
    'enabled',
--- a/mobile/test/drift/main/generated/schema.dart
+++ b/mobile/test/drift/main/generated/schema.dart
@@ -13,7 +13,6 @@ import 'schema_v7.dart' as v7;
 import 'schema_v8.dart' as v8;
 import 'schema_v9.dart' as v9;
 import 'schema_v10.dart' as v10;
-import 'schema_v11.dart' as v11;

 class GeneratedHelper implements SchemaInstantiationHelper {
  @override
@@ -39,12 +38,10 @@ class GeneratedHelper implements SchemaInstantiationHelper {
        return v9.DatabaseAtV9(db);
      case 10:
        return v10.DatabaseAtV10(db);
-      case 11:
-        return v11.DatabaseAtV11(db);
      default:
        throw MissingSchemaException(version, versions);
    }
  }

-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 }
--- a/mobile/test/drift/main/generated/schema_v11.dart
+++ b/mobile/test/drift/main/generated/schema_v11.dart
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -12259,25 +12259,6 @@
        ],
        "type": "object"
      },
-      "MachineLearningAvailabilityChecksDto": {
-        "properties": {
-          "enabled": {
-            "type": "boolean"
-          },
-          "interval": {
-            "type": "number"
-          },
-          "timeout": {
-            "type": "number"
-          }
-        },
-        "required": [
-          "enabled",
-          "interval",
-          "timeout"
-        ],
-        "type": "object"
-      },
      "ManualJobName": {
        "enum": [
          "person-cleanup",
@@ -16414,9 +16395,6 @@
      },
      "SystemConfigMachineLearningDto": {
        "properties": {
-          "availabilityChecks": {
-            "$ref": "#/components/schemas/MachineLearningAvailabilityChecksDto"
-          },
          "clip": {
            "$ref": "#/components/schemas/CLIPConfig"
          },
@@ -16429,6 +16407,11 @@
          "facialRecognition": {
            "$ref": "#/components/schemas/FacialRecognitionConfig"
          },
+          "url": {
+            "deprecated": true,
+            "description": "This property was deprecated in v1.122.0",
+            "type": "string"
+          },
          "urls": {
            "format": "uri",
            "items": {
@@ -16440,7 +16423,6 @@
          }
        },
        "required": [
-          "availabilityChecks",
          "clip",
          "duplicateDetection",
          "enabled",
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1383,11 +1383,6 @@ export type SystemConfigLoggingDto = {
    enabled: boolean;
    level: LogLevel;
 };
-export type MachineLearningAvailabilityChecksDto = {
-    enabled: boolean;
-    interval: number;
-    timeout: number;
-};
 export type ClipConfig = {
    enabled: boolean;
    modelName: string;
@@ -1404,11 +1399,12 @@ export type FacialRecognitionConfig = {
    modelName: string;
 };
 export type SystemConfigMachineLearningDto = {
-    availabilityChecks: MachineLearningAvailabilityChecksDto;
    clip: ClipConfig;
    duplicateDetection: DuplicateDetectionConfig;
    enabled: boolean;
    facialRecognition: FacialRecognitionConfig;
+    /** This property was deprecated in v1.122.0 */
+    url?: string;
    urls: string[];
 };
 export type SystemConfigMapDto = {
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "version": "0.0.1",
  "description": "Monorepo for Immich",
  "private": true,
-  "packageManager": "pnpm@10.15.1+sha512.34e538c329b5553014ca8e8f4535997f96180a1d0f614339357449935350d924e22f8614682191264ec33d1462ac21561aff97f6bb18065351c162c7e8f6de67",
+  "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
  "engines": {
    "pnpm": ">=10.0.0"
  }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/immich-app/base-server-dev:pr-272 AS builder
+FROM ghcr.io/immich-app/base-server-dev:202509091104@sha256:4f9275330f1e49e7ce9840758ea91839052fe6ed40972d5bb97a9af857fa956a AS builder
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
  CI=1 \
  COREPACK_HOME=/tmp
@@ -33,7 +33,7 @@ RUN pnpm --filter @immich/sdk --filter @immich/cli --frozen-lockfile install &&
  pnpm --filter @immich/sdk --filter @immich/cli build && \
  pnpm --filter @immich/cli --prod --no-optional deploy /output/cli-pruned

-FROM ghcr.io/immich-app/base-server-prod:pr-272
+FROM ghcr.io/immich-app/base-server-prod:202509091104@sha256:d1ccbac24c84f2f8277cf85281edfca62d85d7daed6a62b8efd3a81bcd3c5e0e

 WORKDIR /usr/src/app
 ENV NODE_ENV=production \
--- a/server/package.json
+++ b/server/package.json
@@ -44,14 +44,14 @@
    "@nestjs/websockets": "^11.0.4",
    "@opentelemetry/api": "^1.9.0",
    "@opentelemetry/context-async-hooks": "^2.0.0",
-    "@opentelemetry/exporter-prometheus": "^0.205.0",
-    "@opentelemetry/instrumentation-http": "^0.205.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.53.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.51.0",
-    "@opentelemetry/instrumentation-pg": "^0.58.0",
+    "@opentelemetry/exporter-prometheus": "^0.203.0",
+    "@opentelemetry/instrumentation-http": "^0.203.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.51.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.49.0",
+    "@opentelemetry/instrumentation-pg": "^0.56.0",
    "@opentelemetry/resources": "^2.0.1",
    "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.205.0",
+    "@opentelemetry/sdk-node": "^0.203.0",
    "@opentelemetry/semantic-conventions": "^1.34.0",
    "@react-email/components": "^0.5.0",
    "@react-email/render": "^1.1.2",
--- a/server/src/bin/sync-sql.ts
+++ b/server/src/bin/sync-sql.ts
@@ -15,7 +15,6 @@ import { repositories } from 'src/repositories';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
-import { MachineLearningRepository } from 'src/repositories/machine-learning.repository';
 import { SyncRepository } from 'src/repositories/sync.repository';
 import { AuthService } from 'src/services/auth.service';
 import { getKyselyConfig } from 'src/utils/database';
@@ -58,7 +57,7 @@ class SqlGenerator {
    try {
      await this.setup();
      for (const Repository of repositories) {
-        if (Repository === LoggingRepository || Repository === MachineLearningRepository) {
+        if (Repository === LoggingRepository) {
          continue;
        }
        await this.process(Repository);
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -54,11 +54,6 @@ export interface SystemConfig {
  machineLearning: {
    enabled: boolean;
    urls: string[];
-    availabilityChecks: {
-      enabled: boolean;
-      timeout: number;
-      interval: number;
-    };
    clip: {
      enabled: boolean;
      modelName: string;
@@ -181,8 +176,6 @@ export interface SystemConfig {
  };
 }

-export type MachineLearningConfig = SystemConfig['machineLearning'];
-
 export const defaults = Object.freeze<SystemConfig>({
  backup: {
    database: {
@@ -234,11 +227,6 @@ export const defaults = Object.freeze<SystemConfig>({
  machineLearning: {
    enabled: process.env.IMMICH_MACHINE_LEARNING_ENABLED !== 'false',
    urls: [process.env.IMMICH_MACHINE_LEARNING_URL || 'http://immich-machine-learning:3003'],
-    availabilityChecks: {
-      enabled: true,
-      timeout: Number(process.env.IMMICH_MACHINE_LEARNING_PING_TIMEOUT) || 2000,
-      interval: 30_000,
-    },
    clip: {
      enabled: true,
      modelName: 'ViT-B-32__openai',
--- a/server/src/constants.ts
+++ b/server/src/constants.ts
@@ -51,6 +51,11 @@ export const serverVersion = new SemVer(version);
 export const AUDIT_LOG_MAX_DURATION = Duration.fromObject({ days: 100 });
 export const ONE_HOUR = Duration.fromObject({ hours: 1 });

+export const MACHINE_LEARNING_PING_TIMEOUT = Number(process.env.MACHINE_LEARNING_PING_TIMEOUT || 2000);
+export const MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME = Number(
+  process.env.MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME || 30_000,
+);
+
 export const citiesFile = 'cities500.txt';
 export const reverseGeocodeMaxDistance = 25_000;

--- a/server/src/dtos/search.dto.ts
+++ b/server/src/dtos/search.dto.ts
@@ -6,7 +6,7 @@ import { PropertyLifecycle } from 'src/decorators';
 import { AlbumResponseDto } from 'src/dtos/album.dto';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AssetOrder, AssetType, AssetVisibility } from 'src/enum';
-import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateString, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';

 class BaseSearchDto {
  @ValidateUUID({ optional: true, nullable: true })
@@ -144,7 +144,9 @@ export class MetadataSearchDto extends RandomSearchDto {
  @Optional()
  deviceAssetId?: string;

-  @ValidateString({ optional: true, trim: true })
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
  description?: string;

  @IsString()
@@ -152,7 +154,9 @@ export class MetadataSearchDto extends RandomSearchDto {
  @Optional()
  checksum?: string;

-  @ValidateString({ optional: true, trim: true })
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
  originalFileName?: string;

  @IsString()
@@ -186,12 +190,16 @@ export class MetadataSearchDto extends RandomSearchDto {
 }

 export class StatisticsSearchDto extends BaseSearchDto {
-  @ValidateString({ optional: true, trim: true })
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
  description?: string;
 }

 export class SmartSearchDto extends BaseSearchWithResultsDto {
-  @ValidateString({ optional: true, trim: true })
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
  query?: string;

  @ValidateUUID({ optional: true })
--- a/server/src/dtos/system-config.dto.ts
+++ b/server/src/dtos/system-config.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
+import { Exclude, Transform, Type } from 'class-transformer';
 import {
  ArrayMinSize,
  IsInt,
@@ -15,6 +15,7 @@ import {
  ValidateNested,
 } from 'class-validator';
 import { SystemConfig } from 'src/config';
+import { PropertyLifecycle } from 'src/decorators';
 import { CLIPConfig, DuplicateDetectionConfig, FacialRecognitionConfig } from 'src/dtos/model-config.dto';
 import {
  AudioCodec,
@@ -256,32 +257,21 @@ class SystemConfigLoggingDto {
  level!: LogLevel;
 }

-class MachineLearningAvailabilityChecksDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @IsInt()
-  timeout!: number;
-
-  @IsInt()
-  interval!: number;
-}
-
 class SystemConfigMachineLearningDto {
  @ValidateBoolean()
  enabled!: boolean;

+  @PropertyLifecycle({ deprecatedAt: 'v1.122.0' })
+  @Exclude()
+  url?: string;
+
  @IsUrl({ require_tld: false, allow_underscores: true }, { each: true })
  @ArrayMinSize(1)
+  @Transform(({ obj, value }) => (obj.url ? [obj.url] : value))
  @ValidateIf((dto) => dto.enabled)
  @ApiProperty({ type: 'array', items: { type: 'string', format: 'uri' }, minItems: 1 })
  urls!: string[];

-  @Type(() => MachineLearningAvailabilityChecksDto)
-  @ValidateNested()
-  @IsObject()
-  availabilityChecks!: MachineLearningAvailabilityChecksDto;
-
  @Type(() => CLIPConfig)
  @ValidateNested()
  @IsObject()
--- a/server/src/repositories/logging.repository.ts
+++ b/server/src/repositories/logging.repository.ts
@@ -142,10 +142,6 @@ export class LoggingRepository {
    this.handleMessage(LogLevel.Fatal, message, details);
  }

-  deprecate(message: string) {
-    this.warn(`[Deprecated] ${message}`);
-  }
-
  private handleFunction(level: LogLevel, message: LogFunction, details: LogDetails[]) {
    if (this.logger.isLevelEnabled(level)) {
      this.handleMessage(level, message(), details);
--- a/server/src/repositories/machine-learning.repository.ts
+++ b/server/src/repositories/machine-learning.repository.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { Duration } from 'luxon';
 import { readFile } from 'node:fs/promises';
-import { MachineLearningConfig } from 'src/config';
+import { MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME, MACHINE_LEARNING_PING_TIMEOUT } from 'src/constants';
 import { CLIPConfig } from 'src/dtos/model-config.dto';
 import { LoggingRepository } from 'src/repositories/logging.repository';

@@ -58,100 +57,82 @@ export type TextEncodingOptions = ModelOptions & { language?: string };

@Injectable()
 export class MachineLearningRepository {
-  private healthyMap: Record<string, boolean> = {};
-  private interval?: ReturnType<typeof setInterval>;
-  private _config?: MachineLearningConfig;
-
-  private get config(): MachineLearningConfig {
-    if (!this._config) {
-      throw new Error('Machine learning repository not been setup');
-    }
-
-    return this._config;
-  }
+  // Note that deleted URL's are not removed from this map (ie: they're leaked)
+  // Cleaning them up is low priority since there should be very few over a
+  // typical server uptime cycle
+  private urlAvailability: {
+    [url: string]:
+      | {
+          active: boolean;
+          lastChecked: number;
+        }
+      | undefined;
+  };

  constructor(private logger: LoggingRepository) {
    this.logger.setContext(MachineLearningRepository.name);
+    this.urlAvailability = {};
  }

-  setup(config: MachineLearningConfig) {
-    this._config = config;
-    this.teardown();
-
-    // delete old servers
-    for (const url of Object.keys(this.healthyMap)) {
-      if (!config.urls.includes(url)) {
-        delete this.healthyMap[url];
-      }
+  private setUrlAvailability(url: string, active: boolean) {
+    const current = this.urlAvailability[url];
+    if (current?.active !== active) {
+      this.logger.verbose(`Setting ${url} ML server to ${active ? 'active' : 'inactive'}.`);
    }
-
-    if (!config.availabilityChecks.enabled) {
-      return;
-    }
-
-    this.tick();
-    this.interval = setInterval(
-      () => this.tick(),
-      Duration.fromObject({ milliseconds: config.availabilityChecks.interval }).as('milliseconds'),
-    );
+    this.urlAvailability[url] = {
+      active,
+      lastChecked: Date.now(),
+    };
  }

-  teardown() {
-    if (this.interval) {
-      clearInterval(this.interval);
-    }
-  }
-
-  private tick() {
-    for (const url of this.config.urls) {
-      void this.check(url);
-    }
-  }
-
-  private async check(url: string) {
-    let healthy = false;
+  private async checkAvailability(url: string) {
+    let active = false;
    try {
      const response = await fetch(new URL('/ping', url), {
-        signal: AbortSignal.timeout(this.config.availabilityChecks.timeout),
+        signal: AbortSignal.timeout(MACHINE_LEARNING_PING_TIMEOUT),
      });
-      if (response.ok) {
-        healthy = true;
-      }
+      active = response.ok;
    } catch {
      // nothing to do here
    }
-
-    this.setHealthy(url, healthy);
+    this.setUrlAvailability(url, active);
+    return active;
  }

-  private setHealthy(url: string, healthy: boolean) {
-    if (this.healthyMap[url] !== healthy) {
-      this.logger.log(`Machine learning server became ${healthy ? 'healthy' : 'unhealthy'} (${url}).`);
+  private async shouldSkipUrl(url: string) {
+    const availability = this.urlAvailability[url];
+    if (availability === undefined) {
+      // If this is a new endpoint, then check inline and skip if it fails
+      if (!(await this.checkAvailability(url))) {
+        return true;
+      }
+      return false;
    }
-
-    this.healthyMap[url] = healthy;
-  }
-
-  private isHealthy(url: string) {
-    if (!this.config.availabilityChecks.enabled) {
+    if (!availability.active && Date.now() - availability.lastChecked < MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME) {
+      // If this is an old inactive endpoint that hasn't been checked in a
+      // while then check but don't wait for the result, just skip it
+      // This avoids delays on every search whilst allowing higher priority
+      // ML servers to recover over time.
+      void this.checkAvailability(url);
      return true;
    }
-
-    return this.healthyMap[url];
+    return false;
  }

-  private async predict<T>(payload: ModelPayload, config: MachineLearningRequest): Promise<T> {
+  private async predict<T>(urls: string[], payload: ModelPayload, config: MachineLearningRequest): Promise<T> {
    const formData = await this.getFormData(payload, config);
+    let urlCounter = 0;
+    for (const url of urls) {
+      urlCounter++;
+      const isLast = urlCounter >= urls.length;
+      if (!isLast && (await this.shouldSkipUrl(url))) {
+        continue;
+      }

-    for (const url of [
-      // try healthy servers first
-      ...this.config.urls.filter((url) => this.isHealthy(url)),
-      ...this.config.urls.filter((url) => !this.isHealthy(url)),
-    ]) {
      try {
        const response = await fetch(new URL('/predict', url), { method: 'POST', body: formData });
        if (response.ok) {
-          this.setHealthy(url, true);
+          this.setUrlAvailability(url, true);
          return response.json();
        }

@@ -163,21 +144,20 @@ export class MachineLearningRepository {
          `Machine learning request to "${url}" failed: ${error instanceof Error ? error.message : error}`,
        );
      }
-
-      this.setHealthy(url, false);
+      this.setUrlAvailability(url, false);
    }

    throw new Error(`Machine learning request '${JSON.stringify(config)}' failed for all URLs`);
  }

-  async detectFaces(imagePath: string, { modelName, minScore }: FaceDetectionOptions) {
+  async detectFaces(urls: string[], imagePath: string, { modelName, minScore }: FaceDetectionOptions) {
    const request = {
      [ModelTask.FACIAL_RECOGNITION]: {
        [ModelType.DETECTION]: { modelName, options: { minScore } },
        [ModelType.RECOGNITION]: { modelName },
      },
    };
-    const response = await this.predict<FacialRecognitionResponse>({ imagePath }, request);
+    const response = await this.predict<FacialRecognitionResponse>(urls, { imagePath }, request);
    return {
      imageHeight: response.imageHeight,
      imageWidth: response.imageWidth,
@@ -185,15 +165,15 @@ export class MachineLearningRepository {
    };
  }

-  async encodeImage(imagePath: string, { modelName }: CLIPConfig) {
+  async encodeImage(urls: string[], imagePath: string, { modelName }: CLIPConfig) {
    const request = { [ModelTask.SEARCH]: { [ModelType.VISUAL]: { modelName } } };
-    const response = await this.predict<ClipVisualResponse>({ imagePath }, request);
+    const response = await this.predict<ClipVisualResponse>(urls, { imagePath }, request);
    return response[ModelTask.SEARCH];
  }

-  async encodeText(text: string, { language, modelName }: TextEncodingOptions) {
+  async encodeText(urls: string[], text: string, { language, modelName }: TextEncodingOptions) {
    const request = { [ModelTask.SEARCH]: { [ModelType.TEXTUAL]: { modelName, options: { language } } } };
-    const response = await this.predict<ClipTextualResponse>({ text }, request);
+    const response = await this.predict<ClipTextualResponse>(urls, { text }, request);
    return response[ModelTask.SEARCH];
  }

--- a/server/src/repositories/media.repository.ts
+++ b/server/src/repositories/media.repository.ts
@@ -57,28 +57,28 @@ export class MediaRepository {
      const buffer = await exiftool.extractBinaryTagToBuffer('JpgFromRaw2', input);
      return { buffer, format: RawExtractedFormat.Jpeg };
    } catch (error: any) {
-      this.logger.debug(`Could not extract JpgFromRaw2 buffer from image, trying JPEG from RAW next: ${error}`);
+      this.logger.debug('Could not extract JpgFromRaw2 buffer from image, trying JPEG from RAW next', error.message);
    }

    try {
      const buffer = await exiftool.extractBinaryTagToBuffer('JpgFromRaw', input);
      return { buffer, format: RawExtractedFormat.Jpeg };
    } catch (error: any) {
-      this.logger.debug(`Could not extract JPEG buffer from image, trying PreviewJXL next: ${error}`);
+      this.logger.debug('Could not extract JPEG buffer from image, trying PreviewJXL next', error.message);
    }

    try {
      const buffer = await exiftool.extractBinaryTagToBuffer('PreviewJXL', input);
      return { buffer, format: RawExtractedFormat.Jxl };
    } catch (error: any) {
-      this.logger.debug(`Could not extract PreviewJXL buffer from image, trying PreviewImage next: ${error}`);
+      this.logger.debug('Could not extract PreviewJXL buffer from image, trying PreviewImage next', error.message);
    }

    try {
      const buffer = await exiftool.extractBinaryTagToBuffer('PreviewImage', input);
      return { buffer, format: RawExtractedFormat.Jpeg };
    } catch (error: any) {
-      this.logger.debug(`Could not extract preview buffer from image: ${error}`);
+      this.logger.debug('Could not extract preview buffer from image', error.message);
      return null;
    }
  }
--- a/server/src/repositories/metadata.repository.ts
+++ b/server/src/repositories/metadata.repository.ts
@@ -103,7 +103,7 @@ export class MetadataRepository {

  readTags(path: string): Promise<ImmichTags> {
    return this.exiftool.read(path).catch((error) => {
-      this.logger.warn(`Error reading exif data (${path}): ${error}\n${error?.stack}`);
+      this.logger.warn(`Error reading exif data (${path}): ${error}`, error?.stack);
      return {};
    }) as Promise<ImmichTags>;
  }
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -344,7 +344,7 @@ export class AuthService extends BaseService {
        await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: [oldPath] } });
      }
    } catch (error: Error | any) {
-      this.logger.warn(`Unable to sync oauth profile picture: ${error}\n${error?.stack}`);
+      this.logger.warn(`Unable to sync oauth profile picture: ${error}`, error?.stack);
    }
  }

--- a/server/src/services/backup.service.ts
+++ b/server/src/services/backup.service.ts
@@ -132,12 +132,12 @@ export class BackupService extends BaseService {
        gzip.stdout.pipe(fileStream);

        pgdump.on('error', (err) => {
-          this.logger.error(`Backup failed with error: ${err}`);
+          this.logger.error('Backup failed with error', err);
          reject(err);
        });

        gzip.on('error', (err) => {
-          this.logger.error(`Gzip failed with error: ${err}`);
+          this.logger.error('Gzip failed with error', err);
          reject(err);
        });

@@ -175,10 +175,10 @@ export class BackupService extends BaseService {
      });
      await this.storageRepository.rename(backupFilePath, backupFilePath.replace('.tmp', ''));
    } catch (error) {
-      this.logger.error(`Database Backup Failure: ${error}`);
+      this.logger.error('Database Backup Failure', error);
      await this.storageRepository
        .unlink(backupFilePath)
-        .catch((error) => this.logger.error(`Failed to delete failed backup file: ${error}`));
+        .catch((error) => this.logger.error('Failed to delete failed backup file', error));
      throw error;
    }

--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -245,7 +245,7 @@ export class LibraryService extends BaseService {
      job.paths.map((path) =>
        this.processEntity(path, library.ownerId, job.libraryId)
          .then((asset) => assetImports.push(asset))
-          .catch((error: any) => this.logger.error(`Error processing ${path} for library ${job.libraryId}: ${error}`)),
+          .catch((error: any) => this.logger.error(`Error processing ${path} for library ${job.libraryId}`, error)),
      ),
    );

--- a/server/src/services/memory.service.ts
+++ b/server/src/services/memory.service.ts
@@ -40,7 +40,7 @@ export class MemoryService extends BaseService {
        try {
          await Promise.all(users.map((owner, i) => this.createOnThisDayMemories(owner.id, usersIds[i], target)));
        } catch (error) {
-          this.logger.error(`Failed to create memories for ${target.toISO()}: ${error}`);
+          this.logger.error(`Failed to create memories for ${target.toISO()}`, error);
        }
        // update system metadata even when there is an error to minimize the chance of duplicates
        await this.systemMetadataRepository.set(SystemMetadataKey.MemoriesState, {
--- a/server/src/services/person.service.spec.ts
+++ b/server/src/services/person.service.spec.ts
@@ -729,6 +729,7 @@ describe(PersonService.name, () => {
      mocks.assetJob.getForDetectFacesJob.mockResolvedValue({ ...assetStub.image, files: [assetStub.image.files[1]] });
      await sut.handleDetectFaces({ id: assetStub.image.id });
      expect(mocks.machineLearning.detectFaces).toHaveBeenCalledWith(
+        ['http://immich-machine-learning:3003'],
        '/uploads/user-id/thumbs/path.jpg',
        expect.objectContaining({ minScore: 0.7, modelName: 'buffalo_l' }),
      );
--- a/server/src/services/person.service.ts
+++ b/server/src/services/person.service.ts
@@ -316,6 +316,7 @@ export class PersonService extends BaseService {
    }

    const { imageHeight, imageWidth, faces } = await this.machineLearningRepository.detectFaces(
+      machineLearning.urls,
      previewFile.path,
      machineLearning.facialRecognition,
    );
--- a/server/src/services/search.service.spec.ts
+++ b/server/src/services/search.service.spec.ts
@@ -211,6 +211,7 @@ describe(SearchService.name, () => {
      await sut.searchSmart(authStub.user1, { query: 'test' });

      expect(mocks.machineLearning.encodeText).toHaveBeenCalledWith(
+        [expect.any(String)],
        'test',
        expect.objectContaining({ modelName: expect.any(String) }),
      );
@@ -224,6 +225,7 @@ describe(SearchService.name, () => {
      await sut.searchSmart(authStub.user1, { query: 'test', page: 2, size: 50 });

      expect(mocks.machineLearning.encodeText).toHaveBeenCalledWith(
+        [expect.any(String)],
        'test',
        expect.objectContaining({ modelName: expect.any(String) }),
      );
@@ -241,6 +243,7 @@ describe(SearchService.name, () => {
      await sut.searchSmart(authStub.user1, { query: 'test' });

      expect(mocks.machineLearning.encodeText).toHaveBeenCalledWith(
+        [expect.any(String)],
        'test',
        expect.objectContaining({ modelName: 'ViT-B-16-SigLIP__webli' }),
      );
@@ -250,6 +253,7 @@ describe(SearchService.name, () => {
      await sut.searchSmart(authStub.user1, { query: 'test', language: 'de' });

      expect(mocks.machineLearning.encodeText).toHaveBeenCalledWith(
+        [expect.any(String)],
        'test',
        expect.objectContaining({ language: 'de' }),
      );
--- a/server/src/services/search.service.ts
+++ b/server/src/services/search.service.ts
@@ -118,7 +118,7 @@ export class SearchService extends BaseService {
      const key = machineLearning.clip.modelName + dto.query + dto.language;
      embedding = this.embeddingCache.get(key);
      if (!embedding) {
-        embedding = await this.machineLearningRepository.encodeText(dto.query, {
+        embedding = await this.machineLearningRepository.encodeText(machineLearning.urls, dto.query, {
          modelName: machineLearning.clip.modelName,
          language: dto.language,
        });
--- a/server/src/services/smart-info.service.spec.ts
+++ b/server/src/services/smart-info.service.spec.ts
@@ -205,6 +205,7 @@ describe(SmartInfoService.name, () => {
      expect(await sut.handleEncodeClip({ id: assetStub.image.id })).toEqual(JobStatus.Success);

      expect(mocks.machineLearning.encodeImage).toHaveBeenCalledWith(
+        ['http://immich-machine-learning:3003'],
        '/uploads/user-id/thumbs/path.jpg',
        expect.objectContaining({ modelName: 'ViT-B-32__openai' }),
      );
@@ -241,6 +242,7 @@ describe(SmartInfoService.name, () => {

      expect(mocks.database.wait).toHaveBeenCalledWith(512);
      expect(mocks.machineLearning.encodeImage).toHaveBeenCalledWith(
+        ['http://immich-machine-learning:3003'],
        '/uploads/user-id/thumbs/path.jpg',
        expect.objectContaining({ modelName: 'ViT-B-32__openai' }),
      );
--- a/server/src/services/smart-info.service.ts
+++ b/server/src/services/smart-info.service.ts
@@ -108,7 +108,11 @@ export class SmartInfoService extends BaseService {
      return JobStatus.Skipped;
    }

-    const embedding = await this.machineLearningRepository.encodeImage(asset.files[0].path, machineLearning.clip);
+    const embedding = await this.machineLearningRepository.encodeImage(
+      machineLearning.urls,
+      asset.files[0].path,
+      machineLearning.clip,
+    );

    if (this.databaseRepository.isBusy(DatabaseLock.CLIPDimSize)) {
      this.logger.verbose(`Waiting for CLIP dimension size to be updated`);
--- a/server/src/services/storage-template.service.ts
+++ b/server/src/services/storage-template.service.ts
@@ -338,7 +338,7 @@ export class StorageTemplateService extends BaseService {

      return destination;
    } catch (error: any) {
-      this.logger.error(`Unable to get template path for ${filename}: ${error}`);
+      this.logger.error(`Unable to get template path for ${filename}`, error);
      return asset.originalPath;
    }
  }
--- a/server/src/services/system-config.service.spec.ts
+++ b/server/src/services/system-config.service.spec.ts
@@ -82,11 +82,6 @@ const updatedConfig = Object.freeze<SystemConfig>({
  machineLearning: {
    enabled: true,
    urls: ['http://immich-machine-learning:3003'],
-    availabilityChecks: {
-      enabled: true,
-      interval: 30_000,
-      timeout: 2000,
-    },
    clip: {
      enabled: true,
      modelName: 'ViT-B-32__openai',
--- a/server/src/services/system-config.service.ts
+++ b/server/src/services/system-config.service.ts
@@ -16,20 +16,6 @@ export class SystemConfigService extends BaseService {
  async onBootstrap() {
    const config = await this.getConfig({ withCache: false });
    await this.eventRepository.emit('ConfigInit', { newConfig: config });
-
-    if (
-      process.env.IMMICH_MACHINE_LEARNING_PING_TIMEOUT ||
-      process.env.IMMICH_MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME
-    ) {
-      this.logger.deprecate(
-        'IMMICH_MACHINE_LEARNING_PING_TIMEOUT and MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME have been moved to system config(`machineLearning.availabilityChecks`) and will be removed in a future release.',
-      );
-    }
-  }
-
-  @OnEvent({ name: 'AppShutdown' })
-  onShutdown() {
-    this.machineLearningRepository.teardown();
  }

  async getSystemConfig(): Promise<SystemConfigDto> {
@@ -42,14 +28,12 @@ export class SystemConfigService extends BaseService {
  }

  @OnEvent({ name: 'ConfigInit', priority: -100 })
-  onConfigInit({ newConfig: { logging, machineLearning } }: ArgOf<'ConfigInit'>) {
+  onConfigInit({ newConfig: { logging } }: ArgOf<'ConfigInit'>) {
    const { logLevel: envLevel } = this.configRepository.getEnv();
    const configLevel = logging.enabled ? logging.level : false;
    const level = envLevel ?? configLevel;
    this.logger.setLogLevel(level);
    this.logger.log(`LogLevel=${level} ${envLevel ? '(set via IMMICH_LOG_LEVEL)' : '(set via system config)'}`);
-
-    this.machineLearningRepository.setup(machineLearning);
  }

  @OnEvent({ name: 'ConfigUpdate', server: true })
--- a/server/src/services/version.service.ts
+++ b/server/src/services/version.service.ts
@@ -95,7 +95,7 @@ export class VersionService extends BaseService {
        this.eventRepository.clientBroadcast('on_new_release', asNotification(metadata));
      }
    } catch (error: Error | any) {
-      this.logger.warn(`Unable to run version check: ${error}\n${error?.stack}`);
+      this.logger.warn(`Unable to run version check: ${error}`, error?.stack);
      return JobStatus.Failed;
    }

--- a/server/src/utils/file.ts
+++ b/server/src/utils/file.ts
@@ -73,7 +73,7 @@ export const sendFile = async (

    // log non-http errors
    if (error instanceof HttpException === false) {
-      logger.error(`Unable to send file: ${error}`, error.stack);
+      logger.error(`Unable to send file: ${error.name}`, error.stack);
    }

    res.header('Cache-Control', 'none');
--- a/server/src/validation.ts
+++ b/server/src/validation.ts
@@ -211,18 +211,6 @@ export const ValidateDate = (options?: DateOptions & ApiPropertyOptions) => {
  return applyDecorators(...decorators);
 };

-type StringOptions = { optional?: boolean; nullable?: boolean; trim?: boolean };
-export const ValidateString = (options?: StringOptions & ApiPropertyOptions) => {
-  const { optional, nullable, trim, ...apiPropertyOptions } = options || {};
-  const decorators = [ApiProperty(apiPropertyOptions), IsString(), optional ? Optional({ nullable }) : IsNotEmpty()];
-
-  if (trim) {
-    decorators.push(Transform(({ value }: { value: string }) => value?.trim()));
-  }
-
-  return applyDecorators(...decorators);
-};
-
 type BooleanOptions = { optional?: boolean; nullable?: boolean };
 export const ValidateBoolean = (options?: BooleanOptions & ApiPropertyOptions) => {
  const { optional, nullable, ...apiPropertyOptions } = options || {};
--- a/web/eslint.config.js
+++ b/web/eslint.config.js
@@ -127,7 +127,6 @@ export default typescriptEslint.config(
      '@typescript-eslint/no-misused-promises': 'error',
      '@typescript-eslint/require-await': 'error',
      'object-shorthand': ['error', 'always'],
-      'svelte/no-navigation-without-resolve': 'off',
    },
  },
  {
--- a/web/package.json
+++ b/web/package.json
@@ -55,7 +55,7 @@
    "qrcode": "^1.5.4",
    "simple-icons": "^15.15.0",
    "socket.io-client": "~4.8.0",
-    "svelte-gestures": "5.1.4",
+    "svelte-gestures": "^5.1.3",
    "svelte-i18n": "^4.0.1",
    "svelte-maplibre": "^1.2.0",
    "svelte-persisted-store": "^0.12.0",
@@ -70,7 +70,7 @@
    "@sveltejs/adapter-static": "^3.0.8",
    "@sveltejs/enhanced-img": "^0.8.0",
    "@sveltejs/kit": "^2.27.1",
-    "@sveltejs/vite-plugin-svelte": "6.2.0",
+    "@sveltejs/vite-plugin-svelte": "6.1.2",
    "@tailwindcss/vite": "^4.1.7",
    "@testing-library/jest-dom": "^6.4.2",
    "@testing-library/svelte": "^5.2.8",
@@ -85,7 +85,7 @@
    "dotenv": "^17.0.0",
    "eslint": "^9.18.0",
    "eslint-config-prettier": "^10.1.8",
-    "eslint-p": "^0.26.0",
+    "eslint-p": "^0.25.0",
    "eslint-plugin-compat": "^6.0.2",
    "eslint-plugin-svelte": "^3.9.0",
    "eslint-plugin-unicorn": "^60.0.0",
@@ -97,7 +97,7 @@
    "prettier-plugin-sort-json": "^4.1.1",
    "prettier-plugin-svelte": "^3.3.3",
    "rollup-plugin-visualizer": "^6.0.0",
-    "svelte": "5.38.10",
+    "svelte": "5.35.5",
    "svelte-check": "^4.1.5",
    "svelte-eslint-parser": "^1.2.0",
    "tailwindcss": "^4.1.7",
--- a/web/src/lib/components/admin-settings/MachineLearningSettings.svelte
+++ b/web/src/lib/components/admin-settings/MachineLearningSettings.svelte
@@ -9,7 +9,7 @@
  import { featureFlags } from '$lib/stores/server-config.store';
  import type { SystemConfigDto } from '@immich/sdk';
  import { Button, IconButton } from '@immich/ui';
-  import { mdiPlus, mdiTrashCanOutline } from '@mdi/js';
+  import { mdiMinusCircle } from '@mdi/js';
  import { isEqual } from 'lodash-es';
  import { t } from 'svelte-i18n';
  import { fade } from 'svelte/transition';
@@ -46,6 +46,19 @@

        <div>
          {#each config.machineLearning.urls as _, i (i)}
+            {#snippet removeButton()}
+              {#if config.machineLearning.urls.length > 1}
+                <IconButton
+                  size="large"
+                  shape="round"
+                  color="danger"
+                  aria-label=""
+                  onclick={() => config.machineLearning.urls.splice(i, 1)}
+                  icon={mdiMinusCircle}
+                />
+              {/if}
+            {/snippet}
+
            <SettingInputField
              inputType={SettingInputFieldType.TEXT}
              label={i === 0 ? $t('url') : undefined}
@@ -54,69 +67,20 @@
              required={i === 0}
              disabled={disabled || !config.machineLearning.enabled}
              isEdited={i === 0 && !isEqual(config.machineLearning.urls, savedConfig.machineLearning.urls)}
-            >
-              {#snippet trailingSnippet()}
-                {#if config.machineLearning.urls.length > 1}
-                  <IconButton
-                    aria-label=""
-                    onclick={() => config.machineLearning.urls.splice(i, 1)}
-                    icon={mdiTrashCanOutline}
-                    color="danger"
-                  />
-                {/if}
-              {/snippet}
-            </SettingInputField>
+              trailingSnippet={removeButton}
+            />
          {/each}
        </div>

-        <div class="flex justify-end">
-          <Button
-            class="mb-2"
-            size="small"
-            shape="round"
-            leadingIcon={mdiPlus}
-            onclick={() => config.machineLearning.urls.push('')}
-            disabled={disabled || !config.machineLearning.enabled}>{$t('add_url')}</Button
-          >
-        </div>
+        <Button
+          class="mb-2"
+          size="small"
+          shape="round"
+          onclick={() => config.machineLearning.urls.splice(0, 0, '')}
+          disabled={disabled || !config.machineLearning.enabled}>{$t('add_url')}</Button
+        >
      </div>

-      <SettingAccordion
-        key="availability-checks"
-        title={$t('admin.machine_learning_availability_checks')}
-        subtitle={$t('admin.machine_learning_availability_checks_description')}
-      >
-        <div class="ms-4 mt-4 flex flex-col gap-4">
-          <SettingSwitch
-            title={$t('admin.machine_learning_availability_checks_enabled')}
-            bind:checked={config.machineLearning.availabilityChecks.enabled}
-            disabled={disabled || !config.machineLearning.enabled}
-          />
-
-          <hr />
-
-          <SettingInputField
-            inputType={SettingInputFieldType.NUMBER}
-            label={$t('admin.machine_learning_availability_checks_interval')}
-            bind:value={config.machineLearning.availabilityChecks.interval}
-            description={$t('admin.machine_learning_availability_checks_interval_description')}
-            disabled={disabled || !config.machineLearning.enabled || !config.machineLearning.availabilityChecks.enabled}
-            isEdited={config.machineLearning.availabilityChecks.interval !==
-              savedConfig.machineLearning.availabilityChecks.interval}
-          />
-
-          <SettingInputField
-            inputType={SettingInputFieldType.NUMBER}
-            label={$t('admin.machine_learning_availability_checks_timeout')}
-            bind:value={config.machineLearning.availabilityChecks.timeout}
-            description={$t('admin.machine_learning_availability_checks_timeout_description')}
-            disabled={disabled || !config.machineLearning.enabled || !config.machineLearning.availabilityChecks.enabled}
-            isEdited={config.machineLearning.availabilityChecks.timeout !==
-              savedConfig.machineLearning.availabilityChecks.timeout}
-          />
-        </div>
-      </SettingAccordion>
-
      <SettingAccordion
        key="smart-search"
        title={$t('admin.machine_learning_smart_search')}
--- a/web/src/lib/components/admin-settings/StorageTemplateSettings.svelte
+++ b/web/src/lib/components/admin-settings/StorageTemplateSettings.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { resolve } from '$app/paths';
  import SupportedDatetimePanel from '$lib/components/admin-settings/SupportedDatetimePanel.svelte';
  import SupportedVariablesPanel from '$lib/components/admin-settings/SupportedVariablesPanel.svelte';
  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
@@ -263,7 +262,7 @@
                      values={{ job: $t('admin.storage_template_migration_job') }}
                    >
                      {#snippet children({ message })}
-                        <a href={resolve(AppRoute.ADMIN_JOBS)} class="text-primary">
+                        <a href={AppRoute.ADMIN_JOBS} class="text-primary">
                          {message}
                        </a>
                      {/snippet}
--- a/web/src/lib/components/album-page/album-card-group.svelte
+++ b/web/src/lib/components/album-page/album-card-group.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { resolve } from '$app/paths';
  import AlbumCard from '$lib/components/album-page/album-card.svelte';
  import { AppRoute } from '$lib/constants';
  import { albumViewSettings } from '$lib/stores/preferences.store';
@@ -66,7 +65,7 @@
      {#each albums as album, index (album.id)}
        <a
          data-sveltekit-preload-data="hover"
-          href={resolve(`${AppRoute.ALBUMS}/${album.id}`)}
+          href="{AppRoute.ALBUMS}/{album.id}"
          animate:flip={{ duration: 400 }}
          oncontextmenu={(event) => oncontextmenu(event, album)}
        >
--- a/web/src/lib/components/album-page/albums-list.svelte
+++ b/web/src/lib/components/album-page/albums-list.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
  import { goto } from '$app/navigation';
-  import { resolve } from '$app/paths';
  import AlbumCardGroup from '$lib/components/album-page/album-card-group.svelte';
  import AlbumsTable from '$lib/components/album-page/albums-table.svelte';
  import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
@@ -316,7 +315,7 @@
      button: {
        text: $t('view_album'),
        onClick() {
-          return goto(resolve(`${AppRoute.ALBUMS}/${album.id}`));
+          return goto(`${AppRoute.ALBUMS}/${album.id}`);
        },
      },
    });
--- a/web/src/lib/components/album-page/albums-table-row.svelte
+++ b/web/src/lib/components/album-page/albums-table-row.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
  import { goto } from '$app/navigation';
-  import { resolve } from '$app/paths';
  import { AppRoute, dateFormats } from '$lib/constants';
  import { locale } from '$lib/stores/preferences.store';
  import { user } from '$lib/stores/user.store';
@@ -33,7 +32,7 @@

 <tr
  class="flex h-[50px] w-full place-items-center border-[3px] border-transparent p-2 text-center even:bg-subtle/20 odd:bg-subtle/80 hover:cursor-pointer hover:border-immich-primary/75 odd:dark:bg-immich-dark-gray/75 even:dark:bg-immich-dark-gray/50 dark:hover:border-immich-dark-primary/75 md:p-5"
-  onclick={() => goto(resolve(`${AppRoute.ALBUMS}/${album.id}`))}
+  onclick={() => goto(`${AppRoute.ALBUMS}/${album.id}`)}
  {oncontextmenu}
 >
  <td class="text-md text-ellipsis text-start w-8/12 sm:w-4/12 md:w-4/12 xl:w-[30%] 2xl:w-[40%] items-center">
--- a/web/src/lib/components/asset-viewer/activity-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/activity-viewer.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { resolve } from '$app/paths';
  import { autoGrowHeight } from '$lib/actions/autogrow';
  import { shortcut } from '$lib/actions/shortcut';
  import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
@@ -147,10 +146,7 @@

              <div class="w-full leading-4 overflow-hidden self-center break-words text-sm">{reaction.comment}</div>
              {#if assetId === undefined && reaction.assetId}
-                <a
-                  class="aspect-square w-[75px] h-[75px]"
-                  href={resolve(`${AppRoute.ALBUMS}/${albumId}/photos/${reaction.assetId}`)}
-                >
+                <a class="aspect-square w-[75px] h-[75px]" href="{AppRoute.ALBUMS}/{albumId}/photos/{reaction.assetId}">
                  <img
                    class="rounded-lg w-[75px] h-[75px] object-cover"
                    src={getAssetThumbnailUrl(reaction.assetId)}
@@ -202,7 +198,7 @@
                {#if assetId === undefined && reaction.assetId}
                  <a
                    class="aspect-square w-[75px] h-[75px]"
-                    href={resolve(`${AppRoute.ALBUMS}/${albumId}/photos/${reaction.assetId}`)}
+                    href="{AppRoute.ALBUMS}/{albumId}/photos/{reaction.assetId}"
                  >
                    <img
                      class="rounded-lg w-[75px] h-[75px] object-cover"
--- a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
  import { goto } from '$app/navigation';
-  import { resolve } from '$app/paths';
  import CastButton from '$lib/cast/cast-button.svelte';
  import type { OnAction, PreAction } from '$lib/components/asset-viewer/actions/action';
  import AddToAlbumAction from '$lib/components/asset-viewer/actions/add-to-album-action.svelte';
@@ -225,15 +224,14 @@
            {#if !asset.isArchived && !asset.isTrashed}
              <MenuOption
                icon={mdiImageSearch}
-                onClick={() => goto(resolve(`${AppRoute.PHOTOS}?at=${stack?.primaryAssetId ?? asset.id}`))}
+                onClick={() => goto(`${AppRoute.PHOTOS}?at=${stack?.primaryAssetId ?? asset.id}`)}
                text={$t('view_in_timeline')}
              />
            {/if}
            {#if !asset.isArchived && !asset.isTrashed && smartSearchEnabled}
              <MenuOption
                icon={mdiCompare}
-                onClick={() =>
-                  goto(resolve(`${AppRoute.SEARCH}?query={"queryAssetId":"${stack?.primaryAssetId ?? asset.id}"}`))}
+                onClick={() => goto(`${AppRoute.SEARCH}?query={"queryAssetId":"${stack?.primaryAssetId ?? asset.id}"}`)}
                text={$t('view_similar_photos')}
              />
            {/if}
--- a/web/src/lib/components/asset-viewer/detail-panel-tags.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel-tags.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { resolve } from '$app/paths';
  import { shortcut } from '$lib/actions/shortcut';
  import { AppRoute } from '$lib/constants';
  import { authManager } from '$lib/managers/auth-manager.svelte';
@@ -46,7 +45,7 @@
        <div class="flex group transition-all">
          <a
            class="inline-block h-min whitespace-nowrap ps-3 pe-1 group-hover:ps-3 py-1 text-center align-baseline leading-none text-gray-100 dark:text-immich-dark-gray bg-primary rounded-s-full hover:bg-immich-primary/80 dark:hover:bg-immich-dark-primary/80 transition-all"
-            href={resolve(`${AppRoute.TAGS}/?path=${encodeURI(tag.value)}`)}
+            href={encodeURI(`${AppRoute.TAGS}/?path=${tag.value}`)}
          >
            <p class="text-sm">
              {tag.value}
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
  import { goto } from '$app/navigation';
-  import { resolve } from '$app/paths';
  import DetailPanelDescription from '$lib/components/asset-viewer/detail-panel-description.svelte';
  import DetailPanelLocation from '$lib/components/asset-viewer/detail-panel-location.svelte';
  import DetailPanelRating from '$lib/components/asset-viewer/detail-panel-star-rating.svelte';
@@ -209,11 +208,9 @@
          {#if showingHiddenPeople || !person.isHidden}
            <a
              class="w-[90px]"
-              href={resolve(
-                `${AppRoute.PEOPLE}/${person.id}?${QueryParameter.PREVIOUS_ROUTE}=${
-                  currentAlbum?.id ? `${AppRoute.ALBUMS}/${currentAlbum?.id}` : AppRoute.PHOTOS
-                }`,
-              )}
+              href="{AppRoute.PEOPLE}/{person.id}?{QueryParameter.PREVIOUS_ROUTE}={currentAlbum?.id
+                ? `${AppRoute.ALBUMS}/${currentAlbum?.id}`
+                : AppRoute.PHOTOS}"
              onfocus={() => ($boundingBoxesArray = people[index].faces)}
              onblur={() => ($boundingBoxesArray = [])}
              onmouseover={() => ($boundingBoxesArray = people[index].faces)}
@@ -365,7 +362,6 @@
        </p>
        {#if showAssetPath}
          <p class="text-xs opacity-50 break-all pb-2 hover:text-primary" transition:slide={{ duration: 250 }}>
-            <!-- eslint-disable-next-line svelte/no-navigation-without-resolve this is supposed to be treated as an absolute/external link -->
            <a href={getAssetFolderHref(asset)} title={$t('go_to_folder')} class="whitespace-pre-wrap">
              {asset.originalPath}
            </a>
@@ -398,12 +394,10 @@
          {#if asset.exifInfo?.make || asset.exifInfo?.model}
            <p>
              <a
-                href={resolve(
-                  `${AppRoute.SEARCH}?${getMetadataSearchQuery({
-                    ...(asset.exifInfo?.make ? { make: asset.exifInfo.make } : {}),
-                    ...(asset.exifInfo?.model ? { model: asset.exifInfo.model } : {}),
-                  })}`,
-                )}
+                href="{AppRoute.SEARCH}?{getMetadataSearchQuery({
+                  ...(asset.exifInfo?.make ? { make: asset.exifInfo.make } : {}),
+                  ...(asset.exifInfo?.model ? { model: asset.exifInfo.model } : {}),
+                })}"
                title="{$t('search_for')} {asset.exifInfo.make || ''} {asset.exifInfo.model || ''}"
                class="hover:text-primary"
              >
@@ -417,9 +411,7 @@
            <div class="flex gap-2 text-sm">
              <p>
                <a
-                  href={resolve(
-                    `${AppRoute.SEARCH}?${getMetadataSearchQuery({ lensModel: asset.exifInfo.lensModel })}`,
-                  )}
+                  href="{AppRoute.SEARCH}?{getMetadataSearchQuery({ lensModel: asset.exifInfo.lensModel })}"
                  title="{$t('search_for')} {asset.exifInfo.lensModel}"
                  class="hover:text-primary line-clamp-1"
                >
@@ -483,7 +475,7 @@
        simplified
        useLocationPin
        showSimpleControls={!showEditFaces}
-        onOpenInMapView={() => goto(resolve(`${AppRoute.MAP}#12.5/${latlng.lat}/${latlng.lng}`))}
+        onOpenInMapView={() => goto(`${AppRoute.MAP}#12.5/${latlng.lat}/${latlng.lng}`)}
      >
        {#snippet popup({ marker })}
          {@const { lat, lon } = marker}
@@ -524,7 +516,7 @@
  <section class="px-6 pt-6 dark:text-immich-dark-fg">
    <p class="uppercase pb-4 text-sm">{$t('appears_in')}</p>
    {#each albums as album (album.id)}
-      <a href={resolve(`${AppRoute.ALBUMS}/${album.id}`)}>
+      <a href="{AppRoute.ALBUMS}/{album.id}">
        <div class="flex gap-4 pt-2 hover:cursor-pointer items-center">
          <div>
            <img
--- a/web/src/lib/components/asset-viewer/photo-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/photo-viewer.svelte
@@ -97,15 +97,12 @@
    }

    try {
-      const result = await copyImageToClipboard($photoViewerImgElement ?? assetFileUrl);
-      if (result.success) {
-        notificationController.show({ type: NotificationType.Info, message: $t('copied_image_to_clipboard') });
-      } else {
-        notificationController.show({
-          type: NotificationType.Error,
-          message: $t('errors.clipboard_unsupported_mime_type', { values: { mimeType: result.mimeType } }),
-        });
-      }
+      await copyImageToClipboard($photoViewerImgElement ?? assetFileUrl);
+      notificationController.show({
+        type: NotificationType.Info,
+        message: $t('copied_image_to_clipboard'),
+        timeout: 3000,
+      });
    } catch (error) {
      handleError(error, $t('copy_error'));
    }
@@ -243,7 +240,7 @@
      use:zoomImageAction
      use:swipe={() => ({})}
      onswipe={onSwipe}
-      class="h-full w-full flex"
+      class="h-full w-full"
      transition:fade={{ duration: haveFadeTransition ? assetViewerFadeDuration : 0 }}
    >
      {#if $slideshowState !== SlideshowState.None && $slideshowLook === SlideshowLook.BlurredBackground}
@@ -258,7 +255,7 @@
        bind:this={$photoViewerImgElement}
        src={assetFileUrl}
        alt={$getAltText(toTimelineAsset(asset))}
-        class="max-h-full max-w-full h-auto w-auto mx-auto my-auto {$slideshowState === SlideshowState.None
+        class="h-full w-full {$slideshowState === SlideshowState.None
          ? 'object-contain'
          : slideshowLookCssMapping[$slideshowLook]}"
        draggable="false"
--- a/web/src/lib/components/shared-components/search-bar/search-date-section.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-date-section.svelte
@@ -7,7 +7,6 @@

 <script lang="ts">
  import DateInput from '$lib/elements/DateInput.svelte';
-  import { Text } from '@immich/ui';
  import { t } from 'svelte-i18n';

  interface Props {
@@ -15,27 +14,31 @@
  }

  let { filters = $bindable() }: Props = $props();
-
-  let invalid = $derived(filters.takenAfter && filters.takenBefore && filters.takenAfter > filters.takenBefore);
-
-  const inputClasses = $derived(
-    `immich-form-input w-full mt-1 hover:cursor-pointer ${invalid ? 'border border-danger' : ''}`,
-  );
 </script>

-<div class="flex flex-col gap-1">
-  <div id="date-range-selection" class="grid grid-auto-fit-40 gap-5">
-    <label class="immich-form-label" for="start-date">
-      <span class="uppercase">{$t('start_date')}</span>
-      <DateInput class={inputClasses} type="date" id="start-date" name="start-date" bind:value={filters.takenAfter} />
-    </label>
+<div id="date-range-selection" class="grid grid-auto-fit-40 gap-5">
+  <label class="immich-form-label" for="start-date">
+    <span class="uppercase">{$t('start_date')}</span>
+    <DateInput
+      class="immich-form-input w-full mt-1 hover:cursor-pointer"
+      type="date"
+      id="start-date"
+      name="start-date"
+      max={filters.takenBefore}
+      bind:value={filters.takenAfter}
+    />
+  </label>

-    <label class="immich-form-label" for="end-date">
-      <span class="uppercase">{$t('end_date')}</span>
-      <DateInput class={inputClasses} type="date" id="end-date" name="end-date" bind:value={filters.takenBefore} />
-    </label>
-  </div>
-  {#if invalid}
-    <Text color="danger">{$t('start_date_before_end_date')}</Text>
-  {/if}
+  <label class="immich-form-label" for="end-date">
+    <span class="uppercase">{$t('end_date')}</span>
+    <DateInput
+      class="immich-form-input w-full mt-1 hover:cursor-pointer"
+      type="date"
+      id="end-date"
+      name="end-date"
+      placeholder=""
+      min={filters.takenAfter}
+      bind:value={filters.takenBefore}
+    />
+  </label>
 </div>
--- a/web/src/lib/components/shared-components/settings/setting-input-field.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-input-field.svelte
@@ -105,7 +105,7 @@
  {/if}

  {#if inputType !== SettingInputFieldType.PASSWORD}
-    <div class="flex place-items-center place-content-center gap-2">
+    <div class="flex place-items-center place-content-center">
      {#if inputType === SettingInputFieldType.COLOR}
        <input
          bind:this={input}
--- a/web/src/lib/components/shared-components/side-bar/recent-albums.spec.ts
+++ b/web/src/lib/components/shared-components/side-bar/recent-albums.spec.ts
@@ -17,9 +17,6 @@ describe('RecentAlbums component', () => {
    render(RecentAlbums);

    expect(sdkMock.getAllAlbums).toBeCalledTimes(1);
-
-    // wtf
-    await tick();
    await tick();

    const links = screen.getAllByRole('link');
--- a/web/src/lib/components/timeline/Timeline.svelte
+++ b/web/src/lib/components/timeline/Timeline.svelte
@@ -670,7 +670,7 @@
          break;
        }
        if (started) {
-          await timelineManager.loadMonthGroup(monthGroup.yearMonth);
+          await timelineManager.loadSegment(monthGroup.yearMonth);
          for (const asset of monthGroup.assetsIterator()) {
            if (deselect) {
              assetInteraction.removeAssetFromMultiselectGroup(asset.id);
@@ -811,7 +811,7 @@
  $effect(() => {
    if ($showAssetViewer) {
      const { localDateTime } = getTimes($viewingAsset.fileCreatedAt, DateTime.local().offset / 60);
-      void timelineManager.loadMonthGroup({ year: localDateTime.year, month: localDateTime.month });
+      void timelineManager.loadSegment({ year: localDateTime.year, month: localDateTime.month });
    }
  });
 </script>
--- a/web/src/lib/managers/timeline-manager/internal/intersection-support.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/internal/intersection-support.svelte.ts
@@ -17,11 +17,7 @@ export function updateIntersectionMonthGroup(timelineManager: TimelineManager, m
      INTERSECTION_EXPAND_BOTTOM,
    );
  }
-  month.intersecting = actuallyIntersecting || preIntersecting;
-  month.actuallyIntersecting = actuallyIntersecting;
-  if (preIntersecting || actuallyIntersecting) {
-    timelineManager.clearDeferredLayout(month);
-  }
+  month.updateIntersection({ intersecting: actuallyIntersecting || preIntersecting, actuallyIntersecting });
 }

 /**
--- a/web/src/lib/managers/timeline-manager/month-group.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/month-group.svelte.ts
@@ -81,7 +81,7 @@ export class MonthGroup {
    }
    this.#intersecting = newValue;
    if (newValue) {
-      void this.timelineManager.loadMonthGroup(this.yearMonth);
+      void this.timelineManager.loadSegment(this.yearMonth);
    } else {
      this.cancel();
    }
@@ -374,4 +374,12 @@ export class MonthGroup {
  cancel() {
    this.loader?.cancel();
  }
+
+  updateIntersection({ intersecting, actuallyIntersecting }: { intersecting: boolean; actuallyIntersecting: boolean }) {
+    this.intersecting = intersecting;
+    this.actuallyIntersecting = actuallyIntersecting;
+    if (intersecting) {
+      this.timelineManager.clearDeferredLayout(this);
+    }
+  }
 }
--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.spec.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.spec.ts
@@ -92,7 +92,7 @@ describe('TimelineManager', () => {
    });
  });

-  describe('loadMonthGroup', () => {
+  describe('loadSegment', () => {
    let timelineManager: TimelineManager;
    const bucketAssets: Record<string, TimelineAsset[]> = {
      '2024-01-03T00:00:00.000Z': timelineAssetFactory.buildList(1).map((asset) =>
@@ -129,46 +129,46 @@ describe('TimelineManager', () => {

    it('loads a month', async () => {
      expect(getMonthGroupByDate(timelineManager, { year: 2024, month: 1 })?.getAssets().length).toEqual(0);
-      await timelineManager.loadMonthGroup({ year: 2024, month: 1 });
+      await timelineManager.loadSegment({ year: 2024, month: 1 });
      expect(sdkMock.getTimeBucket).toBeCalledTimes(1);
      expect(getMonthGroupByDate(timelineManager, { year: 2024, month: 1 })?.getAssets().length).toEqual(3);
    });

    it('ignores invalid months', async () => {
-      await timelineManager.loadMonthGroup({ year: 2023, month: 1 });
+      await timelineManager.loadSegment({ year: 2023, month: 1 });
      expect(sdkMock.getTimeBucket).toBeCalledTimes(0);
    });

    it('cancels month loading', async () => {
      const month = getMonthGroupByDate(timelineManager, { year: 2024, month: 1 })!;
-      void timelineManager.loadMonthGroup({ year: 2024, month: 1 });
+      void timelineManager.loadSegment({ year: 2024, month: 1 });
      const abortSpy = vi.spyOn(month!.loader!.cancelToken!, 'abort');
      month?.cancel();
      expect(abortSpy).toBeCalledTimes(1);
-      await timelineManager.loadMonthGroup({ year: 2024, month: 1 });
+      await timelineManager.loadSegment({ year: 2024, month: 1 });
      expect(getMonthGroupByDate(timelineManager, { year: 2024, month: 1 })?.getAssets().length).toEqual(3);
    });

    it('prevents loading months multiple times', async () => {
      await Promise.all([
-        timelineManager.loadMonthGroup({ year: 2024, month: 1 }),
-        timelineManager.loadMonthGroup({ year: 2024, month: 1 }),
+        timelineManager.loadSegment({ year: 2024, month: 1 }),
+        timelineManager.loadSegment({ year: 2024, month: 1 }),
      ]);
      expect(sdkMock.getTimeBucket).toBeCalledTimes(1);

-      await timelineManager.loadMonthGroup({ year: 2024, month: 1 });
+      await timelineManager.loadSegment({ year: 2024, month: 1 });
      expect(sdkMock.getTimeBucket).toBeCalledTimes(1);
    });

    it('allows loading a canceled month', async () => {
      const month = getMonthGroupByDate(timelineManager, { year: 2024, month: 1 })!;
-      const loadPromise = timelineManager.loadMonthGroup({ year: 2024, month: 1 });
+      const loadPromise = timelineManager.loadSegment({ year: 2024, month: 1 });

      month.cancel();
      await loadPromise;
      expect(month?.getAssets().length).toEqual(0);

-      await timelineManager.loadMonthGroup({ year: 2024, month: 1 });
+      await timelineManager.loadSegment({ year: 2024, month: 1 });
      expect(month!.getAssets().length).toEqual(3);
    });
  });
@@ -477,7 +477,7 @@ describe('TimelineManager', () => {
    });

    it('returns previous assetId', async () => {
-      await timelineManager.loadMonthGroup({ year: 2024, month: 1 });
+      await timelineManager.loadSegment({ year: 2024, month: 1 });
      const month = getMonthGroupByDate(timelineManager, { year: 2024, month: 1 });

      const a = month!.getAssets()[0];
@@ -487,8 +487,8 @@ describe('TimelineManager', () => {
    });

    it('returns previous assetId spanning multiple months', async () => {
-      await timelineManager.loadMonthGroup({ year: 2024, month: 2 });
-      await timelineManager.loadMonthGroup({ year: 2024, month: 3 });
+      await timelineManager.loadSegment({ year: 2024, month: 2 });
+      await timelineManager.loadSegment({ year: 2024, month: 3 });

      const month = getMonthGroupByDate(timelineManager, { year: 2024, month: 2 });
      const previousMonth = getMonthGroupByDate(timelineManager, { year: 2024, month: 3 });
@@ -499,23 +499,23 @@ describe('TimelineManager', () => {
    });

    it('loads previous month', async () => {
-      await timelineManager.loadMonthGroup({ year: 2024, month: 2 });
+      await timelineManager.loadSegment({ year: 2024, month: 2 });
      const month = getMonthGroupByDate(timelineManager, { year: 2024, month: 2 });
      const previousMonth = getMonthGroupByDate(timelineManager, { year: 2024, month: 3 });
      const a = month!.getFirstAsset();
      const b = previousMonth!.getFirstAsset();
-      const loadMonthGroupSpy = vi.spyOn(month!.loader!, 'execute');
+      const loadSegmentSpy = vi.spyOn(month!.loader!, 'execute');
      const previousMonthSpy = vi.spyOn(previousMonth!.loader!, 'execute');
      const previous = await timelineManager.getLaterAsset(a);
      expect(previous).toEqual(b);
-      expect(loadMonthGroupSpy).toBeCalledTimes(0);
+      expect(loadSegmentSpy).toBeCalledTimes(0);
      expect(previousMonthSpy).toBeCalledTimes(0);
    });

    it('skips removed assets', async () => {
-      await timelineManager.loadMonthGroup({ year: 2024, month: 1 });
-      await timelineManager.loadMonthGroup({ year: 2024, month: 2 });
-      await timelineManager.loadMonthGroup({ year: 2024, month: 3 });
+      await timelineManager.loadSegment({ year: 2024, month: 1 });
+      await timelineManager.loadSegment({ year: 2024, month: 2 });
+      await timelineManager.loadSegment({ year: 2024, month: 3 });

      const [assetOne, assetTwo, assetThree] = await getAssets(timelineManager);
      timelineManager.removeAssets([assetTwo.id]);
@@ -523,7 +523,7 @@ describe('TimelineManager', () => {
    });

    it('returns null when no more assets', async () => {
-      await timelineManager.loadMonthGroup({ year: 2024, month: 3 });
+      await timelineManager.loadSegment({ year: 2024, month: 3 });
      expect(await timelineManager.getLaterAsset(timelineManager.months[0].getFirstAsset())).toBeUndefined();
    });
  });
--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
@@ -198,7 +198,7 @@ export class TimelineManager {
    const direction = options?.direction ?? 'earlier';
    let { startDayGroup, startAsset } = options ?? {};
    for (const monthGroup of this.monthGroupIterator({ direction, startMonthGroup: options?.startMonthGroup })) {
-      await this.loadMonthGroup(monthGroup.yearMonth, { cancelable: false });
+      await this.loadSegment(monthGroup.yearMonth, { cancelable: false });
      yield* monthGroup.assetsIterator({ startDayGroup, startAsset, direction });
      startDayGroup = startAsset = undefined;
    }
@@ -387,7 +387,7 @@ export class TimelineManager {
    };
  }

-  async loadMonthGroup(yearMonth: TimelineYearMonth, options?: { cancelable: boolean }): Promise<void> {
+  async loadSegment(yearMonth: TimelineYearMonth, options?: { cancelable: boolean }): Promise<void> {
    let cancelable = true;
    if (options) {
      cancelable = options.cancelable;
@@ -442,7 +442,7 @@ export class TimelineManager {
  }

  async #loadMonthGroupAtTime(yearMonth: TimelineYearMonth, options?: { cancelable: boolean }) {
-    await this.loadMonthGroup(yearMonth, options);
+    await this.loadSegment(yearMonth, options);
    return getMonthGroupByDate(this, yearMonth);
  }

@@ -454,7 +454,7 @@ export class TimelineManager {
  async getRandomMonthGroup() {
    const random = Math.floor(Math.random() * this.months.length);
    const month = this.months[random];
-    await this.loadMonthGroup(month.yearMonth, { cancelable: false });
+    await this.loadSegment(month.yearMonth, { cancelable: false });
    return month;
  }

@@ -527,7 +527,7 @@ export class TimelineManager {
    if (!monthGroup) {
      return;
    }
-    await this.loadMonthGroup(dateTime, { cancelable: false });
+    await this.loadSegment(dateTime, { cancelable: false });
    const asset = monthGroup.findClosest(dateTime);
    if (asset) {
      return asset;
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -513,7 +513,7 @@ export const selectAllAssets = async (timelineManager: TimelineManager, assetInt

  try {
    for (const monthGroup of timelineManager.months) {
-      await timelineManager.loadMonthGroup(monthGroup.yearMonth);
+      await timelineManager.loadSegment(monthGroup.yearMonth);

      if (!get(isSelectingAllAssets)) {
        assetInteraction.clearMultiselect();
@@ -625,21 +625,7 @@ const urlToBlob = async (imageSource: string) => {
  return await response.blob();
 };

-export const copyImageToClipboard = async (
-  source: HTMLImageElement | string,
-): Promise<{ success: true } | { success: false; mimeType: string }> => {
-  if (source instanceof HTMLImageElement) {
-    // do not await, so the Safari clipboard write happens in the context of the user gesture
-    await navigator.clipboard.write([new ClipboardItem({ ['image/png']: imgToBlob(source) })]);
-    return { success: true };
-  }
-
-  // if we had a way to get the mime type synchronously, we could do the same thing here
-  const blob = await urlToBlob(source);
-  if (!ClipboardItem.supports(blob.type)) {
-    return { success: false, mimeType: blob.type };
-  }
-
+export const copyImageToClipboard = async (source: HTMLImageElement | string) => {
+  const blob = source instanceof HTMLImageElement ? await imgToBlob(source) : await urlToBlob(source);
  await navigator.clipboard.write([new ClipboardItem({ [blob.type]: blob })]);
-  return { success: true };
 };