paginate searchMemories

i18n/en.json

@@ -2233,7 +2233,6 @@
   "slideshow_repeat": "Repeat slideshow",
   "slideshow_repeat_description": "Loop back to beginning when slideshow ends",
   "slideshow_settings": "Slideshow settings",
-  "smart_album": "Smart album",
   "sort_albums_by": "Sort albums by...",
   "sort_created": "Date created",
   "sort_items": "Number of items",

machine-learning/immich_ml/models/ocr/recognition.py

@@ -64,7 +64,6 @@ class TextRecognizer(InferenceModel):
                 rec_batch_num=max_batch_size if max_batch_size else 6,
                 rec_img_shape=(3, 48, 320),
                 lang_type=self.language,
-                model_root_dir=self.cache_dir,
             )
         )
         return session

machine-learning/test_main.py

@@ -1028,12 +1028,7 @@ class TestOcr:
         text_recognizer.load()
 
         rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=6,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=6, rec_img_shape=(3, 48, 320))
         )
 
     def test_set_custom_max_batch_size(self, ort_session: mock.Mock, path: mock.Mock, mocker: MockerFixture) -> None:
@@ -1046,12 +1041,7 @@ class TestOcr:
         text_recognizer.load()
 
         rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=4,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=4, rec_img_shape=(3, 48, 320))
         )
 
     def test_ignore_other_custom_max_batch_size(
@@ -1066,12 +1056,7 @@ class TestOcr:
         text_recognizer.load()
 
         rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=6,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=6, rec_img_shape=(3, 48, 320))
         )
 
 

mise.toml

@@ -54,8 +54,8 @@ lockfile = true
 
 [tasks.plugins]
 run = [
-  "pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile",
-  "pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core build",
+  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile",
+  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core build",
 ]
 
 [tasks.open-api-typescript]
@@ -108,7 +108,7 @@ depends = "//:plugins"
 dir = "docker"
 interactive = true
 env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.prod.yml up --build --remove-orphans"
+run = "docker compose -f ./docker-compose.prod.yml up --remove-orphans"
 depends_post = "//:prod-down"
 
 [tasks.prod-scale]

mobile/lib/domain/models/config/app_config.dart

@@ -12,7 +12,7 @@ import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
@@ -95,7 +95,7 @@ class AppConfig {
   String toString() =>
       'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network)';
 
-  T read<T extends Object>(SettingsKey<T> key) =>
+  T read<T extends Object>(MetadataKey<T> key) =>
       (switch (key) {
             .logLevel => logLevel,
             .themePrimaryColor => theme.primaryColor,
@@ -143,10 +143,15 @@ class AppConfig {
           })
           as T;
 
-  factory AppConfig.fromEntries(Map<SettingsKey<Object>, Object> overrides) =>
-      overrides.entries.fold(const AppConfig(), (config, entry) => config.write(entry.key, entry.value));
+  factory AppConfig.fromEntries(Map<MetadataKey<Object>, Object> entries) {
+    var config = const AppConfig();
+    for (final MapEntry(key: key, value: value) in entries.entries) {
+      config = config.write(key, value);
+    }
+    return config;
+  }
 
-  AppConfig write<T extends Object>(SettingsKey<T> key, T value) {
+  AppConfig write<T extends Object>(MetadataKey<T> key, T value) {
     return switch (key) {
       .logLevel => copyWith(logLevel: value as LogLevel),
       .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),

mobile/lib/domain/models/metadata_key.dart

@@ -7,7 +7,14 @@ import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
-enum SettingsKey<T extends Object> {
+enum MetadataScope {
+  user, // keys with this scope are deleted on logout
+  system;
+
+  const MetadataScope();
+}
+
+enum MetadataKey<T extends Object> {
   // Theme
   themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
   themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
@@ -25,11 +32,14 @@ enum SettingsKey<T extends Object> {
   viewerTapToNavigate<bool>(),
 
   // Network
-  networkAutoEndpointSwitching<bool>(),
-  networkPreferredWifiName<String>(),
-  networkLocalEndpoint<String>(),
-  networkExternalEndpointList<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
-  networkCustomHeaders<Map<String, String>>(codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string)),
+  networkAutoEndpointSwitching<bool>(scope: .system),
+  networkPreferredWifiName<String>(scope: .system),
+  networkLocalEndpoint<String>(scope: .system),
+  networkExternalEndpointList<List<String>>(scope: .system, codec: _ListCodec(_PrimitiveCodec.string)),
+  networkCustomHeaders<Map<String, String>>(
+    scope: .system,
+    codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
+  ),
 
   // Album
   albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
@@ -50,7 +60,7 @@ enum SettingsKey<T extends Object> {
   timelineStorageIndicator<bool>(),
 
   // Log
-  logLevel<LogLevel>(codec: _EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(scope: .system, codec: _EnumCodec(LogLevel.values)),
 
   // Map
   mapShowFavoriteOnly<bool>(),
@@ -73,24 +83,25 @@ enum SettingsKey<T extends Object> {
   slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
   slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));
 
-  final _SettingsCodec<T>? _codecOverride;
+  final MetadataScope scope;
+  final _MetadataCodec<T>? _codecOverride;
 
-  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;
+  const MetadataKey({this.scope = .user, _MetadataCodec<T>? codec}) : _codecOverride = codec;
 
-  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);
+  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forType(T);
 
   String encode(T value) => _codec.encode(value);
 
   T decode(String raw) => _codec.decode(raw);
 }
 
-sealed class _SettingsCodec<T extends Object> {
-  const _SettingsCodec();
+sealed class _MetadataCodec<T extends Object> {
+  const _MetadataCodec();
 
   String encode(T value);
   T decode(String raw);
 
-  static const Map<Type, _SettingsCodec<Object>> _primitives = {
+  static const Map<Type, _MetadataCodec<Object>> _primitives = {
     int: _PrimitiveCodec.integer,
     double: _PrimitiveCodec.real,
     bool: _PrimitiveCodec.boolean,
@@ -98,16 +109,16 @@ sealed class _SettingsCodec<T extends Object> {
     DateTime: _DateTimeCodec(),
   };
 
-  static _SettingsCodec<T> forType<T extends Object>(Type runtimeType) {
+  static _MetadataCodec<T> forType<T extends Object>(Type runtimeType) {
     final codec = _primitives[runtimeType];
     if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the MetadataKey.');
     }
-    return codec as _SettingsCodec<T>;
+    return codec as _MetadataCodec<T>;
   }
 }
 
-final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
+final class _EnumCodec<T extends Enum> extends _MetadataCodec<T> {
   final List<T> values;
 
   const _EnumCodec(this.values);
@@ -119,7 +130,7 @@ final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
   T decode(String raw) => values.firstWhere((v) => v.name == raw);
 }
 
-final class _DateTimeCodec extends _SettingsCodec<DateTime> {
+final class _DateTimeCodec extends _MetadataCodec<DateTime> {
   const _DateTimeCodec();
 
   @override
@@ -129,9 +140,9 @@ final class _DateTimeCodec extends _SettingsCodec<DateTime> {
   DateTime decode(String raw) => DateTime.parse(raw);
 }
 
-final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
-  final _SettingsCodec<K> _keyCodec;
-  final _SettingsCodec<V> _valueCodec;
+final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec<Map<K, V>> {
+  final _MetadataCodec<K> _keyCodec;
+  final _MetadataCodec<V> _valueCodec;
 
   const _MapCodec(this._keyCodec, this._valueCodec);
 
@@ -167,8 +178,8 @@ final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec
   }
 }
 
-final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
-  final _SettingsCodec<T> _elementCodec;
+final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
+  final _MetadataCodec<T> _elementCodec;
 
   const _ListCodec(this._elementCodec);
 
@@ -197,7 +208,7 @@ final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
   }
 }
 
-final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
+final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
   final T Function(String) _parse;
 
   const _PrimitiveCodec._(this._parse);

mobile/lib/domain/services/background_worker.service.dart

@@ -11,7 +11,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
@@ -39,7 +39,7 @@ class BackgroundWorkerFgService {
       _foregroundHostApi.saveNotificationMessage(title, body);
 
   Future<void> configure({int? minimumDelaySeconds, bool? requireCharging}) {
-    final backup = SettingsRepository.instance.appConfig.backup;
+    final backup = MetadataRepository.instance.appConfig.backup;
     return _foregroundHostApi.configure(
       BackgroundWorkerSettings(
         minimumDelaySeconds: minimumDelaySeconds ?? backup.triggerDelay,
@@ -67,7 +67,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
     BackgroundWorkerFlutterApi.setUp(this);
   }
 
-  bool get _isBackupEnabled => SettingsRepository.instance.appConfig.backup.enabled;
+  bool get _isBackupEnabled => MetadataRepository.instance.appConfig.backup.enabled;
 
   Future<void> init() async {
     try {

mobile/lib/domain/services/log.service.dart

@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
 
@@ -12,10 +12,10 @@ import 'package:logging/logging.dart';
 ///
 /// It listens to Dart's [Logger.root], buffers logs in memory (optionally),
 /// writes them to a persistent [LogRepository], and manages log levels via
-/// [SettingsRepository].
+/// [MetadataRepository].
 class LogService {
   final LogRepository _logRepository;
-  final SettingsRepository _settingsRepository;
+  final MetadataRepository _metadataRepository;
 
   final List<LogMessage> _msgBuffer = [];
 
@@ -38,12 +38,12 @@ class LogService {
 
   static Future<LogService> init({
     required LogRepository logRepository,
-    required SettingsRepository settingsRepository,
+    required MetadataRepository metadataRepository,
     bool shouldBuffer = true,
   }) async {
     _instance ??= await create(
       logRepository: logRepository,
-      settingsRepository: settingsRepository,
+      metadataRepository: metadataRepository,
       shouldBuffer: shouldBuffer,
     );
     return _instance!;
@@ -51,17 +51,17 @@ class LogService {
 
   static Future<LogService> create({
     required LogRepository logRepository,
-    required SettingsRepository settingsRepository,
+    required MetadataRepository metadataRepository,
     bool shouldBuffer = true,
   }) async {
-    final instance = LogService._(logRepository, settingsRepository, shouldBuffer);
+    final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
     await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = instance._settingsRepository.appConfig.logLevel;
+    final level = instance._metadataRepository.appConfig.logLevel;
     Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
     return instance;
   }
 
-  LogService._(this._logRepository, this._settingsRepository, this._shouldBuffer) {
+  LogService._(this._logRepository, this._metadataRepository, this._shouldBuffer) {
     _logSubscription = Logger.root.onRecord.listen(_handleLogRecord);
   }
 
@@ -91,7 +91,7 @@ class LogService {
   }
 
   Future<void> setLogLevel(LogLevel level) async {
-    await _settingsRepository.write(SettingsKey.logLevel, level);
+    await _metadataRepository.write(MetadataKey.logLevel, level);
     Logger.root.level = level.toLevel();
   }
 

mobile/lib/domain/services/timeline.service.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 
@@ -39,12 +39,12 @@ enum TimelineOrigin {
 
 class TimelineFactory {
   final DriftTimelineRepository _timelineRepository;
-  final SettingsRepository _settingsRepository;
+  final MetadataRepository _metadataRepository;
 
-  const TimelineFactory({required this._timelineRepository, required this._settingsRepository});
+  const TimelineFactory({required this._timelineRepository, required this._metadataRepository});
 
   GroupAssetsBy get groupBy {
-    final group = _settingsRepository.appConfig.timeline.groupAssetsBy;
+    final group = _metadataRepository.appConfig.timeline.groupAssetsBy;
     // We do not support auto grouping in the new timeline yet, fallback to day grouping
     return group == GroupAssetsBy.auto ? GroupAssetsBy.day : group;
   }

mobile/lib/infrastructure/entities/metadata.entity.dart

@@ -1,8 +1,8 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
-class SettingsEntity extends Table with DriftDefaultsMixin {
-  const SettingsEntity();
+class MetadataEntity extends Table with DriftDefaultsMixin {
+  const MetadataEntity();
 
   TextColumn get key => text()();
 
@@ -14,5 +14,5 @@ class SettingsEntity extends Table with DriftDefaultsMixin {
   Set<Column> get primaryKey => {key};
 
   @override
-  String get tableName => "settings";
+  String get tableName => "metadata";
 }

mobile/lib/infrastructure/entities/metadata.entity.drift.dart

@@ -1,28 +1,28 @@
 // dart format width=80
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
     as i1;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart'
     as i2;
 import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
 
-typedef $$SettingsEntityTableCreateCompanionBuilder =
-    i1.SettingsEntityCompanion Function({
+typedef $$MetadataEntityTableCreateCompanionBuilder =
+    i1.MetadataEntityCompanion Function({
       required String key,
       required String value,
       i0.Value<DateTime> updatedAt,
     });
-typedef $$SettingsEntityTableUpdateCompanionBuilder =
-    i1.SettingsEntityCompanion Function({
+typedef $$MetadataEntityTableUpdateCompanionBuilder =
+    i1.MetadataEntityCompanion Function({
       i0.Value<String> key,
       i0.Value<String> value,
       i0.Value<DateTime> updatedAt,
     });
 
-class $$SettingsEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableFilterComposer({
+class $$MetadataEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableFilterComposer({
     required super.$db,
     required super.$table,
     super.joinBuilder,
@@ -45,9 +45,9 @@ class $$SettingsEntityTableFilterComposer
   );
 }
 
-class $$SettingsEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableOrderingComposer({
+class $$MetadataEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableOrderingComposer({
     required super.$db,
     required super.$table,
     super.joinBuilder,
@@ -70,9 +70,9 @@ class $$SettingsEntityTableOrderingComposer
   );
 }
 
-class $$SettingsEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableAnnotationComposer({
+class $$MetadataEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableAnnotationComposer({
     required super.$db,
     required super.$table,
     super.joinBuilder,
@@ -89,47 +89,47 @@ class $$SettingsEntityTableAnnotationComposer
       $composableBuilder(column: $table.updatedAt, builder: (column) => column);
 }
 
-class $$SettingsEntityTableTableManager
+class $$MetadataEntityTableTableManager
     extends
         i0.RootTableManager<
           i0.GeneratedDatabase,
-          i1.$SettingsEntityTable,
-          i1.SettingsEntityData,
-          i1.$$SettingsEntityTableFilterComposer,
-          i1.$$SettingsEntityTableOrderingComposer,
-          i1.$$SettingsEntityTableAnnotationComposer,
-          $$SettingsEntityTableCreateCompanionBuilder,
-          $$SettingsEntityTableUpdateCompanionBuilder,
+          i1.$MetadataEntityTable,
+          i1.MetadataEntityData,
+          i1.$$MetadataEntityTableFilterComposer,
+          i1.$$MetadataEntityTableOrderingComposer,
+          i1.$$MetadataEntityTableAnnotationComposer,
+          $$MetadataEntityTableCreateCompanionBuilder,
+          $$MetadataEntityTableUpdateCompanionBuilder,
           (
-            i1.SettingsEntityData,
+            i1.MetadataEntityData,
             i0.BaseReferences<
               i0.GeneratedDatabase,
-              i1.$SettingsEntityTable,
-              i1.SettingsEntityData
+              i1.$MetadataEntityTable,
+              i1.MetadataEntityData
             >,
           ),
-          i1.SettingsEntityData,
+          i1.MetadataEntityData,
           i0.PrefetchHooks Function()
         > {
-  $$SettingsEntityTableTableManager(
+  $$MetadataEntityTableTableManager(
     i0.GeneratedDatabase db,
-    i1.$SettingsEntityTable table,
+    i1.$MetadataEntityTable table,
   ) : super(
         i0.TableManagerState(
           db: db,
           table: table,
           createFilteringComposer: () =>
-              i1.$$SettingsEntityTableFilterComposer($db: db, $table: table),
+              i1.$$MetadataEntityTableFilterComposer($db: db, $table: table),
           createOrderingComposer: () =>
-              i1.$$SettingsEntityTableOrderingComposer($db: db, $table: table),
+              i1.$$MetadataEntityTableOrderingComposer($db: db, $table: table),
           createComputedFieldComposer: () => i1
-              .$$SettingsEntityTableAnnotationComposer($db: db, $table: table),
+              .$$MetadataEntityTableAnnotationComposer($db: db, $table: table),
           updateCompanionCallback:
               ({
                 i0.Value<String> key = const i0.Value.absent(),
                 i0.Value<String> value = const i0.Value.absent(),
                 i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.SettingsEntityCompanion(
+              }) => i1.MetadataEntityCompanion(
                 key: key,
                 value: value,
                 updatedAt: updatedAt,
@@ -139,7 +139,7 @@ class $$SettingsEntityTableTableManager
                 required String key,
                 required String value,
                 i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.SettingsEntityCompanion.insert(
+              }) => i1.MetadataEntityCompanion.insert(
                 key: key,
                 value: value,
                 updatedAt: updatedAt,
@@ -152,34 +152,34 @@ class $$SettingsEntityTableTableManager
       );
 }
 
-typedef $$SettingsEntityTableProcessedTableManager =
+typedef $$MetadataEntityTableProcessedTableManager =
     i0.ProcessedTableManager<
       i0.GeneratedDatabase,
-      i1.$SettingsEntityTable,
-      i1.SettingsEntityData,
-      i1.$$SettingsEntityTableFilterComposer,
-      i1.$$SettingsEntityTableOrderingComposer,
-      i1.$$SettingsEntityTableAnnotationComposer,
-      $$SettingsEntityTableCreateCompanionBuilder,
-      $$SettingsEntityTableUpdateCompanionBuilder,
+      i1.$MetadataEntityTable,
+      i1.MetadataEntityData,
+      i1.$$MetadataEntityTableFilterComposer,
+      i1.$$MetadataEntityTableOrderingComposer,
+      i1.$$MetadataEntityTableAnnotationComposer,
+      $$MetadataEntityTableCreateCompanionBuilder,
+      $$MetadataEntityTableUpdateCompanionBuilder,
       (
-        i1.SettingsEntityData,
+        i1.MetadataEntityData,
         i0.BaseReferences<
           i0.GeneratedDatabase,
-          i1.$SettingsEntityTable,
-          i1.SettingsEntityData
+          i1.$MetadataEntityTable,
+          i1.MetadataEntityData
         >,
       ),
-      i1.SettingsEntityData,
+      i1.MetadataEntityData,
       i0.PrefetchHooks Function()
     >;
 
-class $SettingsEntityTable extends i2.SettingsEntity
-    with i0.TableInfo<$SettingsEntityTable, i1.SettingsEntityData> {
+class $MetadataEntityTable extends i2.MetadataEntity
+    with i0.TableInfo<$MetadataEntityTable, i1.MetadataEntityData> {
   @override
   final i0.GeneratedDatabase attachedDatabase;
   final String? _alias;
-  $SettingsEntityTable(this.attachedDatabase, [this._alias]);
+  $MetadataEntityTable(this.attachedDatabase, [this._alias]);
   static const i0.VerificationMeta _keyMeta = const i0.VerificationMeta('key');
   @override
   late final i0.GeneratedColumn<String> key = i0.GeneratedColumn<String>(
@@ -219,10 +219,10 @@ class $SettingsEntityTable extends i2.SettingsEntity
   String get aliasedName => _alias ?? actualTableName;
   @override
   String get actualTableName => $name;
-  static const String $name = 'settings';
+  static const String $name = 'metadata';
   @override
   i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.SettingsEntityData> instance, {
+    i0.Insertable<i1.MetadataEntityData> instance, {
     bool isInserting = false,
   }) {
     final context = i0.VerificationContext();
@@ -255,9 +255,9 @@ class $SettingsEntityTable extends i2.SettingsEntity
   @override
   Set<i0.GeneratedColumn> get $primaryKey => {key};
   @override
-  i1.SettingsEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+  i1.MetadataEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.SettingsEntityData(
+    return i1.MetadataEntityData(
       key: attachedDatabase.typeMapping.read(
         i0.DriftSqlType.string,
         data['${effectivePrefix}key'],
@@ -274,8 +274,8 @@ class $SettingsEntityTable extends i2.SettingsEntity
   }
 
   @override
-  $SettingsEntityTable createAlias(String alias) {
-    return $SettingsEntityTable(attachedDatabase, alias);
+  $MetadataEntityTable createAlias(String alias) {
+    return $MetadataEntityTable(attachedDatabase, alias);
   }
 
   @override
@@ -284,12 +284,12 @@ class $SettingsEntityTable extends i2.SettingsEntity
   bool get isStrict => true;
 }
 
-class SettingsEntityData extends i0.DataClass
-    implements i0.Insertable<i1.SettingsEntityData> {
+class MetadataEntityData extends i0.DataClass
+    implements i0.Insertable<i1.MetadataEntityData> {
   final String key;
   final String value;
   final DateTime updatedAt;
-  const SettingsEntityData({
+  const MetadataEntityData({
     required this.key,
     required this.value,
     required this.updatedAt,
@@ -303,12 +303,12 @@ class SettingsEntityData extends i0.DataClass
     return map;
   }
 
-  factory SettingsEntityData.fromJson(
+  factory MetadataEntityData.fromJson(
     Map<String, dynamic> json, {
     i0.ValueSerializer? serializer,
   }) {
     serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return SettingsEntityData(
+    return MetadataEntityData(
       key: serializer.fromJson<String>(json['key']),
       value: serializer.fromJson<String>(json['value']),
       updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
@@ -324,17 +324,17 @@ class SettingsEntityData extends i0.DataClass
     };
   }
 
-  i1.SettingsEntityData copyWith({
+  i1.MetadataEntityData copyWith({
     String? key,
     String? value,
     DateTime? updatedAt,
-  }) => i1.SettingsEntityData(
+  }) => i1.MetadataEntityData(
     key: key ?? this.key,
     value: value ?? this.value,
     updatedAt: updatedAt ?? this.updatedAt,
   );
-  SettingsEntityData copyWithCompanion(i1.SettingsEntityCompanion data) {
-    return SettingsEntityData(
+  MetadataEntityData copyWithCompanion(i1.MetadataEntityCompanion data) {
+    return MetadataEntityData(
       key: data.key.present ? data.key.value : this.key,
       value: data.value.present ? data.value.value : this.value,
       updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
@@ -343,7 +343,7 @@ class SettingsEntityData extends i0.DataClass
 
   @override
   String toString() {
-    return (StringBuffer('SettingsEntityData(')
+    return (StringBuffer('MetadataEntityData(')
           ..write('key: $key, ')
           ..write('value: $value, ')
           ..write('updatedAt: $updatedAt')
@@ -356,29 +356,29 @@ class SettingsEntityData extends i0.DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is i1.SettingsEntityData &&
+      (other is i1.MetadataEntityData &&
           other.key == this.key &&
           other.value == this.value &&
           other.updatedAt == this.updatedAt);
 }
 
-class SettingsEntityCompanion
-    extends i0.UpdateCompanion<i1.SettingsEntityData> {
+class MetadataEntityCompanion
+    extends i0.UpdateCompanion<i1.MetadataEntityData> {
   final i0.Value<String> key;
   final i0.Value<String> value;
   final i0.Value<DateTime> updatedAt;
-  const SettingsEntityCompanion({
+  const MetadataEntityCompanion({
     this.key = const i0.Value.absent(),
     this.value = const i0.Value.absent(),
     this.updatedAt = const i0.Value.absent(),
   });
-  SettingsEntityCompanion.insert({
+  MetadataEntityCompanion.insert({
     required String key,
     required String value,
     this.updatedAt = const i0.Value.absent(),
   }) : key = i0.Value(key),
        value = i0.Value(value);
-  static i0.Insertable<i1.SettingsEntityData> custom({
+  static i0.Insertable<i1.MetadataEntityData> custom({
     i0.Expression<String>? key,
     i0.Expression<String>? value,
     i0.Expression<DateTime>? updatedAt,
@@ -390,12 +390,12 @@ class SettingsEntityCompanion
     });
   }
 
-  i1.SettingsEntityCompanion copyWith({
+  i1.MetadataEntityCompanion copyWith({
     i0.Value<String>? key,
     i0.Value<String>? value,
     i0.Value<DateTime>? updatedAt,
   }) {
-    return i1.SettingsEntityCompanion(
+    return i1.MetadataEntityCompanion(
       key: key ?? this.key,
       value: value ?? this.value,
       updatedAt: updatedAt ?? this.updatedAt,
@@ -419,7 +419,7 @@ class SettingsEntityCompanion
 
   @override
   String toString() {
-    return (StringBuffer('SettingsEntityCompanion(')
+    return (StringBuffer('MetadataEntityCompanion(')
           ..write('key: $key, ')
           ..write('value: $value, ')
           ..write('updatedAt: $updatedAt')

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -13,7 +13,7 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/person.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
@@ -55,7 +55,7 @@ import 'package:logging/logging.dart';
     StoreEntity,
     TrashedLocalAssetEntity,
     AssetEditEntity,
-    SettingsEntity,
+    MetadataEntity,
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -98,7 +98,7 @@ class Drift extends $Drift {
   }
 
   @override
-  int get schemaVersion => 27;
+  int get schemaVersion => 26;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -276,9 +276,6 @@ class Drift extends $Drift {
           from25To26: (m, v26) async {
             await m.addColumn(v26.remoteAssetEntity, v26.remoteAssetEntity.uploadedAt);
           },
-          from26To27: (m, v27) async {
-            await customStatement('ALTER TABLE metadata RENAME TO settings');
-          },
         ),
       );
 

mobile/lib/infrastructure/repositories/db.repository.drift.dart

@@ -43,7 +43,7 @@ import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity
     as i20;
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart'
     as i21;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
     as i22;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
     as i23;
@@ -91,7 +91,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
       .$TrashedLocalAssetEntityTable(this);
   late final i21.$AssetEditEntityTable assetEditEntity = i21
       .$AssetEditEntityTable(this);
-  late final i22.$SettingsEntityTable settingsEntity = i22.$SettingsEntityTable(
+  late final i22.$MetadataEntityTable metadataEntity = i22.$MetadataEntityTable(
     this,
   );
   i23.MergedAssetDrift get mergedAssetDrift => i24.ReadDatabaseContainer(
@@ -132,7 +132,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
     storeEntity,
     trashedLocalAssetEntity,
     assetEditEntity,
-    settingsEntity,
+    metadataEntity,
     i10.idxPartnerSharedWithId,
     i11.idxLatLng,
     i11.idxRemoteExifCity,
@@ -395,6 +395,6 @@ class $DriftManager {
       );
   i21.$$AssetEditEntityTableTableManager get assetEditEntity =>
       i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
-  i22.$$SettingsEntityTableTableManager get settingsEntity =>
-      i22.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
+  i22.$$MetadataEntityTableTableManager get metadataEntity =>
+      i22.$$MetadataEntityTableTableManager(_db, _db.metadataEntity);
 }

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -13539,550 +13539,6 @@ i1.GeneratedColumn<String> _column_212(String aliasedName) =>
       type: i1.DriftSqlType.string,
       $customConstraints: 'NULL',
     );
-
-final class Schema27 extends i0.VersionedSchema {
-  Schema27({required super.database}) : super(version: 27);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAlbumAssetAlbumAsset,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxStackPrimaryAssetId,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    idxRemoteAssetStackId,
-    idxRemoteAssetOwnerVisibilityDeletedCreated,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    assetEditEntity,
-    settings,
-    idxPartnerSharedWithId,
-    idxLatLng,
-    idxRemoteExifCity,
-    idxRemoteAlbumAssetAlbumAsset,
-    idxRemoteAssetCloudId,
-    idxPersonOwnerId,
-    idxAssetFacePersonId,
-    idxAssetFaceAssetId,
-    idxAssetFaceVisiblePerson,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-    idxAssetEditAssetId,
-  ];
-  late final Shape33 userEntity = Shape33(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_110,
-        _column_111,
-        _column_112,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape50 remoteAssetEntity = Shape50(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_119,
-        _column_120,
-        _column_121,
-        _column_122,
-        _column_123,
-        _column_124,
-        _column_212,
-        _column_125,
-        _column_126,
-        _column_127,
-        _column_128,
-        _column_129,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape35 stackEntity = Shape35(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_130,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape36 localAssetEntity = Shape36(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_133,
-        _column_134,
-        _column_135,
-        _column_136,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape48 remoteAlbumEntity = Shape48(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_138,
-        _column_114,
-        _column_115,
-        _column_139,
-        _column_140,
-        _column_141,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape38 localAlbumEntity = Shape38(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_115,
-        _column_142,
-        _column_143,
-        _column_144,
-        _column_145,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape39 localAlbumAssetEntity = Shape39(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_146, _column_147, _column_145],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
-    'idx_local_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
-  );
-  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 idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxStackPrimaryAssetId = i1.Index(
-    'idx_stack_primary_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
-  );
-  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)',
-  );
-  final i1.Index idxRemoteAssetStackId = i1.Index(
-    'idx_remote_asset_stack_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
-    'idx_remote_asset_owner_visibility_deleted_created',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
-  );
-  late final Shape40 authUserEntity = Shape40(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_148,
-        _column_110,
-        _column_111,
-        _column_149,
-        _column_150,
-        _column_151,
-        _column_152,
-      ],
-      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_153, _column_154, _column_155],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape41 partnerEntity = Shape41(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_156, _column_157, _column_158],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape42 remoteExifEntity = Shape42(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_160,
-        _column_161,
-        _column_162,
-        _column_163,
-        _column_164,
-        _column_117,
-        _column_116,
-        _column_165,
-        _column_166,
-        _column_167,
-        _column_168,
-        _column_135,
-        _column_136,
-        _column_169,
-        _column_170,
-        _column_171,
-        _column_172,
-        _column_173,
-        _column_174,
-        _column_175,
-        _column_176,
-      ],
-      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_159, _column_177],
-      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_177, _column_153, _column_178],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape43 remoteAssetCloudIdEntity = Shape43(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_179,
-        _column_180,
-        _column_134,
-        _column_135,
-        _column_136,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape44 memoryEntity = Shape44(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_124,
-        _column_121,
-        _column_113,
-        _column_181,
-        _column_182,
-        _column_183,
-        _column_184,
-        _column_185,
-        _column_186,
-      ],
-      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_159, _column_187],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape45 personEntity = Shape45(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_108,
-        _column_188,
-        _column_189,
-        _column_190,
-        _column_191,
-        _column_192,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape46 assetFaceEntity = Shape46(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_193,
-        _column_194,
-        _column_195,
-        _column_196,
-        _column_197,
-        _column_198,
-        _column_199,
-        _column_200,
-        _column_201,
-        _column_124,
-      ],
-      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_202, _column_203, _column_204],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape47 trashedLocalAssetEntity = Shape47(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_205,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_206,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape32 assetEditEntity = Shape32(
-    source: i0.VersionedTable(
-      entityName: 'asset_edit_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_207,
-        _column_208,
-        _column_209,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape49 settings = Shape49(
-    source: i0.VersionedTable(
-      entityName: 'settings',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_211, _column_115],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxPartnerSharedWithId = i1.Index(
-    'idx_partner_shared_with_id',
-    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxRemoteExifCity = i1.Index(
-    'idx_remote_exif_city',
-    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
-  );
-  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
-    'idx_remote_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxRemoteAssetCloudId = i1.Index(
-    'idx_remote_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
-  );
-  final i1.Index idxPersonOwnerId = i1.Index(
-    'idx_person_owner_id',
-    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
-  );
-  final i1.Index idxAssetFacePersonId = i1.Index(
-    'idx_asset_face_person_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
-  );
-  final i1.Index idxAssetFaceAssetId = i1.Index(
-    'idx_asset_face_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
-  );
-  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
-    'idx_asset_face_visible_person',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-  final i1.Index idxAssetEditAssetId = i1.Index(
-    'idx_asset_edit_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
-  );
-}
-
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -14109,7 +13565,6 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
   required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
   required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
-  required Future<void> Function(i1.Migrator m, Schema27 schema) from26To27,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -14238,11 +13693,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from25To26(migrator, schema);
         return 26;
-      case 26:
-        final schema = Schema27(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from26To27(migrator, schema);
-        return 27;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -14275,7 +13725,6 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
   required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
   required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
-  required Future<void> Function(i1.Migrator m, Schema27 schema) from26To27,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -14303,6 +13752,5 @@ i1.OnUpgrade stepByStep({
     from23To24: from23To24,
     from24To25: from24To25,
     from25To26: from25To26,
-    from26To27: from26To27,
   ),
 );

mobile/lib/infrastructure/repositories/metadata.repository.dart

@@ -0,0 +1,72 @@
+import 'package:collection/collection.dart';
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class MetadataRepository extends DriftDatabaseRepository {
+  final Drift _db;
+
+  MetadataRepository._(this._db) : super(_db);
+
+  static MetadataRepository? _instance;
+
+  static MetadataRepository get instance {
+    final instance = _instance;
+    if (instance == null) {
+      throw StateError('MetadataRepository not initialized. Call ensureInitialized() first');
+    }
+    return instance;
+  }
+
+  AppConfig _appConfig = const .new();
+  AppConfig get appConfig => _appConfig;
+
+  static Future<MetadataRepository> ensureInitialized(Drift db) async {
+    if (_instance == null) {
+      final instance = MetadataRepository._(db);
+      await instance.refresh();
+      _instance = instance;
+    }
+    return _instance!;
+  }
+
+  Future<void> refresh() async => _applyOverrides(await _db.select(_db.metadataEntity).get());
+
+  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
+    if (value == _appConfig.read(key)) {
+      return;
+    }
+
+    if (value == defaultConfig.read(key)) {
+      await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.name))).go();
+    } else {
+      await _db
+          .into(_db.metadataEntity)
+          .insertOnConflictUpdate(
+            MetadataEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
+          );
+    }
+
+    _appConfig = _appConfig.write(key, value);
+  }
+
+  Stream<AppConfig> watchConfig() => _db.select(_db.metadataEntity).watch().map((rows) {
+    _applyOverrides(rows);
+    return _appConfig;
+  });
+
+  void _applyOverrides(List<MetadataEntityData> rows) {
+    _appConfig = AppConfig.fromEntries(
+      rows.fold({}, (overrides, row) {
+        final metadataKey = MetadataKey.values.firstWhereOrNull((key) => key.name == row.key);
+        if (metadataKey == null) {
+          return overrides;
+        }
+
+        return {...overrides, metadataKey: metadataKey.decode(row.value)};
+      }),
+    );
+  }
+}

mobile/lib/infrastructure/repositories/settings.repository.dart

@@ -1,84 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-
-class SettingsRepository extends DriftDatabaseRepository {
-  final Drift _db;
-
-  SettingsRepository._(this._db) : super(_db);
-
-  static SettingsRepository? _instance;
-
-  static SettingsRepository get instance {
-    final instance = _instance;
-    if (instance == null) {
-      throw StateError('SettingsRepository not initialized. Call ensureInitialized() first');
-    }
-    return instance;
-  }
-
-  AppConfig _appConfig = const .new();
-  AppConfig get appConfig => _appConfig;
-
-  static Future<SettingsRepository> ensureInitialized(Drift db) async {
-    if (_instance == null) {
-      final instance = SettingsRepository._(db);
-      await instance.refresh();
-      _instance = instance;
-    }
-    return _instance!;
-  }
-
-  Future<void> refresh() async => _applyOverrides(await _db.select(_db.settingsEntity).get());
-
-  Future<void> clear(Iterable<SettingsKey> keys) async {
-    if (keys.isEmpty) {
-      return;
-    }
-
-    final names = keys.map((key) => key.name).toList();
-    await (_db.delete(_db.settingsEntity)..where((row) => row.key.isIn(names))).go();
-
-    for (final key in keys) {
-      _appConfig = _appConfig.write(key, defaultConfig.read(key));
-    }
-  }
-
-  Future<void> write<T extends Object, U extends T>(SettingsKey<T> key, U value) async {
-    if (value == _appConfig.read(key)) {
-      return;
-    }
-
-    if (value == defaultConfig.read(key)) {
-      return clear([key]);
-    }
-
-    await _db
-        .into(_db.settingsEntity)
-        .insertOnConflictUpdate(
-          SettingsEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
-        );
-    _appConfig = _appConfig.write(key, value);
-  }
-
-  Stream<AppConfig> watchConfig() => _db.select(_db.settingsEntity).watch().map((rows) {
-    _applyOverrides(rows);
-    return _appConfig;
-  });
-
-  void _applyOverrides(List<SettingsEntityData> rows) {
-    _appConfig = AppConfig.fromEntries(
-      rows.fold({}, (overrides, row) {
-        final metadataKey = SettingsKey.values.firstWhereOrNull((key) => key.name == row.key);
-        if (metadataKey == null) {
-          return overrides;
-        }
-
-        return {...overrides, metadataKey: metadataKey.decode(row.value)};
-      }),
-    );
-  }
-}

mobile/lib/main.dart

@@ -25,7 +25,7 @@ import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/locale_provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';

mobile/lib/pages/backup/drift_backup_album_selection.page.dart

@@ -8,11 +8,11 @@ import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 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/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
@@ -103,7 +103,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
             return;
           }
 
-          final isBackupEnabled = SettingsRepository.instance.appConfig.backup.enabled;
+          final isBackupEnabled = MetadataRepository.instance.appConfig.backup.enabled;
           await ref.read(driftBackupProvider.notifier).getBackupStatus(user.id);
           final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
           final totalChanged = currentTotalAssetCount != _initialTotalAssetCount;

mobile/lib/pages/backup/drift_backup_options.page.dart

@@ -4,10 +4,10 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/settings/backup_settings/drift_backup_settings.dart';
 import 'package:logging/logging.dart';
@@ -27,7 +27,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
         // There is an issue with Flutter where the pop event
         // can be triggered multiple times, so we guard it with _hasPopped
 
-        final currentBackup = ref.read(appConfigProvider).backup;
+        final currentBackup = ref.read(metadataProvider).appConfig.backup;
         final currentCellularForVideos = currentBackup.useCellularForVideos;
         final currentCellularForPhotos = currentBackup.useCellularForPhotos;
 
@@ -45,7 +45,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
           }
 
           await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-          final isBackupEnabled = SettingsRepository.instance.appConfig.backup.enabled;
+          final isBackupEnabled = MetadataRepository.instance.appConfig.backup.enabled;
           if (!isBackupEnabled) {
             return;
           }

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

@@ -3,9 +3,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 
 class SettingsHeader {
   String key = "";
@@ -21,7 +22,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
     final headers = useState<List<SettingsHeader>>([]);
     final setInitialHeaders = useState(false);
 
-    final storedHeaders = ref.read(appConfigProvider).network.customHeaders;
+    final storedHeaders = ref.read(metadataProvider).appConfig.network.customHeaders;
     if (!setInitialHeaders.value) {
       storedHeaders.forEach((k, v) {
         final header = SettingsHeader();
@@ -93,7 +94,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
       headersMap[key] = value;
     }
 
-    await ref.read(settingsProvider).write(.networkCustomHeaders, headersMap);
+    await ref.read(metadataProvider).write(MetadataKey.networkCustomHeaders, headersMap);
     await ref.read(apiServiceProvider).updateHeaders();
   }
 }

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

@@ -12,7 +12,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
@@ -341,7 +341,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                 await backgroundManager.hashAssets();
               }
 
-              if (SettingsRepository.instance.appConfig.backup.syncAlbums) {
+              if (MetadataRepository.instance.appConfig.backup.syncAlbums) {
                 await backgroundManager.syncLinkedAlbum();
               }
             } catch (e) {
@@ -370,7 +370,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
   }
 
   Future<void> _resumeBackup(DriftBackupNotifier notifier) async {
-    final isEnableBackup = SettingsRepository.instance.appConfig.backup.enabled;
+    final isEnableBackup = MetadataRepository.instance.appConfig.backup.enabled;
 
     if (isEnableBackup) {
       final currentUser = Store.tryGet(StoreKey.currentUser);

mobile/lib/presentation/pages/drift_slideshow.page.dart

@@ -17,7 +17,7 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.wid
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';

mobile/lib/presentation/widgets/album/album_selector.widget.dart

@@ -15,11 +15,12 @@ import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/album/new_album_name_modal.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -57,7 +58,7 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
     super.initState();
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      final albumConfig = ref.read(appConfigProvider).album;
+      final albumConfig = ref.read(metadataProvider).appConfig.album;
 
       setState(() {
         sort = AlbumSort(mode: albumConfig.sortMode, isReverse: albumConfig.isReverse);
@@ -93,7 +94,7 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
     setState(() {
       isGrid = !isGrid;
     });
-    ref.read(settingsProvider).write(.albumIsGrid, isGrid);
+    ref.read(metadataProvider).write(MetadataKey.albumIsGrid, isGrid);
   }
 
   void changeFilter(QuickFilterMode mode) {
@@ -109,9 +110,9 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
       this.sort = sort;
     });
 
-    final metadata = ref.read(settingsProvider);
-    await metadata.write(.albumSortMode, sort.mode);
-    await metadata.write(.albumIsReverse, sort.isReverse);
+    final metadata = ref.read(metadataProvider);
+    await metadata.write(MetadataKey.albumSortMode, sort.mode);
+    await metadata.write(MetadataKey.albumIsReverse, sort.isReverse);
 
     await sortAlbums();
   }

mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart

@@ -19,7 +19,7 @@ import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
@@ -241,7 +241,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
       return;
     }
 
-    final tapToNavigate = ref.read(appConfigProvider).viewer.tapToNavigate;
+    final tapToNavigate = ref.read(metadataProvider).appConfig.viewer.tapToNavigate;
     if (!tapToNavigate) {
       _viewer.toggleControls();
       return;

mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart

@@ -12,7 +12,7 @@ import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.pro
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:logging/logging.dart';
 import 'package:native_video_player/native_video_player.dart';
@@ -128,7 +128,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
       final remoteId = (videoAsset as RemoteAsset).id;
 
       final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-      final isOriginalVideo = ref.read(appConfigProvider).viewer.loadOriginalVideo;
+      final isOriginalVideo = ref.read(metadataProvider).appConfig.viewer.loadOriginalVideo;
       final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
       final String videoUrl = videoAsset.livePhotoVideoId != null
           ? '$serverEndpoint/assets/${videoAsset.livePhotoVideoId}/$postfixUrl'
@@ -161,7 +161,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
       return;
     }
 
-    final autoPlayVideo = ref.read(appConfigProvider).viewer.autoPlayVideo;
+    final autoPlayVideo = ref.read(metadataProvider).appConfig.viewer.autoPlayVideo;
     if (autoPlayVideo || widget.asset.isMotionPhoto) {
       await _notifier.play();
     }
@@ -212,7 +212,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
     }
 
     await _notifier.load(source);
-    final loopVideo = ref.read(appConfigProvider).viewer.loopVideo;
+    final loopVideo = ref.read(metadataProvider).appConfig.viewer.loopVideo;
     await _notifier.setLoop(!widget.asset.isMotionPhoto && loopVideo);
     await _notifier.setVolume(1);
   }

mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart

@@ -2,6 +2,7 @@ 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/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
@@ -33,7 +34,7 @@ class ViewerKebabMenu extends ConsumerWidget {
     final isInLockedView = ref.watch(inLockedViewProvider);
     final currentAlbum = ref.watch(currentRemoteAlbumProvider);
     final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
-    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
+    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
 
     final actionContext = ActionButtonContext(
       asset: asset,

mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 
 class BackupToggleButton extends ConsumerStatefulWidget {
   final VoidCallback onStart;
@@ -30,7 +31,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton> with Sin
       end: 1,
     ).animate(CurvedAnimation(parent: _animationController, curve: Curves.easeInOut));
 
-    _isEnabled = ref.read(appConfigProvider).backup.enabled;
+    _isEnabled = ref.read(metadataProvider).appConfig.backup.enabled;
   }
 
   @override
@@ -40,7 +41,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton> with Sin
   }
 
   Future<void> _onToggle(bool value) async {
-    await ref.read(settingsProvider).write(.backupEnabled, value);
+    await ref.read(metadataProvider).write(MetadataKey.backupEnabled, value);
 
     setState(() {
       _isEnabled = value;

mobile/lib/presentation/widgets/images/image_provider.dart

@@ -4,7 +4,7 @@ import 'package:async/async.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
@@ -189,5 +189,5 @@ ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnai
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
     asset.hasLocal &&
-    (!asset.hasRemote || !SettingsRepository.instance.appConfig.image.preferRemote) &&
+    (!asset.hasRemote || !MetadataRepository.instance.appConfig.image.preferRemote) &&
     !asset.isEdited;

mobile/lib/presentation/widgets/images/local_image_provider.dart

@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/animated_image_stream_completer.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
@@ -104,7 +104,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
       return;
     }
 
-    final loadOriginal = SettingsRepository.instance.appConfig.image.loadOriginal;
+    final loadOriginal = MetadataRepository.instance.appConfig.image.loadOriginal;
     final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
     var request = this.request = LocalImageRequest(
       localId: key.id,

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/animated_image_stream_completer.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
@@ -122,7 +122,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
         edited: key.edited,
       ),
     );
-    final loadOriginal = assetType == AssetType.image && SettingsRepository.instance.appConfig.image.loadOriginal;
+    final loadOriginal = assetType == AssetType.image && MetadataRepository.instance.appConfig.image.loadOriginal;
     yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
 
     if (!loadOriginal) {

mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart

@@ -9,7 +9,7 @@ import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart'
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class ThumbnailTile extends ConsumerStatefulWidget {

mobile/lib/presentation/widgets/map/map.state.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/map.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/map/map_state.provider.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
@@ -80,25 +81,25 @@ class MapStateNotifier extends Notifier<MapState> {
   }
 
   void switchFavoriteOnly(bool isFavoriteOnly) {
-    ref.read(settingsProvider).write(.mapShowFavoriteOnly, isFavoriteOnly);
+    ref.read(metadataProvider).write(MetadataKey.mapShowFavoriteOnly, isFavoriteOnly);
     state = state.copyWith(onlyFavorites: isFavoriteOnly);
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   void switchIncludeArchived(bool isIncludeArchived) {
-    ref.read(settingsProvider).write(.mapIncludeArchived, isIncludeArchived);
+    ref.read(metadataProvider).write(MetadataKey.mapIncludeArchived, isIncludeArchived);
     state = state.copyWith(includeArchived: isIncludeArchived);
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   void switchWithPartners(bool isWithPartners) {
-    ref.read(settingsProvider).write(.mapWithPartners, isWithPartners);
+    ref.read(metadataProvider).write(MetadataKey.mapWithPartners, isWithPartners);
     state = state.copyWith(withPartners: isWithPartners);
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   void setRelativeTime(int relativeDays) {
-    ref.read(settingsProvider).write(.mapRelativeDate, relativeDays);
+    ref.read(metadataProvider).write(MetadataKey.mapRelativeDate, relativeDays);
     state = state.copyWith(relativeDays: relativeDays);
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }

mobile/lib/presentation/widgets/timeline/timeline.state.dart

@@ -5,7 +5,7 @@ import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/fixed/segment_builder.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 
 class TimelineArgs {

mobile/lib/presentation/widgets/timeline/timeline.widget.dart

@@ -10,6 +10,7 @@ import 'package:flutter/rendering.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 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';
@@ -21,7 +22,7 @@ import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.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/presentation/widgets/timeline/timeline_drag_region.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -458,7 +459,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                             _restoreAssetIndex = targetAssetIndex;
                           });
 
-                          ref.read(settingsProvider).write(.timelineTilesPerRow, _perRow);
+                          ref.read(metadataProvider).write(MetadataKey.timelineTilesPerRow, _perRow);
                         }
                       };
                     },

mobile/lib/providers/app_life_cycle.provider.dart

@@ -9,8 +9,8 @@ import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/notification_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -107,7 +107,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     await Future.delayed(const Duration(milliseconds: 500));
 
     final backgroundManager = _ref.read(backgroundSyncProvider);
-    final isAlbumLinkedSyncEnable = _ref.read(appConfigProvider).backup.syncAlbums;
+    final isAlbumLinkedSyncEnable = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
 
     try {
       bool syncSuccess = false;
@@ -137,7 +137,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
   }
 
   Future<void> _resumeBackup() async {
-    final isEnableBackup = _ref.read(appConfigProvider).backup.enabled;
+    final isEnableBackup = _ref.read(metadataProvider).appConfig.backup.enabled;
 
     if (isEnableBackup) {
       final currentUser = Store.tryGet(StoreKey.currentUser);

mobile/lib/providers/auth.provider.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter_udid/flutter_udid.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
@@ -10,7 +11,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/models/auth/auth_state.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
@@ -129,7 +130,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
     await _apiService.updateHeaders();
 
     final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-    final headerMap = _ref.read(appConfigProvider).network.customHeaders;
+    final headerMap = _ref.read(metadataProvider).appConfig.network.customHeaders;
     final customHeaders = headerMap.isEmpty ? null : jsonEncode(headerMap);
     await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);
 
@@ -178,19 +179,19 @@ class AuthNotifier extends StateNotifier<AuthState> {
   }
 
   Future<void> saveWifiName(String wifiName) async {
-    await _ref.read(settingsProvider).write(.networkPreferredWifiName, wifiName);
+    await _ref.read(metadataProvider).write(MetadataKey.networkPreferredWifiName, wifiName);
   }
 
   Future<void> saveLocalEndpoint(String url) async {
-    await _ref.read(settingsProvider).write(.networkLocalEndpoint, url);
+    await _ref.read(metadataProvider).write(MetadataKey.networkLocalEndpoint, url);
   }
 
   String? getSavedWifiName() {
-    return _ref.read(appConfigProvider).network.preferredWifiName;
+    return _ref.read(metadataProvider).appConfig.network.preferredWifiName;
   }
 
   String? getSavedLocalEndpoint() {
-    return _ref.read(appConfigProvider).network.localEndpoint;
+    return _ref.read(metadataProvider).appConfig.network.localEndpoint;
   }
 
   /// Returns the current server endpoint (with /api) URL from the store

mobile/lib/providers/cleanup.provider.dart

@@ -1,8 +1,8 @@
 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/settings.repository.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/cleanup.service.dart';
 
@@ -54,21 +54,21 @@ final cleanupProvider = StateNotifierProvider<CleanupNotifier, CleanupState>((re
   return CleanupNotifier(
     ref.watch(cleanupServiceProvider),
     ref.watch(currentUserProvider)?.id,
-    ref.watch(settingsProvider),
+    ref.watch(metadataProvider),
   );
 });
 
 class CleanupNotifier extends StateNotifier<CleanupState> {
   final CleanupService _cleanupService;
   final String? _userId;
-  final SettingsRepository _settingsRepository;
+  final MetadataRepository _metadataRepository;
 
-  CleanupNotifier(this._cleanupService, this._userId, this._settingsRepository) : super(const CleanupState()) {
+  CleanupNotifier(this._cleanupService, this._userId, this._metadataRepository) : super(const CleanupState()) {
     _loadPersistedSettings();
   }
 
   void _loadPersistedSettings() {
-    final cleanup = _settingsRepository.appConfig.cleanup;
+    final cleanup = _metadataRepository.appConfig.cleanup;
     final keepFavorites = cleanup.keepFavorites;
     final keepMediaType = cleanup.keepMediaType;
     final keepAlbumIds = cleanup.keepAlbumIds.toSet();
@@ -87,18 +87,18 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
     state = state.copyWith(selectedDate: date, assetsToDelete: []);
     if (date != null) {
       final daysAgo = DateTime.now().difference(date).inDays;
-      _settingsRepository.write(.cleanupCutoffDaysAgo, daysAgo);
+      _metadataRepository.write(.cleanupCutoffDaysAgo, daysAgo);
     }
   }
 
   void setKeepMediaType(AssetKeepType keepMediaType) {
     state = state.copyWith(keepMediaType: keepMediaType, assetsToDelete: []);
-    _settingsRepository.write(.cleanupKeepMediaType, keepMediaType);
+    _metadataRepository.write(.cleanupKeepMediaType, keepMediaType);
   }
 
   void setKeepFavorites(bool keepFavorites) {
     state = state.copyWith(keepFavorites: keepFavorites, assetsToDelete: []);
-    _settingsRepository.write(.cleanupKeepFavorites, keepFavorites);
+    _metadataRepository.write(.cleanupKeepFavorites, keepFavorites);
   }
 
   void toggleKeepAlbum(String albumId) {
@@ -118,7 +118,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
   }
 
   void _persistExcludedAlbumIds(Set<String> albumIds) {
-    _settingsRepository.write(.cleanupKeepAlbumIds, albumIds.toList());
+    _metadataRepository.write(.cleanupKeepAlbumIds, albumIds.toList());
   }
 
   void cleanupStaleAlbumIds(Set<String> existingAlbumIds) {
@@ -131,7 +131,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
   }
 
   void applyDefaultAlbumSelections(List<(String id, String name)> albums) {
-    final isInitialized = _settingsRepository.appConfig.cleanup.defaultsInitialized;
+    final isInitialized = _metadataRepository.appConfig.cleanup.defaultsInitialized;
     if (isInitialized) {
       return;
     }
@@ -144,7 +144,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
       _persistExcludedAlbumIds(keepAlbumIds);
     }
 
-    _settingsRepository.write(.cleanupDefaultsInitialized, true);
+    _metadataRepository.write(.cleanupDefaultsInitialized, true);
   }
 
   Future<void> scanAssets() async {

mobile/lib/providers/infrastructure/metadata.provider.dart

@@ -1,11 +1,11 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 
-final settingsProvider = Provider.autoDispose<SettingsRepository>((_) => SettingsRepository.instance);
+final metadataProvider = Provider.autoDispose<MetadataRepository>((_) => MetadataRepository.instance);
 
 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
-  final repo = ref.watch(settingsProvider);
+  final repo = ref.watch(metadataProvider);
   final subscription = repo.watchConfig().listen((event) => ref.state = event);
   ref.onDispose(subscription.cancel);
   return repo.appConfig;

mobile/lib/providers/infrastructure/timeline.provider.dart

@@ -3,7 +3,7 @@ import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 
 final timelineRepositoryProvider = Provider<DriftTimelineRepository>(
@@ -29,7 +29,7 @@ final timelineServiceProvider = Provider<TimelineService>(
 final timelineFactoryProvider = Provider<TimelineFactory>(
   (ref) => TimelineFactory(
     timelineRepository: ref.watch(timelineRepositoryProvider),
-    settingsRepository: ref.watch(settingsProvider),
+    metadataRepository: ref.watch(metadataProvider),
   ),
 );
 

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

@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/models/map/map_state.model.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 
 final mapStateNotifierProvider = NotifierProvider<MapStateNotifier, MapState>(MapStateNotifier.new);
@@ -26,12 +27,12 @@ class MapStateNotifier extends Notifier<MapState> {
   }
 
   void switchTheme(ThemeMode mode) {
-    ref.read(settingsProvider).write(.mapThemeMode, mode);
+    ref.read(metadataProvider).write(MetadataKey.mapThemeMode, mode);
     state = state.copyWith(themeMode: mode);
   }
 
   void switchFavoriteOnly(bool isFavoriteOnly) {
-    ref.read(settingsProvider).write(.mapShowFavoriteOnly, isFavoriteOnly);
+    ref.read(metadataProvider).write(MetadataKey.mapShowFavoriteOnly, isFavoriteOnly);
     state = state.copyWith(showFavoriteOnly: isFavoriteOnly, shouldRefetchMarkers: true);
   }
 
@@ -40,17 +41,17 @@ class MapStateNotifier extends Notifier<MapState> {
   }
 
   void switchIncludeArchived(bool isIncludeArchived) {
-    ref.read(settingsProvider).write(.mapIncludeArchived, isIncludeArchived);
+    ref.read(metadataProvider).write(MetadataKey.mapIncludeArchived, isIncludeArchived);
     state = state.copyWith(includeArchived: isIncludeArchived, shouldRefetchMarkers: true);
   }
 
   void switchWithPartners(bool isWithPartners) {
-    ref.read(settingsProvider).write(.mapWithPartners, isWithPartners);
+    ref.read(metadataProvider).write(MetadataKey.mapWithPartners, isWithPartners);
     state = state.copyWith(withPartners: isWithPartners, shouldRefetchMarkers: true);
   }
 
   void setRelativeTime(int relativeTime) {
-    ref.read(settingsProvider).write(.mapRelativeDate, relativeTime);
+    ref.read(metadataProvider).write(MetadataKey.mapRelativeDate, relativeTime);
     state = state.copyWith(relativeTime: relativeTime, shouldRefetchMarkers: true);
   }
 }

mobile/lib/providers/theme.provider.dart

@@ -1,5 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
 import 'package:immich_mobile/theme/theme_data.dart';

mobile/lib/providers/websocket.provider.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/infrastructure/repositories/network.repository.dar
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -193,7 +193,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
       return;
     }
 
-    final isSyncAlbumEnabled = _ref.read(appConfigProvider).backup.syncAlbums;
+    final isSyncAlbumEnabled = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
     try {
       unawaited(
         _ref.read(backgroundSyncProvider).syncWebsocketBatchV1(_batchedAssetUploadReady.toList()).then((_) {
@@ -214,7 +214,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
       return;
     }
 
-    final isSyncAlbumEnabled = _ref.read(appConfigProvider).backup.syncAlbums;
+    final isSyncAlbumEnabled = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
     try {
       unawaited(
         _ref.read(backgroundSyncProvider).syncWebsocketBatchV2(_batchedAssetUploadReady.toList()).then((_) {

mobile/lib/repositories/auth.repository.dart

@@ -4,7 +4,7 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 
 final authRepositoryProvider = Provider<AuthRepository>(
   (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(appConfigProvider)),

mobile/lib/services/api.service.dart

@@ -5,7 +5,7 @@ import 'dart:io';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -13,7 +13,7 @@ import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
 class ApiService {
-  final ApiClient _apiClient = ApiClient(basePath: '');
+  late ApiClient _apiClient;
 
   late UsersApi usersApi;
   late AuthenticationApi authenticationApi;
@@ -54,7 +54,7 @@ class ApiService {
   }
 
   setEndpoint(String endpoint) {
-    _apiClient.basePath = endpoint;
+    _apiClient = ApiClient(basePath: endpoint);
     _apiClient.client = NetworkRepository.client;
     usersApi = UsersApi(_apiClient);
     authenticationApi = AuthenticationApi(_apiClient);
@@ -177,7 +177,7 @@ class ApiService {
     if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
       urls.add(serverEndpoint);
     }
-    final network = SettingsRepository.instance.appConfig.network;
+    final network = MetadataRepository.instance.appConfig.network;
     final localEndpoint = network.localEndpoint;
     if (localEndpoint.isNotEmpty) {
       urls.add(localEndpoint);
@@ -191,7 +191,7 @@ class ApiService {
   }
 
   static Map<String, String> getRequestHeaders() {
-    return SettingsRepository.instance.appConfig.network.customHeaders;
+    return MetadataRepository.instance.appConfig.network.customHeaders;
   }
 
   ApiClient get apiClient => _apiClient;

mobile/lib/services/auth.service.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
@@ -100,7 +100,7 @@ class AuthService {
         _log.severe("Error clearing local data", error, stackTrace);
       });
 
-      await SettingsRepository.instance.write(SettingsKey.backupEnabled, false);
+      await MetadataRepository.instance.write(MetadataKey.backupEnabled, false);
     }
   }
 
@@ -110,7 +110,7 @@ class AuthService {
   /// - Authentication repository data
   /// - Current user information
   /// - Access token
-  /// - Server-specific endpoint configuration
+  /// - Asset ETag
   ///
   /// All deletions are executed in parallel using [Future.wait].
   Future<void> clearLocalData() async {
@@ -120,12 +120,6 @@ class AuthService {
       _authRepository.clearLocalData(),
       Store.delete(StoreKey.currentUser),
       Store.delete(StoreKey.accessToken),
-      SettingsRepository.instance.clear(const [
-        .networkAutoEndpointSwitching,
-        .networkPreferredWifiName,
-        .networkLocalEndpoint,
-        .networkExternalEndpointList,
-      ]),
     ]);
   }
 

mobile/lib/services/background_upload.service.dart

@@ -13,7 +13,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
@@ -359,7 +359,7 @@ class BackgroundUploadService {
   }
 
   bool _shouldRequireWiFi(LocalAsset asset) {
-    final backup = SettingsRepository.instance.appConfig.backup;
+    final backup = MetadataRepository.instance.appConfig.backup;
     if (asset.isVideo && backup.useCellularForVideos) {
       return false;
     }

mobile/lib/services/foreground_upload.service.dart

@@ -11,7 +11,7 @@ import 'package:immich_mobile/extensions/network_capability_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
@@ -451,7 +451,7 @@ class ForegroundUploadService {
   }
 
   bool _shouldRequireWiFi(LocalAsset asset) {
-    final backup = SettingsRepository.instance.appConfig.backup;
+    final backup = MetadataRepository.instance.appConfig.backup;
     if (asset.isVideo && backup.useCellularForVideos) {
       return false;
     }

mobile/lib/utils/bootstrap.dart

@@ -6,7 +6,7 @@ import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -49,11 +49,11 @@ abstract final class Bootstrap {
 
     await StoreService.init(storeRepository: storeRepo, listenUpdates: listenStoreUpdates);
 
-    final settingsRepo = await SettingsRepository.ensureInitialized(drift);
+    final metadataRepo = await MetadataRepository.ensureInitialized(drift);
 
     await LogService.init(
       logRepository: LogRepository(logDb),
-      settingsRepository: settingsRepo,
+      metadataRepository: metadataRepo,
       shouldBuffer: shouldBufferLogs,
     );
 

mobile/lib/utils/migration.dart

@@ -8,11 +8,11 @@ import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
@@ -74,65 +74,65 @@ Future<void> _migrateTo25() async {
 
 Future<void> _migrateTo26(Drift drift) async {
   final migrator = _StoreMigrator(drift);
-  await migrator.migrateEnumIndex(StoreKey.legacyLogLevel, SettingsKey.logLevel, LogLevel.values);
+  await migrator.migrateEnumIndex(StoreKey.legacyLogLevel, MetadataKey.logLevel, LogLevel.values);
   // Theme
-  await migrator.migrateEnumName(StoreKey.legacyThemeMode, SettingsKey.themeMode, ThemeMode.values);
-  await migrator.migrateEnumName(StoreKey.legacyPrimaryColor, SettingsKey.themePrimaryColor, ImmichColorPreset.values);
-  await migrator.migrateBool(StoreKey.legacyDynamicTheme, SettingsKey.themeDynamic);
-  await migrator.migrateBool(StoreKey.legacyColorfulInterface, SettingsKey.themeColorfulInterface);
+  await migrator.migrateEnumName(StoreKey.legacyThemeMode, MetadataKey.themeMode, ThemeMode.values);
+  await migrator.migrateEnumName(StoreKey.legacyPrimaryColor, MetadataKey.themePrimaryColor, ImmichColorPreset.values);
+  await migrator.migrateBool(StoreKey.legacyDynamicTheme, MetadataKey.themeDynamic);
+  await migrator.migrateBool(StoreKey.legacyColorfulInterface, MetadataKey.themeColorfulInterface);
   // Cleanup
   final cleanupKeepAlbumIds = await migrator.readLegacyStoreString(StoreKey.legacyCleanupKeepAlbumIds.id);
   if (cleanupKeepAlbumIds != null) {
     final ids = cleanupKeepAlbumIds.split(',').where((id) => id.isNotEmpty).toList();
-    migrator.stage(StoreKey.legacyCleanupKeepAlbumIds, SettingsKey.cleanupKeepAlbumIds, ids);
+    migrator.stage(StoreKey.legacyCleanupKeepAlbumIds, MetadataKey.cleanupKeepAlbumIds, ids);
   }
-  await migrator.migrateBool(StoreKey.legacyCleanupKeepFavorites, SettingsKey.cleanupKeepFavorites);
+  await migrator.migrateBool(StoreKey.legacyCleanupKeepFavorites, MetadataKey.cleanupKeepFavorites);
   await migrator.migrateEnumIndex(
     StoreKey.legacyCleanupKeepMediaType,
-    SettingsKey.cleanupKeepMediaType,
+    MetadataKey.cleanupKeepMediaType,
     AssetKeepType.values,
   );
-  await migrator.migrateInt(StoreKey.legacyCleanupCutoffDaysAgo, SettingsKey.cleanupCutoffDaysAgo);
-  await migrator.migrateBool(StoreKey.legacyCleanupDefaultsInitialized, SettingsKey.cleanupDefaultsInitialized);
+  await migrator.migrateInt(StoreKey.legacyCleanupCutoffDaysAgo, MetadataKey.cleanupCutoffDaysAgo);
+  await migrator.migrateBool(StoreKey.legacyCleanupDefaultsInitialized, MetadataKey.cleanupDefaultsInitialized);
   // Map
-  await migrator.migrateBool(StoreKey.legacyMapShowFavoriteOnly, SettingsKey.mapShowFavoriteOnly);
-  await migrator.migrateInt(StoreKey.legacyMapRelativeDate, SettingsKey.mapRelativeDate);
-  await migrator.migrateBool(StoreKey.legacyMapIncludeArchived, SettingsKey.mapIncludeArchived);
-  await migrator.migrateEnumIndex(StoreKey.legacyMapThemeMode, SettingsKey.mapThemeMode, ThemeMode.values);
-  await migrator.migrateBool(StoreKey.legacyMapwithPartners, SettingsKey.mapWithPartners);
+  await migrator.migrateBool(StoreKey.legacyMapShowFavoriteOnly, MetadataKey.mapShowFavoriteOnly);
+  await migrator.migrateInt(StoreKey.legacyMapRelativeDate, MetadataKey.mapRelativeDate);
+  await migrator.migrateBool(StoreKey.legacyMapIncludeArchived, MetadataKey.mapIncludeArchived);
+  await migrator.migrateEnumIndex(StoreKey.legacyMapThemeMode, MetadataKey.mapThemeMode, ThemeMode.values);
+  await migrator.migrateBool(StoreKey.legacyMapwithPartners, MetadataKey.mapWithPartners);
   // Timeline
-  await migrator.migrateInt(StoreKey.legacyTilesPerRow, SettingsKey.timelineTilesPerRow);
+  await migrator.migrateInt(StoreKey.legacyTilesPerRow, MetadataKey.timelineTilesPerRow);
   await migrator.migrateEnumIndex(
     StoreKey.legacyGroupAssetsBy,
-    SettingsKey.timelineGroupAssetsBy,
+    MetadataKey.timelineGroupAssetsBy,
     GroupAssetsBy.values,
   );
-  await migrator.migrateBool(StoreKey.legacyStorageIndicator, SettingsKey.timelineStorageIndicator);
+  await migrator.migrateBool(StoreKey.legacyStorageIndicator, MetadataKey.timelineStorageIndicator);
   // Image
-  await migrator.migrateBool(StoreKey.legacyPreferRemoteImage, SettingsKey.imagePreferRemote);
-  await migrator.migrateBool(StoreKey.legacyLoadOriginal, SettingsKey.imageLoadOriginal);
+  await migrator.migrateBool(StoreKey.legacyPreferRemoteImage, MetadataKey.imagePreferRemote);
+  await migrator.migrateBool(StoreKey.legacyLoadOriginal, MetadataKey.imageLoadOriginal);
   // Viewer
-  await migrator.migrateBool(StoreKey.legacyLoopVideo, SettingsKey.viewerLoopVideo);
-  await migrator.migrateBool(StoreKey.legacyLoadOriginalVideo, SettingsKey.viewerLoadOriginalVideo);
-  await migrator.migrateBool(StoreKey.legacyAutoPlayVideo, SettingsKey.viewerAutoPlayVideo);
-  await migrator.migrateBool(StoreKey.legacyTapToNavigate, SettingsKey.viewerTapToNavigate);
+  await migrator.migrateBool(StoreKey.legacyLoopVideo, MetadataKey.viewerLoopVideo);
+  await migrator.migrateBool(StoreKey.legacyLoadOriginalVideo, MetadataKey.viewerLoadOriginalVideo);
+  await migrator.migrateBool(StoreKey.legacyAutoPlayVideo, MetadataKey.viewerAutoPlayVideo);
+  await migrator.migrateBool(StoreKey.legacyTapToNavigate, MetadataKey.viewerTapToNavigate);
   // Network
-  await migrator.migrateBool(StoreKey.legacyAutoEndpointSwitching, SettingsKey.networkAutoEndpointSwitching);
-  await migrator.migrateString(StoreKey.legacyPreferredWifiName, SettingsKey.networkPreferredWifiName);
-  await migrator.migrateString(StoreKey.legacyLocalEndpoint, SettingsKey.networkLocalEndpoint);
+  await migrator.migrateBool(StoreKey.legacyAutoEndpointSwitching, MetadataKey.networkAutoEndpointSwitching);
+  await migrator.migrateString(StoreKey.legacyPreferredWifiName, MetadataKey.networkPreferredWifiName);
+  await migrator.migrateString(StoreKey.legacyLocalEndpoint, MetadataKey.networkLocalEndpoint);
   await _migrateExternalEndpointList(migrator);
   await _migrateCustomHeaders(migrator);
   // Album
   await _migrateAlbumSortMode(migrator);
-  await migrator.migrateBool(StoreKey.legacySelectedAlbumSortReverse, SettingsKey.albumIsReverse);
-  await migrator.migrateBool(StoreKey.legacyAlbumGridView, SettingsKey.albumIsGrid);
+  await migrator.migrateBool(StoreKey.legacySelectedAlbumSortReverse, MetadataKey.albumIsReverse);
+  await migrator.migrateBool(StoreKey.legacyAlbumGridView, MetadataKey.albumIsGrid);
   // Backup
-  await migrator.migrateBool(StoreKey.legacyEnableBackup, SettingsKey.backupEnabled);
-  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadVideos, SettingsKey.backupUseCellularForVideos);
-  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadPhotos, SettingsKey.backupUseCellularForPhotos);
-  await migrator.migrateBool(StoreKey.legacyBackupRequireCharging, SettingsKey.backupRequireCharging);
-  await migrator.migrateInt(StoreKey.legacyBackupTriggerDelay, SettingsKey.backupTriggerDelay);
-  await migrator.migrateBool(StoreKey.legacySyncAlbums, SettingsKey.backupSyncAlbums);
+  await migrator.migrateBool(StoreKey.legacyEnableBackup, MetadataKey.backupEnabled);
+  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadVideos, MetadataKey.backupUseCellularForVideos);
+  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadPhotos, MetadataKey.backupUseCellularForPhotos);
+  await migrator.migrateBool(StoreKey.legacyBackupRequireCharging, MetadataKey.backupRequireCharging);
+  await migrator.migrateInt(StoreKey.legacyBackupTriggerDelay, MetadataKey.backupTriggerDelay);
+  await migrator.migrateBool(StoreKey.legacySyncAlbums, MetadataKey.backupSyncAlbums);
   await migrator.complete();
 }
 
@@ -143,7 +143,7 @@ Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
     return;
   }
 
-  migrator.stage(StoreKey.legacySelectedAlbumSortOrder, SettingsKey.albumSortMode, mode);
+  migrator.stage(StoreKey.legacySelectedAlbumSortOrder, MetadataKey.albumSortMode, mode);
 }
 
 Future<void> _migrateExternalEndpointList(_StoreMigrator migrator) async {
@@ -167,7 +167,7 @@ Future<void> _migrateExternalEndpointList(_StoreMigrator migrator) async {
     // ignore invalid entries
   }
 
-  migrator.stage(StoreKey.legacyExternalEndpointList, SettingsKey.networkExternalEndpointList, urls);
+  migrator.stage(StoreKey.legacyExternalEndpointList, MetadataKey.networkExternalEndpointList, urls);
 }
 
 Future<void> _migrateCustomHeaders(_StoreMigrator migrator) async {
@@ -190,17 +190,17 @@ Future<void> _migrateCustomHeaders(_StoreMigrator migrator) async {
     // ignore invalid entries
   }
 
-  migrator.stage(StoreKey.legacyCustomHeaders, SettingsKey.networkCustomHeaders, headers);
+  migrator.stage(StoreKey.legacyCustomHeaders, MetadataKey.networkCustomHeaders, headers);
 }
 
 class _StoreMigrator {
   final Drift _db;
-  final Map<SettingsKey<Object>, Object> _cache = {};
+  final Map<MetadataKey<Object>, Object> _cache = {};
   final List<int> _migratedStoreIds = [];
 
   _StoreMigrator(this._db);
 
-  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, SettingsKey<T> newKey, List<T> values) async {
+  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, MetadataKey<T> newKey, List<T> values) async {
     final index = await readLegacyStoreInt(legacyKey.id);
     if (index == null) {
       return;
@@ -217,7 +217,7 @@ class _StoreMigrator {
 
   Future<void> migrateEnumName<T extends Enum>(
     StoreKey<String> legacyKey,
-    SettingsKey<T> newKey,
+    MetadataKey<T> newKey,
     List<T> values,
   ) async {
     final name = await readLegacyStoreString(legacyKey.id);
@@ -234,7 +234,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateBool(StoreKey<bool> legacyKey, SettingsKey<bool> newKey) async {
+  Future<void> migrateBool(StoreKey<bool> legacyKey, MetadataKey<bool> newKey) async {
     final intValue = await readLegacyStoreInt(legacyKey.id);
     if (intValue == null) {
       return;
@@ -245,7 +245,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateInt(StoreKey<int> legacyKey, SettingsKey<int> newKey) async {
+  Future<void> migrateInt(StoreKey<int> legacyKey, MetadataKey<int> newKey) async {
     final intValue = await readLegacyStoreInt(legacyKey.id);
     if (intValue == null) {
       return;
@@ -255,7 +255,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateString(StoreKey<String> legacyKey, SettingsKey<String> newKey) async {
+  Future<void> migrateString(StoreKey<String> legacyKey, MetadataKey<String> newKey) async {
     final value = await readLegacyStoreString(legacyKey.id);
     if (value == null) {
       return;
@@ -265,7 +265,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  void stage<T extends Object>(StoreKey legacyKey, SettingsKey<T> newKey, T value) {
+  void stage<T extends Object>(StoreKey legacyKey, MetadataKey<T> newKey, T value) {
     _cache[newKey] = value;
     _migratedStoreIds.add(legacyKey.id);
   }
@@ -277,8 +277,8 @@ class _StoreMigrator {
           continue;
         }
         batch.insert(
-          _db.settingsEntity,
-          SettingsEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
+          _db.metadataEntity,
+          MetadataEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
           mode: InsertMode.insertOrReplace,
         );
       }

mobile/lib/widgets/common/immich_sliver_app_bar.dart

@@ -10,7 +10,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/server_info/server_info.model.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.dart';

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

@@ -15,7 +15,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
@@ -187,7 +187,7 @@ class LoginForm extends HookConsumerWidget {
       await backgroundManager.syncRemote();
       await backgroundManager.hashAssets();
 
-      if (SettingsRepository.instance.appConfig.backup.syncAlbums) {
+      if (MetadataRepository.instance.appConfig.backup.syncAlbums) {
         await backgroundManager.syncLinkedAlbum();
       }
     }

mobile/lib/widgets/settings/advanced_settings.dart

@@ -7,7 +7,7 @@ import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/repositories/permission.repository.dart';
@@ -35,7 +35,7 @@ class AdvancedSettings extends HookConsumerWidget {
     final preferRemote = useState(ref.read(appConfigProvider).image.preferRemote);
     useValueChanged(
       preferRemote.value,
-      (_, __) => ref.read(settingsProvider).write(.imagePreferRemote, preferRemote.value),
+      (_, __) => ref.read(metadataProvider).write(.imagePreferRemote, preferRemote.value),
     );
     final readonlyModeEnabled = useAppSettingsState(AppSettingsEnum.readonlyModeEnabled);
 

mobile/lib/widgets/settings/asset_list_settings/asset_list_group_settings.dart

@@ -3,10 +3,11 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart';
 
@@ -18,7 +19,7 @@ class GroupSettings extends HookConsumerWidget {
     final groupBy = useValueNotifier(ref.watch(appConfigProvider.select((s) => s.timeline.groupAssetsBy)));
 
     Future<void> updateAppSettings(GroupAssetsBy groupBy) async {
-      await ref.read(settingsProvider).write(.timelineGroupAssetsBy, groupBy);
+      await ref.read(metadataProvider).write(MetadataKey.timelineGroupAssetsBy, groupBy);
       ref.invalidate(appSettingsServiceProvider);
     }
 

mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart

@@ -2,9 +2,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
 
@@ -15,7 +16,7 @@ class LayoutSettings extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final tilesPerRow = useState(ref.read(appConfigProvider.select((s) => s.timeline.tilesPerRow)));
     useValueChanged<int, void>(tilesPerRow.value, (_, __) {
-      ref.read(settingsProvider).write(.timelineTilesPerRow, tilesPerRow.value);
+      ref.read(metadataProvider).write(MetadataKey.timelineTilesPerRow, tilesPerRow.value);
     });
 
     return Column(

mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart

@@ -2,8 +2,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_group_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_layout_settings.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
@@ -21,7 +23,7 @@ class AssetListSettings extends HookConsumerWidget {
         valueNotifier: storageIndicator,
         title: 'theme_setting_asset_list_storage_indicator_title'.tr(),
         onChanged: (value) {
-          ref.read(settingsProvider).write(.timelineStorageIndicator, value);
+          ref.read(metadataProvider).write(MetadataKey.timelineStorageIndicator, value);
           ref.invalidate(appSettingsServiceProvider);
           ref.invalidate(settingsProvider);
         },

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
@@ -14,7 +14,7 @@ class ImageViewerQualitySetting extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final isOriginal = useState(ref.read(appConfigProvider).image.loadOriginal);
     useValueChanged<bool, void>(isOriginal.value, (_, __) {
-      ref.read(settingsProvider).write(.imageLoadOriginal, isOriginal.value);
+      ref.read(metadataProvider).write(.imageLoadOriginal, isOriginal.value);
     });
 
     return Column(

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart

@@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
@@ -13,7 +13,7 @@ class ImageViewerTapToNavigateSetting extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final tapToNavigate = useState(ref.read(appConfigProvider).viewer.tapToNavigate);
     useValueChanged<bool, void>(tapToNavigate.value, (_, __) {
-      ref.read(settingsProvider).write(.viewerTapToNavigate, tapToNavigate.value);
+      ref.read(metadataProvider).write(.viewerTapToNavigate, tapToNavigate.value);
     });
 
     return Column(

mobile/lib/widgets/settings/asset_viewer_settings/slideshow_settings.dart

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
@@ -23,19 +23,19 @@ class SlideshowSettings extends HookConsumerWidget {
     final useDirection = useState(slideshow.direction);
 
     useValueChanged<bool, void>(useTransition.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowTransition, useTransition.value);
+      ref.read(metadataProvider).write(.slideshowTransition, useTransition.value);
     });
     useValueChanged<bool, void>(useRepeat.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowRepeat, useRepeat.value);
+      ref.read(metadataProvider).write(.slideshowRepeat, useRepeat.value);
     });
     useValueChanged<int, void>(useDuration.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowDuration, useDuration.value);
+      ref.read(metadataProvider).write(.slideshowDuration, useDuration.value);
     });
     useValueChanged<SlideshowLook, void>(useLook.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowLook, useLook.value);
+      ref.read(metadataProvider).write(.slideshowLook, useLook.value);
     });
     useValueChanged<SlideshowDirection, void>(useDirection.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowDirection, useDirection.value);
+      ref.read(metadataProvider).write(.slideshowDirection, useDirection.value);
     });
 
     return Column(

mobile/lib/widgets/settings/asset_viewer_settings/video_viewer_settings.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
@@ -17,13 +17,13 @@ class VideoViewerSettings extends HookConsumerWidget {
     final useOriginalVideo = useState(viewer.loadOriginalVideo);
 
     useValueChanged<bool, void>(useAutoPlayVideo.value, (_, __) {
-      ref.read(settingsProvider).write(.viewerAutoPlayVideo, useAutoPlayVideo.value);
+      ref.read(metadataProvider).write(.viewerAutoPlayVideo, useAutoPlayVideo.value);
     });
     useValueChanged<bool, void>(useLoopVideo.value, (_, __) {
-      ref.read(settingsProvider).write(.viewerLoopVideo, useLoopVideo.value);
+      ref.read(metadataProvider).write(.viewerLoopVideo, useLoopVideo.value);
     });
     useValueChanged<bool, void>(useOriginalVideo.value, (_, __) {
-      ref.read(settingsProvider).write(.viewerLoadOriginalVideo, useOriginalVideo.value);
+      ref.read(metadataProvider).write(.viewerLoadOriginalVideo, useOriginalVideo.value);
     });
 
     return Column(

mobile/lib/widgets/settings/backup_settings/drift_backup_settings.dart

@@ -5,15 +5,15 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
@@ -112,7 +112,7 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
                 trailing: Switch(
                   value: albumSyncEnable,
                   onChanged: (bool newValue) async {
-                    await ref.read(settingsProvider).write(.backupSyncAlbums, newValue);
+                    await ref.read(metadataProvider).write(MetadataKey.backupSyncAlbums, newValue);
 
                     if (newValue == true) {
                       await _manageLinkedAlbums();
@@ -158,7 +158,7 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
 }
 
 class _BackupSwitchTile extends ConsumerWidget {
-  final SettingsKey<bool> metadataKey;
+  final MetadataKey<bool> metadataKey;
   final bool Function(AppConfig) selector;
   final String titleKey;
   final String subtitleKey;
@@ -183,7 +183,7 @@ class _BackupSwitchTile extends ConsumerWidget {
         trailing: Switch(
           value: value,
           onChanged: (bool newValue) async {
-            await ref.read(settingsProvider).write(metadataKey, newValue);
+            await ref.read(metadataProvider).write(metadataKey, newValue);
             onChanged?.call(newValue);
           },
         ),
@@ -198,7 +198,7 @@ class _UseCellularForVideosButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return _BackupSwitchTile(
-      metadataKey: SettingsKey.backupUseCellularForVideos,
+      metadataKey: MetadataKey.backupUseCellularForVideos,
       selector: (c) => c.backup.useCellularForVideos,
       titleKey: "videos",
       subtitleKey: "network_requirement_videos_upload",
@@ -212,7 +212,7 @@ class _UseCellularForPhotosButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return _BackupSwitchTile(
-      metadataKey: SettingsKey.backupUseCellularForPhotos,
+      metadataKey: MetadataKey.backupUseCellularForPhotos,
       selector: (c) => c.backup.useCellularForPhotos,
       titleKey: "photos",
       subtitleKey: "network_requirement_photos_upload",
@@ -227,7 +227,7 @@ class _BackupOnlyWhenChargingButton extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final fgService = ref.read(backgroundWorkerFgServiceProvider);
     return _BackupSwitchTile(
-      metadataKey: SettingsKey.backupRequireCharging,
+      metadataKey: MetadataKey.backupRequireCharging,
       selector: (c) => c.backup.requireCharging,
       titleKey: "charging",
       subtitleKey: "charging_requirement_mobile_backup",
@@ -282,11 +282,11 @@ class _BackupDelaySlider extends ConsumerWidget {
           value: currentValue.toDouble(),
           onChanged: (double v) async {
             final seconds = backupDelayToSeconds(v.toInt());
-            await ref.read(settingsProvider).write(SettingsKey.backupTriggerDelay, seconds);
+            await ref.read(metadataProvider).write(MetadataKey.backupTriggerDelay, seconds);
           },
           onChangeEnd: (double v) async {
             final seconds = backupDelayToSeconds(v.toInt());
-            await ref.read(settingsProvider).write(SettingsKey.backupTriggerDelay, seconds);
+            await ref.read(metadataProvider).write(MetadataKey.backupTriggerDelay, seconds);
           },
           max: 3.0,
           min: 0.0,

mobile/lib/widgets/settings/networking_settings/external_network_preference.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/endpoint_input.dart';
 
 class ExternalNetworkPreference extends HookConsumerWidget {
@@ -26,7 +26,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
           .map((e) => e.url)
           .toList();
 
-      ref.read(settingsProvider).write(SettingsKey.networkExternalEndpointList, urls);
+      ref.read(metadataProvider).write(MetadataKey.networkExternalEndpointList, urls);
     }
 
     updateValidationStatus(String url, int index, AuxCheckStatus status) {

mobile/lib/widgets/settings/networking_settings/networking_settings.dart

@@ -5,7 +5,7 @@ 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/models/auth/auxilary_endpoint.model.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/network.provider.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/external_network_preference.dart';
@@ -21,7 +21,7 @@ class NetworkingSettings extends HookConsumerWidget {
     final currentEndpoint = getServerUrl();
     final featureEnabled = useState(ref.read(appConfigProvider).network.autoEndpointSwitching);
     useValueChanged<bool, void>(featureEnabled.value, (_, __) {
-      ref.read(settingsProvider).write(.networkAutoEndpointSwitching, featureEnabled.value);
+      ref.read(metadataProvider).write(.networkAutoEndpointSwitching, featureEnabled.value);
     });
 
     Future<void> checkWifiReadPermission() async {

mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart

@@ -4,7 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
@@ -26,16 +26,16 @@ class PrimaryColorSetting extends HookConsumerWidget {
     }
 
     onUseSystemColorChange(bool newValue) {
-      ref.read(settingsProvider).write(.themeDynamic, newValue);
+      ref.read(metadataProvider).write(.themeDynamic, newValue);
       popBottomSheet();
     }
 
     onPrimaryColorChange(ImmichColorPreset colorPreset) {
-      ref.read(settingsProvider).write(.themePrimaryColor, colorPreset);
+      ref.read(metadataProvider).write(.themePrimaryColor, colorPreset);
 
       //turn off system color setting
       if (themeConfig.dynamicTheme) {
-        ref.read(settingsProvider).write(.themeDynamic, false);
+        ref.read(metadataProvider).write(.themeDynamic, false);
       }
       popBottomSheet();
     }

mobile/lib/widgets/settings/preference_settings/theme_setting.dart

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/primary_color_setting.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
@@ -22,7 +22,7 @@ class ThemeSetting extends HookConsumerWidget {
 
     void onThemeChange(bool isDark) {
       currentTheme.value = isDark ? ThemeMode.dark : ThemeMode.light;
-      ref.read(settingsProvider).write(.themeMode, currentTheme.value);
+      ref.read(metadataProvider).write(.themeMode, currentTheme.value);
     }
 
     void onSystemThemeChange(bool isSystem) {
@@ -39,11 +39,11 @@ class ThemeSetting extends HookConsumerWidget {
           currentTheme.value = ThemeMode.dark;
         }
       }
-      ref.read(settingsProvider).write(.themeMode, currentTheme.value);
+      ref.read(metadataProvider).write(.themeMode, currentTheme.value);
     }
 
     void onSurfaceColorSettingChange(bool useColorfulInterface) {
-      ref.read(settingsProvider).write(.themeColorfulInterface, useColorfulInterface);
+      ref.read(metadataProvider).write(.themeColorfulInterface, useColorfulInterface);
       colorfulInterface.value = useColorfulInterface;
     }
 

mobile/openapi/README.md

@@ -450,6 +450,7 @@ Class | Method | HTTP request | Description
  - [MemoryCreateDto](doc//MemoryCreateDto.md)
  - [MemoryResponseDto](doc//MemoryResponseDto.md)
  - [MemorySearchOrder](doc//MemorySearchOrder.md)
+ - [MemorySearchResponseDto](doc//MemorySearchResponseDto.md)
  - [MemoryStatisticsResponseDto](doc//MemoryStatisticsResponseDto.md)
  - [MemoryType](doc//MemoryType.md)
  - [MemoryUpdateDto](doc//MemoryUpdateDto.md)

mobile/openapi/lib/api.dart

@@ -195,6 +195,7 @@ part 'model/memories_update.dart';
 part 'model/memory_create_dto.dart';
 part 'model/memory_response_dto.dart';
 part 'model/memory_search_order.dart';
+part 'model/memory_search_response_dto.dart';
 part 'model/memory_statistics_response_dto.dart';
 part 'model/memory_type.dart';
 part 'model/memory_update_dto.dart';

mobile/openapi/lib/api/albums_api.dart

@@ -508,18 +508,12 @@ class AlbumsApi {
   /// * [String] assetId:
   ///   Filter albums containing this asset ID (ignores other parameters)
   ///
-  /// * [String] id:
-  ///   Album ID
-  ///
   /// * [bool] isOwned:
   ///   Filter by ownership: true = only owned, false = only shared-with-me, undefined = no filter
   ///
   /// * [bool] isShared:
   ///   Filter by shared status: true = only shared, false = not shared, undefined = no filter
-  ///
-  /// * [String] name:
-  ///   Album name (exact match)
-  Future<Response> getAllAlbumsWithHttpInfo({ String? assetId, String? id, bool? isOwned, bool? isShared, String? name, }) async {
+  Future<Response> getAllAlbumsWithHttpInfo({ String? assetId, bool? isOwned, bool? isShared, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/albums';
 
@@ -533,18 +527,12 @@ class AlbumsApi {
     if (assetId != null) {
       queryParams.addAll(_queryParams('', 'assetId', assetId));
     }
-    if (id != null) {
-      queryParams.addAll(_queryParams('', 'id', id));
-    }
     if (isOwned != null) {
       queryParams.addAll(_queryParams('', 'isOwned', isOwned));
     }
     if (isShared != null) {
       queryParams.addAll(_queryParams('', 'isShared', isShared));
     }
-    if (name != null) {
-      queryParams.addAll(_queryParams('', 'name', name));
-    }
 
     const contentTypes = <String>[];
 
@@ -569,19 +557,13 @@ class AlbumsApi {
   /// * [String] assetId:
   ///   Filter albums containing this asset ID (ignores other parameters)
   ///
-  /// * [String] id:
-  ///   Album ID
-  ///
   /// * [bool] isOwned:
   ///   Filter by ownership: true = only owned, false = only shared-with-me, undefined = no filter
   ///
   /// * [bool] isShared:
   ///   Filter by shared status: true = only shared, false = not shared, undefined = no filter
-  ///
-  /// * [String] name:
-  ///   Album name (exact match)
-  Future<List<AlbumResponseDto>?> getAllAlbums({ String? assetId, String? id, bool? isOwned, bool? isShared, String? name, }) async {
-    final response = await getAllAlbumsWithHttpInfo( assetId: assetId, id: id, isOwned: isOwned, isShared: isShared, name: name, );
+  Future<List<AlbumResponseDto>?> getAllAlbums({ String? assetId, bool? isOwned, bool? isShared, }) async {
+    final response = await getAllAlbumsWithHttpInfo( assetId: assetId, isOwned: isOwned, isShared: isShared, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api/memories_api.dart

@@ -261,11 +261,14 @@ class MemoriesApi {
   ///
   /// * [MemorySearchOrder] order:
   ///
+  /// * [int] page:
+  ///   Page number
+  ///
   /// * [int] size:
   ///   Number of memories to return
   ///
   /// * [MemoryType] type:
-  Future<Response> memoriesStatisticsWithHttpInfo({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? size, MemoryType? type, }) async {
+  Future<Response> memoriesStatisticsWithHttpInfo({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? page, int? size, MemoryType? type, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/memories/statistics';
 
@@ -288,6 +291,9 @@ class MemoriesApi {
     if (order != null) {
       queryParams.addAll(_queryParams('', 'order', order));
     }
+    if (page != null) {
+      queryParams.addAll(_queryParams('', 'page', page));
+    }
     if (size != null) {
       queryParams.addAll(_queryParams('', 'size', size));
     }
@@ -326,12 +332,15 @@ class MemoriesApi {
   ///
   /// * [MemorySearchOrder] order:
   ///
+  /// * [int] page:
+  ///   Page number
+  ///
   /// * [int] size:
   ///   Number of memories to return
   ///
   /// * [MemoryType] type:
-  Future<MemoryStatisticsResponseDto?> memoriesStatistics({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? size, MemoryType? type, }) async {
-    final response = await memoriesStatisticsWithHttpInfo( for_: for_, isSaved: isSaved, isTrashed: isTrashed, order: order, size: size, type: type, );
+  Future<MemoryStatisticsResponseDto?> memoriesStatistics({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? page, int? size, MemoryType? type, }) async {
+    final response = await memoriesStatisticsWithHttpInfo( for_: for_, isSaved: isSaved, isTrashed: isTrashed, order: order, page: page, size: size, type: type, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -428,11 +437,14 @@ class MemoriesApi {
   ///
   /// * [MemorySearchOrder] order:
   ///
+  /// * [int] page:
+  ///   Page number
+  ///
   /// * [int] size:
   ///   Number of memories to return
   ///
   /// * [MemoryType] type:
-  Future<Response> searchMemoriesWithHttpInfo({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? size, MemoryType? type, }) async {
+  Future<Response> searchMemoriesWithHttpInfo({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? page, int? size, MemoryType? type, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/memories';
 
@@ -455,6 +467,9 @@ class MemoriesApi {
     if (order != null) {
       queryParams.addAll(_queryParams('', 'order', order));
     }
+    if (page != null) {
+      queryParams.addAll(_queryParams('', 'page', page));
+    }
     if (size != null) {
       queryParams.addAll(_queryParams('', 'size', size));
     }
@@ -493,12 +508,15 @@ class MemoriesApi {
   ///
   /// * [MemorySearchOrder] order:
   ///
+  /// * [int] page:
+  ///   Page number
+  ///
   /// * [int] size:
   ///   Number of memories to return
   ///
   /// * [MemoryType] type:
-  Future<List<MemoryResponseDto>?> searchMemories({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? size, MemoryType? type, }) async {
-    final response = await searchMemoriesWithHttpInfo( for_: for_, isSaved: isSaved, isTrashed: isTrashed, order: order, size: size, type: type, );
+  Future<MemorySearchResponseDto?> searchMemories({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? page, int? size, MemoryType? type, }) async {
+    final response = await searchMemoriesWithHttpInfo( for_: for_, isSaved: isSaved, isTrashed: isTrashed, order: order, page: page, size: size, type: type, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -506,11 +524,8 @@ class MemoriesApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      final responseBody = await _decodeBodyBytes(response);
-      return (await apiClient.deserializeAsync(responseBody, 'List<MemoryResponseDto>') as List)
-        .cast<MemoryResponseDto>()
-        .toList(growable: false);
-
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MemorySearchResponseDto',) as MemorySearchResponseDto;
+    
     }
     return null;
   }

mobile/openapi/lib/api_client.dart

@@ -13,7 +13,7 @@ part of openapi.api;
 class ApiClient {
   ApiClient({this.basePath = '/api', this.authentication,});
 
-  String basePath;
+  final String basePath;
   final Authentication? authentication;
 
   var _client = Client();
@@ -436,6 +436,8 @@ class ApiClient {
           return MemoryResponseDto.fromJson(value);
         case 'MemorySearchOrder':
           return MemorySearchOrderTypeTransformer().decode(value);
+        case 'MemorySearchResponseDto':
+          return MemorySearchResponseDto.fromJson(value);
         case 'MemoryStatisticsResponseDto':
           return MemoryStatisticsResponseDto.fromJson(value);
         case 'MemoryType':

mobile/openapi/lib/model/job_name.dart

@@ -77,7 +77,7 @@ class JobName {
   static const versionCheck = JobName._(r'VersionCheck');
   static const ocrQueueAll = JobName._(r'OcrQueueAll');
   static const ocr = JobName._(r'Ocr');
-  static const workflowAssetTrigger = JobName._(r'WorkflowAssetTrigger');
+  static const workflowAssetCreate = JobName._(r'WorkflowAssetCreate');
 
   /// List of all possible values in this [enum][JobName].
   static const values = <JobName>[
@@ -135,7 +135,7 @@ class JobName {
     versionCheck,
     ocrQueueAll,
     ocr,
-    workflowAssetTrigger,
+    workflowAssetCreate,
   ];
 
   static JobName? fromJson(dynamic value) => JobNameTypeTransformer().decode(value);
@@ -228,7 +228,7 @@ class JobNameTypeTransformer {
         case r'VersionCheck': return JobName.versionCheck;
         case r'OcrQueueAll': return JobName.ocrQueueAll;
         case r'Ocr': return JobName.ocr;
-        case r'WorkflowAssetTrigger': return JobName.workflowAssetTrigger;
+        case r'WorkflowAssetCreate': return JobName.workflowAssetCreate;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');

mobile/openapi/lib/model/memory_search_response_dto.dart

@@ -0,0 +1,120 @@
+//
+// 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 MemorySearchResponseDto {
+  /// Returns a new [MemorySearchResponseDto] instance.
+  MemorySearchResponseDto({
+    required this.hasNextPage,
+    this.items = const [],
+    required this.total,
+  });
+
+  /// Whether there are more pages
+  bool hasNextPage;
+
+  List<MemoryResponseDto> items;
+
+  /// Total number of matching memories
+  ///
+  /// Minimum value: 0
+  /// Maximum value: 9007199254740991
+  int total;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is MemorySearchResponseDto &&
+    other.hasNextPage == hasNextPage &&
+    _deepEquality.equals(other.items, items) &&
+    other.total == total;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (hasNextPage.hashCode) +
+    (items.hashCode) +
+    (total.hashCode);
+
+  @override
+  String toString() => 'MemorySearchResponseDto[hasNextPage=$hasNextPage, items=$items, total=$total]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'hasNextPage'] = this.hasNextPage;
+      json[r'items'] = this.items;
+      json[r'total'] = this.total;
+    return json;
+  }
+
+  /// Returns a new [MemorySearchResponseDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static MemorySearchResponseDto? fromJson(dynamic value) {
+    upgradeDto(value, "MemorySearchResponseDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return MemorySearchResponseDto(
+        hasNextPage: mapValueOfType<bool>(json, r'hasNextPage')!,
+        items: MemoryResponseDto.listFromJson(json[r'items']),
+        total: mapValueOfType<int>(json, r'total')!,
+      );
+    }
+    return null;
+  }
+
+  static List<MemorySearchResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <MemorySearchResponseDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = MemorySearchResponseDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, MemorySearchResponseDto> mapFromJson(dynamic json) {
+    final map = <String, MemorySearchResponseDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = MemorySearchResponseDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of MemorySearchResponseDto-objects as value to a dart map
+  static Map<String, List<MemorySearchResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<MemorySearchResponseDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = MemorySearchResponseDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'hasNextPage',
+    'items',
+    'total',
+  };
+}
+

mobile/openapi/lib/model/plugin_template_response_dto.dart

@@ -18,7 +18,6 @@ class PluginTemplateResponseDto {
     this.steps = const [],
     required this.title,
     required this.trigger,
-    this.uiHints = const [],
   });
 
   /// Template description
@@ -35,17 +34,13 @@ class PluginTemplateResponseDto {
 
   WorkflowTrigger trigger;
 
-  /// Ui hints, for example \"smart-album\"
-  List<String> uiHints;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is PluginTemplateResponseDto &&
     other.description == description &&
     other.key == key &&
     _deepEquality.equals(other.steps, steps) &&
     other.title == title &&
-    other.trigger == trigger &&
-    _deepEquality.equals(other.uiHints, uiHints);
+    other.trigger == trigger;
 
   @override
   int get hashCode =>
@@ -54,11 +49,10 @@ class PluginTemplateResponseDto {
     (key.hashCode) +
     (steps.hashCode) +
     (title.hashCode) +
-    (trigger.hashCode) +
-    (uiHints.hashCode);
+    (trigger.hashCode);
 
   @override
-  String toString() => 'PluginTemplateResponseDto[description=$description, key=$key, steps=$steps, title=$title, trigger=$trigger, uiHints=$uiHints]';
+  String toString() => 'PluginTemplateResponseDto[description=$description, key=$key, steps=$steps, title=$title, trigger=$trigger]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -67,7 +61,6 @@ class PluginTemplateResponseDto {
       json[r'steps'] = this.steps;
       json[r'title'] = this.title;
       json[r'trigger'] = this.trigger;
-      json[r'uiHints'] = this.uiHints;
     return json;
   }
 
@@ -85,9 +78,6 @@ class PluginTemplateResponseDto {
         steps: PluginTemplateStepResponseDto.listFromJson(json[r'steps']),
         title: mapValueOfType<String>(json, r'title')!,
         trigger: WorkflowTrigger.fromJson(json[r'trigger'])!,
-        uiHints: json[r'uiHints'] is Iterable
-            ? (json[r'uiHints'] as Iterable).cast<String>().toList(growable: false)
-            : const [],
       );
     }
     return null;
@@ -140,7 +130,6 @@ class PluginTemplateResponseDto {
     'steps',
     'title',
     'trigger',
-    'uiHints',
   };
 }
 

mobile/openapi/lib/model/workflow_trigger.dart

@@ -24,13 +24,11 @@ class WorkflowTrigger {
   String toJson() => value;
 
   static const assetCreate = WorkflowTrigger._(r'AssetCreate');
-  static const assetMetadataExtraction = WorkflowTrigger._(r'AssetMetadataExtraction');
   static const personRecognized = WorkflowTrigger._(r'PersonRecognized');
 
   /// List of all possible values in this [enum][WorkflowTrigger].
   static const values = <WorkflowTrigger>[
     assetCreate,
-    assetMetadataExtraction,
     personRecognized,
   ];
 
@@ -71,7 +69,6 @@ class WorkflowTriggerTypeTransformer {
     if (data != null) {
       switch (data) {
         case r'AssetCreate': return WorkflowTrigger.assetCreate;
-        case r'AssetMetadataExtraction': return WorkflowTrigger.assetMetadataExtraction;
         case r'PersonRecognized': return WorkflowTrigger.personRecognized;
         default:
           if (!allowNull) {

mobile/test/domain/services/log_service_test.dart

@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:logging/logging.dart';
@@ -29,23 +29,23 @@ final _kWarnLog = LogMessage(
 void main() {
   late LogService sut;
   late LogRepository mockLogRepo;
-  late MockSettingsRepository mockSettingsRepository;
+  late MockMetadataRepository mockMetadataRepository;
 
   setUp(() async {
     mockLogRepo = MockLogRepository();
-    mockSettingsRepository = MockSettingsRepository();
+    mockMetadataRepository = MockMetadataRepository();
 
     registerFallbackValue(_kInfoLog);
     registerFallbackValue(LogLevel.info);
 
     when(() => mockLogRepo.truncate(limit: any(named: 'limit'))).thenAnswer((_) async => {});
-    when(() => mockSettingsRepository.appConfig).thenReturn(const AppConfig(logLevel: LogLevel.fine));
-    when(() => mockSettingsRepository.write<LogLevel, LogLevel>(SettingsKey.logLevel, any())).thenAnswer((_) async {});
+    when(() => mockMetadataRepository.appConfig).thenReturn(const AppConfig(logLevel: LogLevel.fine));
+    when(() => mockMetadataRepository.write<LogLevel, LogLevel>(MetadataKey.logLevel, any())).thenAnswer((_) async {});
     when(() => mockLogRepo.getAll()).thenAnswer((_) async => []);
     when(() => mockLogRepo.insert(any())).thenAnswer((_) async => true);
     when(() => mockLogRepo.insertAll(any())).thenAnswer((_) async => true);
 
-    sut = await LogService.create(logRepository: mockLogRepo, settingsRepository: mockSettingsRepository);
+    sut = await LogService.create(logRepository: mockLogRepo, metadataRepository: mockMetadataRepository);
   });
 
   tearDown(() async {
@@ -59,7 +59,7 @@ void main() {
     });
 
     test('Sets log level based on the metadata repository', () {
-      verify(() => mockSettingsRepository.appConfig).called(1);
+      verify(() => mockMetadataRepository.appConfig).called(1);
       expect(Logger.root.level, Level.FINE);
     });
   });
@@ -71,7 +71,7 @@ void main() {
 
     test('Updates the log level via metadata repository', () {
       final captured = verify(
-        () => mockSettingsRepository.write<LogLevel, LogLevel>(SettingsKey.logLevel, captureAny()),
+        () => mockMetadataRepository.write<LogLevel, LogLevel>(MetadataKey.logLevel, captureAny()),
       ).captured.firstOrNull;
       expect(captured, LogLevel.shout);
     });
@@ -86,7 +86,7 @@ void main() {
       TestUtils.fakeAsync((time) async {
         sut = await LogService.create(
           logRepository: mockLogRepo,
-          settingsRepository: mockSettingsRepository,
+          metadataRepository: mockMetadataRepository,
           shouldBuffer: true,
         );
 
@@ -104,7 +104,7 @@ void main() {
       TestUtils.fakeAsync((time) async {
         sut = await LogService.create(
           logRepository: mockLogRepo,
-          settingsRepository: mockSettingsRepository,
+          metadataRepository: mockMetadataRepository,
           shouldBuffer: true,
         );
 
@@ -125,7 +125,7 @@ void main() {
       TestUtils.fakeAsync((time) async {
         sut = await LogService.create(
           logRepository: mockLogRepo,
-          settingsRepository: mockSettingsRepository,
+          metadataRepository: mockMetadataRepository,
           shouldBuffer: false,
         );
 
@@ -159,7 +159,7 @@ void main() {
       TestUtils.fakeAsync((time) async {
         sut = await LogService.create(
           logRepository: mockLogRepo,
-          settingsRepository: mockSettingsRepository,
+          metadataRepository: mockMetadataRepository,
           shouldBuffer: true,
         );
 

mobile/test/drift/main/generated/schema.dart

@@ -30,7 +30,6 @@ import 'schema_v23.dart' as v23;
 import 'schema_v24.dart' as v24;
 import 'schema_v25.dart' as v25;
 import 'schema_v26.dart' as v26;
-import 'schema_v27.dart' as v27;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -88,8 +87,6 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v25.DatabaseAtV25(db);
       case 26:
         return v26.DatabaseAtV26(db);
-      case 27:
-        return v27.DatabaseAtV27(db);
       default:
         throw MissingSchemaException(version, versions);
     }
@@ -122,6 +119,5 @@ class GeneratedHelper implements SchemaInstantiationHelper {
     24,
     25,
     26,
-    27,
   ];
 }

mobile/test/infrastructure/repository.mock.dart

@@ -2,7 +2,7 @@ import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
@@ -18,7 +18,7 @@ import 'package:mocktail/mocktail.dart';
 
 class MockDriftStoreRepository extends Mock implements DriftStoreRepository {}
 
-class MockSettingsRepository extends Mock implements SettingsRepository {}
+class MockMetadataRepository extends Mock implements MetadataRepository {}
 
 class MockLogRepository extends Mock implements LogRepository {}
 

mobile/test/medium/repositories/metadata_repository_test.dart

@@ -2,19 +2,19 @@ import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 
 import '../repository_context.dart';
 
 void main() {
   late MediumRepositoryContext ctx;
-  late SettingsRepository sut;
+  late MetadataRepository sut;
 
   setUpAll(() async {
     ctx = MediumRepositoryContext();
-    sut = await SettingsRepository.ensureInitialized(ctx.db);
+    sut = await MetadataRepository.ensureInitialized(ctx.db);
   });
 
   tearDownAll(() async {
@@ -22,8 +22,8 @@ void main() {
   });
 
   setUp(() async {
-    await ctx.db.delete(ctx.db.settingsEntity).go();
-    await SettingsRepository.instance.refresh();
+    await ctx.db.delete(ctx.db.metadataEntity).go();
+    await MetadataRepository.instance.refresh();
   });
 
   group('defaults', () {
@@ -56,7 +56,7 @@ void main() {
       await sut.write(.themeMode, ThemeMode.system);
       expect(sut.appConfig.theme.mode, ThemeMode.system);
 
-      final rows = await ctx.db.select(ctx.db.settingsEntity).get();
+      final rows = await ctx.db.select(ctx.db.metadataEntity).get();
       expect(rows, isEmpty);
     });
   });
@@ -66,10 +66,10 @@ void main() {
   group('sync', () {
     test('picks up rows that were inserted directly into the DB', () async {
       await ctx.db
-          .into(ctx.db.settingsEntity)
+          .into(ctx.db.metadataEntity)
           .insert(
-            SettingsEntityCompanion.insert(
-              key: SettingsKey.themeMode.name,
+            MetadataEntityCompanion.insert(
+              key: MetadataKey.themeMode.name,
               value: ThemeMode.dark.name,
               updatedAt: Value(DateTime.now()),
             ),
@@ -78,32 +78,32 @@ void main() {
       // Cache hasn't seen this row yet — view still returns the default.
       expect(sut.appConfig.theme.mode, ThemeMode.system);
 
-      await SettingsRepository.instance.refresh();
+      await MetadataRepository.instance.refresh();
       expect(sut.appConfig.theme.mode, ThemeMode.dark);
     });
 
     test('drops cached values for rows that were deleted out from under the repo', () async {
       await sut.write(.themeMode, ThemeMode.dark);
       // Wipe the row directly. Cache still holds the old value.
-      await ctx.db.delete(ctx.db.settingsEntity).go();
+      await ctx.db.delete(ctx.db.metadataEntity).go();
       expect(sut.appConfig.theme.mode, ThemeMode.dark);
 
-      await SettingsRepository.instance.refresh();
+      await MetadataRepository.instance.refresh();
       expect(sut.appConfig.theme.mode, ThemeMode.system);
     });
 
-    test('skips rows whose key is unknown to SettingsKey', () async {
+    test('skips rows whose key is unknown to MetadataKey', () async {
       await ctx.db
-          .into(ctx.db.settingsEntity)
+          .into(ctx.db.metadataEntity)
           .insert(
-            SettingsEntityCompanion.insert(
+            MetadataEntityCompanion.insert(
               key: 'app-config.unknown.future-key',
               value: 'whatever',
               updatedAt: Value(DateTime.now()),
             ),
           );
 
-      await SettingsRepository.instance.refresh();
+      await MetadataRepository.instance.refresh();
       expect(sut.appConfig.theme.mode, ThemeMode.system);
     });
   });
@@ -111,13 +111,13 @@ void main() {
   group('watch', () {
     test('watchAppConfig emits the new value after a write', () async {
       final expectation = expectLater(sut.watchConfig().map((c) => c.theme.mode), emitsThrough(ThemeMode.dark));
-      await sut.write(SettingsKey.themeMode, ThemeMode.dark);
+      await sut.write(MetadataKey.themeMode, ThemeMode.dark);
       await expectation;
     });
 
     test('watchConfig emits the new value after a write', () async {
       final expectation = expectLater(sut.watchConfig().map((c) => c.logLevel), emitsThrough(LogLevel.warning));
-      await sut.write(SettingsKey.logLevel, LogLevel.warning);
+      await sut.write(MetadataKey.logLevel, LogLevel.warning);
       await expectation;
     });
   });

mobile/test/services/background_upload.service_test.dart

@@ -11,7 +11,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/services/background_upload.service.dart';
 import 'package:mocktail/mocktail.dart';
@@ -38,7 +38,7 @@ void main() {
     );
     db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
     await StoreService.init(storeRepository: DriftStoreRepository(db));
-    await SettingsRepository.ensureInitialized(db);
+    await MetadataRepository.ensureInitialized(db);
 
     await Store.put(StoreKey.serverEndpoint, 'http://test-server.com');
     await Store.put(StoreKey.deviceId, 'test-device-id');

mobile/test/unit/repositories/metadata_repository_test.dart

@@ -1,10 +1,10 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 
 void main() {
-  group('SettingsKey', () {
-    for (final key in SettingsKey.values) {
+  group('MetadataKey', () {
+    for (final key in MetadataKey.values) {
       test('verify codec for $key', () {
         final defaultValue = defaultConfig.read(key);
         final encoded = key.encode(defaultValue);

open-api/immich-openapi-specs.json

@@ -1627,17 +1627,6 @@
               "type": "string"
             }
           },
-          {
-            "name": "id",
-            "required": false,
-            "in": "query",
-            "description": "Album ID",
-            "schema": {
-              "format": "uuid",
-              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
-              "type": "string"
-            }
-          },
           {
             "name": "isOwned",
             "required": false,
@@ -1655,15 +1644,6 @@
             "schema": {
               "type": "boolean"
             }
-          },
-          {
-            "name": "name",
-            "required": false,
-            "in": "query",
-            "description": "Album name (exact match)",
-            "schema": {
-              "type": "string"
-            }
           }
         ],
         "responses": {
@@ -6383,6 +6363,17 @@
               "$ref": "#/components/schemas/MemorySearchOrder"
             }
           },
+          {
+            "name": "page",
+            "required": false,
+            "in": "query",
+            "description": "Page number",
+            "schema": {
+              "minimum": 1,
+              "maximum": 9007199254740991,
+              "type": "integer"
+            }
+          },
           {
             "name": "size",
             "required": false,
@@ -6408,10 +6399,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "items": {
-                    "$ref": "#/components/schemas/MemoryResponseDto"
-                  },
-                  "type": "array"
+                  "$ref": "#/components/schemas/MemorySearchResponseDto"
                 }
               }
             },
@@ -6552,6 +6540,17 @@
               "$ref": "#/components/schemas/MemorySearchOrder"
             }
           },
+          {
+            "name": "page",
+            "required": false,
+            "in": "query",
+            "description": "Page number",
+            "schema": {
+              "minimum": 1,
+              "maximum": 9007199254740991,
+              "type": "integer"
+            }
+          },
           {
             "name": "size",
             "required": false,
@@ -18171,7 +18170,7 @@
           "VersionCheck",
           "OcrQueueAll",
           "Ocr",
-          "WorkflowAssetTrigger"
+          "WorkflowAssetCreate"
         ],
         "type": "string"
       },
@@ -18827,6 +18826,32 @@
         ],
         "type": "string"
       },
+      "MemorySearchResponseDto": {
+        "properties": {
+          "hasNextPage": {
+            "description": "Whether there are more pages",
+            "type": "boolean"
+          },
+          "items": {
+            "items": {
+              "$ref": "#/components/schemas/MemoryResponseDto"
+            },
+            "type": "array"
+          },
+          "total": {
+            "description": "Total number of matching memories",
+            "maximum": 9007199254740991,
+            "minimum": 0,
+            "type": "integer"
+          }
+        },
+        "required": [
+          "hasNextPage",
+          "items",
+          "total"
+        ],
+        "type": "object"
+      },
       "MemoryStatisticsResponseDto": {
         "properties": {
           "total": {
@@ -20219,13 +20244,6 @@
           "trigger": {
             "$ref": "#/components/schemas/WorkflowTrigger",
             "description": "Workflow trigger"
-          },
-          "uiHints": {
-            "description": "Ui hints, for example \"smart-album\"",
-            "items": {
-              "type": "string"
-            },
-            "type": "array"
           }
         },
         "required": [
@@ -20233,8 +20251,7 @@
           "key",
           "steps",
           "title",
-          "trigger",
-          "uiHints"
+          "trigger"
         ],
         "type": "object"
       },
@@ -26355,7 +26372,6 @@
         "description": "Plugin trigger type",
         "enum": [
           "AssetCreate",
-          "AssetMetadataExtraction",
           "PersonRecognized"
         ],
         "type": "string"

open-api/patch/api_client.dart.patch

@@ -1,12 +1,3 @@
-@@ -13,7 +13,7 @@
- class ApiClient {
-   ApiClient({this.basePath = '/api', this.authentication,});
-
--  final String basePath;
-+  String basePath;
-   final Authentication? authentication;
-
-   var _client = Client();
 @@ -143,19 +143,19 @@
      );
    }

packages/plugin-core/manifest.json

@@ -7,8 +7,8 @@
   "wasmPath": "dist/plugin.wasm",
   "templates": [
     {
-      "name": "screenshots-smart-album",
-      "title": "Archive screenshots",
+      "name": "auto-archive-screenshots",
+      "title": "Auto-archive screenshots",
       "description": "Archive uploads with \"screenshot\" in the filename and optionally add them to an album",
       "trigger": "AssetCreate",
       "steps": [
@@ -20,41 +20,19 @@
             "caseSensitive": false
           }
         },
+        {
+          "method": "immich-plugin-core#assetAddToAlbums",
+          "config": {
+            "albumIds": []
+          }
+        },
         {
           "method": "immich-plugin-core#assetArchive",
           "config": {
             "inverse": false
           }
-        },
-        {
-          "method": "immich-plugin-core#assetAddToAlbums",
-          "config": {
-            "albumName": "Screenshots",
-            "albumIds": []
-          }
         }
-      ],
-      "uiHints": ["SmartAlbum"]
-    },
-    {
-      "name": "missing-timezone-smart-album",
-      "title": "Missing timezone",
-      "description": "Automatically create an album for assets without a time zone",
-      "trigger": "AssetMetadataExtraction",
-      "steps": [
-        {
-          "method": "immich-plugin-core#assetMissingTimeZoneFilter",
-          "config": {}
-        },
-        {
-          "method": "immich-plugin-core#assetAddToAlbums",
-          "config": {
-            "albumName": "Missing time zone",
-            "albumIds": []
-          }
-        }
-      ],
-      "uiHints": ["SmartAlbum"]
+      ]
     }
   ],
   "methods": [
@@ -87,25 +65,7 @@
         },
         "required": ["pattern"]
       },
-      "uiHints": ["Filter"]
-    },
-    {
-      "name": "assetMissingTimeZoneFilter",
-      "title": "Filter by missing time zone",
-      "description": "Filter assets that have no time zone information",
-      "types": ["AssetV1"],
-      "schema": {
-        "type": "object",
-        "properties": {
-          "inverse": {
-            "type": "boolean",
-            "title": "Inverse",
-            "description": "Missing by default, set to true to filter assets with a time zone",
-            "default": false
-          }
-        }
-      },
-      "uiHints": ["Filter"]
+      "uiHints": ["filter"]
     },
     {
       "name": "filterFileType",
@@ -125,7 +85,7 @@
         },
         "required": ["fileTypes"]
       },
-      "uiHints": ["Filter"]
+      "uiHints": ["filter"]
     },
     {
       "name": "filterPerson",
@@ -139,7 +99,7 @@
             "array": true,
             "title": "Person IDs",
             "description": "List of person to match",
-            "uiHint": "personId"
+            "uiHint": "personI"
           },
           "matchAny": {
             "type": "boolean",
@@ -150,7 +110,7 @@
         },
         "required": ["personIds"]
       },
-      "uiHints": ["Filter"]
+      "uiHints": ["filter"]
     },
     {
       "name": "assetArchive",
@@ -227,13 +187,7 @@
             "title": "Album IDs",
             "array": true,
             "description": "Target album IDs",
-            "uiHint": "AlbumId"
-          },
-          "albumName": {
-            "type": "string",
-            "title": "Album name",
-            "array": true,
-            "description": "Use an album with this name if one exists, otherwise create a new one"
+            "uiHint": "albumId"
           }
         },
         "required": ["albumIds"]
@@ -318,14 +272,14 @@
             "type": "string",
             "title": "Album ID",
             "description": "Target album ID",
-            "uiHint": "AlbumId"
+            "uiHint": "albumId"
           },
           "albumIds": {
             "type": "string",
             "title": "Album IDs",
             "description": "Target album IDs",
             "array": true,
-            "uiHint": "AlbumId"
+            "uiHint": "albumId"
           }
         }
       }

packages/plugin-core/package.json

@@ -13,7 +13,6 @@
   "license": "AGPL-3.0",
   "devDependencies": {
     "@extism/js-pdk": "^1.0.1",
-    "@immich/sdk": "workspace:*",
     "@immich/plugin-sdk": "workspace:*",
     "esbuild": "^0.28.0",
     "typescript": "^6.0.0"

packages/plugin-core/src/index.d.ts

@@ -1,20 +1,14 @@
-// keep in sync with plugin-sdk/host-functions.ts';
+// copy from
+// import '@immich/plugin-sdk/host-functions';
 declare module 'extism:host' {
   interface user {
-    searchAlbums(ptr: PTR): I64;
-    createAlbum(ptr: PTR): I64;
-    addAssetsToAlbum(ptr: PTR): I64;
+    albumAddAssets(ptr: PTR): I64;
     addAssetsToAlbums(ptr: PTR): I64;
   }
 }
 
-// keep in sync with manifest.json
 declare module 'main' {
-  // filters
   export function assetFileFilter(): I32;
-  export function assetMissingTimeZoneFilter(): I32;
-
-  // updates
   export function assetFavorite(): I32;
   export function assetVisibility(): I32;
   export function assetArchive(): I32;

packages/plugin-core/src/index.ts

@@ -1,5 +1,4 @@
-import { wrapper } from '@immich/plugin-sdk';
-import { AssetVisibility, WorkflowType } from '@immich/sdk';
+import { AssetStatus, AssetVisibility, WorkflowType, wrapper } from '@immich/plugin-sdk';
 
 type AssetFileFilterConfig = {
   pattern: string;
@@ -42,14 +41,6 @@ export const assetFileFilter = () => {
   });
 };
 
-export const assetMissingTimeZoneFilter = () => {
-  return wrapper<WorkflowType.AssetV1, { inverse?: boolean }>(({ config, data }) => {
-    const hasTimeZone = !!data.asset?.exifInfo?.timeZone;
-    const needsTimeZone = config.inverse ? true : false;
-    return { workflow: { continue: hasTimeZone === needsTimeZone } };
-  });
-};
-
 export const assetFavorite = () => {
   return wrapper<WorkflowType.AssetV1, { inverse?: boolean }>(({ config, data }) => {
     const target = config.inverse ? false : true;
@@ -98,35 +89,28 @@ export const assetLock = () => {
 };
 
 export const assetTrash = () => {
-  // TODO use trash/untrash host functions
-  return wrapper<WorkflowType.AssetV1, { inverse?: boolean }>(() => ({}));
+  return wrapper<WorkflowType.AssetV1, { inverse?: boolean }>(({ config, data }) => ({
+    changes: {
+      asset: config.inverse
+        ? { deletedAt: null, status: AssetStatus.Active }
+        : { deletedAt: new Date(), status: AssetStatus.Trashed },
+    },
+  }));
 };
 
 export const assetAddToAlbums = () => {
-  return wrapper<WorkflowType.AssetV1, { albumIds: string[]; albumName?: string }>(({ config, data, functions }) => {
-    const assetId = data.asset.id;
-
+  return wrapper<WorkflowType.AssetV1, { albumIds: string[] }>(({ config, data, functions }) => {
     if (config.albumIds.length === 0) {
-      if (!config.albumName) {
-        return {};
-      }
-
-      const [existing] = functions.searchAlbums({ name: config.albumName });
-      if (!existing) {
-        const created = functions.createAlbum({ albumName: config.albumName, assetIds: [assetId] });
-        config.albumIds.push(created.id);
-        return {};
-      }
-
-      config.albumIds.push(existing.id);
-    }
-
-    if (config.albumIds.length === 1) {
-      functions.addAssetsToAlbum(config.albumIds[0], [assetId]);
+      // noop
       return {};
     }
 
-    functions.addAssetsToAlbums({ albumIds: config.albumIds, assetIds: [assetId] });
+    if (config.albumIds.length === 1) {
+      functions.albumAddAssets(config.albumIds[0], [data.asset.id]);
+      return {};
+    }
+
+    functions.addAssetsToAlbums({ albumIds: config.albumIds, assetIds: [data.asset.id] });
     return {};
   });
 };

packages/plugin-sdk/package.json

@@ -2,6 +2,7 @@
   "name": "@immich/plugin-sdk",
   "version": "0.0.0",
   "description": "",
+  "main": "index.js",
   "type": "module",
   "exports": {
     "./host-functions": {
@@ -10,8 +11,7 @@
     },
     ".": {
       "import": "./dist/index.js",
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.ts"
     }
   },
   "scripts": {
@@ -27,7 +27,6 @@
   "packageManager": "pnpm@10.33.4",
   "devDependencies": {
     "@extism/js-pdk": "^1.1.1",
-    "@immich/sdk": "workspace:*",
     "@types/node": "^24.12.4",
     "esbuild": "^0.28.0",
     "tsc-alias": "^1.8.16",

packages/plugin-sdk/src/enum.ts

@@ -0,0 +1,33 @@
+export enum WorkflowTrigger {
+  AssetCreate = 'AssetCreate',
+  PersonRecognized = 'PersonRecognized',
+}
+
+export enum WorkflowType {
+  AssetV1 = 'AssetV1',
+  AssetPersonV1 = 'AssetPersonV1',
+}
+
+export enum AssetType {
+  Image = 'IMAGE',
+  Video = 'VIDEO',
+  Audio = 'AUDIO',
+  Other = 'OTHER',
+}
+
+export enum AssetStatus {
+  Active = 'active',
+  Trashed = 'trashed',
+  Deleted = 'deleted',
+}
+
+export enum AssetVisibility {
+  Archive = 'archive',
+  Timeline = 'timeline',
+
+  /**
+   * Video part of the LivePhotos and MotionPhotos
+   */
+  Hidden = 'hidden',
+  Locked = 'locked',
+}

packages/plugin-sdk/src/host-functions.ts

@@ -1,26 +1,12 @@
-import {
-  getAllAlbums,
-  type AlbumResponseDto,
-  type BulkIdResponseDto,
-  type BulkIdsDto,
-  type CreateAlbumDto,
-} from '@immich/sdk';
-
-// keep in sync with plugin-core/src/index.d.ts';
 declare module 'extism:host' {
   interface user {
-    searchAlbums(ptr: PTR): I64;
-    createAlbum(ptr: PTR): I64;
-    addAssetsToAlbum(ptr: PTR): I64;
+    albumAddAssets(ptr: PTR): I64;
     addAssetsToAlbums(ptr: PTR): I64;
   }
 }
 
-type AlbumsToAssets = {
-  assetIds: string[];
-  albumIds: string[];
-};
-
+const host = Host.getFunctions();
+type HostFunctionName = keyof typeof host;
 type HostFunctionSuccessResult<T> = { success: true; response: T };
 type HostFunctionErrorResult = {
   success: false;
@@ -31,49 +17,35 @@ type HostFunctionResult<T> =
   | HostFunctionSuccessResult<T>
   | HostFunctionErrorResult;
 
-type QueryParams<T extends (...args: any) => any> = Parameters<T>[0];
-type AlbumSearchDto = QueryParams<typeof getAllAlbums>;
+const call = <T, R>(name: HostFunctionName, authToken: string, args: T) => {
+  const pointer1 = Memory.fromString(JSON.stringify({ authToken, args }));
+  const fn = host[name];
+  const handler = Memory.find(fn(pointer1.offset));
 
-export const hostFunctions = (authToken: string) => {
-  const host = Host.getFunctions();
-  type HostFunctionName = keyof typeof host;
+  try {
+    const result = JSON.parse(handler.readString()) as HostFunctionResult<R>;
 
-  const call = <T, R>(name: HostFunctionName, authToken: string, args: T) => {
-    const pointer1 = Memory.fromString(JSON.stringify({ authToken, args }));
-    const fn = host[name];
-    const handler = Memory.find(fn(pointer1.offset));
-
-    try {
-      const result = JSON.parse(handler.readString()) as HostFunctionResult<R>;
-
-      if (result.success) {
-        return result.response;
-      }
-
-      throw new Error(
-        `Failed to call host function "${String(name)}", received ${result.status} - ${JSON.stringify(result.message)}`,
-      );
-    } finally {
-      handler.free();
-      pointer1.free();
+    if (result.success) {
+      return result.response;
     }
-  };
 
-  return {
-    // album
-    searchAlbums: (dto: AlbumSearchDto) =>
-      call<[AlbumSearchDto], AlbumResponseDto[]>('searchAlbums', authToken, [
-        dto,
-      ]),
-    createAlbum: (dto: CreateAlbumDto) =>
-      call<[CreateAlbumDto], AlbumResponseDto>('createAlbum', authToken, [dto]),
-    addAssetsToAlbum: (albumId: string, assetIds: string[]) =>
-      call<[string, BulkIdsDto], BulkIdResponseDto[]>(
-        'addAssetsToAlbum',
-        authToken,
-        [albumId, { ids: assetIds }],
-      ),
-    addAssetsToAlbums: ({ assetIds, albumIds }: AlbumsToAssets) =>
-      call('addAssetsToAlbums', authToken, [{ albumIds, assetIds }]),
-  };
+    throw new Error(
+      `Failed to call host function "${String(name)}", received ${result.status} - ${JSON.stringify(result.message)}`,
+    );
+  } finally {
+    handler.free();
+    pointer1.free();
+  }
 };
+
+type AlbumsToAssets = {
+  assetIds: string[];
+  albumIds: string[];
+};
+
+export const hostFunctions = (authToken: string) => ({
+  albumAddAssets: (albumId: string, assetIds: string[]) =>
+    call('albumAddAssets', authToken, [albumId, { ids: assetIds }]),
+  addAssetsToAlbums: ({ assetIds, albumIds }: AlbumsToAssets) =>
+    call('addAssetsToAlbums', authToken, [{ albumIds, assetIds }]),
+});

packages/plugin-sdk/src/index.ts

@@ -1,3 +1,4 @@
+export * from 'src/enum.js';
 export * from 'src/host-functions.js';
 export * from 'src/sdk.js';
 export * from 'src/types.js';

packages/plugin-sdk/src/sdk.ts

@@ -1,10 +1,9 @@
-import type { WorkflowType } from '@immich/sdk';
+import type { WorkflowType } from 'src/enum.js';
 import { hostFunctions } from 'src/host-functions.js';
 import type {
   ConfigValue,
   WorkflowEventPayload,
   WorkflowResponse,
-  WorkflowStepConfig,
 } from 'src/types.js';
 
 export const wrapper = <
@@ -20,28 +19,19 @@ export const wrapper = <
   const input = Host.inputString();
 
   try {
-    const payload = JSON.parse(input) as WorkflowEventPayload<T, TConfig>;
-    const event = {
-      ...payload,
-      functions: hostFunctions(payload.workflow.authToken),
-    };
-
-    const eventConfigBefore = JSON.stringify(event.config);
+    const event = JSON.parse(input) as WorkflowEventPayload<T, TConfig>;
+    // const debug = event.workflow.debug ?? false;
 
     console.debug(
-      `Inputs: trigger=${event.trigger}, event=${event.type}, config=${eventConfigBefore}`,
+      `Inputs: trigger=${event.trigger}, event=${event.type}, config=${JSON.stringify(event.config)}`,
     );
 
-    const response = fn(event) ?? {};
-
-    // if config changed, notify host
-    const eventConfigAfter = JSON.stringify(event.config);
-    if (!response.config && eventConfigBefore !== eventConfigAfter) {
-      response.config = event.config as WorkflowStepConfig;
-    }
+    const response =
+      fn({ ...event, functions: hostFunctions(event.workflow.authToken) }) ??
+      {};
 
     console.debug(
-      `Outputs: workflow=${JSON.stringify(response.workflow)}, changes=${JSON.stringify(response.changes)}, data=${JSON.stringify(response.data)}, config=${JSON.stringify(response.config)}`,
+      `Outputs: workflow=${JSON.stringify(response.workflow)}, changes=${JSON.stringify(response.changes)}, data=${JSON.stringify(response.data)}`,
     );
 
     const output = JSON.stringify(response);

packages/plugin-sdk/src/types.ts

@@ -1,4 +1,10 @@
-import type { AssetTypeEnum, AssetVisibility, WorkflowType } from '@immich/sdk';
+import type {
+  AssetStatus,
+  AssetType,
+  AssetVisibility,
+  WorkflowTrigger,
+  WorkflowType,
+} from 'src/enum.js';
 
 type DeepPartial<T> = T extends Date
   ? T
@@ -15,12 +21,6 @@ export type WorkflowEventMap = {
 
 export type WorkflowEventData<T extends WorkflowType> = WorkflowEventMap[T];
 
-export enum WorkflowTrigger {
-  AssetCreate = 'AssetCreate',
-  AssetMetadataExtraction = 'AssetMetadataExtraction',
-  PersonRecognized = 'PersonRecognized',
-}
-
 export type WorkflowEventPayload<
   T extends WorkflowType = WorkflowType,
   TConfig = WorkflowStepConfig,
@@ -48,8 +48,6 @@ export type WorkflowResponse<T extends WorkflowType = WorkflowType> = {
   changes?: WorkflowChanges<T>;
   /** data to be passed to the next workflow step */
   data?: Record<string, unknown>;
-  /** update step config */
-  config?: WorkflowStepConfig;
 };
 
 export type WorkflowStepConfig = {
@@ -68,23 +66,24 @@ export type AssetV1 = {
   asset: {
     id: string;
     ownerId: string;
-    type: AssetTypeEnum;
+    type: AssetType;
     originalPath: string;
-    fileCreatedAt: string;
-    fileModifiedAt: string;
+    fileCreatedAt: Date;
+    fileModifiedAt: Date;
     isFavorite: boolean;
     checksum: Buffer; // sha1 checksum
     livePhotoVideoId: string | null;
-    updatedAt: string;
-    createdAt: string;
+    updatedAt: Date;
+    createdAt: Date;
     originalFileName: string;
     isOffline: boolean;
     libraryId: string | null;
     isExternal: boolean;
-    deletedAt: string | null;
-    localDateTime: string;
+    deletedAt: Date | null;
+    localDateTime: Date;
     stackId: string | null;
     duplicateId: string | null;
+    status: AssetStatus;
     visibility: AssetVisibility;
     isEdited: boolean;
     exifInfo: {
@@ -94,8 +93,8 @@ export type AssetV1 = {
       exifImageHeight: number | null;
       fileSizeInByte: number | null;
       orientation: string | null;
-      dateTimeOriginal: string | null;
-      modifyDate: string | null;
+      dateTimeOriginal: Date | null;
+      modifyDate: Date | null;
       lensModel: string | null;
       fNumber: number | null;
       focalLength: number | null;
@@ -117,7 +116,7 @@ export type AssetV1 = {
       autoStackId: string | null;
       rating: number | null;
       tags: string[] | null;
-      updatedAt: string | null;
+      updatedAt: Date | null;
     } | null;
   };
 };

packages/sdk/src/fetch-client.ts

@@ -1316,6 +1316,13 @@ export type MemoryResponseDto = {
     /** Last update date */
     updatedAt: string;
 };
+export type MemorySearchResponseDto = {
+    /** Whether there are more pages */
+    hasNextPage: boolean;
+    items: MemoryResponseDto[];
+    /** Total number of matching memories */
+    total: number;
+};
 export type MemoryCreateDto = {
     /** Asset IDs to associate with memory */
     assetIds?: string[];
@@ -1535,8 +1542,6 @@ export type PluginTemplateResponseDto = {
     title: string;
     /** Workflow trigger */
     trigger: WorkflowTrigger;
-    /** Ui hints, for example "smart-album" */
-    uiHints: string[];
 };
 export type QueueResponseDto = {
     /** Whether the queue is paused */
@@ -3599,22 +3604,18 @@ export function getUserStatisticsAdmin({ id, isFavorite, isTrashed, visibility }
 /**
  * List all albums
  */
-export function getAllAlbums({ assetId, id, isOwned, isShared, name }: {
+export function getAllAlbums({ assetId, isOwned, isShared }: {
     assetId?: string;
-    id?: string;
     isOwned?: boolean;
     isShared?: boolean;
-    name?: string;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
         data: AlbumResponseDto[];
     }>(`/albums${QS.query(QS.explode({
         assetId,
-        id,
         isOwned,
-        isShared,
-        name
+        isShared
     }))}`, {
         ...opts
     }));
@@ -4684,22 +4685,24 @@ export function reverseGeocode({ lat, lon }: {
 /**
  * Retrieve memories
  */
-export function searchMemories({ $for, isSaved, isTrashed, order, size, $type }: {
+export function searchMemories({ $for, isSaved, isTrashed, order, page, size, $type }: {
     $for?: string;
     isSaved?: boolean;
     isTrashed?: boolean;
     order?: MemorySearchOrder;
+    page?: number;
     size?: number;
     $type?: MemoryType;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
-        data: MemoryResponseDto[];
+        data: MemorySearchResponseDto;
     }>(`/memories${QS.query(QS.explode({
         "for": $for,
         isSaved,
         isTrashed,
         order,
+        page,
         size,
         "type": $type
     }))}`, {
@@ -4724,11 +4727,12 @@ export function createMemory({ memoryCreateDto }: {
 /**
  * Retrieve memories statistics
  */
-export function memoriesStatistics({ $for, isSaved, isTrashed, order, size, $type }: {
+export function memoriesStatistics({ $for, isSaved, isTrashed, order, page, size, $type }: {
     $for?: string;
     isSaved?: boolean;
     isTrashed?: boolean;
     order?: MemorySearchOrder;
+    page?: number;
     size?: number;
     $type?: MemoryType;
 }, opts?: Oazapfts.RequestOpts) {
@@ -4740,6 +4744,7 @@ export function memoriesStatistics({ $for, isSaved, isTrashed, order, size, $typ
         isSaved,
         isTrashed,
         order,
+        page,
         size,
         "type": $type
     }))}`, {
@@ -7081,7 +7086,6 @@ export enum WorkflowType {
 }
 export enum WorkflowTrigger {
     AssetCreate = "AssetCreate",
-    AssetMetadataExtraction = "AssetMetadataExtraction",
     PersonRecognized = "PersonRecognized"
 }
 export enum QueueJobStatus {
@@ -7147,7 +7151,7 @@ export enum JobName {
     VersionCheck = "VersionCheck",
     OcrQueueAll = "OcrQueueAll",
     Ocr = "Ocr",
-    WorkflowAssetTrigger = "WorkflowAssetTrigger"
+    WorkflowAssetCreate = "WorkflowAssetCreate"
 }
 export enum SearchSuggestionType {
     Country = "country",

pnpm-lock.yaml

@@ -10,7 +10,7 @@ overrides:
   sharp: ^0.34.5
   webpackbar: ^7.0.0
 
-packageExtensionsChecksum: sha256-W6pFzyf+6QXnV91iA6oob0OGVkergPXDN1afLgoF53k=
+packageExtensionsChecksum: sha256-3l4AQg4iuprBDup+q+2JaPvbPg/7XodWCE0ZteH+s54=
 
 pnpmfileChecksum: sha256-un98do36L0wZyqsjcLozQ3YUadCAn2yz5bXcBbOuyDA=
 
@@ -320,9 +320,6 @@ importers:
       '@immich/plugin-sdk':
         specifier: workspace:*
         version: link:../plugin-sdk
-      '@immich/sdk':
-        specifier: workspace:*
-        version: link:../sdk
       esbuild:
         specifier: ^0.28.0
         version: 0.28.0
@@ -335,9 +332,6 @@ importers:
       '@extism/js-pdk':
         specifier: ^1.1.1
         version: 1.1.1
-      '@immich/sdk':
-        specifier: workspace:*
-        version: link:../sdk
       '@types/node':
         specifier: ^24.12.4
         version: 24.12.4
@@ -395,7 +389,7 @@ importers:
         version: 6.1.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)
       '@nestjs/swagger':
         specifier: ^11.4.2
-        version: 11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3)
+        version: 11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)
       '@nestjs/websockets':
         specifier: ^11.0.4
         version: 11.1.21(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(@nestjs/platform-socket.io@11.1.21)(reflect-metadata@0.2.2)(rxjs@7.8.2)
@@ -542,7 +536,7 @@ importers:
         version: 8.0.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)
       nestjs-zod:
         specifier: ^5.3.0
-        version: 5.4.0(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3))(rxjs@7.8.2)(zod@4.3.6)
+        version: 5.4.0(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2))(rxjs@7.8.2)(zod@4.3.6)
       nodemailer:
         specifier: ^8.0.0
         version: 8.0.7
@@ -3801,7 +3795,6 @@ packages:
       class-transformer: '*'
       class-validator: '*'
       reflect-metadata: ^0.1.12 || ^0.2.0
-      typescript: '*'
     peerDependenciesMeta:
       '@fastify/static':
         optional: true
@@ -16577,7 +16570,7 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3)':
+  '@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)':
     dependencies:
       '@microsoft/tsdoc': 0.16.0
       '@nestjs/common': 11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2)
@@ -16588,7 +16581,6 @@ snapshots:
       path-to-regexp: 8.4.2
       reflect-metadata: 0.2.2
       swagger-ui-dist: 5.32.6
-      typescript: 6.0.3
 
   '@nestjs/testing@11.1.21(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(@nestjs/platform-express@11.1.21)':
     dependencies:
@@ -23237,14 +23229,14 @@ snapshots:
       '@opentelemetry/host-metrics': 0.38.3(@opentelemetry/api@1.9.1)
       tslib: 2.8.1
 
-  nestjs-zod@5.4.0(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3))(rxjs@7.8.2)(zod@4.3.6):
+  nestjs-zod@5.4.0(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/swagger@11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2))(rxjs@7.8.2)(zod@4.3.6):
     dependencies:
       '@nestjs/common': 11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2)
       deepmerge: 4.3.1
       rxjs: 7.8.2
       zod: 4.3.6
     optionalDependencies:
-      '@nestjs/swagger': 11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)(typescript@6.0.3)
+      '@nestjs/swagger': 11.4.3(@nestjs/common@11.1.21(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.21)(reflect-metadata@0.2.2)
 
   next-tick@1.1.0: {}
 

pnpm-workspace.yaml

@@ -60,9 +60,6 @@ packageExtensions:
     dependencies:
       node-addon-api: '*'
       node-gyp: '*'
-  '@nestjs/swagger':
-    peerDependencies:
-      typescript: '*'
 dedupePeerDependents: false
 preferWorkspacePackages: true
 injectWorkspacePackages: true

server/Dockerfile

@@ -13,15 +13,14 @@ FROM builder AS server
 
 WORKDIR /usr/src/app
 COPY ./server ./server/
-COPY ./packages/sdk ./packages/sdk/
 COPY ./packages/plugin-sdk ./packages/plugin-sdk/
 RUN --mount=type=cache,id=pnpm-server,target=/buildcache/pnpm-store \
   --mount=type=bind,source=package.json,target=package.json \
   --mount=type=bind,source=.pnpmfile.cjs,target=.pnpmfile.cjs \
   --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
   --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
-  SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter immich --frozen-lockfile build && \
-  SHARP_FORCE_GLOBAL_LIBVIPS=true  pnpm --filter immich --frozen-lockfile --prod --no-optional deploy /output/server-pruned
+  SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich --filter @immich/plugin-sdk --frozen-lockfile build && \
+  SHARP_FORCE_GLOBAL_LIBVIPS=true pnpm --filter immich --frozen-lockfile --prod --no-optional deploy /output/server-pruned
 
 FROM builder AS web
 
@@ -67,7 +66,6 @@ ENV MISE_DISABLE_TOOLS=flutter
 RUN --mount=type=cache,id=mise-tools-${TARGETPLATFORM},target=/buildcache/mise \
   mise install
 
-COPY ./packages/sdk ./packages/sdk/
 COPY ./packages/plugin-core ./packages/plugin-core/
 COPY ./packages/plugin-sdk ./packages/plugin-sdk/
 

server/mise.toml

@@ -68,7 +68,6 @@ run = [
 [tasks.ci-medium]
 run = [
   { task = ":install" },
-  { task = "//:plugins" },
   { task = "//packages/plugin-core:build" },
   { task = ":test-medium --run" },
 ]

server/src/controllers/memory.controller.ts

@@ -7,6 +7,7 @@ import {
   MemoryCreateDto,
   MemoryResponseDto,
   MemorySearchDto,
+  MemorySearchResponseDto,
   MemoryStatisticsResponseDto,
   MemoryUpdateDto,
 } from 'src/dtos/memory.dto';
@@ -28,7 +29,7 @@ export class MemoryController {
       'Retrieve a list of memories. Memories are sorted descending by creation date by default, although they can also be sorted in ascending order, or randomly.',
     history: new HistoryBuilder().added('v1').beta('v1').stable('v2'),
   })
-  searchMemories(@Auth() auth: AuthDto, @Query() dto: MemorySearchDto): Promise<MemoryResponseDto[]> {
+  searchMemories(@Auth() auth: AuthDto, @Query() dto: MemorySearchDto): Promise<MemorySearchResponseDto> {
     return this.service.search(auth, dto);
   }
 

server/src/controllers/workflow.controller.spec.ts

@@ -1,5 +1,5 @@
-import { WorkflowTrigger } from '@immich/plugin-sdk';
 import { WorkflowController } from 'src/controllers/workflow.controller';
+import { WorkflowTrigger } from 'src/enum';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { WorkflowService } from 'src/services/workflow.service';
 import request from 'supertest';