chore: remove create from migration

Co-authored-by: Copilot <copilot@github.com>

mobile/drift_schemas/main/drift_schema_v25.json

@@ -2779,15 +2779,17 @@
     },
     {
       "id": 32,
-      "references": [],
+      "references": [
+        1
+      ],
       "type": "table",
       "data": {
-        "name": "metadata",
+        "name": "asset_ocr_entity",
         "was_declared_in_moor": false,
         "columns": [
           {
-            "name": "key",
-            "getter_name": "key",
+            "name": "id",
+            "getter_name": "id",
             "moor_type": "string",
             "nullable": false,
             "customConstraints": null,
@@ -2796,8 +2798,134 @@
             "dsl_features": []
           },
           {
-            "name": "value",
-            "getter_name": "value",
+            "name": "asset_id",
+            "getter_name": "assetId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES remote_asset_entity (id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES remote_asset_entity (id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "remote_asset_entity",
+                    "column": "id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "x1",
+            "getter_name": "x1",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "y1",
+            "getter_name": "y1",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "x2",
+            "getter_name": "x2",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "y2",
+            "getter_name": "y2",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "x3",
+            "getter_name": "x3",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "y3",
+            "getter_name": "y3",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "x4",
+            "getter_name": "x4",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "y4",
+            "getter_name": "y4",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "box_score",
+            "getter_name": "boxScore",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "text_score",
+            "getter_name": "textScore",
+            "moor_type": "double",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "recognized_text",
+            "getter_name": "recognizedText",
             "moor_type": "string",
             "nullable": false,
             "customConstraints": null,
@@ -2806,12 +2934,16 @@
             "dsl_features": []
           },
           {
-            "name": "updated_at",
-            "getter_name": "updatedAt",
-            "moor_type": "dateTime",
+            "name": "is_visible",
+            "getter_name": "isVisible",
+            "moor_type": "bool",
             "nullable": false,
             "customConstraints": null,
-            "default_dart": "const CustomExpression('CURRENT_TIMESTAMP')",
+            "defaultConstraints": "CHECK (\"is_visible\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"is_visible\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('1')",
             "default_client_dart": null,
             "dsl_features": []
           }
@@ -2821,7 +2953,7 @@
         "constraints": [],
         "strict": true,
         "explicit_pk": [
-          "key"
+          "id"
         ]
       }
     },
@@ -3256,11 +3388,11 @@
       ]
     },
     {
-      "name": "metadata",
+      "name": "asset_ocr_entity",
       "sql": [
         {
           "dialect": "sqlite",
-          "sql": "CREATE TABLE IF NOT EXISTS \"metadata\" (\"key\" TEXT NOT NULL, \"value\" TEXT NOT NULL, \"updated_at\" TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP), PRIMARY KEY (\"key\")) WITHOUT ROWID, STRICT;"
+          "sql": "CREATE TABLE IF NOT EXISTS \"asset_ocr_entity\" (\"id\" TEXT NOT NULL, \"asset_id\" TEXT NOT NULL REFERENCES remote_asset_entity (id) ON DELETE CASCADE, \"x1\" REAL NOT NULL, \"y1\" REAL NOT NULL, \"x2\" REAL NOT NULL, \"y2\" REAL NOT NULL, \"x3\" REAL NOT NULL, \"y3\" REAL NOT NULL, \"x4\" REAL NOT NULL, \"y4\" REAL NOT NULL, \"box_score\" REAL NOT NULL, \"text_score\" REAL NOT NULL, \"recognized_text\" TEXT NOT NULL, \"is_visible\" INTEGER NOT NULL DEFAULT 1 CHECK (\"is_visible\" IN (0, 1)), PRIMARY KEY (\"id\")) WITHOUT ROWID, STRICT;"
         }
       ]
     },

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -751,7 +751,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
 				CUSTOM_GROUP_ID = group.app.immich.share;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -760,7 +760,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.121.0;
-				PRODUCT_BUNDLE_IDENTIFIER = app.futo.immich.profile;
+				PRODUCT_BUNDLE_IDENTIFIER = app.alextran.immich.profile;
 				PRODUCT_NAME = "Immich-Profile";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -895,7 +895,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
 				CUSTOM_GROUP_ID = group.app.immich.share;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -904,7 +904,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.121.0;
-				PRODUCT_BUNDLE_IDENTIFIER = app.futo.immich.debug;
+				PRODUCT_BUNDLE_IDENTIFIER = app.alextran.immich.vdebug;
 				PRODUCT_NAME = "Immich-Debug";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -925,7 +925,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
 				CUSTOM_GROUP_ID = group.app.immich.share;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -958,7 +958,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -975,7 +975,7 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = app.futo.immich.debug.Widget;
+				PRODUCT_BUNDLE_IDENTIFIER = app.alextran.immich.vdebug.Widget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
@@ -1001,7 +1001,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1041,7 +1041,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1057,7 +1057,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = app.futo.immich.profile.Widget;
+				PRODUCT_BUNDLE_IDENTIFIER = app.alextran.immich.profile.Widget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1081,7 +1081,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
 				CUSTOM_GROUP_ID = group.app.immich.share;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1098,7 +1098,7 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = app.futo.immich.debug.ShareExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = app.alextran.immich.vdebug.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -1125,7 +1125,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
 				CUSTOM_GROUP_ID = group.app.immich.share;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1166,7 +1166,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
 				CUSTOM_GROUP_ID = group.app.immich.share;
-				DEVELOPMENT_TEAM = 2W7AC6T8T5;
+				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1182,7 +1182,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = app.futo.immich.profile.ShareExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = app.alextran.immich.profile.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;

mobile/ios/ShareExtension/Info.plist

@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>AppGroupId</key>
-	<string>$(CUSTOM_GROUP_ID)</string>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionAttributes</key>
-		<dict>
-			<key>IntentsSupported</key>
-			<array>
-				<string>INSendMessageIntent</string>
-			</array>
-			<key>NSExtensionActivationRule</key>
-			<string>SUBQUERY ( extensionItems, $extensionItem, SUBQUERY ( $extensionItem.attachments,
+  <dict>
+    <key>AppGroupId</key>
+    <string>$(CUSTOM_GROUP_ID)</string>
+    <key>NSExtension</key>
+    <dict>
+      <key>NSExtensionAttributes</key>
+      <dict>
+        <key>IntentsSupported</key>
+        <array>
+          <string>INSendMessageIntent</string>
+        </array>
+        <key>NSExtensionActivationRule</key>
+        <string>SUBQUERY ( extensionItems, $extensionItem, SUBQUERY ( $extensionItem.attachments,
           $attachment, ( ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.file-url"
           || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.image" || ANY
           $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.text" || ANY
           $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.movie" || ANY
           $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url" ) ).@count &gt; 0
           ).@count &gt; 0 </string>
-			<key>PHSupportedMediaTypes</key>
-			<array>
-				<string>Video</string>
-				<string>Image</string>
-			</array>
-		</dict>
-		<key>NSExtensionMainStoryboard</key>
-		<string>MainInterface</string>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.share-services</string>
-	</dict>
-</dict>
-</plist>
+        <key>PHSupportedMediaTypes</key>
+        <array>
+          <string>Video</string>
+          <string>Image</string>
+        </array>
+      </dict>
+      <key>NSExtensionMainStoryboard</key>
+      <string>MainInterface</string>
+      <key>NSExtensionPointIdentifier</key>
+      <string>com.apple.share-services</string>
+    </dict>
+  </dict>
+</plist>

mobile/ios/ShareExtension/ShareExtension.entitlements

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>com.apple.security.application-groups</key>
-    <array>
-      <string>group.app.immich.share</string>
-    </array>
-  </dict>
-</plist>
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.app.immich.share</string>
+	</array>
+</dict>
+</plist>

mobile/ios/WidgetExtension/WidgetExtension.entitlements

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>com.apple.security.application-groups</key>
-    <array>
-      <string>group.app.immich.share</string>
-    </array>
-  </dict>
-</plist>
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.app.immich.share</string>
+	</array>
+</dict>
+</plist>

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

@@ -1,18 +0,0 @@
-import 'package:immich_mobile/domain/models/config/theme_config.dart';
-
-class AppConfig {
-  final ThemeConfig theme;
-
-  const AppConfig({this.theme = const ThemeConfig()});
-
-  AppConfig copyWith({ThemeConfig? theme}) => .new(theme: theme ?? this.theme);
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || (other is AppConfig && other.theme == theme);
-
-  @override
-  int get hashCode => theme.hashCode;
-
-  @override
-  String toString() => 'AppConfig(theme: $theme)';
-}

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

@@ -1,18 +0,0 @@
-import 'package:immich_mobile/domain/models/log.model.dart';
-
-class SystemConfig {
-  final LogLevel logLevel;
-
-  const SystemConfig({this.logLevel = .info});
-
-  SystemConfig copyWith({LogLevel? logLevel}) => SystemConfig(logLevel: logLevel ?? this.logLevel);
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || (other is SystemConfig && other.logLevel == logLevel);
-
-  @override
-  int get hashCode => logLevel.hashCode;
-
-  @override
-  String toString() => 'SystemConfig(logLevel: $logLevel)';
-}

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

@@ -1,18 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ThemeConfig {
-  final ThemeMode mode;
-
-  const ThemeConfig({this.mode = .system});
-
-  ThemeConfig copyWith({ThemeMode? mode}) => .new(mode: mode ?? this.mode);
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || (other is ThemeConfig && other.mode == mode);
-
-  @override
-  int get hashCode => mode.hashCode;
-
-  @override
-  String toString() => 'ThemeConfig(mode: $mode)';
-}

mobile/lib/domain/models/metadata_key.dart

@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/log.model.dart';
-
-enum MetadataDomain {
-  appConfig('app-config'),
-  systemConfig('system-config');
-
-  final String prefix;
-  const MetadataDomain(this.prefix);
-}
-
-enum MetadataKey<T extends Object> {
-  themeMode<ThemeMode>(.appConfig, 'theme.mode', .system, ThemeMode.values),
-  logLevel<LogLevel>(.systemConfig, 'log.level', .info, LogLevel.values);
-
-  final MetadataDomain domain;
-  final String name;
-  final T defaultValue;
-  final List<T>? enumValues;
-
-  const MetadataKey(this.domain, this.name, this.defaultValue, [this.enumValues]);
-
-  String get key => '${domain.prefix}.$name';
-
-  static MetadataKey<Object>? fromKey(String key) {
-    for (final m in MetadataKey.values) {
-      if (m.key == key) return m;
-    }
-    return null;
-  }
-}

mobile/lib/domain/models/ocr.model.dart

@@ -0,0 +1,126 @@
+class Ocr {
+  final String id;
+  final String assetId;
+  final double x1;
+  final double y1;
+  final double x2;
+  final double y2;
+  final double x3;
+  final double y3;
+  final double x4;
+  final double y4;
+  final double boxScore;
+  final double textScore;
+  final String text;
+  final bool isVisible;
+
+  const Ocr({
+    required this.id,
+    required this.assetId,
+    required this.x1,
+    required this.y1,
+    required this.x2,
+    required this.y2,
+    required this.x3,
+    required this.y3,
+    required this.x4,
+    required this.y4,
+    required this.boxScore,
+    required this.textScore,
+    required this.text,
+    required this.isVisible,
+  });
+
+  Ocr copyWith({
+    String? id,
+    String? assetId,
+    double? x1,
+    double? y1,
+    double? x2,
+    double? y2,
+    double? x3,
+    double? y3,
+    double? x4,
+    double? y4,
+    double? boxScore,
+    double? textScore,
+    String? text,
+    bool? isVisible,
+  }) {
+    return Ocr(
+      id: id ?? this.id,
+      assetId: assetId ?? this.assetId,
+      x1: x1 ?? this.x1,
+      y1: y1 ?? this.y1,
+      x2: x2 ?? this.x2,
+      y2: y2 ?? this.y2,
+      x3: x3 ?? this.x3,
+      y3: y3 ?? this.y3,
+      x4: x4 ?? this.x4,
+      y4: y4 ?? this.y4,
+      boxScore: boxScore ?? this.boxScore,
+      textScore: textScore ?? this.textScore,
+      text: text ?? this.text,
+      isVisible: isVisible ?? this.isVisible,
+    );
+  }
+
+  @override
+  String toString() {
+    return '''Ocr {
+    id: $id,
+    assetId: $assetId,
+    x1: $x1,
+    y1: $y1,
+    x2: $x2,
+    y2: $y2,
+    x3: $x3,
+    y3: $y3,
+    x4: $x4,
+    y4: $y4,
+    boxScore: $boxScore,
+    textScore: $textScore,
+    text: $text,
+    isVisible: $isVisible
+  }''';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+
+    return other is Ocr &&
+        other.id == id &&
+        other.assetId == assetId &&
+        other.x1 == x1 &&
+        other.y1 == y1 &&
+        other.x2 == x2 &&
+        other.y2 == y2 &&
+        other.x3 == x3 &&
+        other.y3 == y3 &&
+        other.x4 == x4 &&
+        other.y4 == y4 &&
+        other.boxScore == boxScore &&
+        other.textScore == textScore &&
+        other.text == text &&
+        other.isVisible == isVisible;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        assetId.hashCode ^
+        x1.hashCode ^
+        y1.hashCode ^
+        x2.hashCode ^
+        y2.hashCode ^
+        x3.hashCode ^
+        y3.hashCode ^
+        x4.hashCode ^
+        y4.hashCode ^
+        boxScore.hashCode ^
+        textScore.hashCode ^
+        text.hashCode ^
+        isVisible.hashCode;
+  }
+}

mobile/lib/domain/models/store.model.dart

@@ -22,7 +22,7 @@ enum StoreKey<T> {
   // user settings from [AppSettingsEnum] below:
   loadPreview<bool>._(100),
   loadOriginal<bool>._(101),
-  // id 102 (themeMode) moved to user_config.theme-mode
+  themeMode<String>._(102),
   tilesPerRow<int>._(103),
   dynamicLayout<bool>._(104),
   groupAssetsBy<int>._(105),
@@ -35,7 +35,7 @@ enum StoreKey<T> {
   albumThumbnailCacheSize<int>._(112),
   selectedAlbumSortOrder<int>._(113),
   advancedTroubleshooting<bool>._(114),
-  // id 115 (logLevel) moved to app_metadata.log-level
+  logLevel<int>._(115),
   preferRemoteImage<bool>._(116),
   loopVideo<bool>._(117),
   // map related settings

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

@@ -2,20 +2,20 @@ 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/metadata_key.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
 
 /// Service responsible for handling application logging.
 ///
 /// It listens to Dart's [Logger.root], buffers logs in memory (optionally),
-/// writes them to a persistent [LogRepository], and manages log levels via
-/// [MetadataRepository].
+/// writes them to a persistent [ILogRepository], and manages log levels
+/// via [IStoreRepository]
 class LogService {
   final LogRepository _logRepository;
-  final MetadataRepository _metadataRepository;
+  final DriftStoreRepository _storeRepository;
 
   final List<LogMessage> _msgBuffer = [];
 
@@ -38,12 +38,12 @@ class LogService {
 
   static Future<LogService> init({
     required LogRepository logRepository,
-    required MetadataRepository metadataRepository,
+    required DriftStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     _instance ??= await create(
       logRepository: logRepository,
-      metadataRepository: metadataRepository,
+      storeRepository: storeRepository,
       shouldBuffer: shouldBuffer,
     );
     return _instance!;
@@ -51,17 +51,17 @@ class LogService {
 
   static Future<LogService> create({
     required LogRepository logRepository,
-    required MetadataRepository metadataRepository,
+    required DriftStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
-    final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
+    final instance = LogService._(logRepository, storeRepository, shouldBuffer);
     await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = instance._metadataRepository.systemConfig.logLevel;
-    Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
+    final level = await instance._storeRepository.tryGet(StoreKey.logLevel) ?? LogLevel.info.index;
+    Logger.root.level = Level.LEVELS.elementAtOrNull(level) ?? Level.INFO;
     return instance;
   }
 
-  LogService._(this._logRepository, this._metadataRepository, this._shouldBuffer) {
+  LogService._(this._logRepository, this._storeRepository, this._shouldBuffer) {
     _logSubscription = Logger.root.onRecord.listen(_handleLogRecord);
   }
 
@@ -91,7 +91,7 @@ class LogService {
   }
 
   Future<void> setLogLevel(LogLevel level) async {
-    await _metadataRepository.write(MetadataKey.logLevel, level);
+    await _storeRepository.upsert(StoreKey.logLevel, level.index);
     Logger.root.level = level.toLevel();
   }
 

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

@@ -0,0 +1,12 @@
+import 'package:immich_mobile/domain/models/ocr.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/ocr.repository.dart';
+
+class OcrService {
+  final OcrRepository _repository;
+
+  const OcrService(this._repository);
+
+  Future<List<Ocr>?> get(String assetId) {
+    return _repository.get(assetId);
+  }
+}

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

@@ -296,6 +296,10 @@ class SyncStreamService {
         return _syncStreamRepository.updateAssetFacesV2(data.cast());
       case SyncEntityType.assetFaceDeleteV1:
         return _syncStreamRepository.deleteAssetFacesV1(data.cast());
+      case SyncEntityType.assetOcrV1:
+        return _syncStreamRepository.updateAssetOcrV1(data.cast());
+      case SyncEntityType.assetOcrDeleteV1:
+        return _syncStreamRepository.deleteAssetOcrV1(data.cast());
       default:
         _logger.warning("Unknown sync data type: $type");
     }

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

@@ -0,0 +1,33 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class AssetOcrEntity extends Table with DriftDefaultsMixin {
+  const AssetOcrEntity();
+
+  TextColumn get id => text()();
+
+  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+
+  RealColumn get x1 => real()();
+  RealColumn get y1 => real()();
+
+  RealColumn get x2 => real()();
+  RealColumn get y2 => real()();
+
+  RealColumn get x3 => real()();
+  RealColumn get y3 => real()();
+
+  RealColumn get x4 => real()();
+  RealColumn get y4 => real()();
+
+  RealColumn get boxScore => real()();
+  RealColumn get textScore => real()();
+
+  TextColumn get recognizedText => text()();
+
+  BoolColumn get isVisible => boolean().withDefault(const Constant(true))();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}

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

@@ -1,18 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-class MetadataEntity extends Table with DriftDefaultsMixin {
-  const MetadataEntity();
-
-  TextColumn get key => text()();
-
-  TextColumn get value => text()();
-
-  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
-
-  @override
-  Set<Column> get primaryKey => {key};
-
-  @override
-  String get tableName => "metadata";
-}

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

@@ -1,429 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart'
-    as i2;
-import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
-
-typedef $$MetadataEntityTableCreateCompanionBuilder =
-    i1.MetadataEntityCompanion Function({
-      required String key,
-      required String value,
-      i0.Value<DateTime> updatedAt,
-    });
-typedef $$MetadataEntityTableUpdateCompanionBuilder =
-    i1.MetadataEntityCompanion Function({
-      i0.Value<String> key,
-      i0.Value<String> value,
-      i0.Value<DateTime> updatedAt,
-    });
-
-class $$MetadataEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
-  $$MetadataEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<String> get key => $composableBuilder(
-    column: $table.key,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<String> get value => $composableBuilder(
-    column: $table.value,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
-    column: $table.updatedAt,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-}
-
-class $$MetadataEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
-  $$MetadataEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<String> get key => $composableBuilder(
-    column: $table.key,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<String> get value => $composableBuilder(
-    column: $table.value,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
-    column: $table.updatedAt,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-}
-
-class $$MetadataEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
-  $$MetadataEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<String> get key =>
-      $composableBuilder(column: $table.key, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get value =>
-      $composableBuilder(column: $table.value, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
-}
-
-class $$MetadataEntityTableTableManager
-    extends
-        i0.RootTableManager<
-          i0.GeneratedDatabase,
-          i1.$MetadataEntityTable,
-          i1.MetadataEntityData,
-          i1.$$MetadataEntityTableFilterComposer,
-          i1.$$MetadataEntityTableOrderingComposer,
-          i1.$$MetadataEntityTableAnnotationComposer,
-          $$MetadataEntityTableCreateCompanionBuilder,
-          $$MetadataEntityTableUpdateCompanionBuilder,
-          (
-            i1.MetadataEntityData,
-            i0.BaseReferences<
-              i0.GeneratedDatabase,
-              i1.$MetadataEntityTable,
-              i1.MetadataEntityData
-            >,
-          ),
-          i1.MetadataEntityData,
-          i0.PrefetchHooks Function()
-        > {
-  $$MetadataEntityTableTableManager(
-    i0.GeneratedDatabase db,
-    i1.$MetadataEntityTable table,
-  ) : super(
-        i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$MetadataEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              i1.$$MetadataEntityTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () => i1
-              .$$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.MetadataEntityCompanion(
-                key: key,
-                value: value,
-                updatedAt: updatedAt,
-              ),
-          createCompanionCallback:
-              ({
-                required String key,
-                required String value,
-                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.MetadataEntityCompanion.insert(
-                key: key,
-                value: value,
-                updatedAt: updatedAt,
-              ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
-              .toList(),
-          prefetchHooksCallback: null,
-        ),
-      );
-}
-
-typedef $$MetadataEntityTableProcessedTableManager =
-    i0.ProcessedTableManager<
-      i0.GeneratedDatabase,
-      i1.$MetadataEntityTable,
-      i1.MetadataEntityData,
-      i1.$$MetadataEntityTableFilterComposer,
-      i1.$$MetadataEntityTableOrderingComposer,
-      i1.$$MetadataEntityTableAnnotationComposer,
-      $$MetadataEntityTableCreateCompanionBuilder,
-      $$MetadataEntityTableUpdateCompanionBuilder,
-      (
-        i1.MetadataEntityData,
-        i0.BaseReferences<
-          i0.GeneratedDatabase,
-          i1.$MetadataEntityTable,
-          i1.MetadataEntityData
-        >,
-      ),
-      i1.MetadataEntityData,
-      i0.PrefetchHooks Function()
-    >;
-
-class $MetadataEntityTable extends i2.MetadataEntity
-    with i0.TableInfo<$MetadataEntityTable, i1.MetadataEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _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>(
-    'key',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  static const i0.VerificationMeta _valueMeta = const i0.VerificationMeta(
-    'value',
-  );
-  @override
-  late final i0.GeneratedColumn<String> value = i0.GeneratedColumn<String>(
-    'value',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  static const i0.VerificationMeta _updatedAtMeta = const i0.VerificationMeta(
-    'updatedAt',
-  );
-  @override
-  late final i0.GeneratedColumn<DateTime> updatedAt =
-      i0.GeneratedColumn<DateTime>(
-        'updated_at',
-        aliasedName,
-        false,
-        type: i0.DriftSqlType.dateTime,
-        requiredDuringInsert: false,
-        defaultValue: i3.currentDateAndTime,
-      );
-  @override
-  List<i0.GeneratedColumn> get $columns => [key, value, updatedAt];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'metadata';
-  @override
-  i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.MetadataEntityData> instance, {
-    bool isInserting = false,
-  }) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('key')) {
-      context.handle(
-        _keyMeta,
-        key.isAcceptableOrUnknown(data['key']!, _keyMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_keyMeta);
-    }
-    if (data.containsKey('value')) {
-      context.handle(
-        _valueMeta,
-        value.isAcceptableOrUnknown(data['value']!, _valueMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_valueMeta);
-    }
-    if (data.containsKey('updated_at')) {
-      context.handle(
-        _updatedAtMeta,
-        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
-      );
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {key};
-  @override
-  i1.MetadataEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.MetadataEntityData(
-      key: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}key'],
-      )!,
-      value: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}value'],
-      )!,
-      updatedAt: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}updated_at'],
-      )!,
-    );
-  }
-
-  @override
-  $MetadataEntityTable createAlias(String alias) {
-    return $MetadataEntityTable(attachedDatabase, alias);
-  }
-
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class MetadataEntityData extends i0.DataClass
-    implements i0.Insertable<i1.MetadataEntityData> {
-  final String key;
-  final String value;
-  final DateTime updatedAt;
-  const MetadataEntityData({
-    required this.key,
-    required this.value,
-    required this.updatedAt,
-  });
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['key'] = i0.Variable<String>(key);
-    map['value'] = i0.Variable<String>(value);
-    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
-    return map;
-  }
-
-  factory MetadataEntityData.fromJson(
-    Map<String, dynamic> json, {
-    i0.ValueSerializer? serializer,
-  }) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return MetadataEntityData(
-      key: serializer.fromJson<String>(json['key']),
-      value: serializer.fromJson<String>(json['value']),
-      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'key': serializer.toJson<String>(key),
-      'value': serializer.toJson<String>(value),
-      'updatedAt': serializer.toJson<DateTime>(updatedAt),
-    };
-  }
-
-  i1.MetadataEntityData copyWith({
-    String? key,
-    String? value,
-    DateTime? updatedAt,
-  }) => i1.MetadataEntityData(
-    key: key ?? this.key,
-    value: value ?? this.value,
-    updatedAt: updatedAt ?? this.updatedAt,
-  );
-  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,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('MetadataEntityData(')
-          ..write('key: $key, ')
-          ..write('value: $value, ')
-          ..write('updatedAt: $updatedAt')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(key, value, updatedAt);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.MetadataEntityData &&
-          other.key == this.key &&
-          other.value == this.value &&
-          other.updatedAt == this.updatedAt);
-}
-
-class MetadataEntityCompanion
-    extends i0.UpdateCompanion<i1.MetadataEntityData> {
-  final i0.Value<String> key;
-  final i0.Value<String> value;
-  final i0.Value<DateTime> updatedAt;
-  const MetadataEntityCompanion({
-    this.key = const i0.Value.absent(),
-    this.value = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
-  });
-  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.MetadataEntityData> custom({
-    i0.Expression<String>? key,
-    i0.Expression<String>? value,
-    i0.Expression<DateTime>? updatedAt,
-  }) {
-    return i0.RawValuesInsertable({
-      if (key != null) 'key': key,
-      if (value != null) 'value': value,
-      if (updatedAt != null) 'updated_at': updatedAt,
-    });
-  }
-
-  i1.MetadataEntityCompanion copyWith({
-    i0.Value<String>? key,
-    i0.Value<String>? value,
-    i0.Value<DateTime>? updatedAt,
-  }) {
-    return i1.MetadataEntityCompanion(
-      key: key ?? this.key,
-      value: value ?? this.value,
-      updatedAt: updatedAt ?? this.updatedAt,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (key.present) {
-      map['key'] = i0.Variable<String>(key.value);
-    }
-    if (value.present) {
-      map['value'] = i0.Variable<String>(value.value);
-    }
-    if (updatedAt.present) {
-      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('MetadataEntityCompanion(')
-          ..write('key: $key, ')
-          ..write('value: $value, ')
-          ..write('updatedAt: $updatedAt')
-          ..write(')'))
-        .toString();
-  }
-}

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

@@ -5,6 +5,7 @@ import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
@@ -13,7 +14,6 @@ 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/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';
@@ -54,7 +54,7 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.da
     StoreEntity,
     TrashedLocalAssetEntity,
     AssetEditEntity,
-    MetadataEntity,
+    AssetOcrEntity,
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -253,7 +253,7 @@ class Drift extends $Drift {
             await m.alterTable(TableMigration(v24.remoteAlbumEntity));
           },
           from24To25: (m, v25) async {
-            await m.createTable(v25.metadata);
+            await m.create(v25.assetOcrEntity);
           },
         ),
       );

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/metadata.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/asset_ocr.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.$MetadataEntityTable metadataEntity = i22.$MetadataEntityTable(
+  late final i22.$AssetOcrEntityTable assetOcrEntity = i22.$AssetOcrEntityTable(
     this,
   );
   i23.MergedAssetDrift get mergedAssetDrift => i24.ReadDatabaseContainer(
@@ -134,7 +134,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
     storeEntity,
     trashedLocalAssetEntity,
     assetEditEntity,
-    metadataEntity,
+    assetOcrEntity,
     i10.idxPartnerSharedWithId,
     i11.idxLatLng,
     i12.idxRemoteAlbumAssetAlbumAsset,
@@ -334,6 +334,13 @@ abstract class $Drift extends i0.GeneratedDatabase {
       ),
       result: [i0.TableUpdate('asset_edit_entity', kind: i0.UpdateKind.delete)],
     ),
+    i0.WritePropagation(
+      on: i0.TableUpdateQuery.onTableName(
+        'remote_asset_entity',
+        limitUpdateKind: i0.UpdateKind.delete,
+      ),
+      result: [i0.TableUpdate('asset_ocr_entity', kind: i0.UpdateKind.delete)],
+    ),
   ]);
   @override
   i0.DriftDatabaseOptions get options =>
@@ -395,6 +402,6 @@ class $DriftManager {
       );
   i21.$$AssetEditEntityTableTableManager get assetEditEntity =>
       i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
-  i22.$$MetadataEntityTableTableManager get metadataEntity =>
-      i22.$$MetadataEntityTableTableManager(_db, _db.metadataEntity);
+  i22.$$AssetOcrEntityTableTableManager get assetOcrEntity =>
+      i22.$$AssetOcrEntityTableTableManager(_db, _db.assetOcrEntity);
 }

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

@@ -12411,7 +12411,7 @@ final class Schema25 extends i0.VersionedSchema {
     storeEntity,
     trashedLocalAssetEntity,
     assetEditEntity,
-    metadata,
+    assetOcrEntity,
     idxPartnerSharedWithId,
     idxLatLng,
     idxRemoteAlbumAssetAlbumAsset,
@@ -12864,13 +12864,28 @@ final class Schema25 extends i0.VersionedSchema {
     ),
     alias: null,
   );
-  late final Shape49 metadata = Shape49(
+  late final Shape49 assetOcrEntity = Shape49(
     source: i0.VersionedTable(
-      entityName: 'metadata',
+      entityName: 'asset_ocr_entity',
       withoutRowId: true,
       isStrict: true,
-      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_211, _column_115],
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_210,
+        _column_211,
+        _column_212,
+        _column_213,
+        _column_214,
+        _column_215,
+        _column_216,
+        _column_217,
+        _column_218,
+        _column_219,
+        _column_220,
+        _column_201,
+      ],
       attachedDatabase: database,
     ),
     alias: null,
@@ -12919,25 +12934,119 @@ final class Schema25 extends i0.VersionedSchema {
 
 class Shape49 extends i0.VersionedTable {
   Shape49({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get key =>
-      columnsByName['key']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get value =>
-      columnsByName['value']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get updatedAt =>
-      columnsByName['updated_at']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get assetId =>
+      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<double> get x1 =>
+      columnsByName['x1']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get y1 =>
+      columnsByName['y1']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get x2 =>
+      columnsByName['x2']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get y2 =>
+      columnsByName['y2']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get x3 =>
+      columnsByName['x3']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get y3 =>
+      columnsByName['y3']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get x4 =>
+      columnsByName['x4']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get y4 =>
+      columnsByName['y4']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get boxScore =>
+      columnsByName['box_score']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get textScore =>
+      columnsByName['text_score']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<String> get recognizedText =>
+      columnsByName['recognized_text']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get isVisible =>
+      columnsByName['is_visible']! as i1.GeneratedColumn<int>;
 }
 
-i1.GeneratedColumn<String> _column_210(String aliasedName) =>
-    i1.GeneratedColumn<String>(
-      'key',
+i1.GeneratedColumn<double> _column_210(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'x1',
       aliasedName,
       false,
-      type: i1.DriftSqlType.string,
+      type: i1.DriftSqlType.double,
       $customConstraints: 'NOT NULL',
     );
-i1.GeneratedColumn<String> _column_211(String aliasedName) =>
+i1.GeneratedColumn<double> _column_211(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'y1',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<double> _column_212(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'x2',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<double> _column_213(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'y2',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<double> _column_214(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'x3',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<double> _column_215(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'y3',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<double> _column_216(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'x4',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<double> _column_217(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'y4',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<double> _column_218(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'box_score',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<double> _column_219(String aliasedName) =>
+    i1.GeneratedColumn<double>(
+      'text_score',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.double,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<String> _column_220(String aliasedName) =>
     i1.GeneratedColumn<String>(
-      'value',
+      'recognized_text',
       aliasedName,
       false,
       type: i1.DriftSqlType.string,

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

@@ -1,101 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/config/system_config.dart';
-import 'package:immich_mobile/domain/models/config/theme_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;
-  final Map<MetadataKey, Object> _cache = {};
-
-  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;
-  }
-
-  static Future<MetadataRepository> ensureInitialized(Drift db) async {
-    if (_instance == null) {
-      final instance = MetadataRepository._(db);
-      await instance._hydrate();
-      _instance = instance;
-    }
-    return _instance!;
-  }
-
-  static Future<void> refresh() async {
-    instance._cache.clear();
-    await instance._hydrate();
-  }
-
-  Future<void> _hydrate() async {
-    final rows = await _db.select(_db.metadataEntity).get();
-    for (final row in rows) {
-      final key = MetadataKey.fromKey(row.key);
-      if (key != null) _cache[key] = _decode(key, row.value);
-    }
-  }
-
-  T _read<T extends Object>(MetadataKey<T> key) => (_cache[key] as T?) ?? key.defaultValue;
-
-  Future<void> write<T extends Object>(MetadataKey<T> key, T value) async {
-    if (_read(key) == value) return;
-
-    await _db
-        .into(_db.metadataEntity)
-        .insertOnConflictUpdate(
-          MetadataEntityCompanion.insert(key: key.key, value: _encode(value), updatedAt: Value(DateTime.now())),
-        );
-    _cache[key] = value;
-  }
-
-  String _encode<T extends Object>(T value) => switch (value) {
-    Enum() => value.name,
-    DateTime() => value.toIso8601String(),
-    _ => throw ArgumentError('Unsupported metadata value type: ${value.runtimeType}'),
-  };
-
-  T _decode<T extends Object>(MetadataKey<T> key, String raw) {
-    final enumValues = key.enumValues;
-    if (enumValues != null) {
-      return enumValues.where((v) => (v as Enum).name == raw).firstOrNull ?? key.defaultValue;
-    }
-    return switch (key.defaultValue) {
-      DateTime() => (DateTime.tryParse(raw) ?? key.defaultValue) as T,
-      _ => throw ArgumentError('Unsupported metadata value type: ${key.defaultValue.runtimeType}'),
-    };
-  }
-
-  Future<void> delete<T extends Object>(MetadataKey<T> key) async {
-    _cache[key] = key.defaultValue;
-    await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.key))).go();
-  }
-
-  AppConfig get appConfig => AppConfig(theme: ThemeConfig(mode: _read(MetadataKey.themeMode)));
-
-  SystemConfig get systemConfig => SystemConfig(logLevel: _read(MetadataKey.logLevel));
-
-  Stream<AppConfig> watchAppConfig() => _watchDomain(MetadataDomain.appConfig).map((_) => appConfig).distinct();
-
-  Stream<SystemConfig> watchSystemConfig() =>
-      _watchDomain(MetadataDomain.systemConfig).map((_) => systemConfig).distinct();
-
-  Stream<void> _watchDomain(MetadataDomain domain) {
-    final query = _db.select(_db.metadataEntity)..where((t) => t.key.like('${domain.prefix}.%'));
-    return query.watch().map((rows) => rows.forEach(_updateCacheForRow));
-  }
-
-  void _updateCacheForRow(MetadataEntityData row) {
-    final key = MetadataKey.fromKey(row.key);
-    if (key == null) return;
-    _cache[key] = _decode(key, row.value);
-  }
-}

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

@@ -0,0 +1,36 @@
+import 'package:immich_mobile/domain/models/ocr.model.dart';
+import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class OcrRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const OcrRepository(this._db) : super(_db);
+
+  Future<List<Ocr>?> get(String assetId) async {
+    final query = _db.select(_db.assetOcrEntity)..where((row) => row.assetId.equals(assetId));
+
+    final result = await query.get();
+    return result.map((e) => e.toDto()).toList();
+  }
+}
+
+extension on AssetOcrEntityData {
+  Ocr toDto() {
+    return Ocr(
+      id: id,
+      assetId: assetId,
+      x1: x1,
+      y1: y1,
+      x2: x2,
+      y2: y2,
+      x3: x3,
+      y3: y3,
+      x4: x4,
+      y4: y4,
+      boxScore: boxScore,
+      textScore: textScore,
+      text: recognizedText,
+      isVisible: isVisible,
+    );
+  }
+}

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

@@ -69,6 +69,7 @@ class SyncApiRepository {
           SyncRequestType.peopleV1,
           if (serverVersion < const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetFacesV1,
           if (serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetFacesV2,
+          if (serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)) SyncRequestType.assetOcrV1,
         ],
         reset: shouldReset,
       ).toJson(),
@@ -197,6 +198,8 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.assetFaceV1: SyncAssetFaceV1.fromJson,
   SyncEntityType.assetFaceV2: SyncAssetFaceV2.fromJson,
   SyncEntityType.assetFaceDeleteV1: SyncAssetFaceDeleteV1.fromJson,
+  SyncEntityType.assetOcrV1: SyncAssetOcrV1.fromJson,
+  SyncEntityType.assetOcrDeleteV1: SyncAssetOcrDeleteV1.fromJson,
   SyncEntityType.syncCompleteV1: _SyncEmptyDto.fromJson,
 };
 

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

@@ -12,6 +12,7 @@ import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
@@ -62,6 +63,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           await _db.userMetadataEntity.deleteAll();
           await _db.remoteAssetCloudIdEntity.deleteAll();
           await _db.assetEditEntity.deleteAll();
+          await _db.assetOcrEntity.deleteAll();
         });
         await _db.customStatement('PRAGMA foreign_keys = ON');
       });
@@ -797,6 +799,53 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     }
   }
 
+  Future<void> updateAssetOcrV1(Iterable<SyncAssetOcrV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final assetOcr in data) {
+          final companion = AssetOcrEntityCompanion(
+            id: Value(assetOcr.id),
+            assetId: Value(assetOcr.assetId),
+            recognizedText: Value(assetOcr.text),
+            x1: Value(assetOcr.x1),
+            y1: Value(assetOcr.y1),
+            x2: Value(assetOcr.x2),
+            y2: Value(assetOcr.y2),
+            x3: Value(assetOcr.x3),
+            y3: Value(assetOcr.y3),
+            x4: Value(assetOcr.x4),
+            y4: Value(assetOcr.y4),
+            boxScore: Value(assetOcr.boxScore),
+            textScore: Value(assetOcr.textScore),
+            isVisible: Value(assetOcr.isVisible),
+          );
+
+          batch.insert(
+            _db.assetOcrEntity,
+            companion.copyWith(id: Value(assetOcr.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: updateAssetOcrV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteAssetOcrV1(Iterable<SyncAssetOcrDeleteV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final assetOcr in data) {
+          batch.deleteWhere(_db.assetOcrEntity, (row) => row.id.equals(assetOcr.id));
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: deleteAssetOcrV1', error, stack);
+      rethrow;
+    }
+  }
+
   Future<void> pruneAssets() async {
     try {
       await _db.transaction(() async {

mobile/lib/main.dart

@@ -53,7 +53,7 @@ void main() async {
     await initApp();
     // Warm-up isolate pool for worker manager
     await workerManagerPatch.init(dynamicSpawning: true, isolatesCount: max(Platform.numberOfProcessors - 1, 5));
-    await migrateDatabaseIfNeeded(drift);
+    await migrateDatabaseIfNeeded();
 
     runApp(ProviderScope(overrides: [driftProvider.overrideWith(driftOverride(drift))], child: const MainWidget()));
   } catch (error, stack) {

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

@@ -13,6 +13,7 @@ import 'package:immich_mobile/extensions/scroll_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/ocr_overlay.widget.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
@@ -356,6 +357,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     _showingDetails = ref.watch(assetViewerProvider.select((s) => s.showingDetails));
     final stackIndex = ref.watch(assetViewerProvider.select((s) => s.stackIndex));
     final isPlayingMotionVideo = ref.watch(isPlayingMotionVideoProvider);
+    final showingOcr = ref.watch(assetViewerProvider.select((s) => s.showingOcr));
 
     final asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
     if (asset == null) {
@@ -404,6 +406,15 @@ class _AssetPageState extends ConsumerState<AssetPage> {
                     isPlayingMotionVideo: isPlayingMotionVideo,
                   ),
                 ),
+                if (showingOcr && displayAsset.width != null && displayAsset.height != null)
+                  Positioned.fill(
+                    child: OcrOverlay(
+                      asset: displayAsset,
+                      imageSize: Size(displayAsset.width!.toDouble(), displayAsset.height!.toDouble()),
+                      viewportSize: Size(viewportWidth, viewportHeight),
+                      controller: _viewController,
+                    ),
+                  ),
                 IgnorePointer(
                   ignoring: !_showingDetails,
                   child: Column(

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

@@ -0,0 +1,276 @@
+import 'dart:async';
+import 'dart:math' as math;
+import 'package:flutter/material.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/ocr.model.dart';
+import 'package:immich_mobile/providers/infrastructure/ocr.provider.dart';
+import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
+
+class OcrOverlay extends ConsumerStatefulWidget {
+  final BaseAsset asset;
+  final Size imageSize;
+  final Size viewportSize;
+  final PhotoViewControllerBase? controller;
+
+  const OcrOverlay({
+    super.key,
+    required this.asset,
+    required this.imageSize,
+    required this.viewportSize,
+    this.controller,
+  });
+
+  @override
+  ConsumerState<OcrOverlay> createState() => _OcrOverlayState();
+}
+
+class _OcrOverlayState extends ConsumerState<OcrOverlay> {
+  int? _selectedBoxIndex;
+
+  // Current transform read from the PhotoView controller.
+  // Null until the controller has emitted at least one real event or until
+  // we can seed a reliable value from controller.value on init.
+  PhotoViewControllerValue? _controllerValue;
+  StreamSubscription<PhotoViewControllerValue>? _controllerSub;
+
+  @override
+  void initState() {
+    super.initState();
+    _attachController(widget.controller);
+  }
+
+  @override
+  void didUpdateWidget(OcrOverlay oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.controller != widget.controller) {
+      _detachController();
+      _attachController(widget.controller);
+    }
+  }
+
+  @override
+  void dispose() {
+    _detachController();
+    super.dispose();
+  }
+
+  void _attachController(PhotoViewControllerBase? controller) {
+    if (controller == null) return;
+
+    // Seed with the current value only when scaleBoundaries is already set.
+    // Before the image finishes loading, PhotoView uses childSize = outerSize
+    // (viewport) as a placeholder, which sets scale = 1.0.  That placeholder
+    // is wrong for any image that doesn't exactly fill the viewport.
+    // Once scaleBoundaries is set the value is trustworthy (the image has rendered
+    // at least one frame and setScaleInvisibly has been called with the real
+    // initial/zoomed scale).
+    if (controller.scaleBoundaries != null) {
+      _controllerValue = controller.value;
+    }
+
+    _controllerSub = controller.outputStateStream.listen((value) {
+      if (mounted) setState(() => _controllerValue = value);
+    });
+  }
+
+  void _detachController() {
+    _controllerSub?.cancel();
+    _controllerSub = null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.asset is! RemoteAsset) {
+      return const SizedBox.shrink();
+    }
+
+    final ocrData = ref.watch(ocrAssetProvider((widget.asset as RemoteAsset).id));
+
+    return ocrData.when(
+      data: (data) {
+        if (data == null || data.isEmpty) {
+          return const SizedBox.shrink();
+        }
+        return _buildOcrBoxes(data);
+      },
+      loading: () => const SizedBox.shrink(),
+      error: (_, __) => const SizedBox.shrink(),
+    );
+  }
+
+  Widget _buildOcrBoxes(List<Ocr> ocrData) {
+    // Use the actual decoded image size from PhotoView's scaleBoundaries when
+    // available. The image provider may serve a downscaled preview (e.g. Immich
+    // serves a ~1440px preview for large originals), so the decoded dimensions
+    // can differ significantly from the stored asset dimensions. Using the wrong
+    // size would scale every coordinate by the ratio between the two resolutions.
+    final imageSize = widget.controller?.scaleBoundaries?.childSize ?? widget.imageSize;
+
+    final scale =
+        _controllerValue?.scale ??
+        math.min(widget.viewportSize.width / imageSize.width, widget.viewportSize.height / imageSize.height);
+    final position = _controllerValue?.position ?? Offset.zero;
+    return _buildBoxStack(ocrData, imageSize, scale, position);
+  }
+
+  Widget _buildBoxStack(List<Ocr> ocrData, Size imageSize, double scale, Offset position) {
+    final imageWidth = imageSize.width;
+    final imageHeight = imageSize.height;
+    final viewportWidth = widget.viewportSize.width;
+    final viewportHeight = widget.viewportSize.height;
+
+    // Image center in viewport space, accounting for pan
+    final cx = viewportWidth / 2 + position.dx;
+    final cy = viewportHeight / 2 + position.dy;
+
+    return GestureDetector(
+      behavior: HitTestBehavior.translucent,
+      onTap: () {
+        setState(() {
+          _selectedBoxIndex = null;
+        });
+      },
+      child: ClipRect(
+        child: Stack(
+          children: [
+            // Fills the viewport so taps outside boxes deselect
+            SizedBox(width: viewportWidth, height: viewportHeight),
+            ...ocrData.asMap().entries.map((entry) {
+              final index = entry.key;
+              final ocr = entry.value;
+              final isSelected = _selectedBoxIndex == index;
+
+              // Map normalized image coords (0–1) to viewport space
+              final x1 = cx + (ocr.x1 - 0.5) * imageWidth * scale;
+              final y1 = cy + (ocr.y1 - 0.5) * imageHeight * scale;
+              final x2 = cx + (ocr.x2 - 0.5) * imageWidth * scale;
+              final y2 = cy + (ocr.y2 - 0.5) * imageHeight * scale;
+              final x3 = cx + (ocr.x3 - 0.5) * imageWidth * scale;
+              final y3 = cy + (ocr.y3 - 0.5) * imageHeight * scale;
+              final x4 = cx + (ocr.x4 - 0.5) * imageWidth * scale;
+              final y4 = cy + (ocr.y4 - 0.5) * imageHeight * scale;
+
+              // Bounding rectangle for hit testing and Positioned placement
+              final minX = [x1, x2, x3, x4].reduce((a, b) => a < b ? a : b);
+              final maxX = [x1, x2, x3, x4].reduce((a, b) => a > b ? a : b);
+              final minY = [y1, y2, y3, y4].reduce((a, b) => a < b ? a : b);
+              final maxY = [y1, y2, y3, y4].reduce((a, b) => a > b ? a : b);
+
+              final angle = math.atan2(y2 - y1, x2 - x1);
+              final centerX = (minX + maxX) / 2;
+              final centerY = (minY + maxY) / 2;
+
+              return Positioned(
+                left: minX,
+                top: minY,
+                child: GestureDetector(
+                  onTap: () {
+                    setState(() {
+                      _selectedBoxIndex = isSelected ? null : index;
+                    });
+                  },
+                  behavior: HitTestBehavior.translucent,
+                  child: SizedBox(
+                    width: maxX - minX,
+                    height: maxY - minY,
+                    child: Stack(
+                      children: [
+                        CustomPaint(
+                          painter: _OcrBoxPainter(
+                            points: [
+                              Offset(x1 - minX, y1 - minY),
+                              Offset(x2 - minX, y2 - minY),
+                              Offset(x3 - minX, y3 - minY),
+                              Offset(x4 - minX, y4 - minY),
+                            ],
+                            isSelected: isSelected,
+                            context: context,
+                          ),
+                          size: Size(maxX - minX, maxY - minY),
+                        ),
+                        if (isSelected)
+                          Positioned(
+                            left: centerX - minX,
+                            top: centerY - minY,
+                            child: FractionalTranslation(
+                              translation: const Offset(-0.5, -0.5),
+                              child: Transform.rotate(
+                                angle: angle,
+                                alignment: Alignment.center,
+                                child: Container(
+                                  margin: const EdgeInsets.all(2),
+                                  padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
+                                  decoration: BoxDecoration(
+                                    color: Colors.grey[800]?.withValues(alpha: 0.4),
+                                    borderRadius: const BorderRadius.all(Radius.circular(4)),
+                                  ),
+                                  child: ConstrainedBox(
+                                    constraints: BoxConstraints(
+                                      maxWidth: math.max(50, maxX - minX),
+                                      maxHeight: math.max(20, maxY - minY),
+                                    ),
+                                    child: FittedBox(
+                                      fit: BoxFit.scaleDown,
+                                      child: SelectableText(
+                                        ocr.text,
+                                        style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: math.max(12, (maxY - minY) * 0.6),
+                                          fontWeight: FontWeight.bold,
+                                        ),
+                                        textAlign: TextAlign.center,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ),
+                      ],
+                    ),
+                  ),
+                ),
+              );
+            }),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _OcrBoxPainter extends CustomPainter {
+  final List<Offset> points;
+  final bool isSelected;
+  final BuildContext context;
+
+  const _OcrBoxPainter({required this.points, required this.isSelected, required this.context});
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = isSelected ? Colors.blue : Colors.lightBlue
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 2.0;
+
+    final fillPaint = Paint()
+      ..color = (isSelected ? Colors.blue : Colors.lightBlue).withValues(alpha: 0.1)
+      ..style = PaintingStyle.fill;
+
+    final path = Path()
+      ..moveTo(points[0].dx, points[0].dy)
+      ..lineTo(points[1].dx, points[1].dy)
+      ..lineTo(points[2].dx, points[2].dy)
+      ..lineTo(points[3].dx, points[3].dy)
+      ..close();
+
+    canvas.drawPath(path, fillPaint);
+    canvas.drawPath(path, paint);
+  }
+
+  @override
+  bool shouldRepaint(_OcrBoxPainter oldDelegate) {
+    return oldDelegate.isSelected != isSelected || oldDelegate.points != points;
+  }
+}

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

@@ -4,6 +4,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/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/ocr.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
@@ -14,7 +16,6 @@ import 'package:immich_mobile/providers/infrastructure/current_album.provider.da
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 
 class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
   const ViewerTopAppBar({super.key});
@@ -32,6 +33,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
     final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
     final isInLockedView = ref.watch(inLockedViewProvider);
     final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
+    final hasOcr = asset is RemoteAsset && ref.watch(ocrAssetProvider(asset.id)).valueOrNull?.isNotEmpty == true;
 
     final showingDetails = ref.watch(assetViewerProvider.select((state) => state.showingDetails));
 
@@ -43,8 +45,15 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
     double opacity = ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity)) * (showingControls ? 1 : 0);
 
     final originalTheme = context.themeData;
+    final showingOcr = ref.watch(assetViewerProvider.select((state) => state.showingOcr));
 
     final actions = <Widget>[
+      if (hasOcr)
+        IconButton(
+          icon: Icon(showingOcr ? Icons.text_fields : Icons.text_fields_outlined),
+          onPressed: ref.read(assetViewerProvider.notifier).toggleOcr,
+          color: showingOcr ? context.primaryColor : null,
+        ),
       if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
       if (album != null && album.isActivityEnabled && album.isShared)
         IconButton(

mobile/lib/providers/asset_viewer/asset_viewer.provider.dart

@@ -8,6 +8,7 @@ class AssetViewerState {
   final bool showingDetails;
   final bool showingControls;
   final bool isZoomed;
+  final bool showingOcr;
   final BaseAsset? currentAsset;
   final int stackIndex;
 
@@ -16,6 +17,7 @@ class AssetViewerState {
     this.showingDetails = false,
     this.showingControls = true,
     this.isZoomed = false,
+    this.showingOcr = false,
     this.currentAsset,
     this.stackIndex = 0,
   });
@@ -25,6 +27,7 @@ class AssetViewerState {
     bool? showingDetails,
     bool? showingControls,
     bool? isZoomed,
+    bool? showingOcr,
     BaseAsset? currentAsset,
     int? stackIndex,
   }) {
@@ -33,6 +36,7 @@ class AssetViewerState {
       showingDetails: showingDetails ?? this.showingDetails,
       showingControls: showingControls ?? this.showingControls,
       isZoomed: isZoomed ?? this.isZoomed,
+      showingOcr: showingOcr ?? this.showingOcr,
       currentAsset: currentAsset ?? this.currentAsset,
       stackIndex: stackIndex ?? this.stackIndex,
     );
@@ -40,7 +44,7 @@ class AssetViewerState {
 
   @override
   String toString() {
-    return 'AssetViewerState(opacity: $backgroundOpacity, showingDetails: $showingDetails, controls: $showingControls, isZoomed: $isZoomed)';
+    return 'AssetViewerState(opacity: $backgroundOpacity, showingDetails: $showingDetails, controls: $showingControls, isZoomed: $isZoomed, showingOcr: $showingOcr)';
   }
 
   @override
@@ -52,6 +56,7 @@ class AssetViewerState {
         other.showingDetails == showingDetails &&
         other.showingControls == showingControls &&
         other.isZoomed == isZoomed &&
+        other.showingOcr == showingOcr &&
         other.currentAsset == currentAsset &&
         other.stackIndex == stackIndex;
   }
@@ -62,6 +67,7 @@ class AssetViewerState {
       showingDetails.hashCode ^
       showingControls.hashCode ^
       isZoomed.hashCode ^
+      showingOcr.hashCode ^
       currentAsset.hashCode ^
       stackIndex.hashCode;
 }
@@ -131,6 +137,10 @@ class AssetViewerStateNotifier extends Notifier<AssetViewerState> {
     }
     state = state.copyWith(stackIndex: index);
   }
+
+  void toggleOcr() {
+    state = state.copyWith(showingOcr: !state.showingOcr);
+  }
 }
 
 final assetViewerProvider = NotifierProvider<AssetViewerStateNotifier, AssetViewerState>(AssetViewerStateNotifier.new);

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

@@ -1,20 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/config/system_config.dart';
-import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
-
-final metadataProvider = Provider<MetadataRepository>((_) => MetadataRepository.instance);
-
-final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
-  final repo = ref.watch(metadataProvider);
-  final subscription = repo.watchAppConfig().listen((event) => ref.state = event);
-  ref.onDispose(subscription.cancel);
-  return repo.appConfig;
-});
-
-final systemConfigProvider = Provider.autoDispose<SystemConfig>((ref) {
-  final repo = ref.watch(metadataProvider);
-  final subscription = repo.watchSystemConfig().listen((event) => ref.state = event);
-  ref.onDispose(subscription.cancel);
-  return repo.systemConfig;
-});

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

@@ -0,0 +1,14 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/ocr.model.dart';
+import 'package:immich_mobile/domain/services/ocr.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/ocr.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+
+final ocrRepositoryProvider = Provider<OcrRepository>((ref) => OcrRepository(ref.watch(driftProvider)));
+
+final ocrServiceProvider = Provider<OcrService>((ref) => OcrService(ref.watch(ocrRepositoryProvider)));
+
+final ocrAssetProvider = FutureProvider.family<List<Ocr>?, String>((ref, assetId) async {
+  final service = ref.watch(ocrServiceProvider);
+  return service.get(assetId);
+});

mobile/lib/providers/theme.provider.dart

@@ -1,15 +1,27 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+
 import 'package:immich_mobile/constants/colors.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.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';
+import 'package:immich_mobile/theme/dynamic_theme.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 
-final immichThemeModeProvider = StateProvider<ThemeMode>((ref) => ref.watch(appConfigProvider).theme.mode);
+final immichThemeModeProvider = StateProvider<ThemeMode>((ref) {
+  final themeMode = ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.themeMode);
+
+  dPrint(() => "Current themeMode $themeMode");
+
+  if (themeMode == ThemeMode.light.name) {
+    return ThemeMode.light;
+  } else if (themeMode == ThemeMode.dark.name) {
+    return ThemeMode.dark;
+  } else {
+    return ThemeMode.system;
+  }
+});
 
 final immichThemePresetProvider = StateProvider<ImmichColorPreset>((ref) {
   final appSettingsProvider = ref.watch(appSettingsServiceProvider);

mobile/lib/services/app_settings.service.dart

@@ -5,6 +5,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 enum AppSettingsEnum<T> {
   loadPreview<bool>(StoreKey.loadPreview, "loadPreview", true),
   loadOriginal<bool>(StoreKey.loadOriginal, "loadOriginal", false),
+  themeMode<String>(StoreKey.themeMode, "themeMode", "system"), // "light","dark","system"
   primaryColor<String>(StoreKey.primaryColor, "primaryColor", defaultColorPresetName),
   dynamicTheme<bool>(StoreKey.dynamicTheme, "dynamicTheme", false),
   colorfulInterface<bool>(StoreKey.colorfulInterface, "colorfulInterface", true),
@@ -29,6 +30,7 @@ enum AppSettingsEnum<T> {
   selectedAlbumSortOrder<int>(StoreKey.selectedAlbumSortOrder, "selectedAlbumSortOrder", 2),
   advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),
   manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),
+  logLevel<int>(StoreKey.logLevel, null, 5), // Level.INFO = 5
   preferRemoteImage<bool>(StoreKey.preferRemoteImage, null, false),
   loopVideo<bool>(StoreKey.loopVideo, "loopVideo", true),
   loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, "loadOriginalVideo", false),

mobile/lib/utils/bootstrap.dart

@@ -6,7 +6,6 @@ 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/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 +48,9 @@ abstract final class Bootstrap {
 
     await StoreService.init(storeRepository: storeRepo, listenUpdates: listenStoreUpdates);
 
-    final metadataRepo = await MetadataRepository.ensureInitialized(drift);
-
     await LogService.init(
       logRepository: LogRepository(logDb),
-      metadataRepository: metadataRepo,
+      storeRepository: storeRepo,
       shouldBuffer: shouldBufferLogs,
     );
 

mobile/lib/utils/hooks/app_settings_update_hook.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 
 ValueNotifier<T> useAppSettingsState<T>(AppSettingsEnum<T> key) {
   final notifier = useState<T>(Store.get(key.storeKey, key.defaultValue));

mobile/lib/utils/migration.dart

@@ -1,79 +1,25 @@
 import 'dart:async';
 
-import 'package:drift/drift.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/log.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/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 
-const int targetVersion = 26;
+const int targetVersion = 25;
 
-Future<void> migrateDatabaseIfNeeded(Drift drift) async {
+Future<void> migrateDatabaseIfNeeded() async {
   final int version = Store.get(StoreKey.version, targetVersion);
 
   if (version < 25) {
-    await _migrateTo25();
-  }
-
-  if (version < 26) {
-    await _migrateTo26(drift);
+    final accessToken = Store.tryGet(StoreKey.accessToken);
+    if (accessToken != null && accessToken.isNotEmpty) {
+      final serverUrls = ApiService.getServerUrls();
+      if (serverUrls.isNotEmpty) {
+        await NetworkRepository.setHeaders(ApiService.getRequestHeaders(), serverUrls, token: accessToken);
+      }
+    }
   }
 
   await Store.put(StoreKey.version, targetVersion);
   return;
 }
-
-Future<void> _migrateTo25() async {
-  final accessToken = Store.tryGet(StoreKey.accessToken);
-  if (accessToken == null || accessToken.isEmpty) return;
-
-  final serverUrls = ApiService.getServerUrls();
-  if (serverUrls.isEmpty) return;
-
-  await NetworkRepository.setHeaders(ApiService.getRequestHeaders(), serverUrls, token: accessToken);
-}
-
-Future<void> _migrateTo26(Drift drift) async {
-  const int themeModeKey = 102;
-  const int logLevelKey = 115;
-
-  final repo = MetadataRepository.instance;
-  final migrated = <int>[];
-
-  final themeMode = await _readLegacyStoreString(drift, themeModeKey);
-  if (themeMode != null) {
-    final mode = ThemeMode.values.firstWhere((m) => m.name == themeMode, orElse: () => ThemeMode.system);
-    await repo.write(MetadataKey.themeMode, mode);
-    migrated.add(themeModeKey);
-  }
-
-  final logLevelIndex = await _readLegacyStoreInt(drift, logLevelKey);
-  if (logLevelIndex != null) {
-    final logLevel = LogLevel.values.elementAtOrNull(logLevelIndex) ?? LogLevel.info;
-    await LogService.I.setLogLevel(logLevel);
-    migrated.add(logLevelKey);
-  }
-
-  await _deleteLegacyStoreRows(drift, migrated);
-}
-
-Future<String?> _readLegacyStoreString(Drift drift, int id) async {
-  final row = await (drift.storeEntity.select()..where((t) => t.id.equals(id))).getSingleOrNull();
-  return row?.stringValue;
-}
-
-Future<int?> _readLegacyStoreInt(Drift drift, int id) async {
-  final row = await (drift.storeEntity.select()..where((t) => t.id.equals(id))).getSingleOrNull();
-  return row?.intValue;
-}
-
-Future<void> _deleteLegacyStoreRows(Drift drift, List<int> ids) async {
-  if (ids.isEmpty) return;
-  await (drift.storeEntity.delete()..where((t) => t.id.isIn(ids))).go();
-}

mobile/lib/widgets/settings/advanced_settings.dart

@@ -7,7 +7,6 @@ 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/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/local_files_manager.repository.dart';
@@ -31,7 +30,7 @@ class AdvancedSettings extends HookConsumerWidget {
     final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
     final isManageMediaSupported = useState(false);
     final manageMediaAndroidPermission = useState(false);
-    final levelId = useState<int>(ref.read(systemConfigProvider).logLevel.index);
+    final levelId = useAppSettingsState(AppSettingsEnum.logLevel);
     final preferRemote = useAppSettingsState(AppSettingsEnum.preferRemoteImage);
     final readonlyModeEnabled = useAppSettingsState(AppSettingsEnum.readonlyModeEnabled);
 

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

@@ -1,29 +1,37 @@
 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/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.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';
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
 class ThemeSetting extends HookConsumerWidget {
   const ThemeSetting({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final currentTheme = useState(ref.read(immichThemeModeProvider));
+    final currentThemeString = useAppSettingsState(AppSettingsEnum.themeMode);
+    final currentTheme = useValueNotifier(ref.read(immichThemeModeProvider));
     final isDarkTheme = useValueNotifier(currentTheme.value == ThemeMode.dark);
     final isSystemTheme = useValueNotifier(currentTheme.value == ThemeMode.system);
 
     final applyThemeToBackgroundSetting = useAppSettingsState(AppSettingsEnum.colorfulInterface);
     final applyThemeToBackgroundProvider = useValueNotifier(ref.read(colorfulInterfaceSettingProvider));
 
+    useValueChanged(
+      currentThemeString.value,
+      (_, __) => currentTheme.value = switch (currentThemeString.value) {
+        "light" => ThemeMode.light,
+        "dark" => ThemeMode.dark,
+        _ => ThemeMode.system,
+      },
+    );
+
     useValueChanged(
       applyThemeToBackgroundSetting.value,
       (_, __) => applyThemeToBackgroundProvider.value = applyThemeToBackgroundSetting.value,
@@ -32,17 +40,16 @@ class ThemeSetting extends HookConsumerWidget {
     void onThemeChange(bool isDark) {
       if (isDark) {
         ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.dark;
-        currentTheme.value = ThemeMode.dark;
+        currentThemeString.value = "dark";
       } else {
         ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.light;
-        currentTheme.value = ThemeMode.light;
+        currentThemeString.value = "light";
       }
-      ref.read(metadataProvider).write(MetadataKey.themeMode, currentTheme.value);
     }
 
     void onSystemThemeChange(bool isSystem) {
       if (isSystem) {
-        currentTheme.value = ThemeMode.system;
+        currentThemeString.value = "system";
         isSystemTheme.value = true;
         ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.system;
       } else {
@@ -50,14 +57,13 @@ class ThemeSetting extends HookConsumerWidget {
         isSystemTheme.value = false;
         isDarkTheme.value = currentSystemBrightness == Brightness.dark;
         if (currentSystemBrightness == Brightness.light) {
-          currentTheme.value = ThemeMode.light;
+          currentThemeString.value = "light";
           ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.light;
         } else if (currentSystemBrightness == Brightness.dark) {
-          currentTheme.value = ThemeMode.dark;
+          currentThemeString.value = "dark";
           ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.dark;
         }
       }
-      ref.read(metadataProvider).write(MetadataKey.themeMode, currentTheme.value);
     }
 
     void onSurfaceColorSettingChange(bool useColorfulInterface) {

mobile/openapi/README.md

@@ -578,6 +578,8 @@ Class | Method | HTTP request | Description
  - [SyncAssetFaceV2](doc//SyncAssetFaceV2.md)
  - [SyncAssetMetadataDeleteV1](doc//SyncAssetMetadataDeleteV1.md)
  - [SyncAssetMetadataV1](doc//SyncAssetMetadataV1.md)
+ - [SyncAssetOcrDeleteV1](doc//SyncAssetOcrDeleteV1.md)
+ - [SyncAssetOcrV1](doc//SyncAssetOcrV1.md)
  - [SyncAssetV1](doc//SyncAssetV1.md)
  - [SyncAuthUserV1](doc//SyncAuthUserV1.md)
  - [SyncEntityType](doc//SyncEntityType.md)

mobile/openapi/lib/api.dart

@@ -326,6 +326,8 @@ part 'model/sync_asset_face_v1.dart';
 part 'model/sync_asset_face_v2.dart';
 part 'model/sync_asset_metadata_delete_v1.dart';
 part 'model/sync_asset_metadata_v1.dart';
+part 'model/sync_asset_ocr_delete_v1.dart';
+part 'model/sync_asset_ocr_v1.dart';
 part 'model/sync_asset_v1.dart';
 part 'model/sync_auth_user_v1.dart';
 part 'model/sync_entity_type.dart';

mobile/openapi/lib/api_client.dart

@@ -698,6 +698,10 @@ class ApiClient {
           return SyncAssetMetadataDeleteV1.fromJson(value);
         case 'SyncAssetMetadataV1':
           return SyncAssetMetadataV1.fromJson(value);
+        case 'SyncAssetOcrDeleteV1':
+          return SyncAssetOcrDeleteV1.fromJson(value);
+        case 'SyncAssetOcrV1':
+          return SyncAssetOcrV1.fromJson(value);
         case 'SyncAssetV1':
           return SyncAssetV1.fromJson(value);
         case 'SyncAuthUserV1':

mobile/openapi/lib/model/sync_asset_ocr_delete_v1.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 SyncAssetOcrDeleteV1 {
+  /// Returns a new [SyncAssetOcrDeleteV1] instance.
+  SyncAssetOcrDeleteV1({
+    required this.assetId,
+    required this.deletedAt,
+    required this.id,
+  });
+
+  /// Original asset ID of the deleted OCR entry
+  String assetId;
+
+  /// Timestamp when the OCR entry was deleted
+  DateTime deletedAt;
+
+  /// Audit row ID of the deleted OCR entry
+  String id;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAssetOcrDeleteV1 &&
+    other.assetId == assetId &&
+    other.deletedAt == deletedAt &&
+    other.id == id;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (deletedAt.hashCode) +
+    (id.hashCode);
+
+  @override
+  String toString() => 'SyncAssetOcrDeleteV1[assetId=$assetId, deletedAt=$deletedAt, id=$id]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'deletedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+        ? this.deletedAt.millisecondsSinceEpoch
+        : this.deletedAt.toUtc().toIso8601String();
+      json[r'id'] = this.id;
+    return json;
+  }
+
+  /// Returns a new [SyncAssetOcrDeleteV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAssetOcrDeleteV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAssetOcrDeleteV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAssetOcrDeleteV1(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        deletedAt: mapDateTime(json, r'deletedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
+        id: mapValueOfType<String>(json, r'id')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAssetOcrDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAssetOcrDeleteV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAssetOcrDeleteV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAssetOcrDeleteV1> mapFromJson(dynamic json) {
+    final map = <String, SyncAssetOcrDeleteV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAssetOcrDeleteV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAssetOcrDeleteV1-objects as value to a dart map
+  static Map<String, List<SyncAssetOcrDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAssetOcrDeleteV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAssetOcrDeleteV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'deletedAt',
+    'id',
+  };
+}
+

mobile/openapi/lib/model/sync_asset_ocr_v1.dart

@@ -0,0 +1,217 @@
+//
+// 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 SyncAssetOcrV1 {
+  /// Returns a new [SyncAssetOcrV1] instance.
+  SyncAssetOcrV1({
+    required this.assetId,
+    required this.boxScore,
+    required this.id,
+    required this.isVisible,
+    required this.text,
+    required this.textScore,
+    required this.x1,
+    required this.x2,
+    required this.x3,
+    required this.x4,
+    required this.y1,
+    required this.y2,
+    required this.y3,
+    required this.y4,
+  });
+
+  /// Asset ID
+  String assetId;
+
+  /// Confidence score of the bounding box
+  double boxScore;
+
+  /// OCR entry ID
+  String id;
+
+  /// Whether the OCR entry is visible
+  bool isVisible;
+
+  /// Recognized text content
+  String text;
+
+  /// Confidence score of the recognized text
+  double textScore;
+
+  /// Top-left X coordinate (normalized 0–1)
+  double x1;
+
+  /// Top-right X coordinate (normalized 0–1)
+  double x2;
+
+  /// Bottom-right X coordinate (normalized 0–1)
+  double x3;
+
+  /// Bottom-left X coordinate (normalized 0–1)
+  double x4;
+
+  /// Top-left Y coordinate (normalized 0–1)
+  double y1;
+
+  /// Top-right Y coordinate (normalized 0–1)
+  double y2;
+
+  /// Bottom-right Y coordinate (normalized 0–1)
+  double y3;
+
+  /// Bottom-left Y coordinate (normalized 0–1)
+  double y4;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAssetOcrV1 &&
+    other.assetId == assetId &&
+    other.boxScore == boxScore &&
+    other.id == id &&
+    other.isVisible == isVisible &&
+    other.text == text &&
+    other.textScore == textScore &&
+    other.x1 == x1 &&
+    other.x2 == x2 &&
+    other.x3 == x3 &&
+    other.x4 == x4 &&
+    other.y1 == y1 &&
+    other.y2 == y2 &&
+    other.y3 == y3 &&
+    other.y4 == y4;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (boxScore.hashCode) +
+    (id.hashCode) +
+    (isVisible.hashCode) +
+    (text.hashCode) +
+    (textScore.hashCode) +
+    (x1.hashCode) +
+    (x2.hashCode) +
+    (x3.hashCode) +
+    (x4.hashCode) +
+    (y1.hashCode) +
+    (y2.hashCode) +
+    (y3.hashCode) +
+    (y4.hashCode);
+
+  @override
+  String toString() => 'SyncAssetOcrV1[assetId=$assetId, boxScore=$boxScore, id=$id, isVisible=$isVisible, text=$text, textScore=$textScore, x1=$x1, x2=$x2, x3=$x3, x4=$x4, y1=$y1, y2=$y2, y3=$y3, y4=$y4]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'boxScore'] = this.boxScore;
+      json[r'id'] = this.id;
+      json[r'isVisible'] = this.isVisible;
+      json[r'text'] = this.text;
+      json[r'textScore'] = this.textScore;
+      json[r'x1'] = this.x1;
+      json[r'x2'] = this.x2;
+      json[r'x3'] = this.x3;
+      json[r'x4'] = this.x4;
+      json[r'y1'] = this.y1;
+      json[r'y2'] = this.y2;
+      json[r'y3'] = this.y3;
+      json[r'y4'] = this.y4;
+    return json;
+  }
+
+  /// Returns a new [SyncAssetOcrV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAssetOcrV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAssetOcrV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAssetOcrV1(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        boxScore: (mapValueOfType<num>(json, r'boxScore')!).toDouble(),
+        id: mapValueOfType<String>(json, r'id')!,
+        isVisible: mapValueOfType<bool>(json, r'isVisible')!,
+        text: mapValueOfType<String>(json, r'text')!,
+        textScore: (mapValueOfType<num>(json, r'textScore')!).toDouble(),
+        x1: (mapValueOfType<num>(json, r'x1')!).toDouble(),
+        x2: (mapValueOfType<num>(json, r'x2')!).toDouble(),
+        x3: (mapValueOfType<num>(json, r'x3')!).toDouble(),
+        x4: (mapValueOfType<num>(json, r'x4')!).toDouble(),
+        y1: (mapValueOfType<num>(json, r'y1')!).toDouble(),
+        y2: (mapValueOfType<num>(json, r'y2')!).toDouble(),
+        y3: (mapValueOfType<num>(json, r'y3')!).toDouble(),
+        y4: (mapValueOfType<num>(json, r'y4')!).toDouble(),
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAssetOcrV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAssetOcrV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAssetOcrV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAssetOcrV1> mapFromJson(dynamic json) {
+    final map = <String, SyncAssetOcrV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAssetOcrV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAssetOcrV1-objects as value to a dart map
+  static Map<String, List<SyncAssetOcrV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAssetOcrV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAssetOcrV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'boxScore',
+    'id',
+    'isVisible',
+    'text',
+    'textScore',
+    'x1',
+    'x2',
+    'x3',
+    'x4',
+    'y1',
+    'y2',
+    'y3',
+    'y4',
+  };
+}
+

mobile/openapi/lib/model/sync_entity_type.dart

@@ -33,6 +33,8 @@ class SyncEntityType {
   static const assetEditDeleteV1 = SyncEntityType._(r'AssetEditDeleteV1');
   static const assetMetadataV1 = SyncEntityType._(r'AssetMetadataV1');
   static const assetMetadataDeleteV1 = SyncEntityType._(r'AssetMetadataDeleteV1');
+  static const assetOcrV1 = SyncEntityType._(r'AssetOcrV1');
+  static const assetOcrDeleteV1 = SyncEntityType._(r'AssetOcrDeleteV1');
   static const partnerV1 = SyncEntityType._(r'PartnerV1');
   static const partnerDeleteV1 = SyncEntityType._(r'PartnerDeleteV1');
   static const partnerAssetV1 = SyncEntityType._(r'PartnerAssetV1');
@@ -87,6 +89,8 @@ class SyncEntityType {
     assetEditDeleteV1,
     assetMetadataV1,
     assetMetadataDeleteV1,
+    assetOcrV1,
+    assetOcrDeleteV1,
     partnerV1,
     partnerDeleteV1,
     partnerAssetV1,
@@ -176,6 +180,8 @@ class SyncEntityTypeTypeTransformer {
         case r'AssetEditDeleteV1': return SyncEntityType.assetEditDeleteV1;
         case r'AssetMetadataV1': return SyncEntityType.assetMetadataV1;
         case r'AssetMetadataDeleteV1': return SyncEntityType.assetMetadataDeleteV1;
+        case r'AssetOcrV1': return SyncEntityType.assetOcrV1;
+        case r'AssetOcrDeleteV1': return SyncEntityType.assetOcrDeleteV1;
         case r'PartnerV1': return SyncEntityType.partnerV1;
         case r'PartnerDeleteV1': return SyncEntityType.partnerDeleteV1;
         case r'PartnerAssetV1': return SyncEntityType.partnerAssetV1;

mobile/openapi/lib/model/sync_request_type.dart

@@ -33,6 +33,7 @@ class SyncRequestType {
   static const assetExifsV1 = SyncRequestType._(r'AssetExifsV1');
   static const assetEditsV1 = SyncRequestType._(r'AssetEditsV1');
   static const assetMetadataV1 = SyncRequestType._(r'AssetMetadataV1');
+  static const assetOcrV1 = SyncRequestType._(r'AssetOcrV1');
   static const authUsersV1 = SyncRequestType._(r'AuthUsersV1');
   static const memoriesV1 = SyncRequestType._(r'MemoriesV1');
   static const memoryToAssetsV1 = SyncRequestType._(r'MemoryToAssetsV1');
@@ -59,6 +60,7 @@ class SyncRequestType {
     assetExifsV1,
     assetEditsV1,
     assetMetadataV1,
+    assetOcrV1,
     authUsersV1,
     memoriesV1,
     memoryToAssetsV1,
@@ -120,6 +122,7 @@ class SyncRequestTypeTypeTransformer {
         case r'AssetExifsV1': return SyncRequestType.assetExifsV1;
         case r'AssetEditsV1': return SyncRequestType.assetEditsV1;
         case r'AssetMetadataV1': return SyncRequestType.assetMetadataV1;
+        case r'AssetOcrV1': return SyncRequestType.assetOcrV1;
         case r'AuthUsersV1': return SyncRequestType.authUsersV1;
         case r'MemoriesV1': return SyncRequestType.memoriesV1;
         case r'MemoryToAssetsV1': return SyncRequestType.memoryToAssetsV1;

mobile/test/domain/services/log_service_test.dart

@@ -1,11 +1,11 @@
 import 'package:collection/collection.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -29,23 +29,21 @@ final _kWarnLog = LogMessage(
 void main() {
   late LogService sut;
   late LogRepository mockLogRepo;
-  late MockMetadataRepository mockMetadataRepository;
+  late DriftStoreRepository mockStoreRepo;
 
   setUp(() async {
     mockLogRepo = MockLogRepository();
-    mockMetadataRepository = MockMetadataRepository();
+    mockStoreRepo = MockDriftStoreRepository();
 
     registerFallbackValue(_kInfoLog);
-    registerFallbackValue(LogLevel.info);
 
     when(() => mockLogRepo.truncate(limit: any(named: 'limit'))).thenAnswer((_) async => {});
-    when(() => mockMetadataRepository.systemConfig).thenReturn(const SystemConfig(logLevel: LogLevel.fine));
-    when(() => mockMetadataRepository.write<LogLevel>(MetadataKey.logLevel, any())).thenAnswer((_) async {});
+    when(() => mockStoreRepo.tryGet<int>(StoreKey.logLevel)).thenAnswer((_) async => LogLevel.fine.index);
     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, metadataRepository: mockMetadataRepository);
+    sut = await LogService.create(logRepository: mockLogRepo, storeRepository: mockStoreRepo);
   });
 
   tearDown(() async {
@@ -58,22 +56,21 @@ void main() {
       expect(limit, kLogTruncateLimit);
     });
 
-    test('Sets log level based on the metadata repository', () {
-      verify(() => mockMetadataRepository.systemConfig).called(1);
+    test('Sets log level based on the store setting', () {
+      verify(() => mockStoreRepo.tryGet<int>(StoreKey.logLevel)).called(1);
       expect(Logger.root.level, Level.FINE);
     });
   });
 
   group("Log Service Set Level:", () {
     setUp(() async {
+      when(() => mockStoreRepo.upsert<int>(StoreKey.logLevel, any())).thenAnswer((_) async => true);
       await sut.setLogLevel(LogLevel.shout);
     });
 
-    test('Updates the log level via metadata repository', () {
-      final captured = verify(
-        () => mockMetadataRepository.write<LogLevel>(MetadataKey.logLevel, captureAny()),
-      ).captured.firstOrNull;
-      expect(captured, LogLevel.shout);
+    test('Updates the log level in store', () {
+      final index = verify(() => mockStoreRepo.upsert<int>(StoreKey.logLevel, captureAny())).captured.firstOrNull;
+      expect(index, LogLevel.shout.index);
     });
 
     test('Sets log level on logger', () {
@@ -84,11 +81,7 @@ void main() {
   group("Log Service Buffer:", () {
     test('Buffers logs until timer elapses', () {
       TestUtils.fakeAsync((time) async {
-        sut = await LogService.create(
-          logRepository: mockLogRepo,
-          metadataRepository: mockMetadataRepository,
-          shouldBuffer: true,
-        );
+        sut = await LogService.create(logRepository: mockLogRepo, storeRepository: mockStoreRepo, shouldBuffer: true);
 
         final logger = Logger(_kInfoLog.logger!);
         logger.info(_kInfoLog.message);
@@ -102,11 +95,7 @@ void main() {
 
     test('Batch inserts all logs on timer', () {
       TestUtils.fakeAsync((time) async {
-        sut = await LogService.create(
-          logRepository: mockLogRepo,
-          metadataRepository: mockMetadataRepository,
-          shouldBuffer: true,
-        );
+        sut = await LogService.create(logRepository: mockLogRepo, storeRepository: mockStoreRepo, shouldBuffer: true);
 
         final logger = Logger(_kInfoLog.logger!);
         logger.info(_kInfoLog.message);
@@ -123,11 +112,7 @@ void main() {
 
     test('Does not buffer when off', () {
       TestUtils.fakeAsync((time) async {
-        sut = await LogService.create(
-          logRepository: mockLogRepo,
-          metadataRepository: mockMetadataRepository,
-          shouldBuffer: false,
-        );
+        sut = await LogService.create(logRepository: mockLogRepo, storeRepository: mockStoreRepo, shouldBuffer: false);
 
         final logger = Logger(_kInfoLog.logger!);
         logger.info(_kInfoLog.message);
@@ -157,11 +142,7 @@ void main() {
 
     test('Combines result from both DB + Buffer', () {
       TestUtils.fakeAsync((time) async {
-        sut = await LogService.create(
-          logRepository: mockLogRepo,
-          metadataRepository: mockMetadataRepository,
-          shouldBuffer: true,
-        );
+        sut = await LogService.create(logRepository: mockLogRepo, storeRepository: mockStoreRepo, shouldBuffer: true);
 
         final logger = Logger(_kWarnLog.logger!);
         logger.warning(_kWarnLog.message);

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

@@ -8792,67 +8792,216 @@ class AssetEditEntityCompanion extends UpdateCompanion<AssetEditEntityData> {
   }
 }
 
-class Metadata extends Table with TableInfo<Metadata, MetadataData> {
+class AssetOcrEntity extends Table
+    with TableInfo<AssetOcrEntity, AssetOcrEntityData> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
-  Metadata(this.attachedDatabase, [this._alias]);
-  late final GeneratedColumn<String> key = GeneratedColumn<String>(
-    'key',
+  AssetOcrEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
     aliasedName,
     false,
     type: DriftSqlType.string,
     requiredDuringInsert: true,
     $customConstraints: 'NOT NULL',
   );
-  late final GeneratedColumn<String> value = GeneratedColumn<String>(
-    'value',
+  late final GeneratedColumn<String> assetId = GeneratedColumn<String>(
+    'asset_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES remote_asset_entity(id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<double> x1 = GeneratedColumn<double>(
+    'x1',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> y1 = GeneratedColumn<double>(
+    'y1',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> x2 = GeneratedColumn<double>(
+    'x2',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> y2 = GeneratedColumn<double>(
+    'y2',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> x3 = GeneratedColumn<double>(
+    'x3',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> y3 = GeneratedColumn<double>(
+    'y3',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> x4 = GeneratedColumn<double>(
+    'x4',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> y4 = GeneratedColumn<double>(
+    'y4',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> boxScore = GeneratedColumn<double>(
+    'box_score',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<double> textScore = GeneratedColumn<double>(
+    'text_score',
+    aliasedName,
+    false,
+    type: DriftSqlType.double,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> recognizedText = GeneratedColumn<String>(
+    'recognized_text',
     aliasedName,
     false,
     type: DriftSqlType.string,
     requiredDuringInsert: true,
     $customConstraints: 'NOT NULL',
   );
-  late final GeneratedColumn<String> updatedAt = GeneratedColumn<String>(
-    'updated_at',
+  late final GeneratedColumn<int> isVisible = GeneratedColumn<int>(
+    'is_visible',
     aliasedName,
     false,
-    type: DriftSqlType.string,
+    type: DriftSqlType.int,
     requiredDuringInsert: false,
-    $customConstraints: 'NOT NULL DEFAULT CURRENT_TIMESTAMP',
-    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+    $customConstraints: 'NOT NULL DEFAULT 1 CHECK (is_visible IN (0, 1))',
+    defaultValue: const CustomExpression('1'),
   );
   @override
-  List<GeneratedColumn> get $columns => [key, value, updatedAt];
+  List<GeneratedColumn> get $columns => [
+    id,
+    assetId,
+    x1,
+    y1,
+    x2,
+    y2,
+    x3,
+    y3,
+    x4,
+    y4,
+    boxScore,
+    textScore,
+    recognizedText,
+    isVisible,
+  ];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
   String get actualTableName => $name;
-  static const String $name = 'metadata';
+  static const String $name = 'asset_ocr_entity';
   @override
-  Set<GeneratedColumn> get $primaryKey => {key};
+  Set<GeneratedColumn> get $primaryKey => {id};
   @override
-  MetadataData map(Map<String, dynamic> data, {String? tablePrefix}) {
+  AssetOcrEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return MetadataData(
-      key: attachedDatabase.typeMapping.read(
+    return AssetOcrEntityData(
+      id: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
-        data['${effectivePrefix}key'],
+        data['${effectivePrefix}id'],
       )!,
-      value: attachedDatabase.typeMapping.read(
+      assetId: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
-        data['${effectivePrefix}value'],
+        data['${effectivePrefix}asset_id'],
       )!,
-      updatedAt: attachedDatabase.typeMapping.read(
+      x1: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}x1'],
+      )!,
+      y1: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}y1'],
+      )!,
+      x2: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}x2'],
+      )!,
+      y2: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}y2'],
+      )!,
+      x3: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}x3'],
+      )!,
+      y3: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}y3'],
+      )!,
+      x4: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}x4'],
+      )!,
+      y4: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}y4'],
+      )!,
+      boxScore: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}box_score'],
+      )!,
+      textScore: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}text_score'],
+      )!,
+      recognizedText: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
-        data['${effectivePrefix}updated_at'],
+        data['${effectivePrefix}recognized_text'],
+      )!,
+      isVisible: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_visible'],
       )!,
     );
   }
 
   @override
-  Metadata createAlias(String alias) {
-    return Metadata(attachedDatabase, alias);
+  AssetOcrEntity createAlias(String alias) {
+    return AssetOcrEntity(attachedDatabase, alias);
   }
 
   @override
@@ -8860,145 +9009,408 @@ class Metadata extends Table with TableInfo<Metadata, MetadataData> {
   @override
   bool get isStrict => true;
   @override
-  List<String> get customConstraints => const ['PRIMARY KEY("key")'];
+  List<String> get customConstraints => const ['PRIMARY KEY(id)'];
   @override
   bool get dontWriteConstraints => true;
 }
 
-class MetadataData extends DataClass implements Insertable<MetadataData> {
-  final String key;
-  final String value;
-  final String updatedAt;
-  const MetadataData({
-    required this.key,
-    required this.value,
-    required this.updatedAt,
+class AssetOcrEntityData extends DataClass
+    implements Insertable<AssetOcrEntityData> {
+  final String id;
+  final String assetId;
+  final double x1;
+  final double y1;
+  final double x2;
+  final double y2;
+  final double x3;
+  final double y3;
+  final double x4;
+  final double y4;
+  final double boxScore;
+  final double textScore;
+  final String recognizedText;
+  final int isVisible;
+  const AssetOcrEntityData({
+    required this.id,
+    required this.assetId,
+    required this.x1,
+    required this.y1,
+    required this.x2,
+    required this.y2,
+    required this.x3,
+    required this.y3,
+    required this.x4,
+    required this.y4,
+    required this.boxScore,
+    required this.textScore,
+    required this.recognizedText,
+    required this.isVisible,
   });
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
-    map['key'] = Variable<String>(key);
-    map['value'] = Variable<String>(value);
-    map['updated_at'] = Variable<String>(updatedAt);
+    map['id'] = Variable<String>(id);
+    map['asset_id'] = Variable<String>(assetId);
+    map['x1'] = Variable<double>(x1);
+    map['y1'] = Variable<double>(y1);
+    map['x2'] = Variable<double>(x2);
+    map['y2'] = Variable<double>(y2);
+    map['x3'] = Variable<double>(x3);
+    map['y3'] = Variable<double>(y3);
+    map['x4'] = Variable<double>(x4);
+    map['y4'] = Variable<double>(y4);
+    map['box_score'] = Variable<double>(boxScore);
+    map['text_score'] = Variable<double>(textScore);
+    map['recognized_text'] = Variable<String>(recognizedText);
+    map['is_visible'] = Variable<int>(isVisible);
     return map;
   }
 
-  factory MetadataData.fromJson(
+  factory AssetOcrEntityData.fromJson(
     Map<String, dynamic> json, {
     ValueSerializer? serializer,
   }) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
-    return MetadataData(
-      key: serializer.fromJson<String>(json['key']),
-      value: serializer.fromJson<String>(json['value']),
-      updatedAt: serializer.fromJson<String>(json['updatedAt']),
+    return AssetOcrEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      assetId: serializer.fromJson<String>(json['assetId']),
+      x1: serializer.fromJson<double>(json['x1']),
+      y1: serializer.fromJson<double>(json['y1']),
+      x2: serializer.fromJson<double>(json['x2']),
+      y2: serializer.fromJson<double>(json['y2']),
+      x3: serializer.fromJson<double>(json['x3']),
+      y3: serializer.fromJson<double>(json['y3']),
+      x4: serializer.fromJson<double>(json['x4']),
+      y4: serializer.fromJson<double>(json['y4']),
+      boxScore: serializer.fromJson<double>(json['boxScore']),
+      textScore: serializer.fromJson<double>(json['textScore']),
+      recognizedText: serializer.fromJson<String>(json['recognizedText']),
+      isVisible: serializer.fromJson<int>(json['isVisible']),
     );
   }
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
-      'key': serializer.toJson<String>(key),
-      'value': serializer.toJson<String>(value),
-      'updatedAt': serializer.toJson<String>(updatedAt),
+      'id': serializer.toJson<String>(id),
+      'assetId': serializer.toJson<String>(assetId),
+      'x1': serializer.toJson<double>(x1),
+      'y1': serializer.toJson<double>(y1),
+      'x2': serializer.toJson<double>(x2),
+      'y2': serializer.toJson<double>(y2),
+      'x3': serializer.toJson<double>(x3),
+      'y3': serializer.toJson<double>(y3),
+      'x4': serializer.toJson<double>(x4),
+      'y4': serializer.toJson<double>(y4),
+      'boxScore': serializer.toJson<double>(boxScore),
+      'textScore': serializer.toJson<double>(textScore),
+      'recognizedText': serializer.toJson<String>(recognizedText),
+      'isVisible': serializer.toJson<int>(isVisible),
     };
   }
 
-  MetadataData copyWith({String? key, String? value, String? updatedAt}) =>
-      MetadataData(
-        key: key ?? this.key,
-        value: value ?? this.value,
-        updatedAt: updatedAt ?? this.updatedAt,
-      );
-  MetadataData copyWithCompanion(MetadataCompanion data) {
-    return MetadataData(
-      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,
+  AssetOcrEntityData copyWith({
+    String? id,
+    String? assetId,
+    double? x1,
+    double? y1,
+    double? x2,
+    double? y2,
+    double? x3,
+    double? y3,
+    double? x4,
+    double? y4,
+    double? boxScore,
+    double? textScore,
+    String? recognizedText,
+    int? isVisible,
+  }) => AssetOcrEntityData(
+    id: id ?? this.id,
+    assetId: assetId ?? this.assetId,
+    x1: x1 ?? this.x1,
+    y1: y1 ?? this.y1,
+    x2: x2 ?? this.x2,
+    y2: y2 ?? this.y2,
+    x3: x3 ?? this.x3,
+    y3: y3 ?? this.y3,
+    x4: x4 ?? this.x4,
+    y4: y4 ?? this.y4,
+    boxScore: boxScore ?? this.boxScore,
+    textScore: textScore ?? this.textScore,
+    recognizedText: recognizedText ?? this.recognizedText,
+    isVisible: isVisible ?? this.isVisible,
+  );
+  AssetOcrEntityData copyWithCompanion(AssetOcrEntityCompanion data) {
+    return AssetOcrEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      x1: data.x1.present ? data.x1.value : this.x1,
+      y1: data.y1.present ? data.y1.value : this.y1,
+      x2: data.x2.present ? data.x2.value : this.x2,
+      y2: data.y2.present ? data.y2.value : this.y2,
+      x3: data.x3.present ? data.x3.value : this.x3,
+      y3: data.y3.present ? data.y3.value : this.y3,
+      x4: data.x4.present ? data.x4.value : this.x4,
+      y4: data.y4.present ? data.y4.value : this.y4,
+      boxScore: data.boxScore.present ? data.boxScore.value : this.boxScore,
+      textScore: data.textScore.present ? data.textScore.value : this.textScore,
+      recognizedText: data.recognizedText.present
+          ? data.recognizedText.value
+          : this.recognizedText,
+      isVisible: data.isVisible.present ? data.isVisible.value : this.isVisible,
     );
   }
 
   @override
   String toString() {
-    return (StringBuffer('MetadataData(')
-          ..write('key: $key, ')
-          ..write('value: $value, ')
-          ..write('updatedAt: $updatedAt')
+    return (StringBuffer('AssetOcrEntityData(')
+          ..write('id: $id, ')
+          ..write('assetId: $assetId, ')
+          ..write('x1: $x1, ')
+          ..write('y1: $y1, ')
+          ..write('x2: $x2, ')
+          ..write('y2: $y2, ')
+          ..write('x3: $x3, ')
+          ..write('y3: $y3, ')
+          ..write('x4: $x4, ')
+          ..write('y4: $y4, ')
+          ..write('boxScore: $boxScore, ')
+          ..write('textScore: $textScore, ')
+          ..write('recognizedText: $recognizedText, ')
+          ..write('isVisible: $isVisible')
           ..write(')'))
         .toString();
   }
 
   @override
-  int get hashCode => Object.hash(key, value, updatedAt);
+  int get hashCode => Object.hash(
+    id,
+    assetId,
+    x1,
+    y1,
+    x2,
+    y2,
+    x3,
+    y3,
+    x4,
+    y4,
+    boxScore,
+    textScore,
+    recognizedText,
+    isVisible,
+  );
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is MetadataData &&
-          other.key == this.key &&
-          other.value == this.value &&
-          other.updatedAt == this.updatedAt);
+      (other is AssetOcrEntityData &&
+          other.id == this.id &&
+          other.assetId == this.assetId &&
+          other.x1 == this.x1 &&
+          other.y1 == this.y1 &&
+          other.x2 == this.x2 &&
+          other.y2 == this.y2 &&
+          other.x3 == this.x3 &&
+          other.y3 == this.y3 &&
+          other.x4 == this.x4 &&
+          other.y4 == this.y4 &&
+          other.boxScore == this.boxScore &&
+          other.textScore == this.textScore &&
+          other.recognizedText == this.recognizedText &&
+          other.isVisible == this.isVisible);
 }
 
-class MetadataCompanion extends UpdateCompanion<MetadataData> {
-  final Value<String> key;
-  final Value<String> value;
-  final Value<String> updatedAt;
-  const MetadataCompanion({
-    this.key = const Value.absent(),
-    this.value = const Value.absent(),
-    this.updatedAt = const Value.absent(),
+class AssetOcrEntityCompanion extends UpdateCompanion<AssetOcrEntityData> {
+  final Value<String> id;
+  final Value<String> assetId;
+  final Value<double> x1;
+  final Value<double> y1;
+  final Value<double> x2;
+  final Value<double> y2;
+  final Value<double> x3;
+  final Value<double> y3;
+  final Value<double> x4;
+  final Value<double> y4;
+  final Value<double> boxScore;
+  final Value<double> textScore;
+  final Value<String> recognizedText;
+  final Value<int> isVisible;
+  const AssetOcrEntityCompanion({
+    this.id = const Value.absent(),
+    this.assetId = const Value.absent(),
+    this.x1 = const Value.absent(),
+    this.y1 = const Value.absent(),
+    this.x2 = const Value.absent(),
+    this.y2 = const Value.absent(),
+    this.x3 = const Value.absent(),
+    this.y3 = const Value.absent(),
+    this.x4 = const Value.absent(),
+    this.y4 = const Value.absent(),
+    this.boxScore = const Value.absent(),
+    this.textScore = const Value.absent(),
+    this.recognizedText = const Value.absent(),
+    this.isVisible = const Value.absent(),
   });
-  MetadataCompanion.insert({
-    required String key,
-    required String value,
-    this.updatedAt = const Value.absent(),
-  }) : key = Value(key),
-       value = Value(value);
-  static Insertable<MetadataData> custom({
-    Expression<String>? key,
-    Expression<String>? value,
-    Expression<String>? updatedAt,
+  AssetOcrEntityCompanion.insert({
+    required String id,
+    required String assetId,
+    required double x1,
+    required double y1,
+    required double x2,
+    required double y2,
+    required double x3,
+    required double y3,
+    required double x4,
+    required double y4,
+    required double boxScore,
+    required double textScore,
+    required String recognizedText,
+    this.isVisible = const Value.absent(),
+  }) : id = Value(id),
+       assetId = Value(assetId),
+       x1 = Value(x1),
+       y1 = Value(y1),
+       x2 = Value(x2),
+       y2 = Value(y2),
+       x3 = Value(x3),
+       y3 = Value(y3),
+       x4 = Value(x4),
+       y4 = Value(y4),
+       boxScore = Value(boxScore),
+       textScore = Value(textScore),
+       recognizedText = Value(recognizedText);
+  static Insertable<AssetOcrEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? assetId,
+    Expression<double>? x1,
+    Expression<double>? y1,
+    Expression<double>? x2,
+    Expression<double>? y2,
+    Expression<double>? x3,
+    Expression<double>? y3,
+    Expression<double>? x4,
+    Expression<double>? y4,
+    Expression<double>? boxScore,
+    Expression<double>? textScore,
+    Expression<String>? recognizedText,
+    Expression<int>? isVisible,
   }) {
     return RawValuesInsertable({
-      if (key != null) 'key': key,
-      if (value != null) 'value': value,
-      if (updatedAt != null) 'updated_at': updatedAt,
+      if (id != null) 'id': id,
+      if (assetId != null) 'asset_id': assetId,
+      if (x1 != null) 'x1': x1,
+      if (y1 != null) 'y1': y1,
+      if (x2 != null) 'x2': x2,
+      if (y2 != null) 'y2': y2,
+      if (x3 != null) 'x3': x3,
+      if (y3 != null) 'y3': y3,
+      if (x4 != null) 'x4': x4,
+      if (y4 != null) 'y4': y4,
+      if (boxScore != null) 'box_score': boxScore,
+      if (textScore != null) 'text_score': textScore,
+      if (recognizedText != null) 'recognized_text': recognizedText,
+      if (isVisible != null) 'is_visible': isVisible,
     });
   }
 
-  MetadataCompanion copyWith({
-    Value<String>? key,
-    Value<String>? value,
-    Value<String>? updatedAt,
+  AssetOcrEntityCompanion copyWith({
+    Value<String>? id,
+    Value<String>? assetId,
+    Value<double>? x1,
+    Value<double>? y1,
+    Value<double>? x2,
+    Value<double>? y2,
+    Value<double>? x3,
+    Value<double>? y3,
+    Value<double>? x4,
+    Value<double>? y4,
+    Value<double>? boxScore,
+    Value<double>? textScore,
+    Value<String>? recognizedText,
+    Value<int>? isVisible,
   }) {
-    return MetadataCompanion(
-      key: key ?? this.key,
-      value: value ?? this.value,
-      updatedAt: updatedAt ?? this.updatedAt,
+    return AssetOcrEntityCompanion(
+      id: id ?? this.id,
+      assetId: assetId ?? this.assetId,
+      x1: x1 ?? this.x1,
+      y1: y1 ?? this.y1,
+      x2: x2 ?? this.x2,
+      y2: y2 ?? this.y2,
+      x3: x3 ?? this.x3,
+      y3: y3 ?? this.y3,
+      x4: x4 ?? this.x4,
+      y4: y4 ?? this.y4,
+      boxScore: boxScore ?? this.boxScore,
+      textScore: textScore ?? this.textScore,
+      recognizedText: recognizedText ?? this.recognizedText,
+      isVisible: isVisible ?? this.isVisible,
     );
   }
 
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
-    if (key.present) {
-      map['key'] = Variable<String>(key.value);
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
     }
-    if (value.present) {
-      map['value'] = Variable<String>(value.value);
+    if (assetId.present) {
+      map['asset_id'] = Variable<String>(assetId.value);
     }
-    if (updatedAt.present) {
-      map['updated_at'] = Variable<String>(updatedAt.value);
+    if (x1.present) {
+      map['x1'] = Variable<double>(x1.value);
+    }
+    if (y1.present) {
+      map['y1'] = Variable<double>(y1.value);
+    }
+    if (x2.present) {
+      map['x2'] = Variable<double>(x2.value);
+    }
+    if (y2.present) {
+      map['y2'] = Variable<double>(y2.value);
+    }
+    if (x3.present) {
+      map['x3'] = Variable<double>(x3.value);
+    }
+    if (y3.present) {
+      map['y3'] = Variable<double>(y3.value);
+    }
+    if (x4.present) {
+      map['x4'] = Variable<double>(x4.value);
+    }
+    if (y4.present) {
+      map['y4'] = Variable<double>(y4.value);
+    }
+    if (boxScore.present) {
+      map['box_score'] = Variable<double>(boxScore.value);
+    }
+    if (textScore.present) {
+      map['text_score'] = Variable<double>(textScore.value);
+    }
+    if (recognizedText.present) {
+      map['recognized_text'] = Variable<String>(recognizedText.value);
+    }
+    if (isVisible.present) {
+      map['is_visible'] = Variable<int>(isVisible.value);
     }
     return map;
   }
 
   @override
   String toString() {
-    return (StringBuffer('MetadataCompanion(')
-          ..write('key: $key, ')
-          ..write('value: $value, ')
-          ..write('updatedAt: $updatedAt')
+    return (StringBuffer('AssetOcrEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('assetId: $assetId, ')
+          ..write('x1: $x1, ')
+          ..write('y1: $y1, ')
+          ..write('x2: $x2, ')
+          ..write('y2: $y2, ')
+          ..write('x3: $x3, ')
+          ..write('y3: $y3, ')
+          ..write('x4: $x4, ')
+          ..write('y4: $y4, ')
+          ..write('boxScore: $boxScore, ')
+          ..write('textScore: $textScore, ')
+          ..write('recognizedText: $recognizedText, ')
+          ..write('isVisible: $isVisible')
           ..write(')'))
         .toString();
   }
@@ -9076,7 +9488,7 @@ class DatabaseAtV25 extends GeneratedDatabase {
   late final TrashedLocalAssetEntity trashedLocalAssetEntity =
       TrashedLocalAssetEntity(this);
   late final AssetEditEntity assetEditEntity = AssetEditEntity(this);
-  late final Metadata metadata = Metadata(this);
+  late final AssetOcrEntity assetOcrEntity = AssetOcrEntity(this);
   late final Index idxPartnerSharedWithId = Index(
     'idx_partner_shared_with_id',
     'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
@@ -9154,7 +9566,7 @@ class DatabaseAtV25 extends GeneratedDatabase {
     storeEntity,
     trashedLocalAssetEntity,
     assetEditEntity,
-    metadata,
+    assetOcrEntity,
     idxPartnerSharedWithId,
     idxLatLng,
     idxRemoteAlbumAssetAlbumAsset,
@@ -9336,6 +9748,13 @@ class DatabaseAtV25 extends GeneratedDatabase {
       ),
       result: [TableUpdate('asset_edit_entity', kind: UpdateKind.delete)],
     ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'remote_asset_entity',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('asset_ocr_entity', kind: UpdateKind.delete)],
+    ),
   ]);
   @override
   int get schemaVersion => 25;

mobile/test/infrastructure/repository.mock.dart

@@ -2,7 +2,6 @@ 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/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,8 +17,6 @@ import 'package:mocktail/mocktail.dart';
 
 class MockDriftStoreRepository extends Mock implements DriftStoreRepository {}
 
-class MockMetadataRepository extends Mock implements MetadataRepository {}
-
 class MockLogRepository extends Mock implements LogRepository {}
 
 class MockSyncStreamRepository extends Mock implements SyncStreamRepository {}

mobile/test/medium/repositories/metadata_repository_test.dart

@@ -1,138 +0,0 @@
-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/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 MetadataRepository sut;
-
-  setUpAll(() async {
-    ctx = MediumRepositoryContext();
-    sut = await MetadataRepository.ensureInitialized(ctx.db);
-  });
-
-  tearDownAll(() async {
-    await ctx.dispose();
-  });
-
-  setUp(() async {
-    await ctx.db.delete(ctx.db.metadataEntity).go();
-    await MetadataRepository.refresh();
-  });
-
-  group('defaults', () {
-    test('appConfig returns key defaults when DB is empty', () {
-      expect(sut.appConfig.theme.mode, ThemeMode.system);
-    });
-
-    test('systemConfig returns key defaults when DB is empty', () {
-      expect(sut.systemConfig.logLevel, LogLevel.info);
-    });
-  });
-
-  group('write', () {
-    test('persists a value and reflects it in the composed view', () async {
-      await sut.write(.themeMode, ThemeMode.dark);
-      expect(sut.appConfig.theme.mode, ThemeMode.dark);
-    });
-
-    test('persists across domains independently', () async {
-      await sut.write(.themeMode, ThemeMode.light);
-      await sut.write(.logLevel, LogLevel.severe);
-      expect(sut.appConfig.theme.mode, ThemeMode.light);
-      expect(sut.systemConfig.logLevel, LogLevel.severe);
-    });
-  });
-
-  group('delete', () {
-    test('removes the row and reverts to default', () async {
-      await sut.write(.themeMode, ThemeMode.dark);
-      expect(sut.appConfig.theme.mode, ThemeMode.dark);
-
-      await sut.delete(.themeMode);
-      expect(sut.appConfig.theme.mode, ThemeMode.system);
-
-      final rows = await ctx.db.select(ctx.db.metadataEntity).get();
-      expect(rows, isEmpty);
-    });
-  });
-
-  group('refresh', () {
-    test('picks up rows that were inserted directly into the DB', () async {
-      await ctx.db
-          .into(ctx.db.metadataEntity)
-          .insert(
-            MetadataEntityCompanion.insert(
-              key: MetadataKey.themeMode.key,
-              value: ThemeMode.dark.name,
-              updatedAt: Value(DateTime.now()),
-            ),
-          );
-
-      // Cache hasn't seen this row yet — view still returns the default.
-      expect(sut.appConfig.theme.mode, ThemeMode.system);
-
-      await MetadataRepository.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.metadataEntity).go();
-      expect(sut.appConfig.theme.mode, ThemeMode.dark);
-
-      await MetadataRepository.refresh();
-
-      expect(sut.appConfig.theme.mode, ThemeMode.system);
-    });
-
-    test('skips rows whose key is unknown to MetadataKey', () async {
-      await ctx.db
-          .into(ctx.db.metadataEntity)
-          .insert(
-            MetadataEntityCompanion.insert(
-              key: 'app-config.unknown.future-key',
-              value: 'whatever',
-              updatedAt: Value(DateTime.now()),
-            ),
-          );
-
-      await MetadataRepository.refresh();
-      expect(sut.appConfig.theme.mode, ThemeMode.system);
-    });
-  });
-
-  group('watch', () {
-    test('watchAppConfig emits the new value after a write', () async {
-      final expectation = expectLater(sut.watchAppConfig().map((c) => c.theme.mode), emitsThrough(ThemeMode.dark));
-      await sut.write(MetadataKey.themeMode, ThemeMode.dark);
-      await expectation;
-    });
-
-    test('watchAppConfig does not emit when only system-config rows change', () async {
-      final emissions = <ThemeMode>[];
-      // skip(1) drops the on-subscribe replay so we only capture emissions caused by the write below.
-      final sub = sut.watchAppConfig().skip(1).listen((c) => emissions.add(c.theme.mode));
-
-      await sut.write(MetadataKey.logLevel, LogLevel.severe);
-      await pumpEventQueue();
-      await sub.cancel();
-
-      expect(emissions, isEmpty);
-    });
-
-    test('watchSystemConfig emits the new value after a write', () async {
-      final expectation = expectLater(sut.watchSystemConfig().map((c) => c.logLevel), emitsThrough(LogLevel.warning));
-      await sut.write(MetadataKey.logLevel, LogLevel.warning);
-      await expectation;
-    });
-  });
-}

mobile/test/services/auth.service_test.dart

@@ -6,6 +6,7 @@ import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:openapi/api.dart';
@@ -108,6 +109,36 @@ void main() {
     });
   });
 
+  group('logout', () {
+    test('Should logout user', () async {
+      when(() => authApiRepository.logout()).thenAnswer((_) async => {});
+      when(() => backgroundSyncManager.cancel()).thenAnswer((_) async => {});
+      when(() => authRepository.clearLocalData()).thenAnswer((_) => Future.value(null));
+      when(
+        () => appSettingsService.setSetting(AppSettingsEnum.enableBackup, false),
+      ).thenAnswer((_) => Future.value(null));
+      await sut.logout();
+
+      verify(() => authApiRepository.logout()).called(1);
+      verify(() => backgroundSyncManager.cancel()).called(1);
+      verify(() => authRepository.clearLocalData()).called(1);
+    });
+
+    test('Should clear local data even on server error', () async {
+      when(() => authApiRepository.logout()).thenThrow(Exception('Server error'));
+      when(() => backgroundSyncManager.cancel()).thenAnswer((_) async => {});
+      when(() => authRepository.clearLocalData()).thenAnswer((_) => Future.value(null));
+      when(
+        () => appSettingsService.setSetting(AppSettingsEnum.enableBackup, false),
+      ).thenAnswer((_) => Future.value(null));
+      await sut.logout();
+
+      verify(() => authApiRepository.logout()).called(1);
+      verify(() => backgroundSyncManager.cancel()).called(1);
+      verify(() => authRepository.clearLocalData()).called(1);
+    });
+  });
+
   group('setOpenApiServiceEndpoint', () {
     setUp(() {
       when(() => networkService.getWifiName()).thenAnswer((_) async => 'TestWifi');

open-api/immich-openapi-specs.json

@@ -23019,6 +23019,118 @@
         ],
         "type": "object"
       },
+      "SyncAssetOcrDeleteV1": {
+        "properties": {
+          "assetId": {
+            "description": "Original asset ID of the deleted OCR entry",
+            "type": "string"
+          },
+          "deletedAt": {
+            "description": "Timestamp when the OCR entry was deleted",
+            "example": "2024-01-01T00:00:00.000Z",
+            "format": "date-time",
+            "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$",
+            "type": "string"
+          },
+          "id": {
+            "description": "Audit row ID of the deleted OCR entry",
+            "type": "string"
+          }
+        },
+        "required": [
+          "assetId",
+          "deletedAt",
+          "id"
+        ],
+        "type": "object"
+      },
+      "SyncAssetOcrV1": {
+        "properties": {
+          "assetId": {
+            "description": "Asset ID",
+            "type": "string"
+          },
+          "boxScore": {
+            "description": "Confidence score of the bounding box",
+            "format": "double",
+            "type": "number"
+          },
+          "id": {
+            "description": "OCR entry ID",
+            "type": "string"
+          },
+          "isVisible": {
+            "description": "Whether the OCR entry is visible",
+            "type": "boolean"
+          },
+          "text": {
+            "description": "Recognized text content",
+            "type": "string"
+          },
+          "textScore": {
+            "description": "Confidence score of the recognized text",
+            "format": "double",
+            "type": "number"
+          },
+          "x1": {
+            "description": "Top-left X coordinate (normalized 0–1)",
+            "format": "double",
+            "type": "number"
+          },
+          "x2": {
+            "description": "Top-right X coordinate (normalized 0–1)",
+            "format": "double",
+            "type": "number"
+          },
+          "x3": {
+            "description": "Bottom-right X coordinate (normalized 0–1)",
+            "format": "double",
+            "type": "number"
+          },
+          "x4": {
+            "description": "Bottom-left X coordinate (normalized 0–1)",
+            "format": "double",
+            "type": "number"
+          },
+          "y1": {
+            "description": "Top-left Y coordinate (normalized 0–1)",
+            "format": "double",
+            "type": "number"
+          },
+          "y2": {
+            "description": "Top-right Y coordinate (normalized 0–1)",
+            "format": "double",
+            "type": "number"
+          },
+          "y3": {
+            "description": "Bottom-right Y coordinate (normalized 0–1)",
+            "format": "double",
+            "type": "number"
+          },
+          "y4": {
+            "description": "Bottom-left Y coordinate (normalized 0–1)",
+            "format": "double",
+            "type": "number"
+          }
+        },
+        "required": [
+          "assetId",
+          "boxScore",
+          "id",
+          "isVisible",
+          "text",
+          "textScore",
+          "x1",
+          "x2",
+          "x3",
+          "x4",
+          "y1",
+          "y2",
+          "y3",
+          "y4"
+        ],
+        "type": "object"
+      },
       "SyncAssetV1": {
         "properties": {
           "checksum": {
@@ -23252,6 +23364,8 @@
           "AssetEditDeleteV1",
           "AssetMetadataV1",
           "AssetMetadataDeleteV1",
+          "AssetOcrV1",
+          "AssetOcrDeleteV1",
           "PartnerV1",
           "PartnerDeleteV1",
           "PartnerAssetV1",
@@ -23567,6 +23681,7 @@
           "AssetExifsV1",
           "AssetEditsV1",
           "AssetMetadataV1",
+          "AssetOcrV1",
           "AuthUsersV1",
           "MemoriesV1",
           "MemoryToAssetsV1",

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

@@ -3037,6 +3037,44 @@ export type SyncAssetMetadataV1 = {
         [key: string]: any;
     };
 };
+export type SyncAssetOcrDeleteV1 = {
+    /** Original asset ID of the deleted OCR entry */
+    assetId: string;
+    /** Timestamp when the OCR entry was deleted */
+    deletedAt: string;
+    /** Audit row ID of the deleted OCR entry */
+    id: string;
+};
+export type SyncAssetOcrV1 = {
+    /** Asset ID */
+    assetId: string;
+    /** Confidence score of the bounding box */
+    boxScore: number;
+    /** OCR entry ID */
+    id: string;
+    /** Whether the OCR entry is visible */
+    isVisible: boolean;
+    /** Recognized text content */
+    text: string;
+    /** Confidence score of the recognized text */
+    textScore: number;
+    /** Top-left X coordinate (normalized 0–1) */
+    x1: number;
+    /** Top-right X coordinate (normalized 0–1) */
+    x2: number;
+    /** Bottom-right X coordinate (normalized 0–1) */
+    x3: number;
+    /** Bottom-left X coordinate (normalized 0–1) */
+    x4: number;
+    /** Top-left Y coordinate (normalized 0–1) */
+    y1: number;
+    /** Top-right Y coordinate (normalized 0–1) */
+    y2: number;
+    /** Bottom-right Y coordinate (normalized 0–1) */
+    y3: number;
+    /** Bottom-left Y coordinate (normalized 0–1) */
+    y4: number;
+};
 export type SyncAssetV1 = {
     /** Checksum */
     checksum: string;
@@ -7115,6 +7153,8 @@ export enum SyncEntityType {
     AssetEditDeleteV1 = "AssetEditDeleteV1",
     AssetMetadataV1 = "AssetMetadataV1",
     AssetMetadataDeleteV1 = "AssetMetadataDeleteV1",
+    AssetOcrV1 = "AssetOcrV1",
+    AssetOcrDeleteV1 = "AssetOcrDeleteV1",
     PartnerV1 = "PartnerV1",
     PartnerDeleteV1 = "PartnerDeleteV1",
     PartnerAssetV1 = "PartnerAssetV1",
@@ -7168,6 +7208,7 @@ export enum SyncRequestType {
     AssetExifsV1 = "AssetExifsV1",
     AssetEditsV1 = "AssetEditsV1",
     AssetMetadataV1 = "AssetMetadataV1",
+    AssetOcrV1 = "AssetOcrV1",
     AuthUsersV1 = "AuthUsersV1",
     MemoriesV1 = "MemoriesV1",
     MemoryToAssetsV1 = "MemoryToAssetsV1",

server/src/database.ts

@@ -426,6 +426,23 @@ export const columns = {
     'asset_exif.rating',
     'asset_exif.fps',
   ],
+  syncAssetOcr: [
+    'asset_ocr.id',
+    'asset_ocr.assetId',
+    'asset_ocr.x1',
+    'asset_ocr.y1',
+    'asset_ocr.x2',
+    'asset_ocr.y2',
+    'asset_ocr.x3',
+    'asset_ocr.y3',
+    'asset_ocr.x4',
+    'asset_ocr.y4',
+    'asset_ocr.text',
+    'asset_ocr.boxScore',
+    'asset_ocr.textScore',
+    'asset_ocr.updateId',
+    'asset_ocr.isVisible',
+  ],
   syncAssetEdit: [
     'asset_edit.id',
     'asset_edit.assetId',

server/src/dtos/sync.dto.ts

@@ -382,6 +382,41 @@ class SyncMemoryDeleteV1 extends createZodDto(SyncMemoryDeleteV1Schema) {}
 class SyncMemoryAssetV1 extends createZodDto(SyncMemoryAssetV1Schema) {}
 @ExtraModel()
 class SyncMemoryAssetDeleteV1 extends createZodDto(SyncMemoryAssetDeleteV1Schema) {}
+
+const SyncAssetOcrV1Schema = z
+  .object({
+    id: z.string().describe('OCR entry ID'),
+    assetId: z.string().describe('Asset ID'),
+
+    x1: z.number().meta({ format: 'double' }).describe('Top-left X coordinate (normalized 0–1)'),
+    y1: z.number().meta({ format: 'double' }).describe('Top-left Y coordinate (normalized 0–1)'),
+    x2: z.number().meta({ format: 'double' }).describe('Top-right X coordinate (normalized 0–1)'),
+    y2: z.number().meta({ format: 'double' }).describe('Top-right Y coordinate (normalized 0–1)'),
+    x3: z.number().meta({ format: 'double' }).describe('Bottom-right X coordinate (normalized 0–1)'),
+    y3: z.number().meta({ format: 'double' }).describe('Bottom-right Y coordinate (normalized 0–1)'),
+    x4: z.number().meta({ format: 'double' }).describe('Bottom-left X coordinate (normalized 0–1)'),
+    y4: z.number().meta({ format: 'double' }).describe('Bottom-left Y coordinate (normalized 0–1)'),
+
+    boxScore: z.number().meta({ format: 'double' }).describe('Confidence score of the bounding box'),
+    textScore: z.number().meta({ format: 'double' }).describe('Confidence score of the recognized text'),
+    text: z.string().describe('Recognized text content'),
+    isVisible: z.boolean().describe('Whether the OCR entry is visible'),
+  })
+  .meta({ id: 'SyncAssetOcrV1' });
+
+const SyncAssetOcrDeleteV1Schema = z
+  .object({
+    id: z.string().describe('Audit row ID of the deleted OCR entry'),
+    assetId: z.string().describe('Original asset ID of the deleted OCR entry'),
+    deletedAt: isoDatetimeToDate.describe('Timestamp when the OCR entry was deleted'),
+  })
+  .meta({ id: 'SyncAssetOcrDeleteV1' });
+
+@ExtraModel()
+class SyncAssetOcrV1 extends createZodDto(SyncAssetOcrV1Schema) {}
+
+@ExtraModel()
+class SyncAssetOcrDeleteV1 extends createZodDto(SyncAssetOcrDeleteV1Schema) {}
 @ExtraModel()
 class SyncStackV1 extends createZodDto(SyncStackV1Schema) {}
 @ExtraModel()
@@ -424,6 +459,8 @@ export type SyncItem = {
   [SyncEntityType.AssetMetadataV1]: SyncAssetMetadataV1;
   [SyncEntityType.AssetMetadataDeleteV1]: SyncAssetMetadataDeleteV1;
   [SyncEntityType.AssetExifV1]: SyncAssetExifV1;
+  [SyncEntityType.AssetOcrV1]: SyncAssetOcrV1;
+  [SyncEntityType.AssetOcrDeleteV1]: SyncAssetOcrDeleteV1;
   [SyncEntityType.AssetEditV1]: SyncAssetEditV1;
   [SyncEntityType.AssetEditDeleteV1]: SyncAssetEditDeleteV1;
   [SyncEntityType.PartnerAssetV1]: SyncAssetV1;

server/src/enum.ts

@@ -807,6 +807,7 @@ export enum SyncRequestType {
   AssetExifsV1 = 'AssetExifsV1',
   AssetEditsV1 = 'AssetEditsV1',
   AssetMetadataV1 = 'AssetMetadataV1',
+  AssetOcrV1 = 'AssetOcrV1',
   AuthUsersV1 = 'AuthUsersV1',
   MemoriesV1 = 'MemoriesV1',
   MemoryToAssetsV1 = 'MemoryToAssetsV1',
@@ -840,6 +841,8 @@ export enum SyncEntityType {
   AssetEditDeleteV1 = 'AssetEditDeleteV1',
   AssetMetadataV1 = 'AssetMetadataV1',
   AssetMetadataDeleteV1 = 'AssetMetadataDeleteV1',
+  AssetOcrV1 = 'AssetOcrV1',
+  AssetOcrDeleteV1 = 'AssetOcrDeleteV1',
 
   PartnerV1 = 'PartnerV1',
   PartnerDeleteV1 = 'PartnerDeleteV1',

server/src/queries/sync.repository.sql

@@ -575,6 +575,48 @@ where
 order by
   "asset_metadata"."updateId" asc
 
+-- SyncRepository.assetOcr.getDeletes
+select
+  "asset_ocr_audit"."id",
+  "asset_ocr_audit"."assetId",
+  "asset_ocr_audit"."deletedAt"
+from
+  "asset_ocr_audit" as "asset_ocr_audit"
+  left join "asset" on "asset"."id" = "asset_ocr_audit"."assetId"
+where
+  "asset_ocr_audit"."id" < $1
+  and "asset_ocr_audit"."id" > $2
+  and "asset"."ownerId" = $3
+order by
+  "asset_ocr_audit"."id" asc
+
+-- SyncRepository.assetOcr.getUpserts
+select
+  "asset_ocr"."id",
+  "asset_ocr"."assetId",
+  "asset_ocr"."x1",
+  "asset_ocr"."y1",
+  "asset_ocr"."x2",
+  "asset_ocr"."y2",
+  "asset_ocr"."x3",
+  "asset_ocr"."y3",
+  "asset_ocr"."x4",
+  "asset_ocr"."y4",
+  "asset_ocr"."text",
+  "asset_ocr"."boxScore",
+  "asset_ocr"."textScore",
+  "asset_ocr"."updateId",
+  "asset_ocr"."isVisible"
+from
+  "asset_ocr" as "asset_ocr"
+  inner join "asset" on "asset"."id" = "asset_ocr"."assetId"
+where
+  "asset_ocr"."updateId" < $1
+  and "asset_ocr"."updateId" > $2
+  and "asset"."ownerId" = $3
+order by
+  "asset_ocr"."updateId" asc
+
 -- SyncRepository.authUser.getUpserts
 select
   "id",

server/src/repositories/sync.repository.ts

@@ -56,6 +56,7 @@ export class SyncRepository {
   assetEdit: AssetEditSync;
   assetFace: AssetFaceSync;
   assetMetadata: AssetMetadataSync;
+  assetOcr: AssetOcrSync;
   authUser: AuthUserSync;
   memory: MemorySync;
   memoryToAsset: MemoryToAssetSync;
@@ -79,6 +80,7 @@ export class SyncRepository {
     this.assetEdit = new AssetEditSync(this.db);
     this.assetFace = new AssetFaceSync(this.db);
     this.assetMetadata = new AssetMetadataSync(this.db);
+    this.assetOcr = new AssetOcrSync(this.db);
     this.authUser = new AuthUserSync(this.db);
     this.memory = new MemorySync(this.db);
     this.memoryToAsset = new MemoryToAssetSync(this.db);
@@ -767,3 +769,27 @@ class AssetMetadataSync extends BaseSync {
       .stream();
   }
 }
+
+class AssetOcrSync extends BaseSync {
+  @GenerateSql({ params: [dummyQueryOptions, DummyValue.UUID], stream: true })
+  getDeletes(options: SyncQueryOptions, userId: string) {
+    return this.auditQuery('asset_ocr_audit', options)
+      .select(['asset_ocr_audit.id', 'asset_ocr_audit.assetId', 'asset_ocr_audit.deletedAt'])
+      .leftJoin('asset', 'asset.id', 'asset_ocr_audit.assetId')
+      .where('asset.ownerId', '=', userId)
+      .stream();
+  }
+
+  cleanupAuditTable(daysAgo: number) {
+    return this.auditCleanup('asset_ocr_audit', daysAgo);
+  }
+
+  @GenerateSql({ params: [dummyQueryOptions, DummyValue.UUID], stream: true })
+  getUpserts(options: SyncQueryOptions, userId: string) {
+    return this.upsertQuery('asset_ocr', options)
+      .select(columns.syncAssetOcr)
+      .innerJoin('asset', 'asset.id', 'asset_ocr.assetId')
+      .where('asset.ownerId', '=', userId)
+      .stream();
+  }
+}

server/src/schema/functions.ts

@@ -287,3 +287,16 @@ export const asset_edit_audit = registerFunction({
       RETURN NULL;
     END`,
 });
+
+export const asset_ocr_delete_audit = registerFunction({
+  name: 'asset_ocr_delete_audit',
+  returnType: 'TRIGGER',
+  language: 'PLPGSQL',
+  body: `
+    BEGIN
+      INSERT INTO asset_ocr_audit ("assetId")
+      SELECT "assetId"
+      FROM OLD;
+      RETURN NULL;
+    END`,
+});

server/src/schema/index.ts

@@ -11,6 +11,7 @@ import {
   asset_delete_audit,
   asset_face_audit,
   asset_metadata_audit,
+  asset_ocr_delete_audit,
   f_concat_ws,
   f_unaccent,
   immich_uuid_v7,
@@ -42,6 +43,7 @@ import { AssetFileTable } from 'src/schema/tables/asset-file.table';
 import { AssetJobStatusTable } from 'src/schema/tables/asset-job-status.table';
 import { AssetMetadataAuditTable } from 'src/schema/tables/asset-metadata-audit.table';
 import { AssetMetadataTable } from 'src/schema/tables/asset-metadata.table';
+import { AssetOcrAuditTable } from 'src/schema/tables/asset-ocr-audit.table';
 import { AssetOcrTable } from 'src/schema/tables/asset-ocr.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { FaceSearchTable } from 'src/schema/tables/face-search.table';
@@ -99,6 +101,7 @@ export class ImmichDatabase {
     AssetMetadataAuditTable,
     AssetJobStatusTable,
     AssetOcrTable,
+    AssetOcrAuditTable,
     AssetTable,
     AssetFileTable,
     AssetExifTable,
@@ -159,6 +162,7 @@ export class ImmichDatabase {
     user_metadata_audit,
     asset_metadata_audit,
     asset_face_audit,
+    asset_ocr_delete_audit,
   ];
 
   enum = [album_user_role_enum, assets_status_enum, asset_face_source_type, asset_visibility_enum];
@@ -196,6 +200,7 @@ export interface DB {
   asset_metadata_audit: AssetMetadataAuditTable;
   asset_job_status: AssetJobStatusTable;
   asset_ocr: AssetOcrTable;
+  asset_ocr_audit: AssetOcrAuditTable;
   ocr_search: OcrSearchTable;
 
   face_search: FaceSearchTable;

server/src/schema/migrations/1772025522559-AssetOcrSync.ts

@@ -0,0 +1,58 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE OR REPLACE FUNCTION asset_edit_delete()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      UPDATE asset
+      SET "isEdited" = false
+      FROM deleted_edit
+      WHERE asset.id = deleted_edit."assetId" AND asset."isEdited"
+        AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit."assetId" = asset.id);
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION asset_ocr_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO asset_ocr_audit ("assetId")
+      SELECT "assetId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE TABLE "asset_ocr_audit" (
+  "id" uuid NOT NULL DEFAULT immich_uuid_v7(),
+  "assetId" uuid NOT NULL,
+  "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(),
+  CONSTRAINT "asset_ocr_audit_pkey" PRIMARY KEY ("id")
+);`.execute(db);
+  await sql`CREATE INDEX "asset_ocr_audit_assetId_idx" ON "asset_ocr_audit" ("assetId");`.execute(db);
+  await sql`CREATE INDEX "asset_ocr_audit_deletedAt_idx" ON "asset_ocr_audit" ("deletedAt");`.execute(db);
+  await sql`ALTER TABLE "asset_ocr" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
+  await sql`CREATE INDEX "asset_ocr_updateId_idx" ON "asset_ocr" ("updateId");`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_ocr_delete_audit"
+  AFTER DELETE ON "asset_ocr"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION asset_ocr_delete_audit();`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_asset_ocr_delete_audit', '{"type":"function","name":"asset_ocr_delete_audit","sql":"CREATE OR REPLACE FUNCTION asset_ocr_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO asset_ocr_audit (\\"assetId\\")\\n      SELECT \\"assetId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_ocr_delete_audit', '{"type":"trigger","name":"asset_ocr_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"asset_ocr_delete_audit\\"\\n  AFTER DELETE ON \\"asset_ocr\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION asset_ocr_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"function","name":"asset_edit_delete","sql":"CREATE OR REPLACE FUNCTION asset_edit_delete()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      UPDATE asset\\n      SET \\"isEdited\\" = false\\n      FROM deleted_edit\\n      WHERE asset.id = deleted_edit.\\"assetId\\" AND asset.\\"isEdited\\"\\n        AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit.\\"assetId\\" = asset.id);\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb WHERE "name" = 'function_asset_edit_delete';`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TRIGGER "asset_ocr_delete_audit" ON "asset_ocr";`.execute(db);
+  await sql`DROP INDEX "asset_ocr_updateId_idx";`.execute(db);
+  await sql`ALTER TABLE "asset_ocr" DROP COLUMN "updateId";`.execute(db);
+  await sql`DROP TABLE "asset_ocr_audit";`.execute(db);
+  await sql`DROP FUNCTION asset_ocr_delete_audit;`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE OR REPLACE FUNCTION asset_edit_delete()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      UPDATE asset\\n      SET \\"isEdited\\" = false\\n      FROM deleted_edit\\n      WHERE asset.id = deleted_edit.\\"assetId\\" AND asset.\\"isEdited\\" \\n        AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit.\\"assetId\\" = asset.id);\\n      RETURN NULL;\\n    END\\n  $$;","name":"asset_edit_delete","type":"function"}'::jsonb WHERE "name" = 'function_asset_edit_delete';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_asset_ocr_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_ocr_delete_audit';`.execute(db);
+}

server/src/schema/tables/asset-ocr-audit.table.ts

@@ -0,0 +1,14 @@
+import { Column, CreateDateColumn, Generated, Table } from '@immich/sql-tools';
+import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+
+@Table('asset_ocr_audit')
+export class AssetOcrAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: Generated<string>;
+
+  @Column({ type: 'uuid', index: true })
+  assetId!: string;
+
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
+  deletedAt!: Date;
+}

server/src/schema/tables/asset-ocr.table.ts

@@ -1,7 +1,22 @@
-import { Column, ForeignKeyColumn, Generated, PrimaryGeneratedColumn, Table } from '@immich/sql-tools';
+import {
+  AfterDeleteTrigger,
+  Column,
+  ForeignKeyColumn,
+  Generated,
+  PrimaryGeneratedColumn,
+  Table,
+} from '@immich/sql-tools';
+import { UpdateIdColumn } from 'src/decorators';
+import { asset_ocr_delete_audit } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 
 @Table('asset_ocr')
+@AfterDeleteTrigger({
+  scope: 'statement',
+  function: asset_ocr_delete_audit,
+  referencingOldTableAs: 'old',
+  when: 'pg_trigger_depth() = 0',
+})
 export class AssetOcrTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -45,4 +60,7 @@ export class AssetOcrTable {
 
   @Column({ type: 'boolean', default: true })
   isVisible!: Generated<boolean>;
+
+  @UpdateIdColumn({ index: true })
+  updateId!: Generated<string>;
 }

server/src/services/sync.service.ts

@@ -66,6 +66,7 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.AlbumToAssetsV1,
   SyncRequestType.AssetExifsV1,
   SyncRequestType.AlbumAssetExifsV1,
+  SyncRequestType.AssetOcrV1,
   SyncRequestType.PartnerAssetExifsV1,
   SyncRequestType.MemoriesV1,
   SyncRequestType.MemoryToAssetsV1,
@@ -181,6 +182,7 @@ export class SyncService extends BaseService {
       [SyncRequestType.AssetFacesV1]: async () => this.syncAssetFacesV1(options, response, checkpointMap),
       [SyncRequestType.AssetFacesV2]: async () => this.syncAssetFacesV2(options, response, checkpointMap),
       [SyncRequestType.UserMetadataV1]: () => this.syncUserMetadataV1(options, response, checkpointMap),
+      [SyncRequestType.AssetOcrV1]: () => this.syncAssetOcrV1(options, response, checkpointMap, auth),
     };
 
     for (const type of SYNC_TYPES_ORDER.filter((type) => dto.types.includes(type))) {
@@ -211,6 +213,7 @@ export class SyncService extends BaseService {
     await this.syncRepository.stack.cleanupAuditTable(pruneThreshold);
     await this.syncRepository.user.cleanupAuditTable(pruneThreshold);
     await this.syncRepository.userMetadata.cleanupAuditTable(pruneThreshold);
+    await this.syncRepository.assetOcr.cleanupAuditTable(pruneThreshold);
   }
 
   private needsFullSync(checkpointMap: CheckpointMap) {
@@ -874,6 +877,33 @@ export class SyncService extends BaseService {
     }
   }
 
+  private async syncAssetOcrV1(
+    options: SyncQueryOptions,
+    response: Writable,
+    checkpointMap: CheckpointMap,
+    auth: AuthDto,
+  ) {
+    const deleteType = SyncEntityType.AssetOcrDeleteV1;
+    const deletes = this.syncRepository.assetOcr.getDeletes(
+      { ...options, ack: checkpointMap[deleteType] },
+      auth.user.id,
+    );
+
+    for await (const row of deletes) {
+      send(response, { type: deleteType, ids: [row.id], data: row });
+    }
+
+    const upsertType = SyncEntityType.AssetOcrV1;
+    const upserts = this.syncRepository.assetOcr.getUpserts(
+      { ...options, ack: checkpointMap[upsertType] },
+      auth.user.id,
+    );
+
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
   private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) {
     const { type, sessionId, createId } = item;
     await this.syncCheckpointRepository.upsertAll([

server/test/medium/specs/services/ocr.service.spec.ts

@@ -55,6 +55,7 @@ describe(OcrService.name, () => {
         assetId: asset.id,
         boxScore: 0.99,
         id: expect.any(String),
+        updateId: expect.any(String),
         text: 'Test OCR',
         textScore: 0.95,
         isVisible: true,
@@ -105,6 +106,7 @@ describe(OcrService.name, () => {
         assetId: asset.id,
         boxScore: 0.7,
         id: expect.any(String),
+        updateId: expect.any(String),
         text: 'One',
         textScore: 0.9,
         isVisible: true,
@@ -121,6 +123,7 @@ describe(OcrService.name, () => {
         assetId: asset.id,
         boxScore: 0.67,
         id: expect.any(String),
+        updateId: expect.any(String),
         text: 'Two',
         textScore: 0.89,
         isVisible: true,
@@ -137,6 +140,7 @@ describe(OcrService.name, () => {
         assetId: asset.id,
         boxScore: 0.65,
         id: expect.any(String),
+        updateId: expect.any(String),
         text: 'Three',
         textScore: 0.88,
         isVisible: true,
@@ -153,6 +157,7 @@ describe(OcrService.name, () => {
         assetId: asset.id,
         boxScore: 0.62,
         id: expect.any(String),
+        updateId: expect.any(String),
         text: 'Four',
         textScore: 0.87,
         isVisible: true,
@@ -169,6 +174,7 @@ describe(OcrService.name, () => {
         assetId: asset.id,
         boxScore: 0.6,
         id: expect.any(String),
+        updateId: expect.any(String),
         text: 'Five',
         textScore: 0.86,
         isVisible: true,

server/test/medium/specs/sync/sync-asset-ocr.spec.ts

@@ -0,0 +1,379 @@
+import { Kysely } from 'kysely';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { OcrRepository } from 'src/repositories/ocr.repository';
+import { DB } from 'src/schema';
+import { SyncTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.AssetOcrV1, () => {
+  it('should detect and sync new asset OCR', async () => {
+    const { auth, user, ctx } = await setup();
+
+    const ocrRepo = ctx.get(OcrRepository);
+    const { asset } = await ctx.newAsset({ ownerId: user.id });
+    await ocrRepo.upsert(
+      asset.id,
+      [
+        {
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: true,
+        },
+      ],
+      'Hello World',
+    );
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetOcrV1]);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: expect.any(String),
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: true,
+        },
+        type: 'AssetOcrV1',
+      },
+      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetOcrV1]);
+  });
+
+  it('should update asset OCR', async () => {
+    const { auth, user, ctx } = await setup();
+
+    const ocrRepo = ctx.get(OcrRepository);
+    const { asset } = await ctx.newAsset({ ownerId: user.id });
+    await ocrRepo.upsert(
+      asset.id,
+      [
+        {
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: true,
+        },
+      ],
+      'Hello World',
+    );
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetOcrV1]);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: expect.any(String),
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: true,
+        },
+        type: 'AssetOcrV1',
+      },
+      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+
+    // Update OCR data (upsert deletes old entries first, then inserts new ones)
+    await ocrRepo.upsert(
+      asset.id,
+      [
+        {
+          assetId: asset.id,
+          x1: 0.15,
+          y1: 0.25,
+          x2: 0.85,
+          y2: 0.25,
+          x3: 0.85,
+          y3: 0.75,
+          x4: 0.15,
+          y4: 0.75,
+          boxScore: 0.98,
+          textScore: 0.96,
+          text: 'Updated Text',
+          isVisible: true,
+        },
+      ],
+      'Updated Text',
+    );
+
+    const updatedResponse = await ctx.syncStream(auth, [SyncRequestType.AssetOcrV1]);
+    // upsert() deletes old entries first, so we expect both delete and upsert events
+    expect(updatedResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: expect.any(String),
+          assetId: asset.id,
+          deletedAt: expect.any(String),
+        },
+        type: 'AssetOcrDeleteV1',
+      },
+      {
+        ack: expect.any(String),
+        data: {
+          id: expect.any(String),
+          assetId: asset.id,
+          x1: 0.15,
+          y1: 0.25,
+          x2: 0.85,
+          y2: 0.25,
+          x3: 0.85,
+          y3: 0.75,
+          x4: 0.15,
+          y4: 0.75,
+          boxScore: 0.98,
+          textScore: 0.96,
+          text: 'Updated Text',
+          isVisible: true,
+        },
+        type: 'AssetOcrV1',
+      },
+      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
+    ]);
+
+    await ctx.syncAckAll(auth, updatedResponse);
+    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetOcrV1]);
+  });
+
+  it('should update asset OCR visibility flag', async () => {
+    const { auth, user, ctx } = await setup();
+
+    const ocrRepo = ctx.get(OcrRepository);
+    const { asset } = await ctx.newAsset({ ownerId: user.id });
+    await ocrRepo.upsert(
+      asset.id,
+      [
+        {
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: true,
+        },
+      ],
+      'Hello World',
+    );
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetOcrV1]);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: expect.any(String),
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: true,
+        },
+        type: 'AssetOcrV1',
+      },
+      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+
+    await ocrRepo.upsert(
+      asset.id,
+      [
+        {
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: false,
+        },
+      ],
+      'Hello World',
+    );
+
+    const updatedResponse = await ctx.syncStream(auth, [SyncRequestType.AssetOcrV1]);
+    expect(updatedResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: expect.any(String),
+          assetId: asset.id,
+          deletedAt: expect.any(String),
+        },
+        type: 'AssetOcrDeleteV1',
+      },
+      {
+        ack: expect.any(String),
+        data: {
+          id: expect.any(String),
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: false,
+        },
+        type: 'AssetOcrV1',
+      },
+      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
+    ]);
+
+    await ctx.syncAckAll(auth, updatedResponse);
+    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetOcrV1]);
+  });
+});
+
+describe(SyncEntityType.AssetOcrDeleteV1, () => {
+  it('should delete and sync asset OCR', async () => {
+    const { auth, user, ctx } = await setup();
+
+    const ocrRepo = ctx.get(OcrRepository);
+    const { asset } = await ctx.newAsset({ ownerId: user.id });
+    await ocrRepo.upsert(
+      asset.id,
+      [
+        {
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: true,
+        },
+      ],
+      'Hello World',
+    );
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetOcrV1]);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: expect.any(String),
+          assetId: asset.id,
+          x1: 0.1,
+          y1: 0.2,
+          x2: 0.9,
+          y2: 0.2,
+          x3: 0.9,
+          y3: 0.8,
+          x4: 0.1,
+          y4: 0.8,
+          boxScore: 0.95,
+          textScore: 0.92,
+          text: 'Hello World',
+          isVisible: true,
+        },
+        type: 'AssetOcrV1',
+      },
+      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+
+    // Delete OCR data
+    await ocrRepo.upsert(asset.id, [], '');
+
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetOcrV1])).resolves.toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          assetId: asset.id,
+          deletedAt: expect.any(String),
+          id: expect.any(String),
+        },
+        type: 'AssetOcrDeleteV1',
+      },
+      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
+    ]);
+  });
+});

server/test/small.factory.ts

@@ -200,6 +200,7 @@ const assetSidecarWriteFactory = () => {
 const assetOcrFactory = (
   ocr: {
     id?: string;
+    updateId?: string;
     assetId?: string;
     x1?: number;
     y1?: number;
@@ -216,6 +217,7 @@ const assetOcrFactory = (
   } = {},
 ) => ({
   id: newUuid(),
+  updateId: newUuidV7(),
   assetId: newUuid(),
   x1: 0.1,
   y1: 0.2,