update schema

drift logs
feat: drift store migration
2025-06-28 22:20:02 -05:00 · 2025-06-28 17:50:08 -05:00 · 2025-06-27 15:40:48 -05:00
535 changed files with 9880 additions and 19255 deletions
--- a/.devcontainer/server/container-common.sh
+++ b/.devcontainer/server/container-common.sh
@@ -73,8 +73,10 @@ install_dependencies() {
    log "Installing dependencies"
    (
        cd "${IMMICH_WORKSPACE}" || exit 1
-        export CI=1 FROZEN=1 OFFLINE=1
-        run_cmd make setup-dev
+        run_cmd make ci-server
+        run_cmd make ci-sdk
+        run_cmd make build-sdk
+        run_cmd make ci-web
    )
    log ""
 }
--- a/.devcontainer/server/container-compose-overrides.yml
+++ b/.devcontainer/server/container-compose-overrides.yml
@@ -22,7 +22,7 @@ services:

  immich-machine-learning:
    env_file: !reset []
-
+    
  database:
    env_file: !reset []
    environment: !override
@@ -31,7 +31,7 @@ services:
      POSTGRES_DB: ${DB_DATABASE_NAME-immich}
      POSTGRES_INITDB_ARGS: '--data-checksums'
      POSTGRES_HOST_AUTH_METHOD: md5
-    volumes:
+    volumes: 
      - ${UPLOAD_LOCATION:-postgres-devcontainer-volume}${UPLOAD_LOCATION:+/postgres}:/var/lib/postgresql/data

  redis:
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,7 +4,6 @@

 design/
 docker/
-Dockerfile
 !docker/scripts
 docs/
 !docs/package.json
@@ -20,7 +19,6 @@ mobile/
 cli/coverage/
 cli/dist/
 cli/node_modules/
-cli/Dockerfile

 open-api/typescript-sdk/build/
 open-api/typescript-sdk/node_modules/
@@ -31,11 +29,9 @@ server/upload/
 server/src/queries
 server/dist/
 server/www/
-server/Dockerfile

 web/node_modules/
 web/coverage/
 web/.svelte-kit
 web/build/
 web/.env
-web/Dockerfile
--- a/.github/.nvmrc
+++ b/.github/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.16.0
--- a/.github/.prettierignore
+++ b/.github/.prettierignore
@@ -1,4 +0,0 @@
-# Ignore files for PNPM, NPM and YARN
-pnpm-lock.yaml
-package-lock.json
-yarn.lock
--- a/.github/package-lock.json
+++ b/.github/package-lock.json
@@ -9,9 +9,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
+      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
      "dev": true,
      "license": "MIT",
      "bin": {
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -66,6 +66,12 @@ jobs:
          ref: ${{ inputs.ref || github.sha }}
          persist-credentials: false

+      - name: Install missing deps
+        run: |
+          sudo add-apt-repository ppa:rmescandon/yq
+          sudo apt-get update
+          sudo apt-get install -y yq xz-utils ninja-build zstd
+
      - name: Create the Keystore
        env:
          KEY_JKS: ${{ secrets.KEY_JKS }}
@@ -90,7 +96,7 @@ jobs:
          key: build-mobile-gradle-${{ runner.os }}-main

      - name: Setup Flutter SDK
-        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
        with:
          channel: 'stable'
          flutter-version-file: ./mobile/pubspec.yaml
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
        with:
          category: '/language:${{matrix.language}}'
--- a/.github/workflows/pr-label-validation.yml
+++ b/.github/workflows/pr-label-validation.yml
@@ -14,7 +14,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Require PR to have a changelog label
-        uses: mheap/github-action-required-labels@8afbe8ae6ab7647d0c9f0cfa7c2f939650d22509 # v5.5.1
+        uses: mheap/github-action-required-labels@fb29a14a076b0f74099f6198f77750e8fc236016 # v5.5.0
        with:
          mode: exactly
          count: 1
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -42,9 +42,6 @@ jobs:
    runs-on: ubuntu-latest
    permissions:
      contents: read
-    defaults:
-      run:
-        working-directory: ./mobile
    steps:
      - name: Checkout code
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -52,30 +49,34 @@ jobs:
          persist-credentials: false

      - name: Setup Flutter SDK
-        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
        with:
          channel: 'stable'
          flutter-version-file: ./mobile/pubspec.yaml

      - name: Install dependencies
        run: dart pub get
+        working-directory: ./mobile

      - name: Install DCM
-        # TODO: Move to upstream after https://github.com/CQLabs/setup-dcm/pull/235 merges
-        uses: bo0tzz/setup-dcm@b4952ab813659c03513b57bd78bfe3f634171f8a
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          version: auto
-          working-directory: ./mobile
+        run: |
+          sudo apt-get update
+          wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
+          echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
+          sudo apt-get update
+          sudo apt-get install dcm

      - name: Generate translation file
        run: make translation
+        working-directory: ./mobile

      - name: Run Build Runner
        run: make build
+        working-directory: ./mobile

      - name: Generate platform API
        run: make pigeon
+        working-directory: ./mobile

      - name: Find file changes
        uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -97,16 +98,19 @@ jobs:

      - name: Run dart analyze
        run: dart analyze --fatal-infos
+        working-directory: ./mobile

      - name: Run dart format
        run: dart format lib/ --set-exit-if-changed
+        working-directory: ./mobile

      - name: Run dart custom_lint
        run: dart run custom_lint
+        working-directory: ./mobile

-      # TODO: Use https://github.com/CQLabs/dcm-action
      - name: Run DCM
        run: dcm analyze lib --fatal-style --fatal-warnings
+        working-directory: ./mobile

  zizmor:
    name: zizmor
@@ -130,7 +134,7 @@ jobs:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
        with:
          sarif_file: results.sarif
          category: zizmor
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -516,7 +516,7 @@ jobs:
          persist-credentials: false

      - name: Setup Flutter SDK
-        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
        with:
          channel: 'stable'
          flutter-version-file: ./mobile/pubspec.yaml
--- a/26
+++ b/26
@@ -1,33 +1,27 @@
 dev:
-	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans
+	docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans || make dev-down

 dev-down:
 	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans

 dev-update:
-	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
+	docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans

 dev-scale:
-	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
+	docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans

 .PHONY: e2e
 e2e:
-	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
-
-e2e-update:
-	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
-
-e2e-down:
-	docker compose -f ./e2e/docker-compose.yml down --remove-orphans
+	docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans

 prod:
-	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
+	docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans

 prod-down:
 	docker compose -f ./docker/docker-compose.prod.yml down --remove-orphans

 prod-scale:
-	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
+	docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans

 .PHONY: open-api
 open-api:
@@ -99,11 +93,9 @@ hygiene-all: lint-all format-all check-all sql audit-all;
 test-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),test-$M) ;

 clean:
-	find . -name "node_modules" -type d -prune -exec rm -rf {} +
+	find . -name "node_modules" -type d -prune -exec rm -rf '{}' +
 	find . -name "dist" -type d -prune -exec rm -rf '{}' +
 	find . -name "build" -type d -prune -exec rm -rf '{}' +
 	find . -name "svelte-kit" -type d -prune -exec rm -rf '{}' +
-	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
-	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true
-
-setup-dev: install-server install-sdk build-sdk install-web
+	docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
+	docker compose -f ./e2e/docker-compose.yml rm -v -f || true
--- a/cli/.nvmrc
+++ b/cli/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.16.0
--- a/cli/bin/immich
+++ b/cli/bin/immich
@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import '../dist/index.js';
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -16,7 +16,7 @@
        "micromatch": "^4.0.8"
      },
      "bin": {
-        "immich": "bin/immich"
+        "immich": "dist/index.js"
      },
      "devDependencies": {
        "@eslint/eslintrc": "^3.1.0",
@@ -27,7 +27,7 @@
        "@types/lodash-es": "^4.17.12",
        "@types/micromatch": "^4.0.9",
        "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.15.32",
        "@vitest/coverage-v8": "^3.0.0",
        "byte-size": "^9.0.0",
        "cli-progress": "^3.12.0",
@@ -61,7 +61,7 @@
        "@oazapfts/runtime": "^1.0.2"
      },
      "devDependencies": {
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.15.32",
        "typescript": "^5.3.3"
      }
    },
@@ -607,9 +607,9 @@
      }
    },
    "node_modules/@eslint/config-array": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
+      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -622,9 +622,9 @@
      }
    },
    "node_modules/@eslint/config-helpers": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
-      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
+      "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -682,9 +682,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
-      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
+      "version": "9.27.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
+      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1276,16 +1276,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/@types/chai": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
-      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/deep-eql": "*"
-      }
-    },
    "node_modules/@types/cli-progress": {
      "version": "3.11.6",
      "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.6.tgz",
@@ -1296,13 +1286,6 @@
        "@types/node": "*"
      }
    },
-    "node_modules/@types/deep-eql": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
-      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/@types/estree": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
@@ -1355,9 +1338,9 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "22.15.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
-      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
+      "version": "22.15.32",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.32.tgz",
+      "integrity": "sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1365,17 +1348,17 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
-      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
+      "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/type-utils": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.32.1",
+        "@typescript-eslint/type-utils": "8.32.1",
+        "@typescript-eslint/utils": "8.32.1",
+        "@typescript-eslint/visitor-keys": "8.32.1",
        "graphemer": "^1.4.0",
        "ignore": "^7.0.0",
        "natural-compare": "^1.4.0",
@@ -1389,7 +1372,7 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.1",
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
        "eslint": "^8.57.0 || ^9.0.0",
        "typescript": ">=4.8.4 <5.9.0"
      }
@@ -1405,16 +1388,16 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
-      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
+      "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.32.1",
+        "@typescript-eslint/types": "8.32.1",
+        "@typescript-eslint/typescript-estree": "8.32.1",
+        "@typescript-eslint/visitor-keys": "8.32.1",
        "debug": "^4.3.4"
      },
      "engines": {
@@ -1429,37 +1412,15 @@
        "typescript": ">=4.8.4 <5.9.0"
      }
    },
-    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
-      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.1",
-        "@typescript-eslint/types": "^8.35.1",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
-      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
+      "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1"
+        "@typescript-eslint/types": "8.32.1",
+        "@typescript-eslint/visitor-keys": "8.32.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1469,32 +1430,15 @@
        "url": "https://opencollective.com/typescript-eslint"
      }
    },
-    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
-      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
-      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
+      "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.32.1",
+        "@typescript-eslint/utils": "8.32.1",
        "debug": "^4.3.4",
        "ts-api-utils": "^2.1.0"
      },
@@ -1511,9 +1455,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
-      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
+      "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1525,16 +1469,14 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
-      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
+      "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/project-service": "8.35.1",
-        "@typescript-eslint/tsconfig-utils": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/types": "8.32.1",
+        "@typescript-eslint/visitor-keys": "8.32.1",
        "debug": "^4.3.4",
        "fast-glob": "^3.3.2",
        "is-glob": "^4.0.3",
@@ -1554,9 +1496,9 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1580,16 +1522,16 @@
      }
    },
    "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
-      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
+      "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1"
+        "@typescript-eslint/scope-manager": "8.32.1",
+        "@typescript-eslint/types": "8.32.1",
+        "@typescript-eslint/typescript-estree": "8.32.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1604,14 +1546,14 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
-      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
+      "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
-        "eslint-visitor-keys": "^4.2.1"
+        "@typescript-eslint/types": "8.32.1",
+        "eslint-visitor-keys": "^4.2.0"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1622,16 +1564,15 @@
      }
    },
    "node_modules/@vitest/coverage-v8": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
-      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.1.4.tgz",
+      "integrity": "sha512-G4p6OtioySL+hPV7Y6JHlhpsODbJzt1ndwHAFkyk6vVjpK03PFsKnauZIzcd0PrK4zAbc5lc+jeZ+eNGiMA+iw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@ampproject/remapping": "^2.3.0",
        "@bcoe/v8-coverage": "^1.0.2",
-        "ast-v8-to-istanbul": "^0.3.3",
-        "debug": "^4.4.1",
+        "debug": "^4.4.0",
        "istanbul-lib-coverage": "^3.2.2",
        "istanbul-lib-report": "^3.0.1",
        "istanbul-lib-source-maps": "^5.0.6",
@@ -1646,8 +1587,8 @@
        "url": "https://opencollective.com/vitest"
      },
      "peerDependencies": {
-        "@vitest/browser": "3.2.4",
-        "vitest": "3.2.4"
+        "@vitest/browser": "3.1.4",
+        "vitest": "3.1.4"
      },
      "peerDependenciesMeta": {
        "@vitest/browser": {
@@ -1656,15 +1597,14 @@
      }
    },
    "node_modules/@vitest/expect": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
-      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
+      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@types/chai": "^5.2.2",
-        "@vitest/spy": "3.2.4",
-        "@vitest/utils": "3.2.4",
+        "@vitest/spy": "3.1.4",
+        "@vitest/utils": "3.1.4",
        "chai": "^5.2.0",
        "tinyrainbow": "^2.0.0"
      },
@@ -1673,13 +1613,13 @@
      }
    },
    "node_modules/@vitest/mocker": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
-      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
+      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/spy": "3.2.4",
+        "@vitest/spy": "3.1.4",
        "estree-walker": "^3.0.3",
        "magic-string": "^0.30.17"
      },
@@ -1688,7 +1628,7 @@
      },
      "peerDependencies": {
        "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
+        "vite": "^5.0.0 || ^6.0.0"
      },
      "peerDependenciesMeta": {
        "msw": {
@@ -1700,9 +1640,9 @@
      }
    },
    "node_modules/@vitest/pretty-format": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
-      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
+      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1713,28 +1653,27 @@
      }
    },
    "node_modules/@vitest/runner": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
-      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
+      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/utils": "3.2.4",
-        "pathe": "^2.0.3",
-        "strip-literal": "^3.0.0"
+        "@vitest/utils": "3.1.4",
+        "pathe": "^2.0.3"
      },
      "funding": {
        "url": "https://opencollective.com/vitest"
      }
    },
    "node_modules/@vitest/snapshot": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
-      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
+      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/pretty-format": "3.2.4",
+        "@vitest/pretty-format": "3.1.4",
        "magic-string": "^0.30.17",
        "pathe": "^2.0.3"
      },
@@ -1743,27 +1682,27 @@
      }
    },
    "node_modules/@vitest/spy": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
-      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
+      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "tinyspy": "^4.0.3"
+        "tinyspy": "^3.0.2"
      },
      "funding": {
        "url": "https://opencollective.com/vitest"
      }
    },
    "node_modules/@vitest/utils": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
-      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
+      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/pretty-format": "3.2.4",
-        "loupe": "^3.1.4",
+        "@vitest/pretty-format": "3.1.4",
+        "loupe": "^3.1.3",
        "tinyrainbow": "^2.0.0"
      },
      "funding": {
@@ -1771,9 +1710,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -1853,18 +1792,6 @@
        "node": ">=12"
      }
    },
-    "node_modules/ast-v8-to-istanbul": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.3.tgz",
-      "integrity": "sha512-MuXMrSLVVoA6sYN/6Hke18vMzrT4TZNbZIj/hvh0fnYFpO+/kFXcLIaiPwXXWaQUPg4yJD8fj+lfJ7/1EBconw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "estree-walker": "^3.0.3",
-        "js-tokens": "^9.0.1"
-      }
-    },
    "node_modules/balanced-match": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -2178,9 +2105,9 @@
      }
    },
    "node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2305,19 +2232,19 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
-      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
+      "version": "9.27.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
+      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.0",
+        "@eslint/config-array": "^0.20.0",
+        "@eslint/config-helpers": "^0.2.1",
        "@eslint/core": "^0.14.0",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.30.1",
+        "@eslint/js": "9.27.0",
        "@eslint/plugin-kit": "^0.3.1",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
@@ -2329,9 +2256,9 @@
        "cross-spawn": "^7.0.6",
        "debug": "^4.3.2",
        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.4.0",
-        "eslint-visitor-keys": "^4.2.1",
-        "espree": "^10.4.0",
+        "eslint-scope": "^8.3.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
        "esquery": "^1.5.0",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@@ -2382,14 +2309,14 @@
      }
    },
    "node_modules/eslint-plugin-prettier": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz",
-      "integrity": "sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
+      "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "prettier-linter-helpers": "^1.0.0",
-        "synckit": "^0.11.7"
+        "synckit": "^0.11.0"
      },
      "engines": {
        "node": "^14.18.0 || >=16.0.0"
@@ -2475,9 +2402,9 @@
      }
    },
    "node_modules/eslint-scope": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
-      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
@@ -2492,9 +2419,9 @@
      }
    },
    "node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -2505,15 +2432,15 @@
      }
    },
    "node_modules/espree": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
-      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
-        "acorn": "^8.15.0",
+        "acorn": "^8.14.0",
        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.1"
+        "eslint-visitor-keys": "^4.2.0"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2822,9 +2749,9 @@
      }
    },
    "node_modules/globals": {
-      "version": "16.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
-      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz",
+      "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3048,13 +2975,6 @@
        "@pkgjs/parseargs": "^0.11.0"
      }
    },
-    "node_modules/js-tokens": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
-      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/js-yaml": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3156,9 +3076,9 @@
      "license": "MIT"
    },
    "node_modules/loupe": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
-      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
+      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
      "dev": true,
      "license": "MIT"
    },
@@ -3427,9 +3347,9 @@
      "license": "MIT"
    },
    "node_modules/pathval": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
-      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3505,9 +3425,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
+      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -3879,19 +3799,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/strip-literal": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
-      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^9.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
    "node_modules/supports-color": {
      "version": "7.2.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -3906,13 +3813,14 @@
      }
    },
    "node_modules/synckit": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
-      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.4.tgz",
+      "integrity": "sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@pkgr/core": "^0.2.4"
+        "@pkgr/core": "^0.2.3",
+        "tslib": "^2.8.1"
      },
      "engines": {
        "node": "^14.18.0 || >=16.0.0"
@@ -3977,9 +3885,9 @@
      "license": "MIT"
    },
    "node_modules/tinyglobby": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
+      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -4022,9 +3930,9 @@
      }
    },
    "node_modules/tinypool": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
-      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
+      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -4042,9 +3950,9 @@
      }
    },
    "node_modules/tinyspy": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
-      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
+      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -4097,6 +4005,13 @@
        }
      }
    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD"
+    },
    "node_modules/type-check": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -4125,15 +4040,15 @@
      }
    },
    "node_modules/typescript-eslint": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
-      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
+      "version": "8.32.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
+      "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.1",
-        "@typescript-eslint/parser": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1"
+        "@typescript-eslint/eslint-plugin": "8.32.1",
+        "@typescript-eslint/parser": "8.32.1",
+        "@typescript-eslint/utils": "8.32.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4271,17 +4186,17 @@
      }
    },
    "node_modules/vite-node": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
-      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
+      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "cac": "^6.7.14",
-        "debug": "^4.4.1",
+        "debug": "^4.4.0",
        "es-module-lexer": "^1.7.0",
        "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
+        "vite": "^5.0.0 || ^6.0.0"
      },
      "bin": {
        "vite-node": "vite-node.mjs"
@@ -4342,34 +4257,32 @@
      }
    },
    "node_modules/vitest": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
-      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
+      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@types/chai": "^5.2.2",
-        "@vitest/expect": "3.2.4",
-        "@vitest/mocker": "3.2.4",
-        "@vitest/pretty-format": "^3.2.4",
-        "@vitest/runner": "3.2.4",
-        "@vitest/snapshot": "3.2.4",
-        "@vitest/spy": "3.2.4",
-        "@vitest/utils": "3.2.4",
+        "@vitest/expect": "3.1.4",
+        "@vitest/mocker": "3.1.4",
+        "@vitest/pretty-format": "^3.1.4",
+        "@vitest/runner": "3.1.4",
+        "@vitest/snapshot": "3.1.4",
+        "@vitest/spy": "3.1.4",
+        "@vitest/utils": "3.1.4",
        "chai": "^5.2.0",
-        "debug": "^4.4.1",
+        "debug": "^4.4.0",
        "expect-type": "^1.2.1",
        "magic-string": "^0.30.17",
        "pathe": "^2.0.3",
-        "picomatch": "^4.0.2",
        "std-env": "^3.9.0",
        "tinybench": "^2.9.0",
        "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.14",
-        "tinypool": "^1.1.1",
+        "tinyglobby": "^0.2.13",
+        "tinypool": "^1.0.2",
        "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
-        "vite-node": "3.2.4",
+        "vite": "^5.0.0 || ^6.0.0",
+        "vite-node": "3.1.4",
        "why-is-node-running": "^2.3.0"
      },
      "bin": {
@@ -4385,8 +4298,8 @@
        "@edge-runtime/vm": "*",
        "@types/debug": "^4.1.12",
        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.2.4",
-        "@vitest/ui": "3.2.4",
+        "@vitest/browser": "3.1.4",
+        "@vitest/ui": "3.1.4",
        "happy-dom": "*",
        "jsdom": "*"
      },
@@ -4427,19 +4340,6 @@
        "vitest": ">=2.0.0"
      }
    },
-    "node_modules/vitest/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
    "node_modules/which": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
--- a/cli/package.json
+++ b/cli/package.json
@@ -5,7 +5,7 @@
  "type": "module",
  "exports": "./dist/index.js",
  "bin": {
-    "immich": "./bin/immich"
+    "immich": "dist/index.js"
  },
  "license": "GNU Affero General Public License version 3",
  "keywords": [
@@ -21,7 +21,7 @@
    "@types/lodash-es": "^4.17.12",
    "@types/micromatch": "^4.0.9",
    "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.15.33",
+    "@types/node": "^22.15.32",
    "@vitest/coverage-v8": "^3.0.0",
    "byte-size": "^9.0.0",
    "cli-progress": "^3.12.0",
@@ -69,6 +69,6 @@
    "micromatch": "^4.0.8"
  },
  "volta": {
-    "node": "22.17.0"
+    "node": "22.16.0"
  }
 }
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -83,7 +83,7 @@ services:
    container_name: immich_prometheus
    ports:
      - 9090:9090
-    image: prom/prometheus@sha256:7a34573f0b9c952286b33d537f233cd5b708e12263733aa646e50c33f598f16c
+    image: prom/prometheus@sha256:9abc6cf6aea7710d163dbb28d8eeb7dc5baef01e38fa4cd146a406dd9f07f70d
    volumes:
      - ./prometheus.yml:/etc/prometheus/prometheus.yml
      - prometheus-data:/prometheus
--- a/docs/.nvmrc
+++ b/docs/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.16.0
--- a/docs/docs/administration/backup-and-restore.md
+++ b/docs/docs/administration/backup-and-restore.md
@@ -150,10 +150,12 @@ for more info read the [release notes](https://github.com/immich-app/immich/rele
  - Preview images (small thumbnails and large previews) for each asset and thumbnails for recognized faces.
  - Stored in `UPLOAD_LOCATION/thumbs/<userID>`.
 - **Encoded Assets:**
+
  - Videos that have been re-encoded from the original for wider compatibility. The original is not removed.
  - Stored in `UPLOAD_LOCATION/encoded-video/<userID>`.

 - **Postgres**
+
  - The Immich database containing all the information to allow the system to function properly.  
    **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
  - Stored in `DB_DATA_LOCATION`.
@@ -199,6 +201,7 @@ When you turn off the storage template engine, it will leave the assets in `UPLO
  - Temporarily located in `UPLOAD_LOCATION/upload/<userID>`.
  - Transferred to `UPLOAD_LOCATION/library/<userID>` upon successful upload.
 - **Postgres**
+
  - The Immich database containing all the information to allow the system to function properly.  
    **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
  - Stored in `DB_DATA_LOCATION`.
--- a/docs/docs/administration/oauth.md
+++ b/docs/docs/administration/oauth.md
@@ -20,6 +20,7 @@ Immich supports 3rd party authentication via [OpenID Connect][oidc] (OIDC), an i
 Before enabling OAuth in Immich, a new client application needs to be configured in the 3rd-party authentication server. While the specifics of this setup vary from provider to provider, the general approach should be the same.

 1. Create a new (Client) Application
+
   1. The **Provider** type should be `OpenID Connect` or `OAuth2`
   2. The **Client type** should be `Confidential`
   3. The **Application** type should be `Web`
@@ -28,6 +29,7 @@ Before enabling OAuth in Immich, a new client application needs to be configured
 2. Configure Redirect URIs/Origins

   The **Sign-in redirect URIs** should include:
+
   - `app.immich:///oauth-callback` - for logging in with OAuth from the [Mobile App](/docs/features/mobile-app.mdx)
   - `http://DOMAIN:PORT/auth/login` - for logging in with OAuth from the Web Client
   - `http://DOMAIN:PORT/user-settings` - for manually linking OAuth in the Web Client
@@ -35,17 +37,21 @@ Before enabling OAuth in Immich, a new client application needs to be configured
   Redirect URIs should contain all the domains you will be using to access Immich. Some examples include:

   Mobile
+
   - `app.immich:///oauth-callback` (You **MUST** include this for iOS and Android mobile apps to work properly)

   Localhost
+
   - `http://localhost:2283/auth/login`
   - `http://localhost:2283/user-settings`

   Local IP
+
   - `http://192.168.0.200:2283/auth/login`
   - `http://192.168.0.200:2283/user-settings`

   Hostname
+
   - `https://immich.example.com/auth/login`
   - `https://immich.example.com/user-settings`

@@ -62,7 +68,6 @@ Once you have a new OAuth client application configured, Immich can be configure
 | Scope                                                | string  | openid email profile | Full list of scopes to send with the request (space delimited)                      |
 | Signing Algorithm                                    | string  | RS256                | The algorithm used to sign the id token (examples: RS256, HS256)                    |
 | Storage Label Claim                                  | string  | preferred_username   | Claim mapping for the user's storage label**¹**                                     |
-| Role Claim                                           | string  | immich_role          | Claim mapping for the user's role. (should return "user" or "admin")**¹**           |
 | Storage Quota Claim                                  | string  | immich_quota         | Claim mapping for the user's storage**¹**                                           |
 | Default Storage Quota (GiB)                          | number  | 0                    | Default quota for user without storage quota claim (Enter 0 for unlimited quota)    |
 | Button Text                                          | string  | Login with OAuth     | Text for the OAuth button on the web                                                |
--- a/docs/docs/developer/devcontainers.md
+++ b/docs/docs/developer/devcontainers.md
@@ -199,11 +199,13 @@ To use your SSH key for commit signing, see the [GitHub guide on SSH commit sign
 When the Dev Container starts, it automatically:

 1. **Runs post-create script** (`container-server-post-create.sh`):
+
   - Adjusts file permissions for the `node` user
   - Installs dependencies: `npm install` in all packages
   - Builds TypeScript SDK: `npm run build` in `open-api/typescript-sdk`

 2. **Starts development servers** via VS Code tasks:
+
   - `Immich API Server (Nest)` - API server with hot-reloading on port 2283
   - `Immich Web Server (Vite)` - Web frontend with hot-reloading on port 3000
   - Both servers watch for file changes and recompile automatically
@@ -333,12 +335,14 @@ make install-all      # Install all dependencies
 The Dev Container is pre-configured for debugging:

 1. **API Server Debugging**:
+
   - Set breakpoints in VS Code
   - Press `F5` or use "Run and Debug" panel
   - Select "Attach to Server" configuration
   - Debug port: 9231

 2. **Worker Debugging**:
+
   - Use "Attach to Workers" configuration
   - Debug port: 9230

@@ -424,6 +428,7 @@ While the Dev Container focuses on server and web development, you can connect m
   ```

 2. **Configure mobile app**:
+
   - Server URL: `http://YOUR_IP:2283/api`
   - Ensure firewall allows port 2283

--- a/docs/docs/features/supported-formats.md
+++ b/docs/docs/features/supported-formats.md
@@ -16,7 +16,7 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a
 | `HEIC`      | `.heic`                       | :white_check_mark: |                 |
 | `HEIF`      | `.heif`                       | :white_check_mark: |                 |
 | `JPEG 2000` | `.jp2`                        | :white_check_mark: |                 |
-| `JPEG`      | `.jpeg` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
+| `JPEG`      | `.webp` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
 | `JPEG XL`   | `.jxl`                        | :white_check_mark: |                 |
 | `PNG`       | `.png`                        | :white_check_mark: |                 |
 | `PSD`       | `.psd`                        | :white_check_mark: | Adobe Photoshop |
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -72,25 +72,22 @@ Information on the current workers can be found [here](/docs/administration/jobs

 ## Database

-| Variable                            | Description                                                                            |  Default   | Containers                     |
-| :---------------------------------- | :------------------------------------------------------------------------------------- | :--------: | :----------------------------- |
-| `DB_URL`                            | Database URL                                                                           |            | server                         |
-| `DB_HOSTNAME`                       | Database host                                                                          | `database` | server                         |
-| `DB_PORT`                           | Database port                                                                          |   `5432`   | server                         |
-| `DB_USERNAME`                       | Database user                                                                          | `postgres` | server, database<sup>\*1</sup> |
-| `DB_PASSWORD`                       | Database password                                                                      | `postgres` | server, database<sup>\*1</sup> |
-| `DB_DATABASE_NAME`                  | Database name                                                                          |  `immich`  | server, database<sup>\*1</sup> |
-| `DB_SSL_MODE`                       | Database SSL mode                                                                      |            | server                         |
-| `DB_VECTOR_EXTENSION`<sup>\*2</sup> | Database vector extension (one of [`vectorchord`, `pgvector`, `pgvecto.rs`])           |            | server                         |
-| `DB_SKIP_MIGRATIONS`                | Whether to skip running migrations on startup (one of [`true`, `false`])               |  `false`   | server                         |
-| `DB_STORAGE_TYPE`                   | Optimize concurrent IO on SSDs or sequential IO on HDDs ([`SSD`, `HDD`])<sup>\*3</sup> |   `SSD`    | server                         |
+| Variable                            | Description                                                                  |  Default   | Containers                     |
+| :---------------------------------- | :--------------------------------------------------------------------------- | :--------: | :----------------------------- |
+| `DB_URL`                            | Database URL                                                                 |            | server                         |
+| `DB_HOSTNAME`                       | Database host                                                                | `database` | server                         |
+| `DB_PORT`                           | Database port                                                                |   `5432`   | server                         |
+| `DB_USERNAME`                       | Database user                                                                | `postgres` | server, database<sup>\*1</sup> |
+| `DB_PASSWORD`                       | Database password                                                            | `postgres` | server, database<sup>\*1</sup> |
+| `DB_DATABASE_NAME`                  | Database name                                                                |  `immich`  | server, database<sup>\*1</sup> |
+| `DB_SSL_MODE`                       | Database SSL mode                                                            |            | server                         |
+| `DB_VECTOR_EXTENSION`<sup>\*2</sup> | Database vector extension (one of [`vectorchord`, `pgvector`, `pgvecto.rs`]) |            | server                         |
+| `DB_SKIP_MIGRATIONS`                | Whether to skip running migrations on startup (one of [`true`, `false`])     |  `false`   | server                         |

 \*1: The values of `DB_USERNAME`, `DB_PASSWORD`, and `DB_DATABASE_NAME` are passed to the Postgres container as the variables `POSTGRES_USER`, `POSTGRES_PASSWORD`, and `POSTGRES_DB` in `docker-compose.yml`.

 \*2: If not provided, the appropriate extension to use is auto-detected at startup by introspecting the database. When multiple extensions are installed, the order of preference is VectorChord, pgvecto.rs, pgvector.

-\*3: Uses either [`postgresql.ssd.conf`](https://github.com/immich-app/base-images/blob/main/postgres/postgresql.ssd.conf) or [`postgresql.hdd.conf`](https://github.com/immich-app/base-images/blob/main/postgres/postgresql.hdd.conf) which mainly controls the Postgres `effective_io_concurrency` setting to allow for concurrenct IO on SSDs and sequential IO on HDDs.
-
 :::info

 All `DB_` variables must be provided to all Immich workers, including `api` and `microservices`.
--- a/docs/docs/install/unraid.md
+++ b/docs/docs/install/unraid.md
@@ -75,6 +75,7 @@ alt="Select Plugins > Compose.Manager > Add New Stack > Label it Immich"
 5.  Click "**Save Changes**", you will be prompted to edit stack UI labels, just leave this blank and click "**Ok**"
 6.  Select the cog ⚙️ next to Immich, click "**Edit Stack**", then click "**Env File**"
 7.  Paste the entire contents of the [Immich example.env](https://github.com/immich-app/immich/releases/latest/download/example.env) file into the Unraid editor, then **before saving** edit the following:
+
    - `UPLOAD_LOCATION`: Create a folder in your Images Unraid share and place the **absolute** location here > For example my _"images"_ share has a folder within it called _"immich"_. If I browse to this directory in the terminal and type `pwd` the output is `/mnt/user/images/immich`. This is the exact value I need to enter as my `UPLOAD_LOCATION`
    - `DB_DATA_LOCATION`: Change this to use an Unraid share (preferably a cache pool, e.g. `/mnt/user/appdata/postgresql/data`). This uses the `appdata` share. Do also create the `postgresql` folder, by running `mkdir /mnt/user/{share_location}/postgresql/data`. If left at default it will try to use Unraid's `/boot/config/plugins/compose.manager/projects/[stack_name]/postgres` folder which it doesn't have permissions to, resulting in this container continuously restarting.

--- a/docs/package-lock.json
+++ b/docs/package-lock.json
--- a/docs/package.json
+++ b/docs/package.json
@@ -16,9 +16,8 @@
    "write-heading-ids": "docusaurus write-heading-ids"
  },
  "dependencies": {
-    "@docusaurus/core": "~3.8.0",
-    "@docusaurus/preset-classic": "~3.8.0",
-    "@docusaurus/theme-common": "~3.8.0",
+    "@docusaurus/core": "~3.7.0",
+    "@docusaurus/preset-classic": "~3.7.0",
    "@mdi/js": "^7.3.67",
    "@mdi/react": "^1.6.1",
    "@mdx-js/react": "^3.0.0",
@@ -27,7 +26,6 @@
    "clsx": "^2.0.0",
    "docusaurus-lunr-search": "^3.3.2",
    "docusaurus-preset-openapi": "^0.7.5",
-    "lunr": "^2.3.9",
    "postcss": "^8.4.25",
    "prism-react-renderer": "^2.3.1",
    "raw-loader": "^4.0.2",
@@ -37,7 +35,7 @@
    "url": "^0.11.0"
  },
  "devDependencies": {
-    "@docusaurus/module-type-aliases": "~3.8.0",
+    "@docusaurus/module-type-aliases": "~3.7.0",
    "@docusaurus/tsconfig": "^3.7.0",
    "@docusaurus/types": "^3.7.0",
    "prettier": "^3.2.4",
@@ -59,6 +57,6 @@
    "node": ">=20"
  },
  "volta": {
-    "node": "22.17.0"
+    "node": "22.16.0"
  }
 }
--- a/docs/src/components/community-guides.tsx
+++ b/docs/src/components/community-guides.tsx
@@ -58,12 +58,6 @@ const guides: CommunityGuidesProps[] = [
    description: 'Access Immich with an end-to-end encrypted connection.',
    url: 'https://meshnet.nordvpn.com/how-to/remote-files-media-access/immich-remote-access',
  },
-  {
-    title: 'Trust Self Signed Certificates with Immich - OAuth Setup',
-    description:
-      'Set up Certificate Authority trust with Immich, and your private OAuth2/OpenID service, while using a private CA for HTTPS commication.',
-    url: 'https://github.com/immich-app/immich/discussions/18614',
-  },
 ];

 function CommunityGuide({ title, description, url }: CommunityGuidesProps): JSX.Element {
--- a/e2e/.nvmrc
+++ b/e2e/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.16.0
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -36,7 +36,7 @@ services:
      - 2285:2285

  redis:
-    image: redis:6.2-alpine@sha256:03fd052257735b41cd19f3d8ae9782926bf9b704fb6a9dc5e29f9ccfbe8827f0
+    image: redis:6.2-alpine@sha256:3211c33a618c457e5d241922c975dbc4f446d0bdb2dc75694f5573ef8e2d01fa

  database:
    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:3aef84a0a4fabbda17ef115c3019ba0c914ec73e9f6e59203674322d858b8eea
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -25,7 +25,7 @@
    "@immich/sdk": "file:../open-api/typescript-sdk",
    "@playwright/test": "^1.44.1",
    "@types/luxon": "^3.4.2",
-    "@types/node": "^22.15.33",
+    "@types/node": "^22.15.32",
    "@types/oidc-provider": "^9.0.0",
    "@types/pg": "^8.15.1",
    "@types/pngjs": "^6.0.4",
@@ -44,7 +44,7 @@
    "pngjs": "^7.0.0",
    "prettier": "^3.2.5",
    "prettier-plugin-organize-imports": "^4.0.0",
-    "sharp": "^0.34.0",
+    "sharp": "^0.33.5",
    "socket.io-client": "^4.7.4",
    "supertest": "^7.0.0",
    "typescript": "^5.3.3",
@@ -53,6 +53,6 @@
    "vitest": "^3.0.0"
  },
  "volta": {
-    "node": "22.17.0"
+    "node": "22.16.0"
  }
 }
--- a/e2e/src/api/specs/auth.e2e-spec.ts
+++ b/e2e/src/api/specs/auth.e2e-spec.ts
@@ -0,0 +1,146 @@
+import { LoginResponseDto, login, signUpAdmin } from '@immich/sdk';
+import { loginDto, signupDto } from 'src/fixtures';
+import { errorDto, loginResponseDto, signupResponseDto } from 'src/responses';
+import { app, utils } from 'src/utils';
+import request from 'supertest';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+const { email, password } = signupDto.admin;
+
+describe(`/auth/admin-sign-up`, () => {
+  beforeEach(async () => {
+    await utils.resetDatabase();
+  });
+
+  describe('POST /auth/admin-sign-up', () => {
+    it(`should sign up the admin`, async () => {
+      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
+      expect(status).toBe(201);
+      expect(body).toEqual(signupResponseDto.admin);
+    });
+
+    it('should not allow a second admin to sign up', async () => {
+      await signUpAdmin({ signUpDto: signupDto.admin });
+
+      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.alreadyHasAdmin);
+    });
+  });
+});
+
+describe('/auth/*', () => {
+  let admin: LoginResponseDto;
+
+  beforeEach(async () => {
+    await utils.resetDatabase();
+    await signUpAdmin({ signUpDto: signupDto.admin });
+    admin = await login({ loginCredentialDto: loginDto.admin });
+  });
+
+  describe(`POST /auth/login`, () => {
+    it('should reject an incorrect password', async () => {
+      const { status, body } = await request(app).post('/auth/login').send({ email, password: 'incorrect' });
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.incorrectLogin);
+    });
+
+    it('should accept a correct password', async () => {
+      const { status, body, headers } = await request(app).post('/auth/login').send({ email, password });
+      expect(status).toBe(201);
+      expect(body).toEqual(loginResponseDto.admin);
+
+      const token = body.accessToken;
+      expect(token).toBeDefined();
+
+      const cookies = headers['set-cookie'];
+      expect(cookies).toHaveLength(3);
+      expect(cookies[0].split(';').map((item) => item.trim())).toEqual([
+        `immich_access_token=${token}`,
+        'Max-Age=34560000',
+        'Path=/',
+        expect.stringContaining('Expires='),
+        'HttpOnly',
+        'SameSite=Lax',
+      ]);
+      expect(cookies[1].split(';').map((item) => item.trim())).toEqual([
+        'immich_auth_type=password',
+        'Max-Age=34560000',
+        'Path=/',
+        expect.stringContaining('Expires='),
+        'HttpOnly',
+        'SameSite=Lax',
+      ]);
+      expect(cookies[2].split(';').map((item) => item.trim())).toEqual([
+        'immich_is_authenticated=true',
+        'Max-Age=34560000',
+        'Path=/',
+        expect.stringContaining('Expires='),
+        'SameSite=Lax',
+      ]);
+    });
+  });
+
+  describe('POST /auth/validateToken', () => {
+    it('should reject an invalid token', async () => {
+      const { status, body } = await request(app).post(`/auth/validateToken`).set('Authorization', 'Bearer 123');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.invalidToken);
+    });
+
+    it('should accept a valid token', async () => {
+      const { status, body } = await request(app)
+        .post(`/auth/validateToken`)
+        .send({})
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual({ authStatus: true });
+    });
+  });
+
+  describe('POST /auth/change-password', () => {
+    it('should require the current password', async () => {
+      const { status, body } = await request(app)
+        .post(`/auth/change-password`)
+        .send({ password: 'wrong-password', newPassword: 'Password1234' })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.wrongPassword);
+    });
+
+    it('should change the password', async () => {
+      const { status } = await request(app)
+        .post(`/auth/change-password`)
+        .send({ password, newPassword: 'Password1234' })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+
+      await login({
+        loginCredentialDto: {
+          email: 'admin@immich.cloud',
+          password: 'Password1234',
+        },
+      });
+    });
+  });
+
+  describe('POST /auth/logout', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).post(`/auth/logout`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should logout the user', async () => {
+      const { status, body } = await request(app)
+        .post(`/auth/logout`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual({
+        successful: true,
+        redirectUri: '/auth/login?autoLaunch=0',
+      });
+    });
+  });
+});
--- a/e2e/src/api/specs/oauth.e2e-spec.ts
+++ b/e2e/src/api/specs/oauth.e2e-spec.ts
@@ -227,21 +227,6 @@ describe(`/oauth`, () => {
      expect(user.storageLabel).toBe('user-username');
    });

-    it('should set the admin status from a role claim', async () => {
-      const callbackParams = await loginWithOAuth(OAuthUser.WITH_ROLE);
-      const { status, body } = await request(app).post('/oauth/callback').send(callbackParams);
-      expect(status).toBe(201);
-      expect(body).toMatchObject({
-        accessToken: expect.any(String),
-        userId: expect.any(String),
-        userEmail: 'oauth-with-role@immich.app',
-        isAdmin: true,
-      });
-
-      const user = await getMyUser({ headers: asBearerAuth(body.accessToken) });
-      expect(user.isAdmin).toBe(true);
-    });
-
    it('should work with RS256 signed tokens', async () => {
      await setupOAuth(admin.accessToken, {
        enabled: true,
--- a/e2e/src/api/specs/shared-link.e2e-spec.ts
+++ b/e2e/src/api/specs/shared-link.e2e-spec.ts
@@ -117,13 +117,6 @@ describe('/shared-links', () => {
      const resp = await request(shareUrl).get(`/${linkWithAssets.key}`);
      expect(resp.status).toBe(200);
      expect(resp.header['content-type']).toContain('text/html');
-      expect(resp.text).toContain(`<meta property="og:image" content="http://127.0.0.1:2285`);
-    });
-
-    it('should fall back to my.immich.app og:image meta tag for shared asset if Host header is not present', async () => {
-      const resp = await request(shareUrl).get(`/${linkWithAssets.key}`).set('Host', '');
-      expect(resp.status).toBe(200);
-      expect(resp.header['content-type']).toContain('text/html');
      expect(resp.text).toContain(`<meta property="og:image" content="https://my.immich.app`);
    });

--- a/e2e/src/api/specs/timeline.e2e-spec.ts
+++ b/e2e/src/api/specs/timeline.e2e-spec.ts
@@ -0,0 +1,230 @@
+import {
+  AssetMediaResponseDto,
+  AssetVisibility,
+  LoginResponseDto,
+  SharedLinkType,
+  TimeBucketAssetResponseDto,
+} from '@immich/sdk';
+import { DateTime } from 'luxon';
+import { createUserDto } from 'src/fixtures';
+import { errorDto } from 'src/responses';
+import { app, utils } from 'src/utils';
+import request from 'supertest';
+import { beforeAll, describe, expect, it } from 'vitest';
+
+// TODO this should probably be a test util function
+const today = DateTime.fromObject({
+  year: 2023,
+  month: 11,
+  day: 3,
+}) as DateTime<true>;
+const yesterday = today.minus({ days: 1 });
+
+describe('/timeline', () => {
+  let admin: LoginResponseDto;
+  let user: LoginResponseDto;
+  let timeBucketUser: LoginResponseDto;
+
+  let user1Assets: AssetMediaResponseDto[];
+  let user2Assets: AssetMediaResponseDto[];
+
+  beforeAll(async () => {
+    await utils.resetDatabase();
+    admin = await utils.adminSetup({ onboarding: false });
+    [user, timeBucketUser] = await Promise.all([
+      utils.userSetup(admin.accessToken, createUserDto.create('1')),
+      utils.userSetup(admin.accessToken, createUserDto.create('time-bucket')),
+    ]);
+
+    user1Assets = await Promise.all([
+      utils.createAsset(user.accessToken),
+      utils.createAsset(user.accessToken),
+      utils.createAsset(user.accessToken, {
+        isFavorite: true,
+        fileCreatedAt: yesterday.toISO(),
+        fileModifiedAt: yesterday.toISO(),
+        assetData: { filename: 'example.mp4' },
+      }),
+      utils.createAsset(user.accessToken),
+      utils.createAsset(user.accessToken),
+    ]);
+
+    user2Assets = await Promise.all([
+      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-01-01').toISOString() }),
+      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-10').toISOString() }),
+      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-11').toISOString() }),
+      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-11').toISOString() }),
+      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-12').toISOString() }),
+    ]);
+
+    await utils.deleteAssets(timeBucketUser.accessToken, [user2Assets[4].id]);
+  });
+
+  describe('GET /timeline/buckets', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get('/timeline/buckets');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should get time buckets by month', async () => {
+      const { status, body } = await request(app)
+        .get('/timeline/buckets')
+        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          { count: 3, timeBucket: '1970-02-01' },
+          { count: 1, timeBucket: '1970-01-01' },
+        ]),
+      );
+    });
+
+    it('should not allow access for unrelated shared links', async () => {
+      const sharedLink = await utils.createSharedLink(user.accessToken, {
+        type: SharedLinkType.Individual,
+        assetIds: user1Assets.map(({ id }) => id),
+      });
+
+      const { status, body } = await request(app).get('/timeline/buckets').query({ key: sharedLink.key });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.noPermission);
+    });
+
+    it('should return error if time bucket is requested with partners asset and archived', async () => {
+      const req1 = await request(app)
+        .get('/timeline/buckets')
+        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
+        .query({ withPartners: true, visibility: AssetVisibility.Archive });
+
+      expect(req1.status).toBe(400);
+      expect(req1.body).toEqual(errorDto.badRequest());
+
+      const req2 = await request(app)
+        .get('/timeline/buckets')
+        .set('Authorization', `Bearer ${user.accessToken}`)
+        .query({ withPartners: true, visibility: undefined });
+
+      expect(req2.status).toBe(400);
+      expect(req2.body).toEqual(errorDto.badRequest());
+    });
+
+    it('should return error if time bucket is requested with partners asset and favorite', async () => {
+      const req1 = await request(app)
+        .get('/timeline/buckets')
+        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
+        .query({ withPartners: true, isFavorite: true });
+
+      expect(req1.status).toBe(400);
+      expect(req1.body).toEqual(errorDto.badRequest());
+
+      const req2 = await request(app)
+        .get('/timeline/buckets')
+        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
+        .query({ withPartners: true, isFavorite: false });
+
+      expect(req2.status).toBe(400);
+      expect(req2.body).toEqual(errorDto.badRequest());
+    });
+
+    it('should return error if time bucket is requested with partners asset and trash', async () => {
+      const req = await request(app)
+        .get('/timeline/buckets')
+        .set('Authorization', `Bearer ${user.accessToken}`)
+        .query({ withPartners: true, isTrashed: true });
+
+      expect(req.status).toBe(400);
+      expect(req.body).toEqual(errorDto.badRequest());
+    });
+  });
+
+  describe('GET /timeline/bucket', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get('/timeline/bucket').query({
+        timeBucket: '1900-01-01',
+      });
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should handle 5 digit years', async () => {
+      const { status, body } = await request(app)
+        .get('/timeline/bucket')
+        .query({ timeBucket: '012345-01-01' })
+        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toEqual({
+        city: [],
+        country: [],
+        duration: [],
+        id: [],
+        visibility: [],
+        isFavorite: [],
+        isImage: [],
+        isTrashed: [],
+        livePhotoVideoId: [],
+        fileCreatedAt: [],
+        localOffsetHours: [],
+        ownerId: [],
+        projectionType: [],
+        ratio: [],
+        status: [],
+        thumbhash: [],
+      });
+    });
+
+    // TODO enable date string validation while still accepting 5 digit years
+    // it('should fail if time bucket is invalid', async () => {
+    //   const { status, body } = await request(app)
+    //     .get('/timeline/bucket')
+    //     .set('Authorization', `Bearer ${user.accessToken}`)
+    //     .query({  timeBucket: 'foo' });
+
+    //   expect(status).toBe(400);
+    //   expect(body).toEqual(errorDto.badRequest);
+    // });
+
+    it('should return time bucket', async () => {
+      const { status, body } = await request(app)
+        .get('/timeline/bucket')
+        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
+        .query({ timeBucket: '1970-02-10' });
+
+      expect(status).toBe(200);
+      expect(body).toEqual({
+        city: [],
+        country: [],
+        duration: [],
+        id: [],
+        visibility: [],
+        isFavorite: [],
+        isImage: [],
+        isTrashed: [],
+        livePhotoVideoId: [],
+        fileCreatedAt: [],
+        localOffsetHours: [],
+        ownerId: [],
+        projectionType: [],
+        ratio: [],
+        status: [],
+        thumbhash: [],
+      });
+    });
+
+    it('should return time bucket in trash', async () => {
+      const { status, body } = await request(app)
+        .get('/timeline/bucket')
+        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
+        .query({ timeBucket: '1970-02-01T00:00:00.000Z', isTrashed: true });
+
+      expect(status).toBe(200);
+
+      const timeBucket: TimeBucketAssetResponseDto = body;
+      expect(timeBucket.isTrashed).toEqual([true]);
+    });
+  });
+});
--- a/e2e/src/setup/auth-server.ts
+++ b/e2e/src/setup/auth-server.ts
@@ -12,7 +12,6 @@ export enum OAuthUser {
  NO_NAME = 'no-name',
  WITH_QUOTA = 'with-quota',
  WITH_USERNAME = 'with-username',
-  WITH_ROLE = 'with-role',
 }

 const claims = [
@@ -35,12 +34,6 @@ const claims = [
    preferred_username: 'user-quota',
    immich_quota: 25,
  },
-  {
-    sub: OAuthUser.WITH_ROLE,
-    email: 'oauth-with-role@immich.app',
-    email_verified: true,
-    immich_role: 'admin',
-  },
 ];

 const withDefaultClaims = (sub: string) => ({
@@ -71,15 +64,7 @@ const setup = async () => {
    claims: {
      openid: ['sub'],
      email: ['email', 'email_verified'],
-      profile: [
-        'name',
-        'given_name',
-        'family_name',
-        'preferred_username',
-        'immich_quota',
-        'immich_username',
-        'immich_role',
-      ],
+      profile: ['name', 'given_name', 'family_name', 'preferred_username', 'immich_quota', 'immich_username'],
    },
    features: {
      jwtUserinfo: {
--- a/e2e/src/utils.ts
+++ b/e2e/src/utils.ts
@@ -60,7 +60,6 @@ import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
 import { makeRandomImage } from 'src/generators';
 import request from 'supertest';
-export type { Emitter } from '@socket.io/component-emitter';

 type CommandResponse = { stdout: string; stderr: string; exitCode: number | null };
 type EventType = 'assetUpload' | 'assetUpdate' | 'assetDelete' | 'userDelete' | 'assetHidden';
@@ -85,10 +84,10 @@ export const immichAdmin = (args: string[]) =>
 export const specialCharStrings = ["'", '"', ',', '{', '}', '*'];
 export const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];

-const executeCommand = (command: string, args: string[], options?: { cwd?: string }) => {
+const executeCommand = (command: string, args: string[]) => {
  let _resolve: (value: CommandResponse) => void;
  const promise = new Promise<CommandResponse>((resolve) => (_resolve = resolve));
-  const child = spawn(command, args, { stdio: 'pipe', cwd: options?.cwd });
+  const child = spawn(command, args, { stdio: 'pipe' });

  let stdout = '';
  let stderr = '';
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -196,8 +196,6 @@
    "oauth_mobile_redirect_uri": "Mobile redirect URI",
    "oauth_mobile_redirect_uri_override": "Mobile redirect URI override",
    "oauth_mobile_redirect_uri_override_description": "Enable when OAuth provider does not allow a mobile URI, like ''{callback}''",
-    "oauth_role_claim": "Role Claim",
-    "oauth_role_claim_description": "Automatically grant admin access based on the presence of this claim. The claim may have either 'user' or 'admin'.",
    "oauth_settings": "OAuth",
    "oauth_settings_description": "Manage OAuth login settings",
    "oauth_settings_more_details": "For more details about this feature, refer to the <link>docs</link>.",
@@ -429,7 +427,6 @@
  "app_settings": "App Settings",
  "appears_in": "Appears in",
  "archive": "Archive",
-  "archive_action_prompt": "{count} added to Archive",
  "archive_or_unarchive_photo": "Archive or unarchive photo",
  "archive_page_no_archived_assets": "No archived assets found",
  "archive_page_title": "Archive ({count})",
@@ -705,7 +702,7 @@
  "daily_title_text_date": "E, MMM dd",
  "daily_title_text_date_year": "E, MMM dd, yyyy",
  "dark": "Dark",
-  "dark_theme": "Toggle dark theme",
+  "darkTheme": "Toggle dark theme",
  "date_after": "Date after",
  "date_and_time": "Date and Time",
  "date_before": "Date before",
@@ -721,7 +718,6 @@
  "default_locale": "Default Locale",
  "default_locale_description": "Format dates and numbers based on your browser locale",
  "delete": "Delete",
-  "delete_action_prompt": "{count} deleted permanently",
  "delete_album": "Delete album",
  "delete_api_key_prompt": "Are you sure you want to delete this API key?",
  "delete_dialog_alert": "These items will be permanently deleted from Immich and from your device",
@@ -802,7 +798,6 @@
  "edit_key": "Edit key",
  "edit_link": "Edit link",
  "edit_location": "Edit location",
-  "edit_location_action_prompt": "{count} location edited",
  "edit_location_dialog_title": "Location",
  "edit_name": "Edit name",
  "edit_people": "Edit people",
@@ -988,7 +983,6 @@
  "failed_to_load_assets": "Failed to load assets",
  "failed_to_load_folder": "Failed to load folder",
  "favorite": "Favorite",
-  "favorite_action_prompt": "{count} added to Favorites",
  "favorite_or_unfavorite_photo": "Favorite or unfavorite photo",
  "favorites": "Favorites",
  "favorites_page_no_favorites": "No favorite assets found",
@@ -1251,7 +1245,6 @@
  "more": "More",
  "move": "Move",
  "move_off_locked_folder": "Move out of locked folder",
-  "move_to_lock_folder_action_prompt": "{count} added to the locked folder",
  "move_to_locked_folder": "Move to locked folder",
  "move_to_locked_folder_confirmation": "These photos and video will be removed from all albums, and only viewable from the locked folder",
  "moved_to_archive": "Moved {count, plural, one {# asset} other {# assets}} to archive",
@@ -1502,7 +1495,6 @@
  "remove_deleted_assets": "Remove Deleted Assets",
  "remove_from_album": "Remove from album",
  "remove_from_favorites": "Remove from favorites",
-  "remove_from_lock_folder_action_prompt": "{count} removed from the locked folder",
  "remove_from_locked_folder": "Remove from locked folder",
  "remove_from_locked_folder_confirmation": "Are you sure you want to move these photos and videos out of the locked folder? They will be visible in your library.",
  "remove_from_shared_link": "Remove from shared link",
@@ -1845,7 +1837,6 @@
  "total": "Total",
  "total_usage": "Total usage",
  "trash": "Trash",
-  "trash_action_prompt": "{count} moved to trash",
  "trash_all": "Trash All",
  "trash_count": "Trash {count, number}",
  "trash_delete_asset": "Trash/Delete Asset",
@@ -1863,11 +1854,9 @@
  "unable_to_change_pin_code": "Unable to change PIN code",
  "unable_to_setup_pin_code": "Unable to setup PIN code",
  "unarchive": "Unarchive",
-  "unarchive_action_prompt": "{count} removed from Archive",
  "unarchived_count": "{count, plural, other {Unarchived #}}",
  "undo": "Undo",
  "unfavorite": "Unfavorite",
-  "unfavorite_action_prompt": "{count} removed from Favorites",
  "unhide_person": "Unhide person",
  "unknown": "Unknown",
  "unknown_country": "Unknown Country",
--- a/machine-learning/uv.lock
+++ b/machine-learning/uv.lock
@@ -517,16 +517,16 @@ wheels = [

 [[package]]
 name = "fastapi"
-version = "0.115.14"
+version = "0.115.13"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "pydantic" },
    { name = "starlette" },
    { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ca/53/8c38a874844a8b0fa10dd8adf3836ac154082cf88d3f22b544e9ceea0a15/fastapi-0.115.14.tar.gz", hash = "sha256:b1de15cdc1c499a4da47914db35d0e4ef8f1ce62b624e94e0e5824421df99739", size = 296263, upload-time = "2025-06-26T15:29:08.21Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/20/64/ec0788201b5554e2a87c49af26b77a4d132f807a0fa9675257ac92c6aa0e/fastapi-0.115.13.tar.gz", hash = "sha256:55d1d25c2e1e0a0a50aceb1c8705cd932def273c102bff0b1c1da88b3c6eb307", size = 295680, upload-time = "2025-06-17T11:49:45.575Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/53/50/b1222562c6d270fea83e9c9075b8e8600b8479150a18e4516a6138b980d1/fastapi-0.115.14-py3-none-any.whl", hash = "sha256:6c0c8bf9420bd58f565e585036d971872472b4f7d3f6c73b698e10cffdefb3ca", size = 95514, upload-time = "2025-06-26T15:29:06.49Z" },
+    { url = "https://files.pythonhosted.org/packages/59/4a/e17764385382062b0edbb35a26b7cf76d71e27e456546277a42ba6545c6e/fastapi-0.115.13-py3-none-any.whl", hash = "sha256:0a0cab59afa7bab22f5eb347f8c9864b681558c278395e94035a741fc10cd865", size = 95315, upload-time = "2025-06-17T11:49:44.106Z" },
 ]

 [[package]]
@@ -900,7 +900,7 @@ wheels = [

 [[package]]
 name = "huggingface-hub"
-version = "0.33.2"
+version = "0.33.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "filelock" },
@@ -912,9 +912,9 @@ dependencies = [
    { name = "tqdm" },
    { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/fa/42/8a95c5632080ae312c0498744b2b852195e10b05a20b1be11c5141092f4c/huggingface_hub-0.33.2.tar.gz", hash = "sha256:84221defaec8fa09c090390cd68c78b88e3c4c2b7befba68d3dc5aacbc3c2c5f", size = 426637, upload-time = "2025-07-02T06:26:05.156Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/91/8a/1362d565fefabaa4185cf3ae842a98dbc5b35146f5694f7080f043a6952f/huggingface_hub-0.33.0.tar.gz", hash = "sha256:aa31f70d29439d00ff7a33837c03f1f9dd83971ce4e29ad664d63ffb17d3bb97", size = 426179, upload-time = "2025-06-11T17:08:07.913Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/44/f4/5f3f22e762ad1965f01122b42dae5bf0e009286e2dba601ce1d0dba72424/huggingface_hub-0.33.2-py3-none-any.whl", hash = "sha256:3749498bfa91e8cde2ddc2c1db92c79981f40e66434c20133b39e5928ac9bcc5", size = 515373, upload-time = "2025-07-02T06:26:03.072Z" },
+    { url = "https://files.pythonhosted.org/packages/33/fb/53587a89fbc00799e4179796f51b3ad713c5de6bb680b2becb6d37c94649/huggingface_hub-0.33.0-py3-none-any.whl", hash = "sha256:e8668875b40c68f9929150d99727d39e5ebb8a05a98e4191b908dc7ded9074b3", size = 514799, upload-time = "2025-06-11T17:08:05.757Z" },
 ]

 [[package]]
@@ -1044,7 +1044,7 @@ requires-dist = [
    { name = "onnxruntime", marker = "extra == 'armnn'", specifier = ">=1.15.0,<2" },
    { name = "onnxruntime", marker = "extra == 'cpu'", specifier = ">=1.15.0,<2" },
    { name = "onnxruntime", marker = "extra == 'rknn'", specifier = ">=1.15.0,<2" },
-    { name = "onnxruntime-gpu", marker = "extra == 'cuda'", specifier = ">=1.17.0,<2", index = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple" },
+    { name = "onnxruntime-gpu", marker = "extra == 'cuda'", specifier = ">=1.17.0,<2", index = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/" },
    { name = "onnxruntime-openvino", marker = "extra == 'openvino'", specifier = ">=1.17.1,<1.19.0" },
    { name = "opencv-python-headless", specifier = ">=4.7.0.72,<5.0" },
    { name = "orjson", specifier = ">=3.9.5" },
@@ -1568,7 +1568,7 @@ wheels = [
 [[package]]
 name = "onnxruntime-gpu"
 version = "1.19.2"
-source = { registry = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple" }
+source = { registry = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/" }
 dependencies = [
    { name = "coloredlogs" },
    { name = "flatbuffers" },
@@ -1936,16 +1936,16 @@ wheels = [

 [[package]]
 name = "pydantic-settings"
-version = "2.10.1"
+version = "2.9.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "pydantic" },
    { name = "python-dotenv" },
    { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/68/85/1ea668bbab3c50071ca613c6ab30047fb36ab0da1b92fa8f17bbc38fd36c/pydantic_settings-2.10.1.tar.gz", hash = "sha256:06f0062169818d0f5524420a360d632d5857b83cffd4d42fe29597807a1614ee", size = 172583, upload-time = "2025-06-24T13:26:46.841Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/67/1d/42628a2c33e93f8e9acbde0d5d735fa0850f3e6a2f8cb1eb6c40b9a732ac/pydantic_settings-2.9.1.tar.gz", hash = "sha256:c509bf79d27563add44e8446233359004ed85066cd096d8b510f715e6ef5d268", size = 163234, upload-time = "2025-04-18T16:44:48.265Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/58/f0/427018098906416f580e3cf1366d3b1abfb408a0652e9f31600c24a1903c/pydantic_settings-2.10.1-py3-none-any.whl", hash = "sha256:a60952460b99cf661dc25c29c0ef171721f98bfcb52ef8d9ea4c943d7c8cc796", size = 45235, upload-time = "2025-06-24T13:26:45.485Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/5f/d6d641b490fd3ec2c4c13b4244d68deea3a1b970a97be64f34fb5504ff72/pydantic_settings-2.9.1-py3-none-any.whl", hash = "sha256:59b4f431b1defb26fe620c71a7d3968a710d719f5f4cdbbdb7926edeb770f6ef", size = 44356, upload-time = "2025-04-18T16:44:46.617Z" },
 ]

 [[package]]
@@ -2304,27 +2304,27 @@ wheels = [

 [[package]]
 name = "ruff"
-version = "0.12.2"
+version = "0.12.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/6c/3d/d9a195676f25d00dbfcf3cf95fdd4c685c497fcfa7e862a44ac5e4e96480/ruff-0.12.2.tar.gz", hash = "sha256:d7b4f55cd6f325cb7621244f19c873c565a08aff5a4ba9c69aa7355f3f7afd3e", size = 4432239, upload-time = "2025-07-03T16:40:19.566Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/24/90/5255432602c0b196a0da6720f6f76b93eb50baef46d3c9b0025e2f9acbf3/ruff-0.12.0.tar.gz", hash = "sha256:4d047db3662418d4a848a3fdbfaf17488b34b62f527ed6f10cb8afd78135bc5c", size = 4376101, upload-time = "2025-06-17T15:19:26.217Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/74/b6/2098d0126d2d3318fd5bec3ad40d06c25d377d95749f7a0c5af17129b3b1/ruff-0.12.2-py3-none-linux_armv6l.whl", hash = "sha256:093ea2b221df1d2b8e7ad92fc6ffdca40a2cb10d8564477a987b44fd4008a7be", size = 10369761, upload-time = "2025-07-03T16:39:38.847Z" },
-    { url = "https://files.pythonhosted.org/packages/b1/4b/5da0142033dbe155dc598cfb99262d8ee2449d76920ea92c4eeb9547c208/ruff-0.12.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:09e4cf27cc10f96b1708100fa851e0daf21767e9709e1649175355280e0d950e", size = 11155659, upload-time = "2025-07-03T16:39:42.294Z" },
-    { url = "https://files.pythonhosted.org/packages/3e/21/967b82550a503d7c5c5c127d11c935344b35e8c521f52915fc858fb3e473/ruff-0.12.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:8ae64755b22f4ff85e9c52d1f82644abd0b6b6b6deedceb74bd71f35c24044cc", size = 10537769, upload-time = "2025-07-03T16:39:44.75Z" },
-    { url = "https://files.pythonhosted.org/packages/33/91/00cff7102e2ec71a4890fb7ba1803f2cdb122d82787c7d7cf8041fe8cbc1/ruff-0.12.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3eb3a6b2db4d6e2c77e682f0b988d4d61aff06860158fdb413118ca133d57922", size = 10717602, upload-time = "2025-07-03T16:39:47.652Z" },
-    { url = "https://files.pythonhosted.org/packages/9b/eb/928814daec4e1ba9115858adcda44a637fb9010618721937491e4e2283b8/ruff-0.12.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:73448de992d05517170fc37169cbca857dfeaeaa8c2b9be494d7bcb0d36c8f4b", size = 10198772, upload-time = "2025-07-03T16:39:49.641Z" },
-    { url = "https://files.pythonhosted.org/packages/50/fa/f15089bc20c40f4f72334f9145dde55ab2b680e51afb3b55422effbf2fb6/ruff-0.12.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b8b94317cbc2ae4a2771af641739f933934b03555e51515e6e021c64441532d", size = 11845173, upload-time = "2025-07-03T16:39:52.069Z" },
-    { url = "https://files.pythonhosted.org/packages/43/9f/1f6f98f39f2b9302acc161a4a2187b1e3a97634fe918a8e731e591841cf4/ruff-0.12.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:45fc42c3bf1d30d2008023a0a9a0cfb06bf9835b147f11fe0679f21ae86d34b1", size = 12553002, upload-time = "2025-07-03T16:39:54.551Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/70/08991ac46e38ddd231c8f4fd05ef189b1b94be8883e8c0c146a025c20a19/ruff-0.12.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce48f675c394c37e958bf229fb5c1e843e20945a6d962cf3ea20b7a107dcd9f4", size = 12171330, upload-time = "2025-07-03T16:39:57.55Z" },
-    { url = "https://files.pythonhosted.org/packages/88/a9/5a55266fec474acfd0a1c73285f19dd22461d95a538f29bba02edd07a5d9/ruff-0.12.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:793d8859445ea47591272021a81391350205a4af65a9392401f418a95dfb75c9", size = 11774717, upload-time = "2025-07-03T16:39:59.78Z" },
-    { url = "https://files.pythonhosted.org/packages/87/e5/0c270e458fc73c46c0d0f7cf970bb14786e5fdb88c87b5e423a4bd65232b/ruff-0.12.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6932323db80484dda89153da3d8e58164d01d6da86857c79f1961934354992da", size = 11646659, upload-time = "2025-07-03T16:40:01.934Z" },
-    { url = "https://files.pythonhosted.org/packages/b7/b6/45ab96070c9752af37f0be364d849ed70e9ccede07675b0ec4e3ef76b63b/ruff-0.12.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6aa7e623a3a11538108f61e859ebf016c4f14a7e6e4eba1980190cacb57714ce", size = 10604012, upload-time = "2025-07-03T16:40:04.363Z" },
-    { url = "https://files.pythonhosted.org/packages/86/91/26a6e6a424eb147cc7627eebae095cfa0b4b337a7c1c413c447c9ebb72fd/ruff-0.12.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2a4a20aeed74671b2def096bdf2eac610c7d8ffcbf4fb0e627c06947a1d7078d", size = 10176799, upload-time = "2025-07-03T16:40:06.514Z" },
-    { url = "https://files.pythonhosted.org/packages/f5/0c/9f344583465a61c8918a7cda604226e77b2c548daf8ef7c2bfccf2b37200/ruff-0.12.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:71a4c550195612f486c9d1f2b045a600aeba851b298c667807ae933478fcef04", size = 11241507, upload-time = "2025-07-03T16:40:08.708Z" },
-    { url = "https://files.pythonhosted.org/packages/1c/b7/99c34ded8fb5f86c0280278fa89a0066c3760edc326e935ce0b1550d315d/ruff-0.12.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:4987b8f4ceadf597c927beee65a5eaf994c6e2b631df963f86d8ad1bdea99342", size = 11717609, upload-time = "2025-07-03T16:40:10.836Z" },
-    { url = "https://files.pythonhosted.org/packages/51/de/8589fa724590faa057e5a6d171e7f2f6cffe3287406ef40e49c682c07d89/ruff-0.12.2-py3-none-win32.whl", hash = "sha256:369ffb69b70cd55b6c3fc453b9492d98aed98062db9fec828cdfd069555f5f1a", size = 10523823, upload-time = "2025-07-03T16:40:13.203Z" },
-    { url = "https://files.pythonhosted.org/packages/94/47/8abf129102ae4c90cba0c2199a1a9b0fa896f6f806238d6f8c14448cc748/ruff-0.12.2-py3-none-win_amd64.whl", hash = "sha256:dca8a3b6d6dc9810ed8f328d406516bf4d660c00caeaef36eb831cf4871b0639", size = 11629831, upload-time = "2025-07-03T16:40:15.478Z" },
-    { url = "https://files.pythonhosted.org/packages/e2/1f/72d2946e3cc7456bb837e88000eb3437e55f80db339c840c04015a11115d/ruff-0.12.2-py3-none-win_arm64.whl", hash = "sha256:48d6c6bfb4761df68bc05ae630e24f506755e702d4fb08f08460be778c7ccb12", size = 10735334, upload-time = "2025-07-03T16:40:17.677Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/fd/b46bb20e14b11ff49dbc74c61de352e0dc07fb650189513631f6fb5fc69f/ruff-0.12.0-py3-none-linux_armv6l.whl", hash = "sha256:5652a9ecdb308a1754d96a68827755f28d5dfb416b06f60fd9e13f26191a8848", size = 10311554, upload-time = "2025-06-17T15:18:45.792Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/d3/021dde5a988fa3e25d2468d1dadeea0ae89dc4bc67d0140c6e68818a12a1/ruff-0.12.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:05ed0c914fabc602fc1f3b42c53aa219e5736cb030cdd85640c32dbc73da74a6", size = 11118435, upload-time = "2025-06-17T15:18:49.064Z" },
+    { url = "https://files.pythonhosted.org/packages/07/a2/01a5acf495265c667686ec418f19fd5c32bcc326d4c79ac28824aecd6a32/ruff-0.12.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:07a7aa9b69ac3fcfda3c507916d5d1bca10821fe3797d46bad10f2c6de1edda0", size = 10466010, upload-time = "2025-06-17T15:18:51.341Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/57/7caf31dd947d72e7aa06c60ecb19c135cad871a0a8a251723088132ce801/ruff-0.12.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7731c3eec50af71597243bace7ec6104616ca56dda2b99c89935fe926bdcd48", size = 10661366, upload-time = "2025-06-17T15:18:53.29Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/ba/aa393b972a782b4bc9ea121e0e358a18981980856190d7d2b6187f63e03a/ruff-0.12.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:952d0630eae628250ab1c70a7fffb641b03e6b4a2d3f3ec6c1d19b4ab6c6c807", size = 10173492, upload-time = "2025-06-17T15:18:55.262Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/50/9349ee777614bc3062fc6b038503a59b2034d09dd259daf8192f56c06720/ruff-0.12.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c021f04ea06966b02614d442e94071781c424ab8e02ec7af2f037b4c1e01cc82", size = 11761739, upload-time = "2025-06-17T15:18:58.906Z" },
+    { url = "https://files.pythonhosted.org/packages/04/8f/ad459de67c70ec112e2ba7206841c8f4eb340a03ee6a5cabc159fe558b8e/ruff-0.12.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:7d235618283718ee2fe14db07f954f9b2423700919dc688eacf3f8797a11315c", size = 12537098, upload-time = "2025-06-17T15:19:01.316Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/50/15ad9c80ebd3c4819f5bd8883e57329f538704ed57bac680d95cb6627527/ruff-0.12.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0758038f81beec8cc52ca22de9685b8ae7f7cc18c013ec2050012862cc9165", size = 12154122, upload-time = "2025-06-17T15:19:03.727Z" },
+    { url = "https://files.pythonhosted.org/packages/76/e6/79b91e41bc8cc3e78ee95c87093c6cacfa275c786e53c9b11b9358026b3d/ruff-0.12.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:139b3d28027987b78fc8d6cfb61165447bdf3740e650b7c480744873688808c2", size = 11363374, upload-time = "2025-06-17T15:19:05.875Z" },
+    { url = "https://files.pythonhosted.org/packages/db/c3/82b292ff8a561850934549aa9dc39e2c4e783ab3c21debe55a495ddf7827/ruff-0.12.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68853e8517b17bba004152aebd9dd77d5213e503a5f2789395b25f26acac0da4", size = 11587647, upload-time = "2025-06-17T15:19:08.246Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/42/d5760d742669f285909de1bbf50289baccb647b53e99b8a3b4f7ce1b2001/ruff-0.12.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3a9512af224b9ac4757f7010843771da6b2b0935a9e5e76bb407caa901a1a514", size = 10527284, upload-time = "2025-06-17T15:19:10.37Z" },
+    { url = "https://files.pythonhosted.org/packages/19/f6/fcee9935f25a8a8bba4adbae62495c39ef281256693962c2159e8b284c5f/ruff-0.12.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b08df3d96db798e5beb488d4df03011874aff919a97dcc2dd8539bb2be5d6a88", size = 10158609, upload-time = "2025-06-17T15:19:12.286Z" },
+    { url = "https://files.pythonhosted.org/packages/37/fb/057febf0eea07b9384787bfe197e8b3384aa05faa0d6bd844b94ceb29945/ruff-0.12.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6a315992297a7435a66259073681bb0d8647a826b7a6de45c6934b2ca3a9ed51", size = 11141462, upload-time = "2025-06-17T15:19:15.195Z" },
+    { url = "https://files.pythonhosted.org/packages/10/7c/1be8571011585914b9d23c95b15d07eec2d2303e94a03df58294bc9274d4/ruff-0.12.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1e55e44e770e061f55a7dbc6e9aed47feea07731d809a3710feda2262d2d4d8a", size = 11641616, upload-time = "2025-06-17T15:19:17.6Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/ef/b960ab4818f90ff59e571d03c3f992828d4683561095e80f9ef31f3d58b7/ruff-0.12.0-py3-none-win32.whl", hash = "sha256:7162a4c816f8d1555eb195c46ae0bd819834d2a3f18f98cc63819a7b46f474fb", size = 10525289, upload-time = "2025-06-17T15:19:19.688Z" },
+    { url = "https://files.pythonhosted.org/packages/34/93/8b16034d493ef958a500f17cda3496c63a537ce9d5a6479feec9558f1695/ruff-0.12.0-py3-none-win_amd64.whl", hash = "sha256:d00b7a157b8fb6d3827b49d3324da34a1e3f93492c1f97b08e222ad7e9b291e0", size = 11598311, upload-time = "2025-06-17T15:19:21.785Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/33/4d3e79e4a84533d6cd526bfb42c020a23256ae5e4265d858bd1287831f7d/ruff-0.12.0-py3-none-win_arm64.whl", hash = "sha256:8cd24580405ad8c1cc64d61725bca091d6b6da7eb3d36f72cc605467069d7e8b", size = 10724946, upload-time = "2025-06-17T15:19:23.952Z" },
 ]

 [[package]]
@@ -2504,27 +2504,27 @@ wheels = [

 [[package]]
 name = "tokenizers"
-version = "0.21.2"
+version = "0.21.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "huggingface-hub" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ab/2d/b0fce2b8201635f60e8c95990080f58461cc9ca3d5026de2e900f38a7f21/tokenizers-0.21.2.tar.gz", hash = "sha256:fdc7cffde3e2113ba0e6cc7318c40e3438a4d74bbc62bf04bcc63bdfb082ac77", size = 351545, upload-time = "2025-06-24T10:24:52.449Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/92/76/5ac0c97f1117b91b7eb7323dcd61af80d72f790b4df71249a7850c195f30/tokenizers-0.21.1.tar.gz", hash = "sha256:a1bb04dc5b448985f86ecd4b05407f5a8d97cb2c0532199b2a302a604a0165ab", size = 343256, upload-time = "2025-03-13T10:51:18.189Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/1d/cc/2936e2d45ceb130a21d929743f1e9897514691bec123203e10837972296f/tokenizers-0.21.2-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:342b5dfb75009f2255ab8dec0041287260fed5ce00c323eb6bab639066fef8ec", size = 2875206, upload-time = "2025-06-24T10:24:42.755Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/e6/33f41f2cc7861faeba8988e7a77601407bf1d9d28fc79c5903f8f77df587/tokenizers-0.21.2-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:126df3205d6f3a93fea80c7a8a266a78c1bd8dd2fe043386bafdd7736a23e45f", size = 2732655, upload-time = "2025-06-24T10:24:41.56Z" },
-    { url = "https://files.pythonhosted.org/packages/33/2b/1791eb329c07122a75b01035b1a3aa22ad139f3ce0ece1b059b506d9d9de/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a32cd81be21168bd0d6a0f0962d60177c447a1aa1b1e48fa6ec9fc728ee0b12", size = 3019202, upload-time = "2025-06-24T10:24:31.791Z" },
-    { url = "https://files.pythonhosted.org/packages/05/15/fd2d8104faa9f86ac68748e6f7ece0b5eb7983c7efc3a2c197cb98c99030/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8bd8999538c405133c2ab999b83b17c08b7fc1b48c1ada2469964605a709ef91", size = 2934539, upload-time = "2025-06-24T10:24:34.567Z" },
-    { url = "https://files.pythonhosted.org/packages/a5/2e/53e8fd053e1f3ffbe579ca5f9546f35ac67cf0039ed357ad7ec57f5f5af0/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e9944e61239b083a41cf8fc42802f855e1dca0f499196df37a8ce219abac6eb", size = 3248665, upload-time = "2025-06-24T10:24:39.024Z" },
-    { url = "https://files.pythonhosted.org/packages/00/15/79713359f4037aa8f4d1f06ffca35312ac83629da062670e8830917e2153/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:514cd43045c5d546f01142ff9c79a96ea69e4b5cda09e3027708cb2e6d5762ab", size = 3451305, upload-time = "2025-06-24T10:24:36.133Z" },
-    { url = "https://files.pythonhosted.org/packages/38/5f/959f3a8756fc9396aeb704292777b84f02a5c6f25c3fc3ba7530db5feb2c/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1b9405822527ec1e0f7d8d2fdb287a5730c3a6518189c968254a8441b21faae", size = 3214757, upload-time = "2025-06-24T10:24:37.784Z" },
-    { url = "https://files.pythonhosted.org/packages/c5/74/f41a432a0733f61f3d21b288de6dfa78f7acff309c6f0f323b2833e9189f/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fed9a4d51c395103ad24f8e7eb976811c57fbec2af9f133df471afcd922e5020", size = 3121887, upload-time = "2025-06-24T10:24:40.293Z" },
-    { url = "https://files.pythonhosted.org/packages/3c/6a/bc220a11a17e5d07b0dfb3b5c628621d4dcc084bccd27cfaead659963016/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2c41862df3d873665ec78b6be36fcc30a26e3d4902e9dd8608ed61d49a48bc19", size = 9091965, upload-time = "2025-06-24T10:24:44.431Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/bd/ac386d79c4ef20dc6f39c4706640c24823dca7ebb6f703bfe6b5f0292d88/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed21dc7e624e4220e21758b2e62893be7101453525e3d23264081c9ef9a6d00d", size = 9053372, upload-time = "2025-06-24T10:24:46.455Z" },
-    { url = "https://files.pythonhosted.org/packages/63/7b/5440bf203b2a5358f074408f7f9c42884849cd9972879e10ee6b7a8c3b3d/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:0e73770507e65a0e0e2a1affd6b03c36e3bc4377bd10c9ccf51a82c77c0fe365", size = 9298632, upload-time = "2025-06-24T10:24:48.446Z" },
-    { url = "https://files.pythonhosted.org/packages/a4/d2/faa1acac3f96a7427866e94ed4289949b2524f0c1878512516567d80563c/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:106746e8aa9014a12109e58d540ad5465b4c183768ea96c03cbc24c44d329958", size = 9470074, upload-time = "2025-06-24T10:24:50.378Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/a5/896e1ef0707212745ae9f37e84c7d50269411aef2e9ccd0de63623feecdf/tokenizers-0.21.2-cp39-abi3-win32.whl", hash = "sha256:cabda5a6d15d620b6dfe711e1af52205266d05b379ea85a8a301b3593c60e962", size = 2330115, upload-time = "2025-06-24T10:24:55.069Z" },
-    { url = "https://files.pythonhosted.org/packages/13/c3/cc2755ee10be859c4338c962a35b9a663788c0c0b50c0bdd8078fb6870cf/tokenizers-0.21.2-cp39-abi3-win_amd64.whl", hash = "sha256:58747bb898acdb1007f37a7bbe614346e98dc28708ffb66a3fd50ce169ac6c98", size = 2509918, upload-time = "2025-06-24T10:24:53.71Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/1f/328aee25f9115bf04262e8b4e5a2050b7b7cf44b59c74e982db7270c7f30/tokenizers-0.21.1-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:e78e413e9e668ad790a29456e677d9d3aa50a9ad311a40905d6861ba7692cf41", size = 2780767, upload-time = "2025-03-13T10:51:09.459Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/1a/4526797f3719b0287853f12c5ad563a9be09d446c44ac784cdd7c50f76ab/tokenizers-0.21.1-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:cd51cd0a91ecc801633829fcd1fda9cf8682ed3477c6243b9a095539de4aecf3", size = 2650555, upload-time = "2025-03-13T10:51:07.692Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/7a/a209b29f971a9fdc1da86f917fe4524564924db50d13f0724feed37b2a4d/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28da6b72d4fb14ee200a1bd386ff74ade8992d7f725f2bde2c495a9a98cf4d9f", size = 2937541, upload-time = "2025-03-13T10:50:56.679Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/1e/b788b50ffc6191e0b1fc2b0d49df8cff16fe415302e5ceb89f619d12c5bc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:34d8cfde551c9916cb92014e040806122295a6800914bab5865deb85623931cf", size = 2819058, upload-time = "2025-03-13T10:50:59.525Z" },
+    { url = "https://files.pythonhosted.org/packages/36/aa/3626dfa09a0ecc5b57a8c58eeaeb7dd7ca9a37ad9dd681edab5acd55764c/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aaa852d23e125b73d283c98f007e06d4595732104b65402f46e8ef24b588d9f8", size = 3133278, upload-time = "2025-03-13T10:51:04.678Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/4d/8fbc203838b3d26269f944a89459d94c858f5b3f9a9b6ee9728cdcf69161/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a21a15d5c8e603331b8a59548bbe113564136dc0f5ad8306dd5033459a226da0", size = 3144253, upload-time = "2025-03-13T10:51:01.261Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/1b/2bd062adeb7c7511b847b32e356024980c0ffcf35f28947792c2d8ad2288/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2fdbd4c067c60a0ac7eca14b6bd18a5bebace54eb757c706b47ea93204f7a37c", size = 3398225, upload-time = "2025-03-13T10:51:03.243Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/63/38be071b0c8e06840bc6046991636bcb30c27f6bb1e670f4f4bc87cf49cc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2dd9a0061e403546f7377df940e866c3e678d7d4e9643d0461ea442b4f89e61a", size = 3038874, upload-time = "2025-03-13T10:51:06.235Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/83/afa94193c09246417c23a3c75a8a0a96bf44ab5630a3015538d0c316dd4b/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:db9484aeb2e200c43b915a1a0150ea885e35f357a5a8fabf7373af333dcc8dbf", size = 9014448, upload-time = "2025-03-13T10:51:10.927Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/b3/0e1a37d4f84c0f014d43701c11eb8072704f6efe8d8fc2dcdb79c47d76de/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed248ab5279e601a30a4d67bdb897ecbe955a50f1e7bb62bd99f07dd11c2f5b6", size = 8937877, upload-time = "2025-03-13T10:51:12.688Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/33/ff08f50e6d615eb180a4a328c65907feb6ded0b8f990ec923969759dc379/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:9ac78b12e541d4ce67b4dfd970e44c060a2147b9b2a21f509566d556a509c67d", size = 9186645, upload-time = "2025-03-13T10:51:14.723Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/aa/8ae85f69a9f6012c6f8011c6f4aa1c96154c816e9eea2e1b758601157833/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:e5a69c1a4496b81a5ee5d2c1f3f7fbdf95e90a0196101b0ee89ed9956b8a168f", size = 9384380, upload-time = "2025-03-13T10:51:16.526Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/5b/a5d98c89f747455e8b7a9504910c865d5e51da55e825a7ae641fb5ff0a58/tokenizers-0.21.1-cp39-abi3-win32.whl", hash = "sha256:1039a3a5734944e09de1d48761ade94e00d0fa760c0e0551151d4dd851ba63e3", size = 2239506, upload-time = "2025-03-13T10:51:20.643Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/b6/072a8e053ae600dcc2ac0da81a23548e3b523301a442a6ca900e92ac35be/tokenizers-0.21.1-cp39-abi3-win_amd64.whl", hash = "sha256:0f0dcbcc9f6e13e675a66d7a5f2f225a736745ce484c1a4e07476a89ccdad382", size = 2435481, upload-time = "2025-03-13T10:51:19.243Z" },
 ]

 [[package]]
@@ -2628,16 +2628,16 @@ wheels = [

 [[package]]
 name = "uvicorn"
-version = "0.35.0"
+version = "0.34.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "click" },
    { name = "h11" },
    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/5e/42/e0e305207bb88c6b8d3061399c6a961ffe5fbb7e2aa63c9234df7259e9cd/uvicorn-0.35.0.tar.gz", hash = "sha256:bc662f087f7cf2ce11a1d7fd70b90c9f98ef2e2831556dd078d131b96cc94a01", size = 78473, upload-time = "2025-06-28T16:15:46.058Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/de/ad/713be230bcda622eaa35c28f0d328c3675c371238470abdea52417f17a8e/uvicorn-0.34.3.tar.gz", hash = "sha256:35919a9a979d7a59334b6b10e05d77c1d0d574c50e0fc98b8b1a0f165708b55a", size = 76631, upload-time = "2025-06-01T07:48:17.531Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d2/e2/dc81b1bd1dcfe91735810265e9d26bc8ec5da45b4c0f6237e286819194c3/uvicorn-0.35.0-py3-none-any.whl", hash = "sha256:197535216b25ff9b785e29a0b79199f55222193d47f820816e7da751e9bc8d4a", size = 66406, upload-time = "2025-06-28T16:15:44.816Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/0d/8adfeaa62945f90d19ddc461c55f4a50c258af7662d34b6a3d5d1f8646f6/uvicorn-0.34.3-py3-none-any.whl", hash = "sha256:16246631db62bdfbf069b0645177d6e8a77ba950cfedbfd093acef9444e4d885", size = 62431, upload-time = "2025-06-01T07:48:15.664Z" },
 ]

 [package.optional-dependencies]
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
@@ -5,7 +5,6 @@ import android.content.Context
 import android.database.Cursor
 import android.provider.MediaStore
 import android.util.Log
-import androidx.core.database.getStringOrNull
 import java.io.File
 import java.io.FileInputStream
 import java.security.MessageDigest
@@ -153,8 +152,7 @@ open class NativeSyncApiImplBase(context: Context) {
          continue
        }

-        // MediaStore might return null for bucket name (commonly for the Root Directory), so default to "Internal Storage"
-        val name = cursor.getStringOrNull(bucketNameColumn) ?: "Internal Storage"
+        val name = cursor.getString(bucketNameColumn)
        val updatedAt = cursor.getLong(dateModified)
        albums.add(PlatformAlbum(id, name, updatedAt, false, 0))
        albumsCount[id] = 1
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -18,7 +18,7 @@ const String kSecuredPinCode = "secured_pin_code";

 // Timeline constants
 const int kTimelineNoneSegmentSize = 120;
-const int kTimelineAssetLoadBatchSize = 1024;
+const int kTimelineAssetLoadBatchSize = 256;
 const int kTimelineAssetLoadOppositeSize = 64;

 // Widget keys
--- a/mobile/lib/constants/enums.dart
+++ b/mobile/lib/constants/enums.dart
@@ -12,5 +12,3 @@ enum TextSearchType {
 enum AssetVisibilityEnum { timeline, hidden, archive, locked }

 enum SortUserBy { id }
-
-enum ActionSource { timeline, viewer }
--- a/mobile/lib/domain/models/album/album.model.dart
+++ b/mobile/lib/domain/models/album/album.model.dart
@@ -21,8 +21,6 @@ class Album {
  final String? thumbnailAssetId;
  final bool isActivityEnabled;
  final AlbumAssetOrder order;
-  final int assetCount;
-  final String ownerName;

  const Album({
    required this.id,
@@ -34,24 +32,20 @@ class Album {
    this.thumbnailAssetId,
    required this.isActivityEnabled,
    required this.order,
-    required this.assetCount,
-    required this.ownerName,
  });

  @override
  String toString() {
    return '''Album {
-    id: $id,
-    name: $name,
-    ownerId: $ownerId,
-    description: $description,
-    createdAt: $createdAt,
-    updatedAt: $updatedAt,
-    isActivityEnabled: $isActivityEnabled,
-    order: $order,
-    thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
-    assetCount: $assetCount
-    ownerName: $ownerName
+   id: $id,
+   name: $name,
+   ownerId: $ownerId,
+   description: $description,
+   createdAt: $createdAt,
+   updatedAt: $updatedAt,
+   isActivityEnabled: $isActivityEnabled,
+   order: $order,
+   thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
 }''';
  }

@@ -67,9 +61,7 @@ class Album {
        updatedAt == other.updatedAt &&
        thumbnailAssetId == other.thumbnailAssetId &&
        isActivityEnabled == other.isActivityEnabled &&
-        order == other.order &&
-        assetCount == other.assetCount &&
-        ownerName == other.ownerName;
+        order == other.order;
  }

  @override
@@ -82,8 +74,6 @@ class Album {
        updatedAt.hashCode ^
        thumbnailAssetId.hashCode ^
        isActivityEnabled.hashCode ^
-        order.hashCode ^
-        assetCount.hashCode ^
-        ownerName.hashCode;
+        order.hashCode;
  }
 }
--- a/mobile/lib/domain/models/asset/asset.model.dart
+++ b/mobile/lib/domain/models/asset/asset.model.dart
@@ -0,0 +1,73 @@
+part of 'base_asset.model.dart';
+
+enum AssetVisibility {
+  timeline,
+  hidden,
+  archive,
+  locked,
+}
+
+// Model for an asset stored in the server
+class Asset extends BaseAsset {
+  final String id;
+  final String? localId;
+  final String? thumbHash;
+  final AssetVisibility visibility;
+
+  const Asset({
+    required this.id,
+    this.localId,
+    required super.name,
+    required super.checksum,
+    required super.type,
+    required super.createdAt,
+    required super.updatedAt,
+    super.width,
+    super.height,
+    super.durationInSeconds,
+    super.isFavorite = false,
+    this.thumbHash,
+    this.visibility = AssetVisibility.timeline,
+  });
+
+  @override
+  AssetState get storage =>
+      localId == null ? AssetState.remote : AssetState.merged;
+
+  @override
+  String toString() {
+    return '''Asset {
+   id: $id,
+   name: $name,
+   type: $type,
+   createdAt: $createdAt,
+   updatedAt: $updatedAt,
+   width: ${width ?? "<NA>"},
+   height: ${height ?? "<NA>"},
+   durationInSeconds: ${durationInSeconds ?? "<NA>"},
+   localId: ${localId ?? "<NA>"},
+   isFavorite: $isFavorite,
+    thumbHash: ${thumbHash ?? "<NA>"},
+    visibility: $visibility,
+ }''';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! Asset) return false;
+    if (identical(this, other)) return true;
+    return super == other &&
+        id == other.id &&
+        localId == other.localId &&
+        thumbHash == other.thumbHash &&
+        visibility == other.visibility;
+  }
+
+  @override
+  int get hashCode =>
+      super.hashCode ^
+      id.hashCode ^
+      localId.hashCode ^
+      thumbHash.hashCode ^
+      visibility.hashCode;
+}
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -1,5 +1,5 @@
+part 'asset.model.dart';
 part 'local_asset.model.dart';
-part 'remote_asset.model.dart';

 enum AssetType {
  // do not change this order!
@@ -40,24 +40,7 @@ sealed class BaseAsset {

  bool get isImage => type == AssetType.image;
  bool get isVideo => type == AssetType.video;
-
-  double? get aspectRatio {
-    if (width != null && height != null && height! > 0) {
-      return width! / height!;
-    }
-    return null;
-  }
-
-  bool get hasRemote =>
-      storage == AssetState.remote || storage == AssetState.merged;
-  bool get hasLocal =>
-      storage == AssetState.local || storage == AssetState.merged;
-  bool get isLocalOnly => storage == AssetState.local;
-  bool get isRemoteOnly => storage == AssetState.remote;
-
-  // Overridden in subclasses
  AssetState get storage;
-  String get heroTag;

  @override
  String toString() {
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -22,9 +22,6 @@ class LocalAsset extends BaseAsset {
  AssetState get storage =>
      remoteId == null ? AssetState.local : AssetState.merged;

-  @override
-  String get heroTag => '${id}_${remoteId ?? checksum}';
-
  @override
  String toString() {
    return '''LocalAsset {
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -1,115 +0,0 @@
-part of 'base_asset.model.dart';
-
-enum AssetVisibility {
-  timeline,
-  hidden,
-  archive,
-  locked,
-}
-
-// Model for an asset stored in the server
-class RemoteAsset extends BaseAsset {
-  final String id;
-  final String? localId;
-  final String? thumbHash;
-  final AssetVisibility visibility;
-  final String ownerId;
-
-  const RemoteAsset({
-    required this.id,
-    this.localId,
-    required super.name,
-    required this.ownerId,
-    required super.checksum,
-    required super.type,
-    required super.createdAt,
-    required super.updatedAt,
-    super.width,
-    super.height,
-    super.durationInSeconds,
-    super.isFavorite = false,
-    this.thumbHash,
-    this.visibility = AssetVisibility.timeline,
-  });
-
-  @override
-  AssetState get storage =>
-      localId == null ? AssetState.remote : AssetState.merged;
-
-  @override
-  String get heroTag => '${localId ?? checksum}_$id';
-
-  @override
-  String toString() {
-    return '''Asset {
-    id: $id,
-    name: $name,
-    ownerId: $ownerId,
-    type: $type,
-    createdAt: $createdAt,
-    updatedAt: $updatedAt,
-    width: ${width ?? "<NA>"},
-    height: ${height ?? "<NA>"},
-    durationInSeconds: ${durationInSeconds ?? "<NA>"},
-    localId: ${localId ?? "<NA>"},
-    isFavorite: $isFavorite,
-    thumbHash: ${thumbHash ?? "<NA>"},
-    visibility: $visibility,
- }''';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! RemoteAsset) return false;
-    if (identical(this, other)) return true;
-    return super == other &&
-        id == other.id &&
-        ownerId == other.ownerId &&
-        localId == other.localId &&
-        thumbHash == other.thumbHash &&
-        visibility == other.visibility;
-  }
-
-  @override
-  int get hashCode =>
-      super.hashCode ^
-      id.hashCode ^
-      ownerId.hashCode ^
-      localId.hashCode ^
-      thumbHash.hashCode ^
-      visibility.hashCode;
-
-  RemoteAsset copyWith({
-    String? id,
-    String? localId,
-    String? name,
-    String? ownerId,
-    String? checksum,
-    AssetType? type,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    int? width,
-    int? height,
-    int? durationInSeconds,
-    bool? isFavorite,
-    String? thumbHash,
-    AssetVisibility? visibility,
-  }) {
-    return RemoteAsset(
-      id: id ?? this.id,
-      localId: localId ?? this.localId,
-      name: name ?? this.name,
-      ownerId: ownerId ?? this.ownerId,
-      checksum: checksum ?? this.checksum,
-      type: type ?? this.type,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      width: width ?? this.width,
-      height: height ?? this.height,
-      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
-      isFavorite: isFavorite ?? this.isFavorite,
-      thumbHash: thumbHash ?? this.thumbHash,
-      visibility: visibility ?? this.visibility,
-    );
-  }
-}
--- a/mobile/lib/domain/models/exif.model.dart
+++ b/mobile/lib/domain/models/exif.model.dart
@@ -3,8 +3,6 @@ class ExifInfo {
  final int? fileSize;
  final String? description;
  final bool isFlipped;
-  final double? width;
-  final double? height;
  final String? orientation;
  final String? timeZone;
  final DateTime? dateTimeOriginal;
@@ -47,8 +45,6 @@ class ExifInfo {
    this.fileSize,
    this.description,
    this.orientation,
-    this.width,
-    this.height,
    this.timeZone,
    this.dateTimeOriginal,
    this.isFlipped = false,
@@ -72,9 +68,6 @@ class ExifInfo {

    return other.fileSize == fileSize &&
        other.description == description &&
-        other.isFlipped == isFlipped &&
-        other.width == width &&
-        other.height == height &&
        other.orientation == orientation &&
        other.timeZone == timeZone &&
        other.dateTimeOriginal == dateTimeOriginal &&
@@ -98,9 +91,6 @@ class ExifInfo {
    return fileSize.hashCode ^
        description.hashCode ^
        orientation.hashCode ^
-        isFlipped.hashCode ^
-        width.hashCode ^
-        height.hashCode ^
        timeZone.hashCode ^
        dateTimeOriginal.hashCode ^
        latitude.hashCode ^
@@ -124,9 +114,6 @@ class ExifInfo {
 fileSize: ${fileSize ?? 'NA'},
 description: ${description ?? 'NA'},
 orientation: ${orientation ?? 'NA'},
-width: ${width ?? 'NA'},
-height: ${height ?? 'NA'},
-isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
 latitude: ${latitude ?? 'NA'},
--- a/mobile/lib/domain/models/memory.model.dart
+++ b/mobile/lib/domain/models/memory.model.dart
@@ -1,166 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'dart:convert';
-
-import 'package:collection/collection.dart';
-
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-enum MemoryTypeEnum {
-  // do not change this order!
-  onThisDay,
-}
-
-class MemoryData {
-  final int year;
-
-  const MemoryData({
-    required this.year,
-  });
-
-  MemoryData copyWith({
-    int? year,
-  }) {
-    return MemoryData(
-      year: year ?? this.year,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'year': year,
-    };
-  }
-
-  factory MemoryData.fromMap(Map<String, dynamic> map) {
-    return MemoryData(
-      year: map['year'] as int,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory MemoryData.fromJson(String source) =>
-      MemoryData.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() => 'MemoryData(year: $year)';
-
-  @override
-  bool operator ==(covariant MemoryData other) {
-    if (identical(this, other)) return true;
-
-    return other.year == year;
-  }
-
-  @override
-  int get hashCode => year.hashCode;
-}
-
-// Model for a memory stored in the server
-class DriftMemory {
-  final String id;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final DateTime? deletedAt;
-  final String ownerId;
-
-  // enum
-  final MemoryTypeEnum type;
-  final MemoryData data;
-  final bool isSaved;
-  final DateTime memoryAt;
-  final DateTime? seenAt;
-  final DateTime? showAt;
-  final DateTime? hideAt;
-  final List<RemoteAsset> assets;
-
-  const DriftMemory({
-    required this.id,
-    required this.createdAt,
-    required this.updatedAt,
-    this.deletedAt,
-    required this.ownerId,
-    required this.type,
-    required this.data,
-    required this.isSaved,
-    required this.memoryAt,
-    this.seenAt,
-    this.showAt,
-    this.hideAt,
-    required this.assets,
-  });
-
-  DriftMemory copyWith({
-    String? id,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    DateTime? deletedAt,
-    String? ownerId,
-    MemoryTypeEnum? type,
-    MemoryData? data,
-    bool? isSaved,
-    DateTime? memoryAt,
-    DateTime? seenAt,
-    DateTime? showAt,
-    DateTime? hideAt,
-    List<RemoteAsset>? assets,
-  }) {
-    return DriftMemory(
-      id: id ?? this.id,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      deletedAt: deletedAt ?? this.deletedAt,
-      ownerId: ownerId ?? this.ownerId,
-      type: type ?? this.type,
-      data: data ?? this.data,
-      isSaved: isSaved ?? this.isSaved,
-      memoryAt: memoryAt ?? this.memoryAt,
-      seenAt: seenAt ?? this.seenAt,
-      showAt: showAt ?? this.showAt,
-      hideAt: hideAt ?? this.hideAt,
-      assets: assets ?? this.assets,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'Memory(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, ownerId: $ownerId, type: $type, data: $data, isSaved: $isSaved, memoryAt: $memoryAt, seenAt: $seenAt, showAt: $showAt, hideAt: $hideAt, assets: $assets)';
-  }
-
-  @override
-  bool operator ==(covariant DriftMemory other) {
-    if (identical(this, other)) return true;
-    final listEquals = const DeepCollectionEquality().equals;
-
-    return other.id == id &&
-        other.createdAt == createdAt &&
-        other.updatedAt == updatedAt &&
-        other.deletedAt == deletedAt &&
-        other.ownerId == ownerId &&
-        other.type == type &&
-        other.data == data &&
-        other.isSaved == isSaved &&
-        other.memoryAt == memoryAt &&
-        other.seenAt == seenAt &&
-        other.showAt == showAt &&
-        other.hideAt == hideAt &&
-        listEquals(other.assets, assets);
-  }
-
-  @override
-  int get hashCode {
-    return id.hashCode ^
-        createdAt.hashCode ^
-        updatedAt.hashCode ^
-        deletedAt.hashCode ^
-        ownerId.hashCode ^
-        type.hashCode ^
-        data.hashCode ^
-        isSaved.hashCode ^
-        memoryAt.hashCode ^
-        seenAt.hashCode ^
-        showAt.hashCode ^
-        hideAt.hashCode ^
-        assets.hashCode;
-  }
-}
--- a/mobile/lib/domain/models/setting.model.dart
+++ b/mobile/lib/domain/models/setting.model.dart
@@ -3,11 +3,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 enum Setting<T> {
  tilesPerRow<int>(StoreKey.tilesPerRow, 4),
  groupAssetsBy<int>(StoreKey.groupAssetsBy, 0),
-  showStorageIndicator<bool>(StoreKey.storageIndicator, true),
-  loadOriginal<bool>(StoreKey.loadOriginal, false),
-  preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),
-  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
-  ;
+  showStorageIndicator<bool>(StoreKey.storageIndicator, true);

  const Setting(this.storeKey, this.defaultValue);

--- a/mobile/lib/domain/models/stack.model.dart
+++ b/mobile/lib/domain/models/stack.model.dart
@@ -1,84 +0,0 @@
-import 'dart:convert';
-
-// Model for a stack stored in the server
-class Stack {
-  final String id;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final String ownerId;
-  final String primaryAssetId;
-
-  const Stack({
-    required this.id,
-    required this.createdAt,
-    required this.updatedAt,
-    required this.ownerId,
-    required this.primaryAssetId,
-  });
-
-  Stack copyWith({
-    String? id,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    String? ownerId,
-    String? primaryAssetId,
-  }) {
-    return Stack(
-      id: id ?? this.id,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      ownerId: ownerId ?? this.ownerId,
-      primaryAssetId: primaryAssetId ?? this.primaryAssetId,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'id': id,
-      'createdAt': createdAt.millisecondsSinceEpoch,
-      'updatedAt': updatedAt.millisecondsSinceEpoch,
-      'ownerId': ownerId,
-      'primaryAssetId': primaryAssetId,
-    };
-  }
-
-  factory Stack.fromMap(Map<String, dynamic> map) {
-    return Stack(
-      id: map['id'] as String,
-      createdAt: DateTime.fromMillisecondsSinceEpoch(map['createdAt'] as int),
-      updatedAt: DateTime.fromMillisecondsSinceEpoch(map['updatedAt'] as int),
-      ownerId: map['ownerId'] as String,
-      primaryAssetId: map['primaryAssetId'] as String,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory Stack.fromJson(String source) =>
-      Stack.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() {
-    return 'Stack(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, ownerId: $ownerId, primaryAssetId: $primaryAssetId)';
-  }
-
-  @override
-  bool operator ==(covariant Stack other) {
-    if (identical(this, other)) return true;
-
-    return other.id == id &&
-        other.createdAt == createdAt &&
-        other.updatedAt == updatedAt &&
-        other.ownerId == ownerId &&
-        other.primaryAssetId == primaryAssetId;
-  }
-
-  @override
-  int get hashCode {
-    return id.hashCode ^
-        createdAt.hashCode ^
-        updatedAt.hashCode ^
-        ownerId.hashCode ^
-        primaryAssetId.hashCode;
-  }
-}
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -1,30 +0,0 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
-
-class AssetService {
-  final RemoteAssetRepository _remoteAssetRepository;
-  final DriftLocalAssetRepository _localAssetRepository;
-
-  const AssetService({
-    required RemoteAssetRepository remoteAssetRepository,
-    required DriftLocalAssetRepository localAssetRepository,
-  })  : _remoteAssetRepository = remoteAssetRepository,
-        _localAssetRepository = localAssetRepository;
-
-  Stream<BaseAsset?> watchAsset(BaseAsset asset) {
-    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
-    return asset is LocalAsset
-        ? _localAssetRepository.watchAsset(id)
-        : _remoteAssetRepository.watchAsset(id);
-  }
-
-  Future<ExifInfo?> getExif(BaseAsset asset) async {
-    if (asset is LocalAsset || asset is! RemoteAsset) {
-      return null;
-    }
-
-    return _remoteAssetRepository.getExif(asset.id);
-  }
-}
--- a/mobile/lib/domain/services/log.service.dart
+++ b/mobile/lib/domain/services/log.service.dart
@@ -5,7 +5,7 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/log.model.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/store.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
 import 'package:logging/logging.dart';

 /// Service responsible for handling application logging.
@@ -14,8 +14,8 @@ import 'package:logging/logging.dart';
 /// writes them to a persistent [ILogRepository], and manages log levels
 /// via [IStoreRepository]
 class LogService {
-  final IsarLogRepository _logRepository;
-  final IsarStoreRepository _storeRepository;
+  final LogRepository _logRepository;
+  final IStoreRepository _storeRepository;

  final List<LogMessage> _msgBuffer = [];

@@ -37,8 +37,8 @@ class LogService {
  }

  static Future<LogService> init({
-    required IsarLogRepository logRepository,
-    required IsarStoreRepository storeRepository,
+    required LogRepository logRepository,
+    required IStoreRepository storeRepository,
    bool shouldBuffer = true,
  }) async {
    _instance ??= await create(
@@ -50,8 +50,8 @@ class LogService {
  }

  static Future<LogService> create({
-    required IsarLogRepository logRepository,
-    required IsarStoreRepository storeRepository,
+    required LogRepository logRepository,
+    required IStoreRepository storeRepository,
    bool shouldBuffer = true,
  }) async {
    final instance = LogService._(logRepository, storeRepository, shouldBuffer);
--- a/mobile/lib/domain/services/memory.service.dart
+++ b/mobile/lib/domain/services/memory.service.dart
@@ -1,15 +0,0 @@
-import 'package:immich_mobile/domain/models/memory.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/memory.repository.dart';
-import 'package:logging/logging.dart';
-
-class DriftMemoryService {
-  final log = Logger("DriftMemoryService");
-
-  final DriftMemoryRepository _repository;
-
-  DriftMemoryService(this._repository);
-
-  Future<List<DriftMemory>> getMemoryLane(String ownerId) {
-    return _repository.getAll(ownerId);
-  }
-}
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -1,60 +0,0 @@
-import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
-import 'package:immich_mobile/models/albums/album_search.model.dart';
-import 'package:immich_mobile/utils/remote_album.utils.dart';
-
-class RemoteAlbumService {
-  final DriftRemoteAlbumRepository _repository;
-
-  const RemoteAlbumService(this._repository);
-
-  Future<List<Album>> getAll() {
-    return _repository.getAll();
-  }
-
-  List<Album> sortAlbums(
-    List<Album> albums,
-    RemoteAlbumSortMode sortMode, {
-    bool isReverse = false,
-  }) {
-    return sortMode.sortFn(albums, isReverse);
-  }
-
-  List<Album> searchAlbums(
-    List<Album> albums,
-    String query,
-    String? userId, [
-    QuickFilterMode filterMode = QuickFilterMode.all,
-  ]) {
-    final lowerQuery = query.toLowerCase();
-    List<Album> filtered = albums;
-
-    // Apply text search filter
-    if (query.isNotEmpty) {
-      filtered = filtered
-          .where(
-            (album) =>
-                album.name.toLowerCase().contains(lowerQuery) ||
-                album.description.toLowerCase().contains(lowerQuery),
-          )
-          .toList();
-    }
-
-    if (userId != null) {
-      switch (filterMode) {
-        case QuickFilterMode.myAlbums:
-          filtered =
-              filtered.where((album) => album.ownerId == userId).toList();
-          break;
-        case QuickFilterMode.sharedWithMe:
-          filtered =
-              filtered.where((album) => album.ownerId != userId).toList();
-          break;
-        case QuickFilterMode.all:
-          break;
-      }
-    }
-
-    return filtered;
-  }
-}
--- a/mobile/lib/domain/services/setting.service.dart
+++ b/mobile/lib/domain/services/setting.service.dart
@@ -1,11 +1,6 @@
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';

-// Singleton instance of SettingsService, to use in places
-// where reactivity is not required
-// ignore: non_constant_identifier_names
-final AppSetting = SettingsService(storeService: StoreService.I);
-
 class SettingsService {
  final StoreService _storeService;

--- a/mobile/lib/domain/services/store.service.dart
+++ b/mobile/lib/domain/services/store.service.dart
@@ -1,18 +1,18 @@
 import 'dart:async';

 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';

 /// Provides access to a persistent key-value store with an in-memory cache.
 /// Listens for repository changes to keep the cache updated.
 class StoreService {
-  final IsarStoreRepository _storeRepository;
+  final IStoreRepository _storeRepository;

  /// In-memory cache. Keys are [StoreKey.id]
  final Map<int, Object?> _cache = {};
  late final StreamSubscription<StoreDto> _storeUpdateSubscription;

-  StoreService._({required IsarStoreRepository storeRepository})
+  StoreService._({required IStoreRepository storeRepository})
      : _storeRepository = storeRepository;

  // TODO: Temporary typedef to make minimal changes. Remove this and make the presentation layer access store through a provider
@@ -26,14 +26,14 @@ class StoreService {

  // TODO: Replace the implementation with the one from create after removing the typedef
  static Future<StoreService> init({
-    required IsarStoreRepository storeRepository,
+    required IStoreRepository storeRepository,
  }) async {
    _instance ??= await create(storeRepository: storeRepository);
    return _instance!;
  }

  static Future<StoreService> create({
-    required IsarStoreRepository storeRepository,
+    required IStoreRepository storeRepository,
  }) async {
    final instance = StoreService._(storeRepository: storeRepository);
    await instance._populateCache();
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -146,33 +146,6 @@ class SyncStreamService {
      // to acknowledge that the client has processed all the backfill events
      case SyncEntityType.syncAckV1:
        return;
-      case SyncEntityType.memoryV1:
-        return _syncStreamRepository.updateMemoriesV1(data.cast());
-      case SyncEntityType.memoryDeleteV1:
-        return _syncStreamRepository.deleteMemoriesV1(data.cast());
-      case SyncEntityType.memoryToAssetV1:
-        return _syncStreamRepository.updateMemoryAssetsV1(data.cast());
-      case SyncEntityType.memoryToAssetDeleteV1:
-        return _syncStreamRepository.deleteMemoryAssetsV1(data.cast());
-      case SyncEntityType.stackV1:
-        return _syncStreamRepository.updateStacksV1(data.cast());
-      case SyncEntityType.stackDeleteV1:
-        return _syncStreamRepository.deleteStacksV1(data.cast());
-      case SyncEntityType.partnerStackV1:
-        return _syncStreamRepository.updateStacksV1(
-          data.cast(),
-          debugLabel: 'partner',
-        );
-      case SyncEntityType.partnerStackBackfillV1:
-        return _syncStreamRepository.updateStacksV1(
-          data.cast(),
-          debugLabel: 'partner backfill',
-        );
-      case SyncEntityType.partnerStackDeleteV1:
-        return _syncStreamRepository.deleteStacksV1(
-          data.cast(),
-          debugLabel: 'partner',
-        );
      default:
        _logger.warning("Unknown sync data type: $type");
    }
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -7,7 +7,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';

@@ -42,85 +41,30 @@ class TimelineFactory {

  TimelineService localAlbum({required String albumId}) => TimelineService(
        assetSource: (offset, count) => _timelineRepository
-            .getLocalAlbumBucketAssets(albumId, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchLocalAlbumBucket(
-          albumId,
-          groupBy: groupBy,
-        ),
+            .getLocalBucketAssets(albumId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchLocalBucket(albumId, groupBy: groupBy),
      );

  TimelineService remoteAlbum({required String albumId}) => TimelineService(
        assetSource: (offset, count) => _timelineRepository
-            .getRemoteAlbumBucketAssets(albumId, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchRemoteAlbumBucket(
-          albumId,
-          groupBy: groupBy,
-        ),
-      );
-
-  TimelineService remoteAssets(List<String> timelineUsers) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getRemoteBucketAssets(timelineUsers, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchRemoteBucket(
-          timelineUsers,
-          groupBy: GroupAssetsBy.month,
-        ),
-      );
-
-  TimelineService favorite(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getFavoriteBucketAssets(userId, offset: offset, count: count),
+            .getRemoteBucketAssets(albumId, offset: offset, count: count),
        bucketSource: () =>
-            _timelineRepository.watchFavoriteBucket(userId, groupBy: groupBy),
-      );
-
-  TimelineService trash(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getTrashBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchTrashBucket(userId, groupBy: groupBy),
-      );
-
-  TimelineService archive(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getArchiveBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchArchiveBucket(userId, groupBy: groupBy),
-      );
-
-  TimelineService lockedFolder(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getLockedFolderBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchLockedFolderBucket(
-          userId,
-          groupBy: groupBy,
-        ),
-      );
-
-  TimelineService video(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getVideoBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchVideoBucket(userId, groupBy: groupBy),
+            _timelineRepository.watchRemoteBucket(albumId, groupBy: groupBy),
      );
 }

 class TimelineService {
  final TimelineAssetSource _assetSource;
  final TimelineBucketSource _bucketSource;
-  int _totalAssets = 0;
-  int get totalAssets => _totalAssets;

  TimelineService({
    required TimelineAssetSource assetSource,
    required TimelineBucketSource bucketSource,
  })  : _assetSource = assetSource,
        _bucketSource = bucketSource {
-    _bucketSubscription = _bucketSource().listen((buckets) {
-      _totalAssets =
-          buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
-      unawaited(_reloadBucket());
-    });
+    _bucketSubscription =
+        _bucketSource().listen((_) => unawaited(_reloadBucket()));
  }

  final AsyncMutex _mutex = AsyncMutex();
@@ -132,7 +76,6 @@ class TimelineService {

  Future<void> _reloadBucket() => _mutex.run(() async {
        _buffer = await _assetSource(_bufferOffset, _buffer.length);
-        EventStream.shared.emit(const TimelineReloadEvent());
      });

  Future<List<BaseAsset>> loadAssets(int index, int count) =>
@@ -174,7 +117,6 @@ class TimelineService {
      index >= _bufferOffset && index + count <= _bufferOffset + _buffer.length;

  List<BaseAsset> getAssets(int index, int count) {
-    assert(index + count <= totalAssets);
    if (!hasRange(index, count)) {
      throw RangeError('TimelineService::getAssets Index out of range');
    }
@@ -182,17 +124,6 @@ class TimelineService {
    return _buffer.slice(start, start + count);
  }

-  // Pre-cache assets around the given index for asset viewer
-  Future<void> preCacheAssets(int index) =>
-      _mutex.run(() => _loadAssets(index, 5));
-
-  BaseAsset getAsset(int index) {
-    if (!hasRange(index, 1)) {
-      throw RangeError('TimelineService::getAsset Index out of range');
-    }
-    return _buffer.elementAt(index - _bufferOffset);
-  }
-
  Future<void> dispose() async {
    await _bucketSubscription?.cancel();
    _bucketSubscription = null;
--- a/mobile/lib/domain/utils/event_stream.dart
+++ b/mobile/lib/domain/utils/event_stream.dart
@@ -1,52 +0,0 @@
-import 'dart:async';
-
-sealed class Event {
-  const Event();
-}
-
-class TimelineReloadEvent extends Event {
-  const TimelineReloadEvent();
-}
-
-class ViewerOpenBottomSheetEvent extends Event {
-  const ViewerOpenBottomSheetEvent();
-}
-
-class EventStream {
-  EventStream._();
-
-  static final EventStream shared = EventStream._();
-
-  final StreamController<Event> _controller =
-      StreamController<Event>.broadcast();
-
-  void emit(Event event) {
-    _controller.add(event);
-  }
-
-  Stream<T> where<T extends Event>() {
-    if (T == Event) {
-      return _controller.stream as Stream<T>;
-    }
-    return _controller.stream.where((event) => event is T).cast<T>();
-  }
-
-  StreamSubscription<T> listen<T extends Event>(
-    void Function(T event)? onData, {
-    Function? onError,
-    void Function()? onDone,
-    bool? cancelOnError,
-  }) {
-    return where<T>().listen(
-      onData,
-      onError: onError,
-      onDone: onDone,
-      cancelOnError: cancelOnError,
-    );
-  }
-
-  /// Closes the stream controller
-  void dispose() {
-    _controller.close();
-  }
-}
--- a/mobile/lib/infrastructure/entities/asset_triggers.drift
+++ b/mobile/lib/infrastructure/entities/asset_triggers.drift
@@ -1,58 +0,0 @@
-import 'remote_asset.entity.dart';
-import 'local_asset.entity.dart';
-
-- TRIGGERS ON local_asset_entity
-
-- Find and update the remote_id in local_asset_entity and local_id in remote_asset_entity when checksum is set
-CREATE TRIGGER IF NOT EXISTS tr_local_asset_update_checksum_set_ids
-AFTER UPDATE OF checksum ON local_asset_entity
-FOR EACH ROW
-WHEN NEW.checksum IS NOT NULL
-BEGIN
-    UPDATE local_asset_entity
-    SET remote_id = (SELECT id FROM remote_asset_entity WHERE checksum = NEW.checksum LIMIT 1)
-    WHERE id = NEW.id;
-
-    UPDATE remote_asset_entity
-    SET local_id = (SELECT id FROM local_asset_entity WHERE checksum = NEW.checksum ORDER BY id ASC LIMIT 1)
-    WHERE checksum = NEW.checksum;
-END;
-
-- When a local asset is updated, relink remote assets that had a checksum match
-CREATE TRIGGER IF NOT EXISTS tr_local_asset_update_old_checksum_set_remote_asset_local_id
-AFTER UPDATE OF checksum ON local_asset_entity
-FOR EACH ROW
-WHEN OLD.checksum IS NOT NULL
-BEGIN
-    UPDATE remote_asset_entity
-    SET local_id = (SELECT id FROM local_asset_entity WHERE checksum = OLD.checksum ORDER BY id ASC LIMIT 1)
-    WHERE checksum = OLD.checksum;
-END;
-
-- remote_asset_entity.checksum is a 1..* relationship with local_asset_entity.checksum.
-- When a local asset is deleted, update remote assets that had a checksum match
-- to ensure their local_id is set to the first matching local asset or NULL
-CREATE TRIGGER IF NOT EXISTS tr_local_asset_delete_update_remote_asset_local_id
-AFTER DELETE ON local_asset_entity
-FOR EACH ROW
-WHEN OLD.checksum IS NOT NULL
-BEGIN
-    UPDATE remote_asset_entity
-    SET local_id = (SELECT id FROM local_asset_entity WHERE checksum = OLD.checksum ORDER BY id ASC LIMIT 1)
-    WHERE checksum = OLD.checksum;
-END;
-
-
-- TRIGGERS ON remote_asset_entity
-
-- Find and update local_id in remote_asset_entity when a new remote asset is inserted
-CREATE TRIGGER IF NOT EXISTS tr_remote_asset_insert_set_local_id
-AFTER INSERT ON remote_asset_entity
-FOR EACH ROW
-BEGIN
-    UPDATE remote_asset_entity
-    SET local_id = (SELECT id FROM local_asset_entity WHERE checksum = NEW.checksum ORDER BY id ASC LIMIT 1)
-    WHERE id = NEW.id;
-
-    UPDATE local_asset_entity SET remote_id = NEW.id WHERE checksum = NEW.checksum;
-END;
--- a/mobile/lib/infrastructure/entities/asset_triggers.drift.dart
+++ b/mobile/lib/infrastructure/entities/asset_triggers.drift.dart
@@ -1,16 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-
-i0.Trigger get trLocalAssetUpdateChecksumSetIds => i0.Trigger(
-    'CREATE TRIGGER IF NOT EXISTS tr_local_asset_update_checksum_set_ids AFTER UPDATE OF checksum ON local_asset_entity WHEN NEW.checksum IS NOT NULL BEGIN UPDATE local_asset_entity SET remote_id = (SELECT id FROM remote_asset_entity WHERE checksum = NEW.checksum LIMIT 1) WHERE id = NEW.id;UPDATE remote_asset_entity SET local_id = (SELECT id FROM local_asset_entity WHERE checksum = NEW.checksum ORDER BY id ASC LIMIT 1) WHERE checksum = NEW.checksum;END',
-    'tr_local_asset_update_checksum_set_ids');
-i0.Trigger get trLocalAssetUpdateOldChecksumSetRemoteAssetLocalId => i0.Trigger(
-    'CREATE TRIGGER IF NOT EXISTS tr_local_asset_update_old_checksum_set_remote_asset_local_id AFTER UPDATE OF checksum ON local_asset_entity WHEN OLD.checksum IS NOT NULL BEGIN UPDATE remote_asset_entity SET local_id = (SELECT id FROM local_asset_entity WHERE checksum = OLD.checksum ORDER BY id ASC LIMIT 1) WHERE checksum = OLD.checksum;END',
-    'tr_local_asset_update_old_checksum_set_remote_asset_local_id');
-i0.Trigger get trLocalAssetDeleteUpdateRemoteAssetLocalId => i0.Trigger(
-    'CREATE TRIGGER IF NOT EXISTS tr_local_asset_delete_update_remote_asset_local_id AFTER DELETE ON local_asset_entity WHEN OLD.checksum IS NOT NULL BEGIN UPDATE remote_asset_entity SET local_id = (SELECT id FROM local_asset_entity WHERE checksum = OLD.checksum ORDER BY id ASC LIMIT 1) WHERE checksum = OLD.checksum;END',
-    'tr_local_asset_delete_update_remote_asset_local_id');
-i0.Trigger get trRemoteAssetInsertSetLocalId => i0.Trigger(
-    'CREATE TRIGGER IF NOT EXISTS tr_remote_asset_insert_set_local_id AFTER INSERT ON remote_asset_entity BEGIN UPDATE remote_asset_entity SET local_id = (SELECT id FROM local_asset_entity WHERE checksum = NEW.checksum ORDER BY id ASC LIMIT 1) WHERE id = NEW.id;UPDATE local_asset_entity SET remote_id = NEW.id WHERE checksum = NEW.checksum;END',
-    'tr_remote_asset_insert_set_local_id');
--- a/mobile/lib/infrastructure/entities/exif.entity.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.dart
@@ -1,6 +1,5 @@
 import 'package:drift/drift.dart' hide Query;
 import 'package:immich_mobile/domain/models/exif.model.dart' as domain;
-import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
@@ -117,15 +116,15 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {

  TextColumn get exposureTime => text().nullable()();

-  RealColumn get fNumber => real().nullable()();
+  IntColumn get fNumber => integer().nullable()();

  IntColumn get fileSize => integer().nullable()();

-  RealColumn get focalLength => real().nullable()();
+  IntColumn get focalLength => integer().nullable()();

-  RealColumn get latitude => real().nullable()();
+  IntColumn get latitude => integer().nullable()();

-  RealColumn get longitude => real().nullable()();
+  IntColumn get longitude => integer().nullable()();

  IntColumn get iso => integer().nullable()();

@@ -133,8 +132,6 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {

  TextColumn get model => text().nullable()();

-  TextColumn get lens => text().nullable()();
-
  TextColumn get orientation => text().nullable()();

  TextColumn get timeZone => text().nullable()();
@@ -146,27 +143,3 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {
  @override
  Set<Column> get primaryKey => {assetId};
 }
-
-extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
-  domain.ExifInfo toDto() => domain.ExifInfo(
-        fileSize: fileSize,
-        dateTimeOriginal: dateTimeOriginal,
-        timeZone: timeZone,
-        make: make,
-        model: model,
-        iso: iso,
-        city: city,
-        state: state,
-        country: country,
-        description: description,
-        orientation: orientation,
-        latitude: latitude,
-        longitude: longitude,
-        f: fNumber?.toDouble(),
-        mm: focalLength?.toDouble(),
-        lens: lens,
-        width: width?.toDouble(),
-        height: height?.toDouble(),
-        isFlipped: ExifDtoConverter.isOrientationFlipped(orientation),
-      );
-}
--- a/mobile/lib/infrastructure/entities/exif.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.drift.dart
@@ -19,15 +19,14 @@ typedef $$RemoteExifEntityTableCreateCompanionBuilder
  i0.Value<int?> height,
  i0.Value<int?> width,
  i0.Value<String?> exposureTime,
-  i0.Value<double?> fNumber,
+  i0.Value<int?> fNumber,
  i0.Value<int?> fileSize,
-  i0.Value<double?> focalLength,
-  i0.Value<double?> latitude,
-  i0.Value<double?> longitude,
+  i0.Value<int?> focalLength,
+  i0.Value<int?> latitude,
+  i0.Value<int?> longitude,
  i0.Value<int?> iso,
  i0.Value<String?> make,
  i0.Value<String?> model,
-  i0.Value<String?> lens,
  i0.Value<String?> orientation,
  i0.Value<String?> timeZone,
  i0.Value<int?> rating,
@@ -44,15 +43,14 @@ typedef $$RemoteExifEntityTableUpdateCompanionBuilder
  i0.Value<int?> height,
  i0.Value<int?> width,
  i0.Value<String?> exposureTime,
-  i0.Value<double?> fNumber,
+  i0.Value<int?> fNumber,
  i0.Value<int?> fileSize,
-  i0.Value<double?> focalLength,
-  i0.Value<double?> latitude,
-  i0.Value<double?> longitude,
+  i0.Value<int?> focalLength,
+  i0.Value<int?> latitude,
+  i0.Value<int?> longitude,
  i0.Value<int?> iso,
  i0.Value<String?> make,
  i0.Value<String?> model,
-  i0.Value<String?> lens,
  i0.Value<String?> orientation,
  i0.Value<String?> timeZone,
  i0.Value<int?> rating,
@@ -127,20 +125,20 @@ class $$RemoteExifEntityTableFilterComposer
      column: $table.exposureTime,
      builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<double> get fNumber => $composableBuilder(
+  i0.ColumnFilters<int> get fNumber => $composableBuilder(
      column: $table.fNumber, builder: (column) => i0.ColumnFilters(column));

  i0.ColumnFilters<int> get fileSize => $composableBuilder(
      column: $table.fileSize, builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<double> get focalLength => $composableBuilder(
+  i0.ColumnFilters<int> get focalLength => $composableBuilder(
      column: $table.focalLength,
      builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<double> get latitude => $composableBuilder(
+  i0.ColumnFilters<int> get latitude => $composableBuilder(
      column: $table.latitude, builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<double> get longitude => $composableBuilder(
+  i0.ColumnFilters<int> get longitude => $composableBuilder(
      column: $table.longitude, builder: (column) => i0.ColumnFilters(column));

  i0.ColumnFilters<int> get iso => $composableBuilder(
@@ -152,9 +150,6 @@ class $$RemoteExifEntityTableFilterComposer
  i0.ColumnFilters<String> get model => $composableBuilder(
      column: $table.model, builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<String> get lens => $composableBuilder(
-      column: $table.lens, builder: (column) => i0.ColumnFilters(column));
-
  i0.ColumnFilters<String> get orientation => $composableBuilder(
      column: $table.orientation,
      builder: (column) => i0.ColumnFilters(column));
@@ -228,20 +223,20 @@ class $$RemoteExifEntityTableOrderingComposer
      column: $table.exposureTime,
      builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<double> get fNumber => $composableBuilder(
+  i0.ColumnOrderings<int> get fNumber => $composableBuilder(
      column: $table.fNumber, builder: (column) => i0.ColumnOrderings(column));

  i0.ColumnOrderings<int> get fileSize => $composableBuilder(
      column: $table.fileSize, builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<double> get focalLength => $composableBuilder(
+  i0.ColumnOrderings<int> get focalLength => $composableBuilder(
      column: $table.focalLength,
      builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<double> get latitude => $composableBuilder(
+  i0.ColumnOrderings<int> get latitude => $composableBuilder(
      column: $table.latitude, builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<double> get longitude => $composableBuilder(
+  i0.ColumnOrderings<int> get longitude => $composableBuilder(
      column: $table.longitude,
      builder: (column) => i0.ColumnOrderings(column));

@@ -254,9 +249,6 @@ class $$RemoteExifEntityTableOrderingComposer
  i0.ColumnOrderings<String> get model => $composableBuilder(
      column: $table.model, builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<String> get lens => $composableBuilder(
-      column: $table.lens, builder: (column) => i0.ColumnOrderings(column));
-
  i0.ColumnOrderings<String> get orientation => $composableBuilder(
      column: $table.orientation,
      builder: (column) => i0.ColumnOrderings(column));
@@ -329,19 +321,19 @@ class $$RemoteExifEntityTableAnnotationComposer
  i0.GeneratedColumn<String> get exposureTime => $composableBuilder(
      column: $table.exposureTime, builder: (column) => column);

-  i0.GeneratedColumn<double> get fNumber =>
+  i0.GeneratedColumn<int> get fNumber =>
      $composableBuilder(column: $table.fNumber, builder: (column) => column);

  i0.GeneratedColumn<int> get fileSize =>
      $composableBuilder(column: $table.fileSize, builder: (column) => column);

-  i0.GeneratedColumn<double> get focalLength => $composableBuilder(
+  i0.GeneratedColumn<int> get focalLength => $composableBuilder(
      column: $table.focalLength, builder: (column) => column);

-  i0.GeneratedColumn<double> get latitude =>
+  i0.GeneratedColumn<int> get latitude =>
      $composableBuilder(column: $table.latitude, builder: (column) => column);

-  i0.GeneratedColumn<double> get longitude =>
+  i0.GeneratedColumn<int> get longitude =>
      $composableBuilder(column: $table.longitude, builder: (column) => column);

  i0.GeneratedColumn<int> get iso =>
@@ -353,9 +345,6 @@ class $$RemoteExifEntityTableAnnotationComposer
  i0.GeneratedColumn<String> get model =>
      $composableBuilder(column: $table.model, builder: (column) => column);

-  i0.GeneratedColumn<String> get lens =>
-      $composableBuilder(column: $table.lens, builder: (column) => column);
-
  i0.GeneratedColumn<String> get orientation => $composableBuilder(
      column: $table.orientation, builder: (column) => column);

@@ -427,15 +416,14 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
            i0.Value<int?> height = const i0.Value.absent(),
            i0.Value<int?> width = const i0.Value.absent(),
            i0.Value<String?> exposureTime = const i0.Value.absent(),
-            i0.Value<double?> fNumber = const i0.Value.absent(),
+            i0.Value<int?> fNumber = const i0.Value.absent(),
            i0.Value<int?> fileSize = const i0.Value.absent(),
-            i0.Value<double?> focalLength = const i0.Value.absent(),
-            i0.Value<double?> latitude = const i0.Value.absent(),
-            i0.Value<double?> longitude = const i0.Value.absent(),
+            i0.Value<int?> focalLength = const i0.Value.absent(),
+            i0.Value<int?> latitude = const i0.Value.absent(),
+            i0.Value<int?> longitude = const i0.Value.absent(),
            i0.Value<int?> iso = const i0.Value.absent(),
            i0.Value<String?> make = const i0.Value.absent(),
            i0.Value<String?> model = const i0.Value.absent(),
-            i0.Value<String?> lens = const i0.Value.absent(),
            i0.Value<String?> orientation = const i0.Value.absent(),
            i0.Value<String?> timeZone = const i0.Value.absent(),
            i0.Value<int?> rating = const i0.Value.absent(),
@@ -459,7 +447,6 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
            iso: iso,
            make: make,
            model: model,
-            lens: lens,
            orientation: orientation,
            timeZone: timeZone,
            rating: rating,
@@ -475,15 +462,14 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
            i0.Value<int?> height = const i0.Value.absent(),
            i0.Value<int?> width = const i0.Value.absent(),
            i0.Value<String?> exposureTime = const i0.Value.absent(),
-            i0.Value<double?> fNumber = const i0.Value.absent(),
+            i0.Value<int?> fNumber = const i0.Value.absent(),
            i0.Value<int?> fileSize = const i0.Value.absent(),
-            i0.Value<double?> focalLength = const i0.Value.absent(),
-            i0.Value<double?> latitude = const i0.Value.absent(),
-            i0.Value<double?> longitude = const i0.Value.absent(),
+            i0.Value<int?> focalLength = const i0.Value.absent(),
+            i0.Value<int?> latitude = const i0.Value.absent(),
+            i0.Value<int?> longitude = const i0.Value.absent(),
            i0.Value<int?> iso = const i0.Value.absent(),
            i0.Value<String?> make = const i0.Value.absent(),
            i0.Value<String?> model = const i0.Value.absent(),
-            i0.Value<String?> lens = const i0.Value.absent(),
            i0.Value<String?> orientation = const i0.Value.absent(),
            i0.Value<String?> timeZone = const i0.Value.absent(),
            i0.Value<int?> rating = const i0.Value.absent(),
@@ -507,7 +493,6 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
            iso: iso,
            make: make,
            model: model,
-            lens: lens,
            orientation: orientation,
            timeZone: timeZone,
            rating: rating,
@@ -637,9 +622,9 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
  static const i0.VerificationMeta _fNumberMeta =
      const i0.VerificationMeta('fNumber');
  @override
-  late final i0.GeneratedColumn<double> fNumber = i0.GeneratedColumn<double>(
+  late final i0.GeneratedColumn<int> fNumber = i0.GeneratedColumn<int>(
      'f_number', aliasedName, true,
-      type: i0.DriftSqlType.double, requiredDuringInsert: false);
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
  static const i0.VerificationMeta _fileSizeMeta =
      const i0.VerificationMeta('fileSize');
  @override
@@ -649,21 +634,21 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
  static const i0.VerificationMeta _focalLengthMeta =
      const i0.VerificationMeta('focalLength');
  @override
-  late final i0.GeneratedColumn<double> focalLength =
-      i0.GeneratedColumn<double>('focal_length', aliasedName, true,
-          type: i0.DriftSqlType.double, requiredDuringInsert: false);
+  late final i0.GeneratedColumn<int> focalLength = i0.GeneratedColumn<int>(
+      'focal_length', aliasedName, true,
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
  static const i0.VerificationMeta _latitudeMeta =
      const i0.VerificationMeta('latitude');
  @override
-  late final i0.GeneratedColumn<double> latitude = i0.GeneratedColumn<double>(
+  late final i0.GeneratedColumn<int> latitude = i0.GeneratedColumn<int>(
      'latitude', aliasedName, true,
-      type: i0.DriftSqlType.double, requiredDuringInsert: false);
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
  static const i0.VerificationMeta _longitudeMeta =
      const i0.VerificationMeta('longitude');
  @override
-  late final i0.GeneratedColumn<double> longitude = i0.GeneratedColumn<double>(
+  late final i0.GeneratedColumn<int> longitude = i0.GeneratedColumn<int>(
      'longitude', aliasedName, true,
-      type: i0.DriftSqlType.double, requiredDuringInsert: false);
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
  static const i0.VerificationMeta _isoMeta = const i0.VerificationMeta('iso');
  @override
  late final i0.GeneratedColumn<int> iso = i0.GeneratedColumn<int>(
@@ -681,12 +666,6 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
  late final i0.GeneratedColumn<String> model = i0.GeneratedColumn<String>(
      'model', aliasedName, true,
      type: i0.DriftSqlType.string, requiredDuringInsert: false);
-  static const i0.VerificationMeta _lensMeta =
-      const i0.VerificationMeta('lens');
-  @override
-  late final i0.GeneratedColumn<String> lens = i0.GeneratedColumn<String>(
-      'lens', aliasedName, true,
-      type: i0.DriftSqlType.string, requiredDuringInsert: false);
  static const i0.VerificationMeta _orientationMeta =
      const i0.VerificationMeta('orientation');
  @override
@@ -730,7 +709,6 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
        iso,
        make,
        model,
-        lens,
        orientation,
        timeZone,
        rating,
@@ -825,10 +803,6 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
      context.handle(
          _modelMeta, model.isAcceptableOrUnknown(data['model']!, _modelMeta));
    }
-    if (data.containsKey('lens')) {
-      context.handle(
-          _lensMeta, lens.isAcceptableOrUnknown(data['lens']!, _lensMeta));
-    }
    if (data.containsKey('orientation')) {
      context.handle(
          _orientationMeta,
@@ -879,23 +853,21 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
      exposureTime: attachedDatabase.typeMapping.read(
          i0.DriftSqlType.string, data['${effectivePrefix}exposure_time']),
      fNumber: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.double, data['${effectivePrefix}f_number']),
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}f_number']),
      fileSize: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.int, data['${effectivePrefix}file_size']),
      focalLength: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.double, data['${effectivePrefix}focal_length']),
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}focal_length']),
      latitude: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.double, data['${effectivePrefix}latitude']),
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}latitude']),
      longitude: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.double, data['${effectivePrefix}longitude']),
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}longitude']),
      iso: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.int, data['${effectivePrefix}iso']),
      make: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}make']),
      model: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}model']),
-      lens: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}lens']),
      orientation: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}orientation']),
      timeZone: attachedDatabase.typeMapping
@@ -929,15 +901,14 @@ class RemoteExifEntityData extends i0.DataClass
  final int? height;
  final int? width;
  final String? exposureTime;
-  final double? fNumber;
+  final int? fNumber;
  final int? fileSize;
-  final double? focalLength;
-  final double? latitude;
-  final double? longitude;
+  final int? focalLength;
+  final int? latitude;
+  final int? longitude;
  final int? iso;
  final String? make;
  final String? model;
-  final String? lens;
  final String? orientation;
  final String? timeZone;
  final int? rating;
@@ -960,7 +931,6 @@ class RemoteExifEntityData extends i0.DataClass
      this.iso,
      this.make,
      this.model,
-      this.lens,
      this.orientation,
      this.timeZone,
      this.rating,
@@ -994,19 +964,19 @@ class RemoteExifEntityData extends i0.DataClass
      map['exposure_time'] = i0.Variable<String>(exposureTime);
    }
    if (!nullToAbsent || fNumber != null) {
-      map['f_number'] = i0.Variable<double>(fNumber);
+      map['f_number'] = i0.Variable<int>(fNumber);
    }
    if (!nullToAbsent || fileSize != null) {
      map['file_size'] = i0.Variable<int>(fileSize);
    }
    if (!nullToAbsent || focalLength != null) {
-      map['focal_length'] = i0.Variable<double>(focalLength);
+      map['focal_length'] = i0.Variable<int>(focalLength);
    }
    if (!nullToAbsent || latitude != null) {
-      map['latitude'] = i0.Variable<double>(latitude);
+      map['latitude'] = i0.Variable<int>(latitude);
    }
    if (!nullToAbsent || longitude != null) {
-      map['longitude'] = i0.Variable<double>(longitude);
+      map['longitude'] = i0.Variable<int>(longitude);
    }
    if (!nullToAbsent || iso != null) {
      map['iso'] = i0.Variable<int>(iso);
@@ -1017,9 +987,6 @@ class RemoteExifEntityData extends i0.DataClass
    if (!nullToAbsent || model != null) {
      map['model'] = i0.Variable<String>(model);
    }
-    if (!nullToAbsent || lens != null) {
-      map['lens'] = i0.Variable<String>(lens);
-    }
    if (!nullToAbsent || orientation != null) {
      map['orientation'] = i0.Variable<String>(orientation);
    }
@@ -1049,15 +1016,14 @@ class RemoteExifEntityData extends i0.DataClass
      height: serializer.fromJson<int?>(json['height']),
      width: serializer.fromJson<int?>(json['width']),
      exposureTime: serializer.fromJson<String?>(json['exposureTime']),
-      fNumber: serializer.fromJson<double?>(json['fNumber']),
+      fNumber: serializer.fromJson<int?>(json['fNumber']),
      fileSize: serializer.fromJson<int?>(json['fileSize']),
-      focalLength: serializer.fromJson<double?>(json['focalLength']),
-      latitude: serializer.fromJson<double?>(json['latitude']),
-      longitude: serializer.fromJson<double?>(json['longitude']),
+      focalLength: serializer.fromJson<int?>(json['focalLength']),
+      latitude: serializer.fromJson<int?>(json['latitude']),
+      longitude: serializer.fromJson<int?>(json['longitude']),
      iso: serializer.fromJson<int?>(json['iso']),
      make: serializer.fromJson<String?>(json['make']),
      model: serializer.fromJson<String?>(json['model']),
-      lens: serializer.fromJson<String?>(json['lens']),
      orientation: serializer.fromJson<String?>(json['orientation']),
      timeZone: serializer.fromJson<String?>(json['timeZone']),
      rating: serializer.fromJson<int?>(json['rating']),
@@ -1077,15 +1043,14 @@ class RemoteExifEntityData extends i0.DataClass
      'height': serializer.toJson<int?>(height),
      'width': serializer.toJson<int?>(width),
      'exposureTime': serializer.toJson<String?>(exposureTime),
-      'fNumber': serializer.toJson<double?>(fNumber),
+      'fNumber': serializer.toJson<int?>(fNumber),
      'fileSize': serializer.toJson<int?>(fileSize),
-      'focalLength': serializer.toJson<double?>(focalLength),
-      'latitude': serializer.toJson<double?>(latitude),
-      'longitude': serializer.toJson<double?>(longitude),
+      'focalLength': serializer.toJson<int?>(focalLength),
+      'latitude': serializer.toJson<int?>(latitude),
+      'longitude': serializer.toJson<int?>(longitude),
      'iso': serializer.toJson<int?>(iso),
      'make': serializer.toJson<String?>(make),
      'model': serializer.toJson<String?>(model),
-      'lens': serializer.toJson<String?>(lens),
      'orientation': serializer.toJson<String?>(orientation),
      'timeZone': serializer.toJson<String?>(timeZone),
      'rating': serializer.toJson<int?>(rating),
@@ -1103,15 +1068,14 @@ class RemoteExifEntityData extends i0.DataClass
          i0.Value<int?> height = const i0.Value.absent(),
          i0.Value<int?> width = const i0.Value.absent(),
          i0.Value<String?> exposureTime = const i0.Value.absent(),
-          i0.Value<double?> fNumber = const i0.Value.absent(),
+          i0.Value<int?> fNumber = const i0.Value.absent(),
          i0.Value<int?> fileSize = const i0.Value.absent(),
-          i0.Value<double?> focalLength = const i0.Value.absent(),
-          i0.Value<double?> latitude = const i0.Value.absent(),
-          i0.Value<double?> longitude = const i0.Value.absent(),
+          i0.Value<int?> focalLength = const i0.Value.absent(),
+          i0.Value<int?> latitude = const i0.Value.absent(),
+          i0.Value<int?> longitude = const i0.Value.absent(),
          i0.Value<int?> iso = const i0.Value.absent(),
          i0.Value<String?> make = const i0.Value.absent(),
          i0.Value<String?> model = const i0.Value.absent(),
-          i0.Value<String?> lens = const i0.Value.absent(),
          i0.Value<String?> orientation = const i0.Value.absent(),
          i0.Value<String?> timeZone = const i0.Value.absent(),
          i0.Value<int?> rating = const i0.Value.absent(),
@@ -1137,7 +1101,6 @@ class RemoteExifEntityData extends i0.DataClass
        iso: iso.present ? iso.value : this.iso,
        make: make.present ? make.value : this.make,
        model: model.present ? model.value : this.model,
-        lens: lens.present ? lens.value : this.lens,
        orientation: orientation.present ? orientation.value : this.orientation,
        timeZone: timeZone.present ? timeZone.value : this.timeZone,
        rating: rating.present ? rating.value : this.rating,
@@ -1169,7 +1132,6 @@ class RemoteExifEntityData extends i0.DataClass
      iso: data.iso.present ? data.iso.value : this.iso,
      make: data.make.present ? data.make.value : this.make,
      model: data.model.present ? data.model.value : this.model,
-      lens: data.lens.present ? data.lens.value : this.lens,
      orientation:
          data.orientation.present ? data.orientation.value : this.orientation,
      timeZone: data.timeZone.present ? data.timeZone.value : this.timeZone,
@@ -1200,7 +1162,6 @@ class RemoteExifEntityData extends i0.DataClass
          ..write('iso: $iso, ')
          ..write('make: $make, ')
          ..write('model: $model, ')
-          ..write('lens: $lens, ')
          ..write('orientation: $orientation, ')
          ..write('timeZone: $timeZone, ')
          ..write('rating: $rating, ')
@@ -1228,7 +1189,6 @@ class RemoteExifEntityData extends i0.DataClass
        iso,
        make,
        model,
-        lens,
        orientation,
        timeZone,
        rating,
@@ -1255,7 +1215,6 @@ class RemoteExifEntityData extends i0.DataClass
          other.iso == this.iso &&
          other.make == this.make &&
          other.model == this.model &&
-          other.lens == this.lens &&
          other.orientation == this.orientation &&
          other.timeZone == this.timeZone &&
          other.rating == this.rating &&
@@ -1273,15 +1232,14 @@ class RemoteExifEntityCompanion
  final i0.Value<int?> height;
  final i0.Value<int?> width;
  final i0.Value<String?> exposureTime;
-  final i0.Value<double?> fNumber;
+  final i0.Value<int?> fNumber;
  final i0.Value<int?> fileSize;
-  final i0.Value<double?> focalLength;
-  final i0.Value<double?> latitude;
-  final i0.Value<double?> longitude;
+  final i0.Value<int?> focalLength;
+  final i0.Value<int?> latitude;
+  final i0.Value<int?> longitude;
  final i0.Value<int?> iso;
  final i0.Value<String?> make;
  final i0.Value<String?> model;
-  final i0.Value<String?> lens;
  final i0.Value<String?> orientation;
  final i0.Value<String?> timeZone;
  final i0.Value<int?> rating;
@@ -1304,7 +1262,6 @@ class RemoteExifEntityCompanion
    this.iso = const i0.Value.absent(),
    this.make = const i0.Value.absent(),
    this.model = const i0.Value.absent(),
-    this.lens = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
    this.timeZone = const i0.Value.absent(),
    this.rating = const i0.Value.absent(),
@@ -1328,7 +1285,6 @@ class RemoteExifEntityCompanion
    this.iso = const i0.Value.absent(),
    this.make = const i0.Value.absent(),
    this.model = const i0.Value.absent(),
-    this.lens = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
    this.timeZone = const i0.Value.absent(),
    this.rating = const i0.Value.absent(),
@@ -1344,15 +1300,14 @@ class RemoteExifEntityCompanion
    i0.Expression<int>? height,
    i0.Expression<int>? width,
    i0.Expression<String>? exposureTime,
-    i0.Expression<double>? fNumber,
+    i0.Expression<int>? fNumber,
    i0.Expression<int>? fileSize,
-    i0.Expression<double>? focalLength,
-    i0.Expression<double>? latitude,
-    i0.Expression<double>? longitude,
+    i0.Expression<int>? focalLength,
+    i0.Expression<int>? latitude,
+    i0.Expression<int>? longitude,
    i0.Expression<int>? iso,
    i0.Expression<String>? make,
    i0.Expression<String>? model,
-    i0.Expression<String>? lens,
    i0.Expression<String>? orientation,
    i0.Expression<String>? timeZone,
    i0.Expression<int>? rating,
@@ -1376,7 +1331,6 @@ class RemoteExifEntityCompanion
      if (iso != null) 'iso': iso,
      if (make != null) 'make': make,
      if (model != null) 'model': model,
-      if (lens != null) 'lens': lens,
      if (orientation != null) 'orientation': orientation,
      if (timeZone != null) 'time_zone': timeZone,
      if (rating != null) 'rating': rating,
@@ -1394,15 +1348,14 @@ class RemoteExifEntityCompanion
      i0.Value<int?>? height,
      i0.Value<int?>? width,
      i0.Value<String?>? exposureTime,
-      i0.Value<double?>? fNumber,
+      i0.Value<int?>? fNumber,
      i0.Value<int?>? fileSize,
-      i0.Value<double?>? focalLength,
-      i0.Value<double?>? latitude,
-      i0.Value<double?>? longitude,
+      i0.Value<int?>? focalLength,
+      i0.Value<int?>? latitude,
+      i0.Value<int?>? longitude,
      i0.Value<int?>? iso,
      i0.Value<String?>? make,
      i0.Value<String?>? model,
-      i0.Value<String?>? lens,
      i0.Value<String?>? orientation,
      i0.Value<String?>? timeZone,
      i0.Value<int?>? rating,
@@ -1425,7 +1378,6 @@ class RemoteExifEntityCompanion
      iso: iso ?? this.iso,
      make: make ?? this.make,
      model: model ?? this.model,
-      lens: lens ?? this.lens,
      orientation: orientation ?? this.orientation,
      timeZone: timeZone ?? this.timeZone,
      rating: rating ?? this.rating,
@@ -1464,19 +1416,19 @@ class RemoteExifEntityCompanion
      map['exposure_time'] = i0.Variable<String>(exposureTime.value);
    }
    if (fNumber.present) {
-      map['f_number'] = i0.Variable<double>(fNumber.value);
+      map['f_number'] = i0.Variable<int>(fNumber.value);
    }
    if (fileSize.present) {
      map['file_size'] = i0.Variable<int>(fileSize.value);
    }
    if (focalLength.present) {
-      map['focal_length'] = i0.Variable<double>(focalLength.value);
+      map['focal_length'] = i0.Variable<int>(focalLength.value);
    }
    if (latitude.present) {
-      map['latitude'] = i0.Variable<double>(latitude.value);
+      map['latitude'] = i0.Variable<int>(latitude.value);
    }
    if (longitude.present) {
-      map['longitude'] = i0.Variable<double>(longitude.value);
+      map['longitude'] = i0.Variable<int>(longitude.value);
    }
    if (iso.present) {
      map['iso'] = i0.Variable<int>(iso.value);
@@ -1487,9 +1439,6 @@ class RemoteExifEntityCompanion
    if (model.present) {
      map['model'] = i0.Variable<String>(model.value);
    }
-    if (lens.present) {
-      map['lens'] = i0.Variable<String>(lens.value);
-    }
    if (orientation.present) {
      map['orientation'] = i0.Variable<String>(orientation.value);
    }
@@ -1525,7 +1474,6 @@ class RemoteExifEntityCompanion
          ..write('iso: $iso, ')
          ..write('make: $make, ')
          ..write('model: $model, ')
-          ..write('lens: $lens, ')
          ..write('orientation: $orientation, ')
          ..write('timeZone: $timeZone, ')
          ..write('rating: $rating, ')
--- a/mobile/lib/infrastructure/entities/isar_store.entity.dart
+++ b/mobile/lib/infrastructure/entities/isar_store.entity.dart
@@ -0,0 +1,13 @@
+import 'package:isar/isar.dart';
+
+part 'isar_store.entity.g.dart';
+
+/// Internal class for `Store`, do not use elsewhere.
+@Collection(inheritance: false)
+class StoreValue {
+  final Id id;
+  final int? intValue;
+  final String? strValue;
+
+  const StoreValue(this.id, {this.intValue, this.strValue});
+}
--- a/mobile/lib/infrastructure/entities/isar_store.entity.g.dart
+++ b/mobile/lib/infrastructure/entities/isar_store.entity.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND

-part of 'store.entity.dart';
+part of 'isar_store.entity.dart';

 // **************************************************************************
 // IsarCollectionGenerator
--- a/mobile/lib/infrastructure/entities/local_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.dart
@@ -1,7 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

@@ -10,11 +9,6 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
  const LocalAssetEntity();

  TextColumn get id => text()();
-
-  TextColumn get remoteId => text()
-      .nullable()
-      .references(RemoteAssetEntity, #id, onDelete: KeyAction.setNull)();
-
  TextColumn get checksum => text().nullable()();

  // Only used during backup to mirror the favorite status of the asset in the server
@@ -34,8 +28,5 @@ extension LocalAssetEntityDataDomainEx on LocalAssetEntityData {
        updatedAt: updatedAt,
        durationInSeconds: durationInSeconds,
        isFavorite: isFavorite,
-        height: height,
-        width: width,
-        remoteId: remoteId,
      );
 }
--- a/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
@@ -7,9 +7,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart' as i2;
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart'
    as i3;
 import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
-    as i5;
-import 'package:drift/internal/modular.dart' as i6;

 typedef $$LocalAssetEntityTableCreateCompanionBuilder
    = i1.LocalAssetEntityCompanion Function({
@@ -21,7 +18,6 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder
  i0.Value<int?> height,
  i0.Value<int?> durationInSeconds,
  required String id,
-  i0.Value<String?> remoteId,
  i0.Value<String?> checksum,
  i0.Value<bool> isFavorite,
 });
@@ -35,43 +31,10 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder
  i0.Value<int?> height,
  i0.Value<int?> durationInSeconds,
  i0.Value<String> id,
-  i0.Value<String?> remoteId,
  i0.Value<String?> checksum,
  i0.Value<bool> isFavorite,
 });

-final class $$LocalAssetEntityTableReferences extends i0.BaseReferences<
-    i0.GeneratedDatabase, i1.$LocalAssetEntityTable, i1.LocalAssetEntityData> {
-  $$LocalAssetEntityTableReferences(
-      super.$_db, super.$_table, super.$_typedResult);
-
-  static i5.$RemoteAssetEntityTable _remoteIdTable(i0.GeneratedDatabase db) =>
-      i6.ReadDatabaseContainer(db)
-          .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i1.$LocalAssetEntityTable>('local_asset_entity')
-                  .remoteId,
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity')
-                  .id));
-
-  i5.$$RemoteAssetEntityTableProcessedTableManager? get remoteId {
-    final $_column = $_itemColumn<String>('remote_id');
-    if ($_column == null) return null;
-    final manager = i5
-        .$$RemoteAssetEntityTableTableManager(
-            $_db,
-            i6.ReadDatabaseContainer($_db)
-                .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'))
-        .filter((f) => f.id.sqlEquals($_column));
-    final item = $_typedResult.readTableOrNull(_remoteIdTable($_db));
-    if (item == null) return manager;
-    return i0.ProcessedTableManager(
-        manager.$state.copyWith(prefetchedData: [item]));
-  }
-}
-
 class $$LocalAssetEntityTableFilterComposer
    extends i0.Composer<i0.GeneratedDatabase, i1.$LocalAssetEntityTable> {
  $$LocalAssetEntityTableFilterComposer({
@@ -113,28 +76,6 @@ class $$LocalAssetEntityTableFilterComposer

  i0.ColumnFilters<bool> get isFavorite => $composableBuilder(
      column: $table.isFavorite, builder: (column) => i0.ColumnFilters(column));
-
-  i5.$$RemoteAssetEntityTableFilterComposer get remoteId {
-    final i5.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.remoteId,
-        referencedTable: i6.ReadDatabaseContainer($db)
-            .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i5.$$RemoteAssetEntityTableFilterComposer(
-              $db: $db,
-              $table: i6.ReadDatabaseContainer($db)
-                  .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
 }

 class $$LocalAssetEntityTableOrderingComposer
@@ -179,30 +120,6 @@ class $$LocalAssetEntityTableOrderingComposer
  i0.ColumnOrderings<bool> get isFavorite => $composableBuilder(
      column: $table.isFavorite,
      builder: (column) => i0.ColumnOrderings(column));
-
-  i5.$$RemoteAssetEntityTableOrderingComposer get remoteId {
-    final i5.$$RemoteAssetEntityTableOrderingComposer composer =
-        $composerBuilder(
-            composer: this,
-            getCurrentColumn: (t) => t.remoteId,
-            referencedTable: i6.ReadDatabaseContainer($db)
-                .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-            getReferencedColumn: (t) => t.id,
-            builder: (joinBuilder,
-                    {$addJoinBuilderToRootComposer,
-                    $removeJoinBuilderFromRootComposer}) =>
-                i5.$$RemoteAssetEntityTableOrderingComposer(
-                  $db: $db,
-                  $table: i6.ReadDatabaseContainer($db)
-                      .resultSet<i5.$RemoteAssetEntityTable>(
-                          'remote_asset_entity'),
-                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                  joinBuilder: joinBuilder,
-                  $removeJoinBuilderFromRootComposer:
-                      $removeJoinBuilderFromRootComposer,
-                ));
-    return composer;
-  }
 }

 class $$LocalAssetEntityTableAnnotationComposer
@@ -243,30 +160,6 @@ class $$LocalAssetEntityTableAnnotationComposer

  i0.GeneratedColumn<bool> get isFavorite => $composableBuilder(
      column: $table.isFavorite, builder: (column) => column);
-
-  i5.$$RemoteAssetEntityTableAnnotationComposer get remoteId {
-    final i5.$$RemoteAssetEntityTableAnnotationComposer composer =
-        $composerBuilder(
-            composer: this,
-            getCurrentColumn: (t) => t.remoteId,
-            referencedTable: i6.ReadDatabaseContainer($db)
-                .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-            getReferencedColumn: (t) => t.id,
-            builder: (joinBuilder,
-                    {$addJoinBuilderToRootComposer,
-                    $removeJoinBuilderFromRootComposer}) =>
-                i5.$$RemoteAssetEntityTableAnnotationComposer(
-                  $db: $db,
-                  $table: i6.ReadDatabaseContainer($db)
-                      .resultSet<i5.$RemoteAssetEntityTable>(
-                          'remote_asset_entity'),
-                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                  joinBuilder: joinBuilder,
-                  $removeJoinBuilderFromRootComposer:
-                      $removeJoinBuilderFromRootComposer,
-                ));
-    return composer;
-  }
 }

 class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
@@ -278,9 +171,13 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
    i1.$$LocalAssetEntityTableAnnotationComposer,
    $$LocalAssetEntityTableCreateCompanionBuilder,
    $$LocalAssetEntityTableUpdateCompanionBuilder,
-    (i1.LocalAssetEntityData, i1.$$LocalAssetEntityTableReferences),
+    (
+      i1.LocalAssetEntityData,
+      i0.BaseReferences<i0.GeneratedDatabase, i1.$LocalAssetEntityTable,
+          i1.LocalAssetEntityData>
+    ),
    i1.LocalAssetEntityData,
-    i0.PrefetchHooks Function({bool remoteId})> {
+    i0.PrefetchHooks Function()> {
  $$LocalAssetEntityTableTableManager(
      i0.GeneratedDatabase db, i1.$LocalAssetEntityTable table)
      : super(i0.TableManagerState(
@@ -302,7 +199,6 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
            i0.Value<int?> height = const i0.Value.absent(),
            i0.Value<int?> durationInSeconds = const i0.Value.absent(),
            i0.Value<String> id = const i0.Value.absent(),
-            i0.Value<String?> remoteId = const i0.Value.absent(),
            i0.Value<String?> checksum = const i0.Value.absent(),
            i0.Value<bool> isFavorite = const i0.Value.absent(),
          }) =>
@@ -315,7 +211,6 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
            height: height,
            durationInSeconds: durationInSeconds,
            id: id,
-            remoteId: remoteId,
            checksum: checksum,
            isFavorite: isFavorite,
          ),
@@ -328,7 +223,6 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
            i0.Value<int?> height = const i0.Value.absent(),
            i0.Value<int?> durationInSeconds = const i0.Value.absent(),
            required String id,
-            i0.Value<String?> remoteId = const i0.Value.absent(),
            i0.Value<String?> checksum = const i0.Value.absent(),
            i0.Value<bool> isFavorite = const i0.Value.absent(),
          }) =>
@@ -341,52 +235,13 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
            height: height,
            durationInSeconds: durationInSeconds,
            id: id,
-            remoteId: remoteId,
            checksum: checksum,
            isFavorite: isFavorite,
          ),
          withReferenceMapper: (p0) => p0
-              .map((e) => (
-                    e.readTable(table),
-                    i1.$$LocalAssetEntityTableReferences(db, table, e)
-                  ))
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
              .toList(),
-          prefetchHooksCallback: ({remoteId = false}) {
-            return i0.PrefetchHooks(
-              db: db,
-              explicitlyWatchedTables: [],
-              addJoins: <
-                  T extends i0.TableManagerState<
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic>>(state) {
-                if (remoteId) {
-                  state = state.withJoin(
-                    currentTable: table,
-                    currentColumn: table.remoteId,
-                    referencedTable:
-                        i1.$$LocalAssetEntityTableReferences._remoteIdTable(db),
-                    referencedColumn: i1.$$LocalAssetEntityTableReferences
-                        ._remoteIdTable(db)
-                        .id,
-                  ) as T;
-                }
-
-                return state;
-              },
-              getPrefetchedDataCallback: (items) async {
-                return [];
-              },
-            );
-          },
+          prefetchHooksCallback: null,
        ));
 }

@@ -399,9 +254,13 @@ typedef $$LocalAssetEntityTableProcessedTableManager = i0.ProcessedTableManager<
    i1.$$LocalAssetEntityTableAnnotationComposer,
    $$LocalAssetEntityTableCreateCompanionBuilder,
    $$LocalAssetEntityTableUpdateCompanionBuilder,
-    (i1.LocalAssetEntityData, i1.$$LocalAssetEntityTableReferences),
+    (
+      i1.LocalAssetEntityData,
+      i0.BaseReferences<i0.GeneratedDatabase, i1.$LocalAssetEntityTable,
+          i1.LocalAssetEntityData>
+    ),
    i1.LocalAssetEntityData,
-    i0.PrefetchHooks Function({bool remoteId})>;
+    i0.PrefetchHooks Function()>;
 i0.Index get idxLocalAssetChecksum => i0.Index('idx_local_asset_checksum',
    'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');

@@ -462,15 +321,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
      'id', aliasedName, false,
      type: i0.DriftSqlType.string, requiredDuringInsert: true);
-  static const i0.VerificationMeta _remoteIdMeta =
-      const i0.VerificationMeta('remoteId');
-  @override
-  late final i0.GeneratedColumn<String> remoteId = i0.GeneratedColumn<String>(
-      'remote_id', aliasedName, true,
-      type: i0.DriftSqlType.string,
-      requiredDuringInsert: false,
-      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-          'REFERENCES remote_asset_entity (id) ON DELETE SET NULL'));
  static const i0.VerificationMeta _checksumMeta =
      const i0.VerificationMeta('checksum');
  @override
@@ -497,7 +347,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        height,
        durationInSeconds,
        id,
-        remoteId,
        checksum,
        isFavorite
      ];
@@ -545,10 +394,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    } else if (isInserting) {
      context.missing(_idMeta);
    }
-    if (data.containsKey('remote_id')) {
-      context.handle(_remoteIdMeta,
-          remoteId.isAcceptableOrUnknown(data['remote_id']!, _remoteIdMeta));
-    }
    if (data.containsKey('checksum')) {
      context.handle(_checksumMeta,
          checksum.isAcceptableOrUnknown(data['checksum']!, _checksumMeta));
@@ -586,8 +431,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
          i0.DriftSqlType.int, data['${effectivePrefix}duration_in_seconds']),
      id: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
-      remoteId: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}remote_id']),
      checksum: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}checksum']),
      isFavorite: attachedDatabase.typeMapping
@@ -618,7 +461,6 @@ class LocalAssetEntityData extends i0.DataClass
  final int? height;
  final int? durationInSeconds;
  final String id;
-  final String? remoteId;
  final String? checksum;
  final bool isFavorite;
  const LocalAssetEntityData(
@@ -630,7 +472,6 @@ class LocalAssetEntityData extends i0.DataClass
      this.height,
      this.durationInSeconds,
      required this.id,
-      this.remoteId,
      this.checksum,
      required this.isFavorite});
  @override
@@ -653,9 +494,6 @@ class LocalAssetEntityData extends i0.DataClass
      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds);
    }
    map['id'] = i0.Variable<String>(id);
-    if (!nullToAbsent || remoteId != null) {
-      map['remote_id'] = i0.Variable<String>(remoteId);
-    }
    if (!nullToAbsent || checksum != null) {
      map['checksum'] = i0.Variable<String>(checksum);
    }
@@ -676,7 +514,6 @@ class LocalAssetEntityData extends i0.DataClass
      height: serializer.fromJson<int?>(json['height']),
      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
      id: serializer.fromJson<String>(json['id']),
-      remoteId: serializer.fromJson<String?>(json['remoteId']),
      checksum: serializer.fromJson<String?>(json['checksum']),
      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
    );
@@ -694,7 +531,6 @@ class LocalAssetEntityData extends i0.DataClass
      'height': serializer.toJson<int?>(height),
      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
      'id': serializer.toJson<String>(id),
-      'remoteId': serializer.toJson<String?>(remoteId),
      'checksum': serializer.toJson<String?>(checksum),
      'isFavorite': serializer.toJson<bool>(isFavorite),
    };
@@ -709,7 +545,6 @@ class LocalAssetEntityData extends i0.DataClass
          i0.Value<int?> height = const i0.Value.absent(),
          i0.Value<int?> durationInSeconds = const i0.Value.absent(),
          String? id,
-          i0.Value<String?> remoteId = const i0.Value.absent(),
          i0.Value<String?> checksum = const i0.Value.absent(),
          bool? isFavorite}) =>
      i1.LocalAssetEntityData(
@@ -723,7 +558,6 @@ class LocalAssetEntityData extends i0.DataClass
            ? durationInSeconds.value
            : this.durationInSeconds,
        id: id ?? this.id,
-        remoteId: remoteId.present ? remoteId.value : this.remoteId,
        checksum: checksum.present ? checksum.value : this.checksum,
        isFavorite: isFavorite ?? this.isFavorite,
      );
@@ -739,7 +573,6 @@ class LocalAssetEntityData extends i0.DataClass
          ? data.durationInSeconds.value
          : this.durationInSeconds,
      id: data.id.present ? data.id.value : this.id,
-      remoteId: data.remoteId.present ? data.remoteId.value : this.remoteId,
      checksum: data.checksum.present ? data.checksum.value : this.checksum,
      isFavorite:
          data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
@@ -757,7 +590,6 @@ class LocalAssetEntityData extends i0.DataClass
          ..write('height: $height, ')
          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
-          ..write('remoteId: $remoteId, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite')
          ..write(')'))
@@ -766,7 +598,7 @@ class LocalAssetEntityData extends i0.DataClass

  @override
  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width,
-      height, durationInSeconds, id, remoteId, checksum, isFavorite);
+      height, durationInSeconds, id, checksum, isFavorite);
  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
@@ -779,7 +611,6 @@ class LocalAssetEntityData extends i0.DataClass
          other.height == this.height &&
          other.durationInSeconds == this.durationInSeconds &&
          other.id == this.id &&
-          other.remoteId == this.remoteId &&
          other.checksum == this.checksum &&
          other.isFavorite == this.isFavorite);
 }
@@ -794,7 +625,6 @@ class LocalAssetEntityCompanion
  final i0.Value<int?> height;
  final i0.Value<int?> durationInSeconds;
  final i0.Value<String> id;
-  final i0.Value<String?> remoteId;
  final i0.Value<String?> checksum;
  final i0.Value<bool> isFavorite;
  const LocalAssetEntityCompanion({
@@ -806,7 +636,6 @@ class LocalAssetEntityCompanion
    this.height = const i0.Value.absent(),
    this.durationInSeconds = const i0.Value.absent(),
    this.id = const i0.Value.absent(),
-    this.remoteId = const i0.Value.absent(),
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
  });
@@ -819,7 +648,6 @@ class LocalAssetEntityCompanion
    this.height = const i0.Value.absent(),
    this.durationInSeconds = const i0.Value.absent(),
    required String id,
-    this.remoteId = const i0.Value.absent(),
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
  })  : name = i0.Value(name),
@@ -834,7 +662,6 @@ class LocalAssetEntityCompanion
    i0.Expression<int>? height,
    i0.Expression<int>? durationInSeconds,
    i0.Expression<String>? id,
-    i0.Expression<String>? remoteId,
    i0.Expression<String>? checksum,
    i0.Expression<bool>? isFavorite,
  }) {
@@ -847,7 +674,6 @@ class LocalAssetEntityCompanion
      if (height != null) 'height': height,
      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
      if (id != null) 'id': id,
-      if (remoteId != null) 'remote_id': remoteId,
      if (checksum != null) 'checksum': checksum,
      if (isFavorite != null) 'is_favorite': isFavorite,
    });
@@ -862,7 +688,6 @@ class LocalAssetEntityCompanion
      i0.Value<int?>? height,
      i0.Value<int?>? durationInSeconds,
      i0.Value<String>? id,
-      i0.Value<String?>? remoteId,
      i0.Value<String?>? checksum,
      i0.Value<bool>? isFavorite}) {
    return i1.LocalAssetEntityCompanion(
@@ -874,7 +699,6 @@ class LocalAssetEntityCompanion
      height: height ?? this.height,
      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      id: id ?? this.id,
-      remoteId: remoteId ?? this.remoteId,
      checksum: checksum ?? this.checksum,
      isFavorite: isFavorite ?? this.isFavorite,
    );
@@ -908,9 +732,6 @@ class LocalAssetEntityCompanion
    if (id.present) {
      map['id'] = i0.Variable<String>(id.value);
    }
-    if (remoteId.present) {
-      map['remote_id'] = i0.Variable<String>(remoteId.value);
-    }
    if (checksum.present) {
      map['checksum'] = i0.Variable<String>(checksum.value);
    }
@@ -931,7 +752,6 @@ class LocalAssetEntityCompanion
          ..write('height: $height, ')
          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
-          ..write('remoteId: $remoteId, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite')
          ..write(')'))
--- a/mobile/lib/infrastructure/entities/log.entity.dart
+++ b/mobile/lib/infrastructure/entities/log.entity.dart
@@ -1,5 +1,7 @@
 import 'package:immich_mobile/domain/models/log.model.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:isar/isar.dart';
+import 'package:drift/drift.dart';

 part 'log.entity.g.dart';

@@ -45,3 +47,21 @@ class LoggerMessage {
    );
  }
 }
+
+class LoggerMessageEntity extends Table with DriftDefaultsMixin {
+  const LoggerMessageEntity();
+
+  IntColumn get id => integer().autoIncrement()();
+
+  TextColumn get message => text()();
+
+  TextColumn get details => text().nullable()();
+
+  IntColumn get level => intEnum<LogLevel>()();
+
+  DateTimeColumn get createdAt => dateTime()();
+
+  TextColumn get context1 => text().nullable()();
+
+  TextColumn get context2 => text().nullable()();
+}
--- a/mobile/lib/infrastructure/entities/log.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/log.entity.drift.dart
@@ -0,0 +1,589 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/log.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/log.entity.dart' as i3;
+
+typedef $$LoggerMessageEntityTableCreateCompanionBuilder
+    = i1.LoggerMessageEntityCompanion Function({
+  required int id,
+  required String message,
+  i0.Value<String?> details,
+  required i2.LogLevel level,
+  required DateTime createdAt,
+  i0.Value<String?> context1,
+  i0.Value<String?> context2,
+});
+typedef $$LoggerMessageEntityTableUpdateCompanionBuilder
+    = i1.LoggerMessageEntityCompanion Function({
+  i0.Value<int> id,
+  i0.Value<String> message,
+  i0.Value<String?> details,
+  i0.Value<i2.LogLevel> level,
+  i0.Value<DateTime> createdAt,
+  i0.Value<String?> context1,
+  i0.Value<String?> context2,
+});
+
+class $$LoggerMessageEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
+  $$LoggerMessageEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get message => $composableBuilder(
+      column: $table.message, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get details => $composableBuilder(
+      column: $table.details, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnWithTypeConverterFilters<i2.LogLevel, i2.LogLevel, int> get level =>
+      $composableBuilder(
+          column: $table.level,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
+      column: $table.createdAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get context1 => $composableBuilder(
+      column: $table.context1, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get context2 => $composableBuilder(
+      column: $table.context2, builder: (column) => i0.ColumnFilters(column));
+}
+
+class $$LoggerMessageEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
+  $$LoggerMessageEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get message => $composableBuilder(
+      column: $table.message, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get details => $composableBuilder(
+      column: $table.details, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get level => $composableBuilder(
+      column: $table.level, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+      column: $table.createdAt,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get context1 => $composableBuilder(
+      column: $table.context1, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get context2 => $composableBuilder(
+      column: $table.context2, builder: (column) => i0.ColumnOrderings(column));
+}
+
+class $$LoggerMessageEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
+  $$LoggerMessageEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get message =>
+      $composableBuilder(column: $table.message, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get details =>
+      $composableBuilder(column: $table.details, builder: (column) => column);
+
+  i0.GeneratedColumnWithTypeConverter<i2.LogLevel, int> get level =>
+      $composableBuilder(column: $table.level, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get context1 =>
+      $composableBuilder(column: $table.context1, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get context2 =>
+      $composableBuilder(column: $table.context2, builder: (column) => column);
+}
+
+class $$LoggerMessageEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$LoggerMessageEntityTable,
+    i1.LoggerMessageEntityData,
+    i1.$$LoggerMessageEntityTableFilterComposer,
+    i1.$$LoggerMessageEntityTableOrderingComposer,
+    i1.$$LoggerMessageEntityTableAnnotationComposer,
+    $$LoggerMessageEntityTableCreateCompanionBuilder,
+    $$LoggerMessageEntityTableUpdateCompanionBuilder,
+    (
+      i1.LoggerMessageEntityData,
+      i0.BaseReferences<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable,
+          i1.LoggerMessageEntityData>
+    ),
+    i1.LoggerMessageEntityData,
+    i0.PrefetchHooks Function()> {
+  $$LoggerMessageEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$LoggerMessageEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () => i1
+              .$$LoggerMessageEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$LoggerMessageEntityTableOrderingComposer(
+                  $db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$LoggerMessageEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<int> id = const i0.Value.absent(),
+            i0.Value<String> message = const i0.Value.absent(),
+            i0.Value<String?> details = const i0.Value.absent(),
+            i0.Value<i2.LogLevel> level = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<String?> context1 = const i0.Value.absent(),
+            i0.Value<String?> context2 = const i0.Value.absent(),
+          }) =>
+              i1.LoggerMessageEntityCompanion(
+            id: id,
+            message: message,
+            details: details,
+            level: level,
+            createdAt: createdAt,
+            context1: context1,
+            context2: context2,
+          ),
+          createCompanionCallback: ({
+            required int id,
+            required String message,
+            i0.Value<String?> details = const i0.Value.absent(),
+            required i2.LogLevel level,
+            required DateTime createdAt,
+            i0.Value<String?> context1 = const i0.Value.absent(),
+            i0.Value<String?> context2 = const i0.Value.absent(),
+          }) =>
+              i1.LoggerMessageEntityCompanion.insert(
+            id: id,
+            message: message,
+            details: details,
+            level: level,
+            createdAt: createdAt,
+            context1: context1,
+            context2: context2,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ));
+}
+
+typedef $$LoggerMessageEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$LoggerMessageEntityTable,
+        i1.LoggerMessageEntityData,
+        i1.$$LoggerMessageEntityTableFilterComposer,
+        i1.$$LoggerMessageEntityTableOrderingComposer,
+        i1.$$LoggerMessageEntityTableAnnotationComposer,
+        $$LoggerMessageEntityTableCreateCompanionBuilder,
+        $$LoggerMessageEntityTableUpdateCompanionBuilder,
+        (
+          i1.LoggerMessageEntityData,
+          i0.BaseReferences<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable,
+              i1.LoggerMessageEntityData>
+        ),
+        i1.LoggerMessageEntityData,
+        i0.PrefetchHooks Function()>;
+
+class $LoggerMessageEntityTable extends i3.LoggerMessageEntity
+    with i0.TableInfo<$LoggerMessageEntityTable, i1.LoggerMessageEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $LoggerMessageEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
+  @override
+  late final i0.GeneratedColumn<int> id = i0.GeneratedColumn<int>(
+      'id', aliasedName, false,
+      hasAutoIncrement: true,
+      type: i0.DriftSqlType.int,
+      requiredDuringInsert: true,
+      defaultConstraints:
+          i0.GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'));
+  static const i0.VerificationMeta _messageMeta =
+      const i0.VerificationMeta('message');
+  @override
+  late final i0.GeneratedColumn<String> message = i0.GeneratedColumn<String>(
+      'message', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  static const i0.VerificationMeta _detailsMeta =
+      const i0.VerificationMeta('details');
+  @override
+  late final i0.GeneratedColumn<String> details = i0.GeneratedColumn<String>(
+      'details', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.LogLevel, int> level =
+      i0.GeneratedColumn<int>('level', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.LogLevel>(
+              i1.$LoggerMessageEntityTable.$converterlevel);
+  static const i0.VerificationMeta _createdAtMeta =
+      const i0.VerificationMeta('createdAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> createdAt =
+      i0.GeneratedColumn<DateTime>('created_at', aliasedName, false,
+          type: i0.DriftSqlType.dateTime, requiredDuringInsert: true);
+  static const i0.VerificationMeta _context1Meta =
+      const i0.VerificationMeta('context1');
+  @override
+  late final i0.GeneratedColumn<String> context1 = i0.GeneratedColumn<String>(
+      'context1', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  static const i0.VerificationMeta _context2Meta =
+      const i0.VerificationMeta('context2');
+  @override
+  late final i0.GeneratedColumn<String> context2 = i0.GeneratedColumn<String>(
+      'context2', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  @override
+  List<i0.GeneratedColumn> get $columns =>
+      [id, message, details, level, createdAt, context1, context2];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'logger_message_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.LoggerMessageEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('message')) {
+      context.handle(_messageMeta,
+          message.isAcceptableOrUnknown(data['message']!, _messageMeta));
+    } else if (isInserting) {
+      context.missing(_messageMeta);
+    }
+    if (data.containsKey('details')) {
+      context.handle(_detailsMeta,
+          details.isAcceptableOrUnknown(data['details']!, _detailsMeta));
+    }
+    if (data.containsKey('created_at')) {
+      context.handle(_createdAtMeta,
+          createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
+    } else if (isInserting) {
+      context.missing(_createdAtMeta);
+    }
+    if (data.containsKey('context1')) {
+      context.handle(_context1Meta,
+          context1.isAcceptableOrUnknown(data['context1']!, _context1Meta));
+    }
+    if (data.containsKey('context2')) {
+      context.handle(_context2Meta,
+          context2.isAcceptableOrUnknown(data['context2']!, _context2Meta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.LoggerMessageEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.LoggerMessageEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}id'])!,
+      message: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}message'])!,
+      details: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}details']),
+      level: i1.$LoggerMessageEntityTable.$converterlevel.fromSql(
+          attachedDatabase.typeMapping
+              .read(i0.DriftSqlType.int, data['${effectivePrefix}level'])!),
+      createdAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
+      context1: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}context1']),
+      context2: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}context2']),
+    );
+  }
+
+  @override
+  $LoggerMessageEntityTable createAlias(String alias) {
+    return $LoggerMessageEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.LogLevel, int, int> $converterlevel =
+      const i0.EnumIndexConverter<i2.LogLevel>(i2.LogLevel.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class LoggerMessageEntityData extends i0.DataClass
+    implements i0.Insertable<i1.LoggerMessageEntityData> {
+  final int id;
+  final String message;
+  final String? details;
+  final i2.LogLevel level;
+  final DateTime createdAt;
+  final String? context1;
+  final String? context2;
+  const LoggerMessageEntityData(
+      {required this.id,
+      required this.message,
+      this.details,
+      required this.level,
+      required this.createdAt,
+      this.context1,
+      this.context2});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<int>(id);
+    map['message'] = i0.Variable<String>(message);
+    if (!nullToAbsent || details != null) {
+      map['details'] = i0.Variable<String>(details);
+    }
+    {
+      map['level'] = i0.Variable<int>(
+          i1.$LoggerMessageEntityTable.$converterlevel.toSql(level));
+    }
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    if (!nullToAbsent || context1 != null) {
+      map['context1'] = i0.Variable<String>(context1);
+    }
+    if (!nullToAbsent || context2 != null) {
+      map['context2'] = i0.Variable<String>(context2);
+    }
+    return map;
+  }
+
+  factory LoggerMessageEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return LoggerMessageEntityData(
+      id: serializer.fromJson<int>(json['id']),
+      message: serializer.fromJson<String>(json['message']),
+      details: serializer.fromJson<String?>(json['details']),
+      level: i1.$LoggerMessageEntityTable.$converterlevel
+          .fromJson(serializer.fromJson<int>(json['level'])),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      context1: serializer.fromJson<String?>(json['context1']),
+      context2: serializer.fromJson<String?>(json['context2']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'message': serializer.toJson<String>(message),
+      'details': serializer.toJson<String?>(details),
+      'level': serializer.toJson<int>(
+          i1.$LoggerMessageEntityTable.$converterlevel.toJson(level)),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'context1': serializer.toJson<String?>(context1),
+      'context2': serializer.toJson<String?>(context2),
+    };
+  }
+
+  i1.LoggerMessageEntityData copyWith(
+          {int? id,
+          String? message,
+          i0.Value<String?> details = const i0.Value.absent(),
+          i2.LogLevel? level,
+          DateTime? createdAt,
+          i0.Value<String?> context1 = const i0.Value.absent(),
+          i0.Value<String?> context2 = const i0.Value.absent()}) =>
+      i1.LoggerMessageEntityData(
+        id: id ?? this.id,
+        message: message ?? this.message,
+        details: details.present ? details.value : this.details,
+        level: level ?? this.level,
+        createdAt: createdAt ?? this.createdAt,
+        context1: context1.present ? context1.value : this.context1,
+        context2: context2.present ? context2.value : this.context2,
+      );
+  LoggerMessageEntityData copyWithCompanion(
+      i1.LoggerMessageEntityCompanion data) {
+    return LoggerMessageEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      message: data.message.present ? data.message.value : this.message,
+      details: data.details.present ? data.details.value : this.details,
+      level: data.level.present ? data.level.value : this.level,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      context1: data.context1.present ? data.context1.value : this.context1,
+      context2: data.context2.present ? data.context2.value : this.context2,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LoggerMessageEntityData(')
+          ..write('id: $id, ')
+          ..write('message: $message, ')
+          ..write('details: $details, ')
+          ..write('level: $level, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('context1: $context1, ')
+          ..write('context2: $context2')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(id, message, details, level, createdAt, context1, context2);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.LoggerMessageEntityData &&
+          other.id == this.id &&
+          other.message == this.message &&
+          other.details == this.details &&
+          other.level == this.level &&
+          other.createdAt == this.createdAt &&
+          other.context1 == this.context1 &&
+          other.context2 == this.context2);
+}
+
+class LoggerMessageEntityCompanion
+    extends i0.UpdateCompanion<i1.LoggerMessageEntityData> {
+  final i0.Value<int> id;
+  final i0.Value<String> message;
+  final i0.Value<String?> details;
+  final i0.Value<i2.LogLevel> level;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<String?> context1;
+  final i0.Value<String?> context2;
+  const LoggerMessageEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.message = const i0.Value.absent(),
+    this.details = const i0.Value.absent(),
+    this.level = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.context1 = const i0.Value.absent(),
+    this.context2 = const i0.Value.absent(),
+  });
+  LoggerMessageEntityCompanion.insert({
+    required int id,
+    required String message,
+    this.details = const i0.Value.absent(),
+    required i2.LogLevel level,
+    required DateTime createdAt,
+    this.context1 = const i0.Value.absent(),
+    this.context2 = const i0.Value.absent(),
+  })  : id = i0.Value(id),
+        message = i0.Value(message),
+        level = i0.Value(level),
+        createdAt = i0.Value(createdAt);
+  static i0.Insertable<i1.LoggerMessageEntityData> custom({
+    i0.Expression<int>? id,
+    i0.Expression<String>? message,
+    i0.Expression<String>? details,
+    i0.Expression<int>? level,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<String>? context1,
+    i0.Expression<String>? context2,
+  }) {
+    return i0.RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (message != null) 'message': message,
+      if (details != null) 'details': details,
+      if (level != null) 'level': level,
+      if (createdAt != null) 'created_at': createdAt,
+      if (context1 != null) 'context1': context1,
+      if (context2 != null) 'context2': context2,
+    });
+  }
+
+  i1.LoggerMessageEntityCompanion copyWith(
+      {i0.Value<int>? id,
+      i0.Value<String>? message,
+      i0.Value<String?>? details,
+      i0.Value<i2.LogLevel>? level,
+      i0.Value<DateTime>? createdAt,
+      i0.Value<String?>? context1,
+      i0.Value<String?>? context2}) {
+    return i1.LoggerMessageEntityCompanion(
+      id: id ?? this.id,
+      message: message ?? this.message,
+      details: details ?? this.details,
+      level: level ?? this.level,
+      createdAt: createdAt ?? this.createdAt,
+      context1: context1 ?? this.context1,
+      context2: context2 ?? this.context2,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<int>(id.value);
+    }
+    if (message.present) {
+      map['message'] = i0.Variable<String>(message.value);
+    }
+    if (details.present) {
+      map['details'] = i0.Variable<String>(details.value);
+    }
+    if (level.present) {
+      map['level'] = i0.Variable<int>(
+          i1.$LoggerMessageEntityTable.$converterlevel.toSql(level.value));
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (context1.present) {
+      map['context1'] = i0.Variable<String>(context1.value);
+    }
+    if (context2.present) {
+      map['context2'] = i0.Variable<String>(context2.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LoggerMessageEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('message: $message, ')
+          ..write('details: $details, ')
+          ..write('level: $level, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('context1: $context1, ')
+          ..write('context2: $context2')
+          ..write(')'))
+        .toString();
+  }
+}
--- a/mobile/lib/infrastructure/entities/memory.entity.dart
+++ b/mobile/lib/infrastructure/entities/memory.entity.dart
@@ -1,36 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/memory.model.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-class MemoryEntity extends Table with DriftDefaultsMixin {
-  const MemoryEntity();
-
-  TextColumn get id => text()();
-
-  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
-
-  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
-
-  DateTimeColumn get deletedAt => dateTime().nullable()();
-
-  TextColumn get ownerId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
-
-  IntColumn get type => intEnum<MemoryTypeEnum>()();
-
-  TextColumn get data => text()();
-
-  BoolColumn get isSaved => boolean().withDefault(const Constant(false))();
-
-  DateTimeColumn get memoryAt => dateTime()();
-
-  DateTimeColumn get seenAt => dateTime().nullable()();
-
-  DateTimeColumn get showAt => dateTime().nullable()();
-
-  DateTimeColumn get hideAt => dateTime().nullable()();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}
--- a/mobile/lib/infrastructure/entities/memory.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/memory.entity.drift.dart
@@ -1,970 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/domain/models/memory.model.dart' as i2;
-import 'package:immich_mobile/infrastructure/entities/memory.entity.dart' as i3;
-import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
-    as i5;
-import 'package:drift/internal/modular.dart' as i6;
-
-typedef $$MemoryEntityTableCreateCompanionBuilder = i1.MemoryEntityCompanion
-    Function({
-  required String id,
-  i0.Value<DateTime> createdAt,
-  i0.Value<DateTime> updatedAt,
-  i0.Value<DateTime?> deletedAt,
-  required String ownerId,
-  required i2.MemoryTypeEnum type,
-  required String data,
-  i0.Value<bool> isSaved,
-  required DateTime memoryAt,
-  i0.Value<DateTime?> seenAt,
-  i0.Value<DateTime?> showAt,
-  i0.Value<DateTime?> hideAt,
-});
-typedef $$MemoryEntityTableUpdateCompanionBuilder = i1.MemoryEntityCompanion
-    Function({
-  i0.Value<String> id,
-  i0.Value<DateTime> createdAt,
-  i0.Value<DateTime> updatedAt,
-  i0.Value<DateTime?> deletedAt,
-  i0.Value<String> ownerId,
-  i0.Value<i2.MemoryTypeEnum> type,
-  i0.Value<String> data,
-  i0.Value<bool> isSaved,
-  i0.Value<DateTime> memoryAt,
-  i0.Value<DateTime?> seenAt,
-  i0.Value<DateTime?> showAt,
-  i0.Value<DateTime?> hideAt,
-});
-
-final class $$MemoryEntityTableReferences extends i0.BaseReferences<
-    i0.GeneratedDatabase, i1.$MemoryEntityTable, i1.MemoryEntityData> {
-  $$MemoryEntityTableReferences(super.$_db, super.$_table, super.$_typedResult);
-
-  static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
-      i6.ReadDatabaseContainer(db)
-          .resultSet<i5.$UserEntityTable>('user_entity')
-          .createAlias(i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i1.$MemoryEntityTable>('memory_entity')
-                  .ownerId,
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i5.$UserEntityTable>('user_entity')
-                  .id));
-
-  i5.$$UserEntityTableProcessedTableManager get ownerId {
-    final $_column = $_itemColumn<String>('owner_id')!;
-
-    final manager = i5
-        .$$UserEntityTableTableManager(
-            $_db,
-            i6.ReadDatabaseContainer($_db)
-                .resultSet<i5.$UserEntityTable>('user_entity'))
-        .filter((f) => f.id.sqlEquals($_column));
-    final item = $_typedResult.readTableOrNull(_ownerIdTable($_db));
-    if (item == null) return manager;
-    return i0.ProcessedTableManager(
-        manager.$state.copyWith(prefetchedData: [item]));
-  }
-}
-
-class $$MemoryEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
-  $$MemoryEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<String> get id => $composableBuilder(
-      column: $table.id, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
-      column: $table.createdAt, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
-      column: $table.updatedAt, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get deletedAt => $composableBuilder(
-      column: $table.deletedAt, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnWithTypeConverterFilters<i2.MemoryTypeEnum, i2.MemoryTypeEnum, int>
-      get type => $composableBuilder(
-          column: $table.type,
-          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
-
-  i0.ColumnFilters<String> get data => $composableBuilder(
-      column: $table.data, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<bool> get isSaved => $composableBuilder(
-      column: $table.isSaved, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get memoryAt => $composableBuilder(
-      column: $table.memoryAt, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get seenAt => $composableBuilder(
-      column: $table.seenAt, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get showAt => $composableBuilder(
-      column: $table.showAt, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get hideAt => $composableBuilder(
-      column: $table.hideAt, builder: (column) => i0.ColumnFilters(column));
-
-  i5.$$UserEntityTableFilterComposer get ownerId {
-    final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.ownerId,
-        referencedTable: i6.ReadDatabaseContainer($db)
-            .resultSet<i5.$UserEntityTable>('user_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i5.$$UserEntityTableFilterComposer(
-              $db: $db,
-              $table: i6.ReadDatabaseContainer($db)
-                  .resultSet<i5.$UserEntityTable>('user_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-}
-
-class $$MemoryEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
-  $$MemoryEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<String> get id => $composableBuilder(
-      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
-      column: $table.createdAt,
-      builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
-      column: $table.updatedAt,
-      builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get deletedAt => $composableBuilder(
-      column: $table.deletedAt,
-      builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<int> get type => $composableBuilder(
-      column: $table.type, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<String> get data => $composableBuilder(
-      column: $table.data, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<bool> get isSaved => $composableBuilder(
-      column: $table.isSaved, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get memoryAt => $composableBuilder(
-      column: $table.memoryAt, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get seenAt => $composableBuilder(
-      column: $table.seenAt, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get showAt => $composableBuilder(
-      column: $table.showAt, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get hideAt => $composableBuilder(
-      column: $table.hideAt, builder: (column) => i0.ColumnOrderings(column));
-
-  i5.$$UserEntityTableOrderingComposer get ownerId {
-    final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.ownerId,
-        referencedTable: i6.ReadDatabaseContainer($db)
-            .resultSet<i5.$UserEntityTable>('user_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i5.$$UserEntityTableOrderingComposer(
-              $db: $db,
-              $table: i6.ReadDatabaseContainer($db)
-                  .resultSet<i5.$UserEntityTable>('user_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-}
-
-class $$MemoryEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
-  $$MemoryEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<String> get id =>
-      $composableBuilder(column: $table.id, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get deletedAt =>
-      $composableBuilder(column: $table.deletedAt, builder: (column) => column);
-
-  i0.GeneratedColumnWithTypeConverter<i2.MemoryTypeEnum, int> get type =>
-      $composableBuilder(column: $table.type, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get data =>
-      $composableBuilder(column: $table.data, builder: (column) => column);
-
-  i0.GeneratedColumn<bool> get isSaved =>
-      $composableBuilder(column: $table.isSaved, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get memoryAt =>
-      $composableBuilder(column: $table.memoryAt, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get seenAt =>
-      $composableBuilder(column: $table.seenAt, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get showAt =>
-      $composableBuilder(column: $table.showAt, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get hideAt =>
-      $composableBuilder(column: $table.hideAt, builder: (column) => column);
-
-  i5.$$UserEntityTableAnnotationComposer get ownerId {
-    final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.ownerId,
-        referencedTable: i6.ReadDatabaseContainer($db)
-            .resultSet<i5.$UserEntityTable>('user_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i5.$$UserEntityTableAnnotationComposer(
-              $db: $db,
-              $table: i6.ReadDatabaseContainer($db)
-                  .resultSet<i5.$UserEntityTable>('user_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-}
-
-class $$MemoryEntityTableTableManager extends i0.RootTableManager<
-    i0.GeneratedDatabase,
-    i1.$MemoryEntityTable,
-    i1.MemoryEntityData,
-    i1.$$MemoryEntityTableFilterComposer,
-    i1.$$MemoryEntityTableOrderingComposer,
-    i1.$$MemoryEntityTableAnnotationComposer,
-    $$MemoryEntityTableCreateCompanionBuilder,
-    $$MemoryEntityTableUpdateCompanionBuilder,
-    (i1.MemoryEntityData, i1.$$MemoryEntityTableReferences),
-    i1.MemoryEntityData,
-    i0.PrefetchHooks Function({bool ownerId})> {
-  $$MemoryEntityTableTableManager(
-      i0.GeneratedDatabase db, i1.$MemoryEntityTable table)
-      : super(i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$MemoryEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              i1.$$MemoryEntityTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () =>
-              i1.$$MemoryEntityTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            i0.Value<String> id = const i0.Value.absent(),
-            i0.Value<DateTime> createdAt = const i0.Value.absent(),
-            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-            i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
-            i0.Value<String> ownerId = const i0.Value.absent(),
-            i0.Value<i2.MemoryTypeEnum> type = const i0.Value.absent(),
-            i0.Value<String> data = const i0.Value.absent(),
-            i0.Value<bool> isSaved = const i0.Value.absent(),
-            i0.Value<DateTime> memoryAt = const i0.Value.absent(),
-            i0.Value<DateTime?> seenAt = const i0.Value.absent(),
-            i0.Value<DateTime?> showAt = const i0.Value.absent(),
-            i0.Value<DateTime?> hideAt = const i0.Value.absent(),
-          }) =>
-              i1.MemoryEntityCompanion(
-            id: id,
-            createdAt: createdAt,
-            updatedAt: updatedAt,
-            deletedAt: deletedAt,
-            ownerId: ownerId,
-            type: type,
-            data: data,
-            isSaved: isSaved,
-            memoryAt: memoryAt,
-            seenAt: seenAt,
-            showAt: showAt,
-            hideAt: hideAt,
-          ),
-          createCompanionCallback: ({
-            required String id,
-            i0.Value<DateTime> createdAt = const i0.Value.absent(),
-            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-            i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
-            required String ownerId,
-            required i2.MemoryTypeEnum type,
-            required String data,
-            i0.Value<bool> isSaved = const i0.Value.absent(),
-            required DateTime memoryAt,
-            i0.Value<DateTime?> seenAt = const i0.Value.absent(),
-            i0.Value<DateTime?> showAt = const i0.Value.absent(),
-            i0.Value<DateTime?> hideAt = const i0.Value.absent(),
-          }) =>
-              i1.MemoryEntityCompanion.insert(
-            id: id,
-            createdAt: createdAt,
-            updatedAt: updatedAt,
-            deletedAt: deletedAt,
-            ownerId: ownerId,
-            type: type,
-            data: data,
-            isSaved: isSaved,
-            memoryAt: memoryAt,
-            seenAt: seenAt,
-            showAt: showAt,
-            hideAt: hideAt,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (
-                    e.readTable(table),
-                    i1.$$MemoryEntityTableReferences(db, table, e)
-                  ))
-              .toList(),
-          prefetchHooksCallback: ({ownerId = false}) {
-            return i0.PrefetchHooks(
-              db: db,
-              explicitlyWatchedTables: [],
-              addJoins: <
-                  T extends i0.TableManagerState<
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic>>(state) {
-                if (ownerId) {
-                  state = state.withJoin(
-                    currentTable: table,
-                    currentColumn: table.ownerId,
-                    referencedTable:
-                        i1.$$MemoryEntityTableReferences._ownerIdTable(db),
-                    referencedColumn:
-                        i1.$$MemoryEntityTableReferences._ownerIdTable(db).id,
-                  ) as T;
-                }
-
-                return state;
-              },
-              getPrefetchedDataCallback: (items) async {
-                return [];
-              },
-            );
-          },
-        ));
-}
-
-typedef $$MemoryEntityTableProcessedTableManager = i0.ProcessedTableManager<
-    i0.GeneratedDatabase,
-    i1.$MemoryEntityTable,
-    i1.MemoryEntityData,
-    i1.$$MemoryEntityTableFilterComposer,
-    i1.$$MemoryEntityTableOrderingComposer,
-    i1.$$MemoryEntityTableAnnotationComposer,
-    $$MemoryEntityTableCreateCompanionBuilder,
-    $$MemoryEntityTableUpdateCompanionBuilder,
-    (i1.MemoryEntityData, i1.$$MemoryEntityTableReferences),
-    i1.MemoryEntityData,
-    i0.PrefetchHooks Function({bool ownerId})>;
-
-class $MemoryEntityTable extends i3.MemoryEntity
-    with i0.TableInfo<$MemoryEntityTable, i1.MemoryEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $MemoryEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
-  @override
-  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
-      'id', aliasedName, false,
-      type: i0.DriftSqlType.string, requiredDuringInsert: true);
-  static const i0.VerificationMeta _createdAtMeta =
-      const i0.VerificationMeta('createdAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> createdAt =
-      i0.GeneratedColumn<DateTime>('created_at', aliasedName, false,
-          type: i0.DriftSqlType.dateTime,
-          requiredDuringInsert: false,
-          defaultValue: i4.currentDateAndTime);
-  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: i4.currentDateAndTime);
-  static const i0.VerificationMeta _deletedAtMeta =
-      const i0.VerificationMeta('deletedAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> deletedAt =
-      i0.GeneratedColumn<DateTime>('deleted_at', aliasedName, true,
-          type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
-  static const i0.VerificationMeta _ownerIdMeta =
-      const i0.VerificationMeta('ownerId');
-  @override
-  late final i0.GeneratedColumn<String> ownerId = i0.GeneratedColumn<String>(
-      'owner_id', aliasedName, false,
-      type: i0.DriftSqlType.string,
-      requiredDuringInsert: true,
-      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-          'REFERENCES user_entity (id) ON DELETE CASCADE'));
-  @override
-  late final i0.GeneratedColumnWithTypeConverter<i2.MemoryTypeEnum, int> type =
-      i0.GeneratedColumn<int>('type', aliasedName, false,
-              type: i0.DriftSqlType.int, requiredDuringInsert: true)
-          .withConverter<i2.MemoryTypeEnum>(
-              i1.$MemoryEntityTable.$convertertype);
-  static const i0.VerificationMeta _dataMeta =
-      const i0.VerificationMeta('data');
-  @override
-  late final i0.GeneratedColumn<String> data = i0.GeneratedColumn<String>(
-      'data', aliasedName, false,
-      type: i0.DriftSqlType.string, requiredDuringInsert: true);
-  static const i0.VerificationMeta _isSavedMeta =
-      const i0.VerificationMeta('isSaved');
-  @override
-  late final i0.GeneratedColumn<bool> isSaved = i0.GeneratedColumn<bool>(
-      'is_saved', aliasedName, false,
-      type: i0.DriftSqlType.bool,
-      requiredDuringInsert: false,
-      defaultConstraints:
-          i0.GeneratedColumn.constraintIsAlways('CHECK ("is_saved" IN (0, 1))'),
-      defaultValue: const i4.Constant(false));
-  static const i0.VerificationMeta _memoryAtMeta =
-      const i0.VerificationMeta('memoryAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> memoryAt =
-      i0.GeneratedColumn<DateTime>('memory_at', aliasedName, false,
-          type: i0.DriftSqlType.dateTime, requiredDuringInsert: true);
-  static const i0.VerificationMeta _seenAtMeta =
-      const i0.VerificationMeta('seenAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> seenAt = i0.GeneratedColumn<DateTime>(
-      'seen_at', aliasedName, true,
-      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
-  static const i0.VerificationMeta _showAtMeta =
-      const i0.VerificationMeta('showAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> showAt = i0.GeneratedColumn<DateTime>(
-      'show_at', aliasedName, true,
-      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
-  static const i0.VerificationMeta _hideAtMeta =
-      const i0.VerificationMeta('hideAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> hideAt = i0.GeneratedColumn<DateTime>(
-      'hide_at', aliasedName, true,
-      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
-  @override
-  List<i0.GeneratedColumn> get $columns => [
-        id,
-        createdAt,
-        updatedAt,
-        deletedAt,
-        ownerId,
-        type,
-        data,
-        isSaved,
-        memoryAt,
-        seenAt,
-        showAt,
-        hideAt
-      ];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'memory_entity';
-  @override
-  i0.VerificationContext validateIntegrity(
-      i0.Insertable<i1.MemoryEntityData> instance,
-      {bool isInserting = false}) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('id')) {
-      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
-    } else if (isInserting) {
-      context.missing(_idMeta);
-    }
-    if (data.containsKey('created_at')) {
-      context.handle(_createdAtMeta,
-          createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
-    }
-    if (data.containsKey('updated_at')) {
-      context.handle(_updatedAtMeta,
-          updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta));
-    }
-    if (data.containsKey('deleted_at')) {
-      context.handle(_deletedAtMeta,
-          deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta));
-    }
-    if (data.containsKey('owner_id')) {
-      context.handle(_ownerIdMeta,
-          ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta));
-    } else if (isInserting) {
-      context.missing(_ownerIdMeta);
-    }
-    if (data.containsKey('data')) {
-      context.handle(
-          _dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta));
-    } else if (isInserting) {
-      context.missing(_dataMeta);
-    }
-    if (data.containsKey('is_saved')) {
-      context.handle(_isSavedMeta,
-          isSaved.isAcceptableOrUnknown(data['is_saved']!, _isSavedMeta));
-    }
-    if (data.containsKey('memory_at')) {
-      context.handle(_memoryAtMeta,
-          memoryAt.isAcceptableOrUnknown(data['memory_at']!, _memoryAtMeta));
-    } else if (isInserting) {
-      context.missing(_memoryAtMeta);
-    }
-    if (data.containsKey('seen_at')) {
-      context.handle(_seenAtMeta,
-          seenAt.isAcceptableOrUnknown(data['seen_at']!, _seenAtMeta));
-    }
-    if (data.containsKey('show_at')) {
-      context.handle(_showAtMeta,
-          showAt.isAcceptableOrUnknown(data['show_at']!, _showAtMeta));
-    }
-    if (data.containsKey('hide_at')) {
-      context.handle(_hideAtMeta,
-          hideAt.isAcceptableOrUnknown(data['hide_at']!, _hideAtMeta));
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {id};
-  @override
-  i1.MemoryEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.MemoryEntityData(
-      id: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
-      createdAt: attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
-      updatedAt: attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
-      deletedAt: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}deleted_at']),
-      ownerId: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}owner_id'])!,
-      type: i1.$MemoryEntityTable.$convertertype.fromSql(attachedDatabase
-          .typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}type'])!),
-      data: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}data'])!,
-      isSaved: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.bool, data['${effectivePrefix}is_saved'])!,
-      memoryAt: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}memory_at'])!,
-      seenAt: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}seen_at']),
-      showAt: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}show_at']),
-      hideAt: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}hide_at']),
-    );
-  }
-
-  @override
-  $MemoryEntityTable createAlias(String alias) {
-    return $MemoryEntityTable(attachedDatabase, alias);
-  }
-
-  static i0.JsonTypeConverter2<i2.MemoryTypeEnum, int, int> $convertertype =
-      const i0.EnumIndexConverter<i2.MemoryTypeEnum>(i2.MemoryTypeEnum.values);
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class MemoryEntityData extends i0.DataClass
-    implements i0.Insertable<i1.MemoryEntityData> {
-  final String id;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final DateTime? deletedAt;
-  final String ownerId;
-  final i2.MemoryTypeEnum type;
-  final String data;
-  final bool isSaved;
-  final DateTime memoryAt;
-  final DateTime? seenAt;
-  final DateTime? showAt;
-  final DateTime? hideAt;
-  const MemoryEntityData(
-      {required this.id,
-      required this.createdAt,
-      required this.updatedAt,
-      this.deletedAt,
-      required this.ownerId,
-      required this.type,
-      required this.data,
-      required this.isSaved,
-      required this.memoryAt,
-      this.seenAt,
-      this.showAt,
-      this.hideAt});
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['id'] = i0.Variable<String>(id);
-    map['created_at'] = i0.Variable<DateTime>(createdAt);
-    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
-    if (!nullToAbsent || deletedAt != null) {
-      map['deleted_at'] = i0.Variable<DateTime>(deletedAt);
-    }
-    map['owner_id'] = i0.Variable<String>(ownerId);
-    {
-      map['type'] =
-          i0.Variable<int>(i1.$MemoryEntityTable.$convertertype.toSql(type));
-    }
-    map['data'] = i0.Variable<String>(data);
-    map['is_saved'] = i0.Variable<bool>(isSaved);
-    map['memory_at'] = i0.Variable<DateTime>(memoryAt);
-    if (!nullToAbsent || seenAt != null) {
-      map['seen_at'] = i0.Variable<DateTime>(seenAt);
-    }
-    if (!nullToAbsent || showAt != null) {
-      map['show_at'] = i0.Variable<DateTime>(showAt);
-    }
-    if (!nullToAbsent || hideAt != null) {
-      map['hide_at'] = i0.Variable<DateTime>(hideAt);
-    }
-    return map;
-  }
-
-  factory MemoryEntityData.fromJson(Map<String, dynamic> json,
-      {i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return MemoryEntityData(
-      id: serializer.fromJson<String>(json['id']),
-      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
-      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
-      deletedAt: serializer.fromJson<DateTime?>(json['deletedAt']),
-      ownerId: serializer.fromJson<String>(json['ownerId']),
-      type: i1.$MemoryEntityTable.$convertertype
-          .fromJson(serializer.fromJson<int>(json['type'])),
-      data: serializer.fromJson<String>(json['data']),
-      isSaved: serializer.fromJson<bool>(json['isSaved']),
-      memoryAt: serializer.fromJson<DateTime>(json['memoryAt']),
-      seenAt: serializer.fromJson<DateTime?>(json['seenAt']),
-      showAt: serializer.fromJson<DateTime?>(json['showAt']),
-      hideAt: serializer.fromJson<DateTime?>(json['hideAt']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'id': serializer.toJson<String>(id),
-      'createdAt': serializer.toJson<DateTime>(createdAt),
-      'updatedAt': serializer.toJson<DateTime>(updatedAt),
-      'deletedAt': serializer.toJson<DateTime?>(deletedAt),
-      'ownerId': serializer.toJson<String>(ownerId),
-      'type': serializer
-          .toJson<int>(i1.$MemoryEntityTable.$convertertype.toJson(type)),
-      'data': serializer.toJson<String>(data),
-      'isSaved': serializer.toJson<bool>(isSaved),
-      'memoryAt': serializer.toJson<DateTime>(memoryAt),
-      'seenAt': serializer.toJson<DateTime?>(seenAt),
-      'showAt': serializer.toJson<DateTime?>(showAt),
-      'hideAt': serializer.toJson<DateTime?>(hideAt),
-    };
-  }
-
-  i1.MemoryEntityData copyWith(
-          {String? id,
-          DateTime? createdAt,
-          DateTime? updatedAt,
-          i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
-          String? ownerId,
-          i2.MemoryTypeEnum? type,
-          String? data,
-          bool? isSaved,
-          DateTime? memoryAt,
-          i0.Value<DateTime?> seenAt = const i0.Value.absent(),
-          i0.Value<DateTime?> showAt = const i0.Value.absent(),
-          i0.Value<DateTime?> hideAt = const i0.Value.absent()}) =>
-      i1.MemoryEntityData(
-        id: id ?? this.id,
-        createdAt: createdAt ?? this.createdAt,
-        updatedAt: updatedAt ?? this.updatedAt,
-        deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt,
-        ownerId: ownerId ?? this.ownerId,
-        type: type ?? this.type,
-        data: data ?? this.data,
-        isSaved: isSaved ?? this.isSaved,
-        memoryAt: memoryAt ?? this.memoryAt,
-        seenAt: seenAt.present ? seenAt.value : this.seenAt,
-        showAt: showAt.present ? showAt.value : this.showAt,
-        hideAt: hideAt.present ? hideAt.value : this.hideAt,
-      );
-  MemoryEntityData copyWithCompanion(i1.MemoryEntityCompanion data) {
-    return MemoryEntityData(
-      id: data.id.present ? data.id.value : this.id,
-      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
-      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
-      deletedAt: data.deletedAt.present ? data.deletedAt.value : this.deletedAt,
-      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
-      type: data.type.present ? data.type.value : this.type,
-      data: data.data.present ? data.data.value : this.data,
-      isSaved: data.isSaved.present ? data.isSaved.value : this.isSaved,
-      memoryAt: data.memoryAt.present ? data.memoryAt.value : this.memoryAt,
-      seenAt: data.seenAt.present ? data.seenAt.value : this.seenAt,
-      showAt: data.showAt.present ? data.showAt.value : this.showAt,
-      hideAt: data.hideAt.present ? data.hideAt.value : this.hideAt,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('MemoryEntityData(')
-          ..write('id: $id, ')
-          ..write('createdAt: $createdAt, ')
-          ..write('updatedAt: $updatedAt, ')
-          ..write('deletedAt: $deletedAt, ')
-          ..write('ownerId: $ownerId, ')
-          ..write('type: $type, ')
-          ..write('data: $data, ')
-          ..write('isSaved: $isSaved, ')
-          ..write('memoryAt: $memoryAt, ')
-          ..write('seenAt: $seenAt, ')
-          ..write('showAt: $showAt, ')
-          ..write('hideAt: $hideAt')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, deletedAt, ownerId,
-      type, data, isSaved, memoryAt, seenAt, showAt, hideAt);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.MemoryEntityData &&
-          other.id == this.id &&
-          other.createdAt == this.createdAt &&
-          other.updatedAt == this.updatedAt &&
-          other.deletedAt == this.deletedAt &&
-          other.ownerId == this.ownerId &&
-          other.type == this.type &&
-          other.data == this.data &&
-          other.isSaved == this.isSaved &&
-          other.memoryAt == this.memoryAt &&
-          other.seenAt == this.seenAt &&
-          other.showAt == this.showAt &&
-          other.hideAt == this.hideAt);
-}
-
-class MemoryEntityCompanion extends i0.UpdateCompanion<i1.MemoryEntityData> {
-  final i0.Value<String> id;
-  final i0.Value<DateTime> createdAt;
-  final i0.Value<DateTime> updatedAt;
-  final i0.Value<DateTime?> deletedAt;
-  final i0.Value<String> ownerId;
-  final i0.Value<i2.MemoryTypeEnum> type;
-  final i0.Value<String> data;
-  final i0.Value<bool> isSaved;
-  final i0.Value<DateTime> memoryAt;
-  final i0.Value<DateTime?> seenAt;
-  final i0.Value<DateTime?> showAt;
-  final i0.Value<DateTime?> hideAt;
-  const MemoryEntityCompanion({
-    this.id = const i0.Value.absent(),
-    this.createdAt = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
-    this.deletedAt = const i0.Value.absent(),
-    this.ownerId = const i0.Value.absent(),
-    this.type = const i0.Value.absent(),
-    this.data = const i0.Value.absent(),
-    this.isSaved = const i0.Value.absent(),
-    this.memoryAt = const i0.Value.absent(),
-    this.seenAt = const i0.Value.absent(),
-    this.showAt = const i0.Value.absent(),
-    this.hideAt = const i0.Value.absent(),
-  });
-  MemoryEntityCompanion.insert({
-    required String id,
-    this.createdAt = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
-    this.deletedAt = const i0.Value.absent(),
-    required String ownerId,
-    required i2.MemoryTypeEnum type,
-    required String data,
-    this.isSaved = const i0.Value.absent(),
-    required DateTime memoryAt,
-    this.seenAt = const i0.Value.absent(),
-    this.showAt = const i0.Value.absent(),
-    this.hideAt = const i0.Value.absent(),
-  })  : id = i0.Value(id),
-        ownerId = i0.Value(ownerId),
-        type = i0.Value(type),
-        data = i0.Value(data),
-        memoryAt = i0.Value(memoryAt);
-  static i0.Insertable<i1.MemoryEntityData> custom({
-    i0.Expression<String>? id,
-    i0.Expression<DateTime>? createdAt,
-    i0.Expression<DateTime>? updatedAt,
-    i0.Expression<DateTime>? deletedAt,
-    i0.Expression<String>? ownerId,
-    i0.Expression<int>? type,
-    i0.Expression<String>? data,
-    i0.Expression<bool>? isSaved,
-    i0.Expression<DateTime>? memoryAt,
-    i0.Expression<DateTime>? seenAt,
-    i0.Expression<DateTime>? showAt,
-    i0.Expression<DateTime>? hideAt,
-  }) {
-    return i0.RawValuesInsertable({
-      if (id != null) 'id': id,
-      if (createdAt != null) 'created_at': createdAt,
-      if (updatedAt != null) 'updated_at': updatedAt,
-      if (deletedAt != null) 'deleted_at': deletedAt,
-      if (ownerId != null) 'owner_id': ownerId,
-      if (type != null) 'type': type,
-      if (data != null) 'data': data,
-      if (isSaved != null) 'is_saved': isSaved,
-      if (memoryAt != null) 'memory_at': memoryAt,
-      if (seenAt != null) 'seen_at': seenAt,
-      if (showAt != null) 'show_at': showAt,
-      if (hideAt != null) 'hide_at': hideAt,
-    });
-  }
-
-  i1.MemoryEntityCompanion copyWith(
-      {i0.Value<String>? id,
-      i0.Value<DateTime>? createdAt,
-      i0.Value<DateTime>? updatedAt,
-      i0.Value<DateTime?>? deletedAt,
-      i0.Value<String>? ownerId,
-      i0.Value<i2.MemoryTypeEnum>? type,
-      i0.Value<String>? data,
-      i0.Value<bool>? isSaved,
-      i0.Value<DateTime>? memoryAt,
-      i0.Value<DateTime?>? seenAt,
-      i0.Value<DateTime?>? showAt,
-      i0.Value<DateTime?>? hideAt}) {
-    return i1.MemoryEntityCompanion(
-      id: id ?? this.id,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      deletedAt: deletedAt ?? this.deletedAt,
-      ownerId: ownerId ?? this.ownerId,
-      type: type ?? this.type,
-      data: data ?? this.data,
-      isSaved: isSaved ?? this.isSaved,
-      memoryAt: memoryAt ?? this.memoryAt,
-      seenAt: seenAt ?? this.seenAt,
-      showAt: showAt ?? this.showAt,
-      hideAt: hideAt ?? this.hideAt,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (id.present) {
-      map['id'] = i0.Variable<String>(id.value);
-    }
-    if (createdAt.present) {
-      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
-    }
-    if (updatedAt.present) {
-      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
-    }
-    if (deletedAt.present) {
-      map['deleted_at'] = i0.Variable<DateTime>(deletedAt.value);
-    }
-    if (ownerId.present) {
-      map['owner_id'] = i0.Variable<String>(ownerId.value);
-    }
-    if (type.present) {
-      map['type'] = i0.Variable<int>(
-          i1.$MemoryEntityTable.$convertertype.toSql(type.value));
-    }
-    if (data.present) {
-      map['data'] = i0.Variable<String>(data.value);
-    }
-    if (isSaved.present) {
-      map['is_saved'] = i0.Variable<bool>(isSaved.value);
-    }
-    if (memoryAt.present) {
-      map['memory_at'] = i0.Variable<DateTime>(memoryAt.value);
-    }
-    if (seenAt.present) {
-      map['seen_at'] = i0.Variable<DateTime>(seenAt.value);
-    }
-    if (showAt.present) {
-      map['show_at'] = i0.Variable<DateTime>(showAt.value);
-    }
-    if (hideAt.present) {
-      map['hide_at'] = i0.Variable<DateTime>(hideAt.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('MemoryEntityCompanion(')
-          ..write('id: $id, ')
-          ..write('createdAt: $createdAt, ')
-          ..write('updatedAt: $updatedAt, ')
-          ..write('deletedAt: $deletedAt, ')
-          ..write('ownerId: $ownerId, ')
-          ..write('type: $type, ')
-          ..write('data: $data, ')
-          ..write('isSaved: $isSaved, ')
-          ..write('memoryAt: $memoryAt, ')
-          ..write('seenAt: $seenAt, ')
-          ..write('showAt: $showAt, ')
-          ..write('hideAt: $hideAt')
-          ..write(')'))
-        .toString();
-  }
-}
--- a/mobile/lib/infrastructure/entities/memory_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/memory_asset.entity.dart
@@ -1,17 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-class MemoryAssetEntity extends Table with DriftDefaultsMixin {
-  const MemoryAssetEntity();
-
-  TextColumn get assetId =>
-      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
-
-  TextColumn get memoryId =>
-      text().references(MemoryEntity, #id, onDelete: KeyAction.cascade)();
-
-  @override
-  Set<Column> get primaryKey => {assetId, memoryId};
-}
--- a/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
@@ -1,550 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart'
-    as i2;
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
-    as i3;
-import 'package:drift/internal/modular.dart' as i4;
-import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
-    as i5;
-
-typedef $$MemoryAssetEntityTableCreateCompanionBuilder
-    = i1.MemoryAssetEntityCompanion Function({
-  required String assetId,
-  required String memoryId,
-});
-typedef $$MemoryAssetEntityTableUpdateCompanionBuilder
-    = i1.MemoryAssetEntityCompanion Function({
-  i0.Value<String> assetId,
-  i0.Value<String> memoryId,
-});
-
-final class $$MemoryAssetEntityTableReferences extends i0.BaseReferences<
-    i0.GeneratedDatabase,
-    i1.$MemoryAssetEntityTable,
-    i1.MemoryAssetEntityData> {
-  $$MemoryAssetEntityTableReferences(
-      super.$_db, super.$_table, super.$_typedResult);
-
-  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
-      i4.ReadDatabaseContainer(db)
-          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
-                  .assetId,
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
-                  .id));
-
-  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
-    final $_column = $_itemColumn<String>('asset_id')!;
-
-    final manager = i3
-        .$$RemoteAssetEntityTableTableManager(
-            $_db,
-            i4.ReadDatabaseContainer($_db)
-                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'))
-        .filter((f) => f.id.sqlEquals($_column));
-    final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
-    if (item == null) return manager;
-    return i0.ProcessedTableManager(
-        manager.$state.copyWith(prefetchedData: [item]));
-  }
-
-  static i5.$MemoryEntityTable _memoryIdTable(i0.GeneratedDatabase db) =>
-      i4.ReadDatabaseContainer(db)
-          .resultSet<i5.$MemoryEntityTable>('memory_entity')
-          .createAlias(i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
-                  .memoryId,
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i5.$MemoryEntityTable>('memory_entity')
-                  .id));
-
-  i5.$$MemoryEntityTableProcessedTableManager get memoryId {
-    final $_column = $_itemColumn<String>('memory_id')!;
-
-    final manager = i5
-        .$$MemoryEntityTableTableManager(
-            $_db,
-            i4.ReadDatabaseContainer($_db)
-                .resultSet<i5.$MemoryEntityTable>('memory_entity'))
-        .filter((f) => f.id.sqlEquals($_column));
-    final item = $_typedResult.readTableOrNull(_memoryIdTable($_db));
-    if (item == null) return manager;
-    return i0.ProcessedTableManager(
-        manager.$state.copyWith(prefetchedData: [item]));
-  }
-}
-
-class $$MemoryAssetEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
-  $$MemoryAssetEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
-    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.assetId,
-        referencedTable: i4.ReadDatabaseContainer($db)
-            .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i3.$$RemoteAssetEntityTableFilterComposer(
-              $db: $db,
-              $table: i4.ReadDatabaseContainer($db)
-                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-
-  i5.$$MemoryEntityTableFilterComposer get memoryId {
-    final i5.$$MemoryEntityTableFilterComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.memoryId,
-        referencedTable: i4.ReadDatabaseContainer($db)
-            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i5.$$MemoryEntityTableFilterComposer(
-              $db: $db,
-              $table: i4.ReadDatabaseContainer($db)
-                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-}
-
-class $$MemoryAssetEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
-  $$MemoryAssetEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
-    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
-        $composerBuilder(
-            composer: this,
-            getCurrentColumn: (t) => t.assetId,
-            referencedTable: i4.ReadDatabaseContainer($db)
-                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-            getReferencedColumn: (t) => t.id,
-            builder: (joinBuilder,
-                    {$addJoinBuilderToRootComposer,
-                    $removeJoinBuilderFromRootComposer}) =>
-                i3.$$RemoteAssetEntityTableOrderingComposer(
-                  $db: $db,
-                  $table: i4.ReadDatabaseContainer($db)
-                      .resultSet<i3.$RemoteAssetEntityTable>(
-                          'remote_asset_entity'),
-                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                  joinBuilder: joinBuilder,
-                  $removeJoinBuilderFromRootComposer:
-                      $removeJoinBuilderFromRootComposer,
-                ));
-    return composer;
-  }
-
-  i5.$$MemoryEntityTableOrderingComposer get memoryId {
-    final i5.$$MemoryEntityTableOrderingComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.memoryId,
-        referencedTable: i4.ReadDatabaseContainer($db)
-            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i5.$$MemoryEntityTableOrderingComposer(
-              $db: $db,
-              $table: i4.ReadDatabaseContainer($db)
-                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-}
-
-class $$MemoryAssetEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
-  $$MemoryAssetEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
-    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
-        $composerBuilder(
-            composer: this,
-            getCurrentColumn: (t) => t.assetId,
-            referencedTable: i4.ReadDatabaseContainer($db)
-                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-            getReferencedColumn: (t) => t.id,
-            builder: (joinBuilder,
-                    {$addJoinBuilderToRootComposer,
-                    $removeJoinBuilderFromRootComposer}) =>
-                i3.$$RemoteAssetEntityTableAnnotationComposer(
-                  $db: $db,
-                  $table: i4.ReadDatabaseContainer($db)
-                      .resultSet<i3.$RemoteAssetEntityTable>(
-                          'remote_asset_entity'),
-                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                  joinBuilder: joinBuilder,
-                  $removeJoinBuilderFromRootComposer:
-                      $removeJoinBuilderFromRootComposer,
-                ));
-    return composer;
-  }
-
-  i5.$$MemoryEntityTableAnnotationComposer get memoryId {
-    final i5.$$MemoryEntityTableAnnotationComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.memoryId,
-        referencedTable: i4.ReadDatabaseContainer($db)
-            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i5.$$MemoryEntityTableAnnotationComposer(
-              $db: $db,
-              $table: i4.ReadDatabaseContainer($db)
-                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-}
-
-class $$MemoryAssetEntityTableTableManager extends i0.RootTableManager<
-    i0.GeneratedDatabase,
-    i1.$MemoryAssetEntityTable,
-    i1.MemoryAssetEntityData,
-    i1.$$MemoryAssetEntityTableFilterComposer,
-    i1.$$MemoryAssetEntityTableOrderingComposer,
-    i1.$$MemoryAssetEntityTableAnnotationComposer,
-    $$MemoryAssetEntityTableCreateCompanionBuilder,
-    $$MemoryAssetEntityTableUpdateCompanionBuilder,
-    (i1.MemoryAssetEntityData, i1.$$MemoryAssetEntityTableReferences),
-    i1.MemoryAssetEntityData,
-    i0.PrefetchHooks Function({bool assetId, bool memoryId})> {
-  $$MemoryAssetEntityTableTableManager(
-      i0.GeneratedDatabase db, i1.$MemoryAssetEntityTable table)
-      : super(i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$MemoryAssetEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () => i1
-              .$$MemoryAssetEntityTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () =>
-              i1.$$MemoryAssetEntityTableAnnotationComposer(
-                  $db: db, $table: table),
-          updateCompanionCallback: ({
-            i0.Value<String> assetId = const i0.Value.absent(),
-            i0.Value<String> memoryId = const i0.Value.absent(),
-          }) =>
-              i1.MemoryAssetEntityCompanion(
-            assetId: assetId,
-            memoryId: memoryId,
-          ),
-          createCompanionCallback: ({
-            required String assetId,
-            required String memoryId,
-          }) =>
-              i1.MemoryAssetEntityCompanion.insert(
-            assetId: assetId,
-            memoryId: memoryId,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (
-                    e.readTable(table),
-                    i1.$$MemoryAssetEntityTableReferences(db, table, e)
-                  ))
-              .toList(),
-          prefetchHooksCallback: ({assetId = false, memoryId = false}) {
-            return i0.PrefetchHooks(
-              db: db,
-              explicitlyWatchedTables: [],
-              addJoins: <
-                  T extends i0.TableManagerState<
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic>>(state) {
-                if (assetId) {
-                  state = state.withJoin(
-                    currentTable: table,
-                    currentColumn: table.assetId,
-                    referencedTable:
-                        i1.$$MemoryAssetEntityTableReferences._assetIdTable(db),
-                    referencedColumn: i1.$$MemoryAssetEntityTableReferences
-                        ._assetIdTable(db)
-                        .id,
-                  ) as T;
-                }
-                if (memoryId) {
-                  state = state.withJoin(
-                    currentTable: table,
-                    currentColumn: table.memoryId,
-                    referencedTable: i1.$$MemoryAssetEntityTableReferences
-                        ._memoryIdTable(db),
-                    referencedColumn: i1.$$MemoryAssetEntityTableReferences
-                        ._memoryIdTable(db)
-                        .id,
-                  ) as T;
-                }
-
-                return state;
-              },
-              getPrefetchedDataCallback: (items) async {
-                return [];
-              },
-            );
-          },
-        ));
-}
-
-typedef $$MemoryAssetEntityTableProcessedTableManager
-    = i0.ProcessedTableManager<
-        i0.GeneratedDatabase,
-        i1.$MemoryAssetEntityTable,
-        i1.MemoryAssetEntityData,
-        i1.$$MemoryAssetEntityTableFilterComposer,
-        i1.$$MemoryAssetEntityTableOrderingComposer,
-        i1.$$MemoryAssetEntityTableAnnotationComposer,
-        $$MemoryAssetEntityTableCreateCompanionBuilder,
-        $$MemoryAssetEntityTableUpdateCompanionBuilder,
-        (i1.MemoryAssetEntityData, i1.$$MemoryAssetEntityTableReferences),
-        i1.MemoryAssetEntityData,
-        i0.PrefetchHooks Function({bool assetId, bool memoryId})>;
-
-class $MemoryAssetEntityTable extends i2.MemoryAssetEntity
-    with i0.TableInfo<$MemoryAssetEntityTable, i1.MemoryAssetEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $MemoryAssetEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _assetIdMeta =
-      const i0.VerificationMeta('assetId');
-  @override
-  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
-      'asset_id', aliasedName, false,
-      type: i0.DriftSqlType.string,
-      requiredDuringInsert: true,
-      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-          'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
-  static const i0.VerificationMeta _memoryIdMeta =
-      const i0.VerificationMeta('memoryId');
-  @override
-  late final i0.GeneratedColumn<String> memoryId = i0.GeneratedColumn<String>(
-      'memory_id', aliasedName, false,
-      type: i0.DriftSqlType.string,
-      requiredDuringInsert: true,
-      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-          'REFERENCES memory_entity (id) ON DELETE CASCADE'));
-  @override
-  List<i0.GeneratedColumn> get $columns => [assetId, memoryId];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'memory_asset_entity';
-  @override
-  i0.VerificationContext validateIntegrity(
-      i0.Insertable<i1.MemoryAssetEntityData> instance,
-      {bool isInserting = false}) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('asset_id')) {
-      context.handle(_assetIdMeta,
-          assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta));
-    } else if (isInserting) {
-      context.missing(_assetIdMeta);
-    }
-    if (data.containsKey('memory_id')) {
-      context.handle(_memoryIdMeta,
-          memoryId.isAcceptableOrUnknown(data['memory_id']!, _memoryIdMeta));
-    } else if (isInserting) {
-      context.missing(_memoryIdMeta);
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {assetId, memoryId};
-  @override
-  i1.MemoryAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.MemoryAssetEntityData(
-      assetId: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
-      memoryId: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}memory_id'])!,
-    );
-  }
-
-  @override
-  $MemoryAssetEntityTable createAlias(String alias) {
-    return $MemoryAssetEntityTable(attachedDatabase, alias);
-  }
-
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class MemoryAssetEntityData extends i0.DataClass
-    implements i0.Insertable<i1.MemoryAssetEntityData> {
-  final String assetId;
-  final String memoryId;
-  const MemoryAssetEntityData({required this.assetId, required this.memoryId});
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['asset_id'] = i0.Variable<String>(assetId);
-    map['memory_id'] = i0.Variable<String>(memoryId);
-    return map;
-  }
-
-  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json,
-      {i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return MemoryAssetEntityData(
-      assetId: serializer.fromJson<String>(json['assetId']),
-      memoryId: serializer.fromJson<String>(json['memoryId']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'assetId': serializer.toJson<String>(assetId),
-      'memoryId': serializer.toJson<String>(memoryId),
-    };
-  }
-
-  i1.MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) =>
-      i1.MemoryAssetEntityData(
-        assetId: assetId ?? this.assetId,
-        memoryId: memoryId ?? this.memoryId,
-      );
-  MemoryAssetEntityData copyWithCompanion(i1.MemoryAssetEntityCompanion data) {
-    return MemoryAssetEntityData(
-      assetId: data.assetId.present ? data.assetId.value : this.assetId,
-      memoryId: data.memoryId.present ? data.memoryId.value : this.memoryId,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('MemoryAssetEntityData(')
-          ..write('assetId: $assetId, ')
-          ..write('memoryId: $memoryId')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(assetId, memoryId);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.MemoryAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.memoryId == this.memoryId);
-}
-
-class MemoryAssetEntityCompanion
-    extends i0.UpdateCompanion<i1.MemoryAssetEntityData> {
-  final i0.Value<String> assetId;
-  final i0.Value<String> memoryId;
-  const MemoryAssetEntityCompanion({
-    this.assetId = const i0.Value.absent(),
-    this.memoryId = const i0.Value.absent(),
-  });
-  MemoryAssetEntityCompanion.insert({
-    required String assetId,
-    required String memoryId,
-  })  : assetId = i0.Value(assetId),
-        memoryId = i0.Value(memoryId);
-  static i0.Insertable<i1.MemoryAssetEntityData> custom({
-    i0.Expression<String>? assetId,
-    i0.Expression<String>? memoryId,
-  }) {
-    return i0.RawValuesInsertable({
-      if (assetId != null) 'asset_id': assetId,
-      if (memoryId != null) 'memory_id': memoryId,
-    });
-  }
-
-  i1.MemoryAssetEntityCompanion copyWith(
-      {i0.Value<String>? assetId, i0.Value<String>? memoryId}) {
-    return i1.MemoryAssetEntityCompanion(
-      assetId: assetId ?? this.assetId,
-      memoryId: memoryId ?? this.memoryId,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (assetId.present) {
-      map['asset_id'] = i0.Variable<String>(assetId.value);
-    }
-    if (memoryId.present) {
-      map['memory_id'] = i0.Variable<String>(memoryId.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('MemoryAssetEntityCompanion(')
-          ..write('assetId: $assetId, ')
-          ..write('memoryId: $memoryId')
-          ..write(')'))
-        .toString();
-  }
-}
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -1,11 +1,11 @@
 import 'remote_asset.entity.dart';
 import 'local_asset.entity.dart';

-mergedAsset: SELECT * FROM
+mergedAsset: SELECT * FROM 
 (
 	SELECT
 		rae.id as remote_id,
-		rae.local_id as local_id,
+		lae.id as local_id,
 		rae.name,
 		rae."type",
 		rae.created_at,
@@ -19,11 +19,13 @@ mergedAsset: SELECT * FROM
 		rae.owner_id
 	FROM
 		remote_asset_entity rae
+	LEFT JOIN
+		local_asset_entity lae ON rae.checksum  = lae.checksum
 	WHERE
-		rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
+		rae.visibility = 0 AND rae.owner_id in ?
 	UNION ALL
 	SELECT
-		lae.remote_id as remote_id,
+		NULL as remote_id,
 		lae.id as local_id,
 		lae.name,
 		lae."type",
@@ -38,18 +40,20 @@ mergedAsset: SELECT * FROM
 		NULL as owner_id
 	FROM
 		local_asset_entity lae
+	LEFT JOIN
+		remote_asset_entity rae ON rae.checksum = lae.checksum
 	WHERE
-		lae.remote_id IS NULL
+		rae.id IS NULL
 )
 ORDER BY created_at DESC
 LIMIT $limit;

-mergedBucket(:group_by AS INTEGER):
-SELECT
+mergedBucket(:group_by AS INTEGER): 
+SELECT 
 	COUNT(*) as asset_count,
 	 CASE
-        WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at, 'localtime') -- day
-        WHEN :group_by = 1 THEN STRFTIME('%Y-%m', created_at, 'localtime') -- month
+        WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at) -- day
+        WHEN :group_by = 1 THEN STRFTIME('%Y-%m', created_at) -- month
    END AS bucket_date
 FROM
 (
@@ -58,16 +62,20 @@ FROM
 		rae.created_at
 	FROM
 		remote_asset_entity rae
+	LEFT JOIN
+		local_asset_entity lae  ON rae.checksum  = lae.checksum
 	WHERE
-		rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
+		rae.visibility = 0 AND rae.owner_id in ?
 	UNION ALL
 	SELECT
 		lae.name,
 		lae.created_at
 	FROM
 		local_asset_entity lae
+	LEFT JOIN
+		remote_asset_entity rae ON rae.checksum = lae.checksum
 	WHERE
-		lae.remote_id IS NULL
+		rae.id IS NULL
 )
 GROUP BY bucket_date
 ORDER BY bucket_date DESC;
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -18,7 +18,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    final generatedlimit = $write(limit, startIndex: $arrayStartIndex);
    $arrayStartIndex += generatedlimit.amountOfVariables;
    return customSelect(
-        'SELECT * FROM (SELECT rae.id AS remote_id, rae.local_id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id FROM remote_asset_entity AS rae WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT lae.remote_id AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id FROM local_asset_entity AS lae WHERE lae.remote_id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
+        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
        variables: [
          for (var $ in var1) i0.Variable<String>($),
          ...generatedlimit.introducedVariables
@@ -51,7 +51,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    final expandedvar2 = $expandVar($arrayStartIndex, var2.length);
    $arrayStartIndex += var2.length;
    return customSelect(
-        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae WHERE lae.remote_id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
+        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at) WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at) END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
        variables: [
          i0.Variable<int>(groupBy),
          for (var $ in var2) i0.Variable<String>($)
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
@@ -17,8 +17,6 @@ class RemoteAssetEntity extends Table

  TextColumn get id => text()();

-  TextColumn get localId => text().nullable()();
-
  TextColumn get checksum => text()();

  BoolColumn get isFavorite => boolean().withDefault(const Constant(false))();
@@ -39,10 +37,9 @@ class RemoteAssetEntity extends Table
 }

 extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
-  RemoteAsset toDto() => RemoteAsset(
+  Asset toDto() => Asset(
        id: id,
        name: name,
-        ownerId: ownerId,
        checksum: checksum,
        type: type,
        createdAt: createdAt,
@@ -53,6 +50,6 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
        width: width,
        thumbHash: thumbHash,
        visibility: visibility,
-        localId: localId,
+        localId: null,
      );
 }
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
@@ -21,7 +21,6 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder
  i0.Value<int?> height,
  i0.Value<int?> durationInSeconds,
  required String id,
-  i0.Value<String?> localId,
  required String checksum,
  i0.Value<bool> isFavorite,
  required String ownerId,
@@ -40,7 +39,6 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder
  i0.Value<int?> height,
  i0.Value<int?> durationInSeconds,
  i0.Value<String> id,
-  i0.Value<String?> localId,
  i0.Value<String> checksum,
  i0.Value<bool> isFavorite,
  i0.Value<String> ownerId,
@@ -120,9 +118,6 @@ class $$RemoteAssetEntityTableFilterComposer
  i0.ColumnFilters<String> get id => $composableBuilder(
      column: $table.id, builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<String> get localId => $composableBuilder(
-      column: $table.localId, builder: (column) => i0.ColumnFilters(column));
-
  i0.ColumnFilters<String> get checksum => $composableBuilder(
      column: $table.checksum, builder: (column) => i0.ColumnFilters(column));

@@ -203,9 +198,6 @@ class $$RemoteAssetEntityTableOrderingComposer
  i0.ColumnOrderings<String> get id => $composableBuilder(
      column: $table.id, builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<String> get localId => $composableBuilder(
-      column: $table.localId, builder: (column) => i0.ColumnOrderings(column));
-
  i0.ColumnOrderings<String> get checksum => $composableBuilder(
      column: $table.checksum, builder: (column) => i0.ColumnOrderings(column));

@@ -285,9 +277,6 @@ class $$RemoteAssetEntityTableAnnotationComposer
  i0.GeneratedColumn<String> get id =>
      $composableBuilder(column: $table.id, builder: (column) => column);

-  i0.GeneratedColumn<String> get localId =>
-      $composableBuilder(column: $table.localId, builder: (column) => column);
-
  i0.GeneratedColumn<String> get checksum =>
      $composableBuilder(column: $table.checksum, builder: (column) => column);

@@ -363,7 +352,6 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
            i0.Value<int?> height = const i0.Value.absent(),
            i0.Value<int?> durationInSeconds = const i0.Value.absent(),
            i0.Value<String> id = const i0.Value.absent(),
-            i0.Value<String?> localId = const i0.Value.absent(),
            i0.Value<String> checksum = const i0.Value.absent(),
            i0.Value<bool> isFavorite = const i0.Value.absent(),
            i0.Value<String> ownerId = const i0.Value.absent(),
@@ -381,7 +369,6 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
            height: height,
            durationInSeconds: durationInSeconds,
            id: id,
-            localId: localId,
            checksum: checksum,
            isFavorite: isFavorite,
            ownerId: ownerId,
@@ -399,7 +386,6 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
            i0.Value<int?> height = const i0.Value.absent(),
            i0.Value<int?> durationInSeconds = const i0.Value.absent(),
            required String id,
-            i0.Value<String?> localId = const i0.Value.absent(),
            required String checksum,
            i0.Value<bool> isFavorite = const i0.Value.absent(),
            required String ownerId,
@@ -417,7 +403,6 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
            height: height,
            durationInSeconds: durationInSeconds,
            id: id,
-            localId: localId,
            checksum: checksum,
            isFavorite: isFavorite,
            ownerId: ownerId,
@@ -545,12 +530,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
      'id', aliasedName, false,
      type: i0.DriftSqlType.string, requiredDuringInsert: true);
-  static const i0.VerificationMeta _localIdMeta =
-      const i0.VerificationMeta('localId');
-  @override
-  late final i0.GeneratedColumn<String> localId = i0.GeneratedColumn<String>(
-      'local_id', aliasedName, true,
-      type: i0.DriftSqlType.string, requiredDuringInsert: false);
  static const i0.VerificationMeta _checksumMeta =
      const i0.VerificationMeta('checksum');
  @override
@@ -610,7 +589,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        height,
        durationInSeconds,
        id,
-        localId,
        checksum,
        isFavorite,
        ownerId,
@@ -663,10 +641,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
    } else if (isInserting) {
      context.missing(_idMeta);
    }
-    if (data.containsKey('local_id')) {
-      context.handle(_localIdMeta,
-          localId.isAcceptableOrUnknown(data['local_id']!, _localIdMeta));
-    }
    if (data.containsKey('checksum')) {
      context.handle(_checksumMeta,
          checksum.isAcceptableOrUnknown(data['checksum']!, _checksumMeta));
@@ -726,8 +700,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
          i0.DriftSqlType.int, data['${effectivePrefix}duration_in_seconds']),
      id: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
-      localId: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}local_id']),
      checksum: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}checksum'])!,
      isFavorite: attachedDatabase.typeMapping
@@ -772,7 +744,6 @@ class RemoteAssetEntityData extends i0.DataClass
  final int? height;
  final int? durationInSeconds;
  final String id;
-  final String? localId;
  final String checksum;
  final bool isFavorite;
  final String ownerId;
@@ -789,7 +760,6 @@ class RemoteAssetEntityData extends i0.DataClass
      this.height,
      this.durationInSeconds,
      required this.id,
-      this.localId,
      required this.checksum,
      required this.isFavorite,
      required this.ownerId,
@@ -817,9 +787,6 @@ class RemoteAssetEntityData extends i0.DataClass
      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds);
    }
    map['id'] = i0.Variable<String>(id);
-    if (!nullToAbsent || localId != null) {
-      map['local_id'] = i0.Variable<String>(localId);
-    }
    map['checksum'] = i0.Variable<String>(checksum);
    map['is_favorite'] = i0.Variable<bool>(isFavorite);
    map['owner_id'] = i0.Variable<String>(ownerId);
@@ -852,7 +819,6 @@ class RemoteAssetEntityData extends i0.DataClass
      height: serializer.fromJson<int?>(json['height']),
      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
      id: serializer.fromJson<String>(json['id']),
-      localId: serializer.fromJson<String?>(json['localId']),
      checksum: serializer.fromJson<String>(json['checksum']),
      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
      ownerId: serializer.fromJson<String>(json['ownerId']),
@@ -876,7 +842,6 @@ class RemoteAssetEntityData extends i0.DataClass
      'height': serializer.toJson<int?>(height),
      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
      'id': serializer.toJson<String>(id),
-      'localId': serializer.toJson<String?>(localId),
      'checksum': serializer.toJson<String>(checksum),
      'isFavorite': serializer.toJson<bool>(isFavorite),
      'ownerId': serializer.toJson<String>(ownerId),
@@ -897,7 +862,6 @@ class RemoteAssetEntityData extends i0.DataClass
          i0.Value<int?> height = const i0.Value.absent(),
          i0.Value<int?> durationInSeconds = const i0.Value.absent(),
          String? id,
-          i0.Value<String?> localId = const i0.Value.absent(),
          String? checksum,
          bool? isFavorite,
          String? ownerId,
@@ -916,7 +880,6 @@ class RemoteAssetEntityData extends i0.DataClass
            ? durationInSeconds.value
            : this.durationInSeconds,
        id: id ?? this.id,
-        localId: localId.present ? localId.value : this.localId,
        checksum: checksum ?? this.checksum,
        isFavorite: isFavorite ?? this.isFavorite,
        ownerId: ownerId ?? this.ownerId,
@@ -938,7 +901,6 @@ class RemoteAssetEntityData extends i0.DataClass
          ? data.durationInSeconds.value
          : this.durationInSeconds,
      id: data.id.present ? data.id.value : this.id,
-      localId: data.localId.present ? data.localId.value : this.localId,
      checksum: data.checksum.present ? data.checksum.value : this.checksum,
      isFavorite:
          data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
@@ -964,7 +926,6 @@ class RemoteAssetEntityData extends i0.DataClass
          ..write('height: $height, ')
          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
-          ..write('localId: $localId, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
          ..write('ownerId: $ownerId, ')
@@ -986,7 +947,6 @@ class RemoteAssetEntityData extends i0.DataClass
      height,
      durationInSeconds,
      id,
-      localId,
      checksum,
      isFavorite,
      ownerId,
@@ -1006,7 +966,6 @@ class RemoteAssetEntityData extends i0.DataClass
          other.height == this.height &&
          other.durationInSeconds == this.durationInSeconds &&
          other.id == this.id &&
-          other.localId == this.localId &&
          other.checksum == this.checksum &&
          other.isFavorite == this.isFavorite &&
          other.ownerId == this.ownerId &&
@@ -1026,7 +985,6 @@ class RemoteAssetEntityCompanion
  final i0.Value<int?> height;
  final i0.Value<int?> durationInSeconds;
  final i0.Value<String> id;
-  final i0.Value<String?> localId;
  final i0.Value<String> checksum;
  final i0.Value<bool> isFavorite;
  final i0.Value<String> ownerId;
@@ -1043,7 +1001,6 @@ class RemoteAssetEntityCompanion
    this.height = const i0.Value.absent(),
    this.durationInSeconds = const i0.Value.absent(),
    this.id = const i0.Value.absent(),
-    this.localId = const i0.Value.absent(),
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
    this.ownerId = const i0.Value.absent(),
@@ -1061,7 +1018,6 @@ class RemoteAssetEntityCompanion
    this.height = const i0.Value.absent(),
    this.durationInSeconds = const i0.Value.absent(),
    required String id,
-    this.localId = const i0.Value.absent(),
    required String checksum,
    this.isFavorite = const i0.Value.absent(),
    required String ownerId,
@@ -1084,7 +1040,6 @@ class RemoteAssetEntityCompanion
    i0.Expression<int>? height,
    i0.Expression<int>? durationInSeconds,
    i0.Expression<String>? id,
-    i0.Expression<String>? localId,
    i0.Expression<String>? checksum,
    i0.Expression<bool>? isFavorite,
    i0.Expression<String>? ownerId,
@@ -1102,7 +1057,6 @@ class RemoteAssetEntityCompanion
      if (height != null) 'height': height,
      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
      if (id != null) 'id': id,
-      if (localId != null) 'local_id': localId,
      if (checksum != null) 'checksum': checksum,
      if (isFavorite != null) 'is_favorite': isFavorite,
      if (ownerId != null) 'owner_id': ownerId,
@@ -1122,7 +1076,6 @@ class RemoteAssetEntityCompanion
      i0.Value<int?>? height,
      i0.Value<int?>? durationInSeconds,
      i0.Value<String>? id,
-      i0.Value<String?>? localId,
      i0.Value<String>? checksum,
      i0.Value<bool>? isFavorite,
      i0.Value<String>? ownerId,
@@ -1139,7 +1092,6 @@ class RemoteAssetEntityCompanion
      height: height ?? this.height,
      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      id: id ?? this.id,
-      localId: localId ?? this.localId,
      checksum: checksum ?? this.checksum,
      isFavorite: isFavorite ?? this.isFavorite,
      ownerId: ownerId ?? this.ownerId,
@@ -1178,9 +1130,6 @@ class RemoteAssetEntityCompanion
    if (id.present) {
      map['id'] = i0.Variable<String>(id.value);
    }
-    if (localId.present) {
-      map['local_id'] = i0.Variable<String>(localId.value);
-    }
    if (checksum.present) {
      map['checksum'] = i0.Variable<String>(checksum.value);
    }
@@ -1218,7 +1167,6 @@ class RemoteAssetEntityCompanion
          ..write('height: $height, ')
          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
-          ..write('localId: $localId, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
          ..write('ownerId: $ownerId, ')
--- a/mobile/lib/infrastructure/entities/stack.entity.dart
+++ b/mobile/lib/infrastructure/entities/stack.entity.dart
@@ -1,22 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-class StackEntity extends Table with DriftDefaultsMixin {
-  const StackEntity();
-
-  TextColumn get id => text()();
-
-  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
-
-  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
-
-  TextColumn get ownerId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
-
-  TextColumn get primaryAssetId => text().references(RemoteAssetEntity, #id)();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}
--- a/mobile/lib/infrastructure/entities/stack.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/stack.entity.drift.dart
@@ -1,706 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/infrastructure/entities/stack.entity.dart' as i2;
-import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
-    as i4;
-import 'package:drift/internal/modular.dart' as i5;
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
-    as i6;
-
-typedef $$StackEntityTableCreateCompanionBuilder = i1.StackEntityCompanion
-    Function({
-  required String id,
-  i0.Value<DateTime> createdAt,
-  i0.Value<DateTime> updatedAt,
-  required String ownerId,
-  required String primaryAssetId,
-});
-typedef $$StackEntityTableUpdateCompanionBuilder = i1.StackEntityCompanion
-    Function({
-  i0.Value<String> id,
-  i0.Value<DateTime> createdAt,
-  i0.Value<DateTime> updatedAt,
-  i0.Value<String> ownerId,
-  i0.Value<String> primaryAssetId,
-});
-
-final class $$StackEntityTableReferences extends i0.BaseReferences<
-    i0.GeneratedDatabase, i1.$StackEntityTable, i1.StackEntityData> {
-  $$StackEntityTableReferences(super.$_db, super.$_table, super.$_typedResult);
-
-  static i4.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
-      i5.ReadDatabaseContainer(db)
-          .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias(i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i1.$StackEntityTable>('stack_entity')
-                  .ownerId,
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i4.$UserEntityTable>('user_entity')
-                  .id));
-
-  i4.$$UserEntityTableProcessedTableManager get ownerId {
-    final $_column = $_itemColumn<String>('owner_id')!;
-
-    final manager = i4
-        .$$UserEntityTableTableManager(
-            $_db,
-            i5.ReadDatabaseContainer($_db)
-                .resultSet<i4.$UserEntityTable>('user_entity'))
-        .filter((f) => f.id.sqlEquals($_column));
-    final item = $_typedResult.readTableOrNull(_ownerIdTable($_db));
-    if (item == null) return manager;
-    return i0.ProcessedTableManager(
-        manager.$state.copyWith(prefetchedData: [item]));
-  }
-
-  static i6.$RemoteAssetEntityTable _primaryAssetIdTable(
-          i0.GeneratedDatabase db) =>
-      i5.ReadDatabaseContainer(db)
-          .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i1.$StackEntityTable>('stack_entity')
-                  .primaryAssetId,
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity')
-                  .id));
-
-  i6.$$RemoteAssetEntityTableProcessedTableManager get primaryAssetId {
-    final $_column = $_itemColumn<String>('primary_asset_id')!;
-
-    final manager = i6
-        .$$RemoteAssetEntityTableTableManager(
-            $_db,
-            i5.ReadDatabaseContainer($_db)
-                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'))
-        .filter((f) => f.id.sqlEquals($_column));
-    final item = $_typedResult.readTableOrNull(_primaryAssetIdTable($_db));
-    if (item == null) return manager;
-    return i0.ProcessedTableManager(
-        manager.$state.copyWith(prefetchedData: [item]));
-  }
-}
-
-class $$StackEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$StackEntityTable> {
-  $$StackEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<String> get id => $composableBuilder(
-      column: $table.id, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
-      column: $table.createdAt, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
-      column: $table.updatedAt, builder: (column) => i0.ColumnFilters(column));
-
-  i4.$$UserEntityTableFilterComposer get ownerId {
-    final i4.$$UserEntityTableFilterComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.ownerId,
-        referencedTable: i5.ReadDatabaseContainer($db)
-            .resultSet<i4.$UserEntityTable>('user_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i4.$$UserEntityTableFilterComposer(
-              $db: $db,
-              $table: i5.ReadDatabaseContainer($db)
-                  .resultSet<i4.$UserEntityTable>('user_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-
-  i6.$$RemoteAssetEntityTableFilterComposer get primaryAssetId {
-    final i6.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.primaryAssetId,
-        referencedTable: i5.ReadDatabaseContainer($db)
-            .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i6.$$RemoteAssetEntityTableFilterComposer(
-              $db: $db,
-              $table: i5.ReadDatabaseContainer($db)
-                  .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-}
-
-class $$StackEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$StackEntityTable> {
-  $$StackEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<String> get id => $composableBuilder(
-      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
-      column: $table.createdAt,
-      builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
-      column: $table.updatedAt,
-      builder: (column) => i0.ColumnOrderings(column));
-
-  i4.$$UserEntityTableOrderingComposer get ownerId {
-    final i4.$$UserEntityTableOrderingComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.ownerId,
-        referencedTable: i5.ReadDatabaseContainer($db)
-            .resultSet<i4.$UserEntityTable>('user_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i4.$$UserEntityTableOrderingComposer(
-              $db: $db,
-              $table: i5.ReadDatabaseContainer($db)
-                  .resultSet<i4.$UserEntityTable>('user_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-
-  i6.$$RemoteAssetEntityTableOrderingComposer get primaryAssetId {
-    final i6.$$RemoteAssetEntityTableOrderingComposer composer =
-        $composerBuilder(
-            composer: this,
-            getCurrentColumn: (t) => t.primaryAssetId,
-            referencedTable: i5.ReadDatabaseContainer($db)
-                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
-            getReferencedColumn: (t) => t.id,
-            builder: (joinBuilder,
-                    {$addJoinBuilderToRootComposer,
-                    $removeJoinBuilderFromRootComposer}) =>
-                i6.$$RemoteAssetEntityTableOrderingComposer(
-                  $db: $db,
-                  $table: i5.ReadDatabaseContainer($db)
-                      .resultSet<i6.$RemoteAssetEntityTable>(
-                          'remote_asset_entity'),
-                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                  joinBuilder: joinBuilder,
-                  $removeJoinBuilderFromRootComposer:
-                      $removeJoinBuilderFromRootComposer,
-                ));
-    return composer;
-  }
-}
-
-class $$StackEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$StackEntityTable> {
-  $$StackEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<String> get id =>
-      $composableBuilder(column: $table.id, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
-
-  i4.$$UserEntityTableAnnotationComposer get ownerId {
-    final i4.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.ownerId,
-        referencedTable: i5.ReadDatabaseContainer($db)
-            .resultSet<i4.$UserEntityTable>('user_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i4.$$UserEntityTableAnnotationComposer(
-              $db: $db,
-              $table: i5.ReadDatabaseContainer($db)
-                  .resultSet<i4.$UserEntityTable>('user_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
-
-  i6.$$RemoteAssetEntityTableAnnotationComposer get primaryAssetId {
-    final i6.$$RemoteAssetEntityTableAnnotationComposer composer =
-        $composerBuilder(
-            composer: this,
-            getCurrentColumn: (t) => t.primaryAssetId,
-            referencedTable: i5.ReadDatabaseContainer($db)
-                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
-            getReferencedColumn: (t) => t.id,
-            builder: (joinBuilder,
-                    {$addJoinBuilderToRootComposer,
-                    $removeJoinBuilderFromRootComposer}) =>
-                i6.$$RemoteAssetEntityTableAnnotationComposer(
-                  $db: $db,
-                  $table: i5.ReadDatabaseContainer($db)
-                      .resultSet<i6.$RemoteAssetEntityTable>(
-                          'remote_asset_entity'),
-                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                  joinBuilder: joinBuilder,
-                  $removeJoinBuilderFromRootComposer:
-                      $removeJoinBuilderFromRootComposer,
-                ));
-    return composer;
-  }
-}
-
-class $$StackEntityTableTableManager extends i0.RootTableManager<
-    i0.GeneratedDatabase,
-    i1.$StackEntityTable,
-    i1.StackEntityData,
-    i1.$$StackEntityTableFilterComposer,
-    i1.$$StackEntityTableOrderingComposer,
-    i1.$$StackEntityTableAnnotationComposer,
-    $$StackEntityTableCreateCompanionBuilder,
-    $$StackEntityTableUpdateCompanionBuilder,
-    (i1.StackEntityData, i1.$$StackEntityTableReferences),
-    i1.StackEntityData,
-    i0.PrefetchHooks Function({bool ownerId, bool primaryAssetId})> {
-  $$StackEntityTableTableManager(
-      i0.GeneratedDatabase db, i1.$StackEntityTable table)
-      : super(i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$StackEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              i1.$$StackEntityTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () =>
-              i1.$$StackEntityTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            i0.Value<String> id = const i0.Value.absent(),
-            i0.Value<DateTime> createdAt = const i0.Value.absent(),
-            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-            i0.Value<String> ownerId = const i0.Value.absent(),
-            i0.Value<String> primaryAssetId = const i0.Value.absent(),
-          }) =>
-              i1.StackEntityCompanion(
-            id: id,
-            createdAt: createdAt,
-            updatedAt: updatedAt,
-            ownerId: ownerId,
-            primaryAssetId: primaryAssetId,
-          ),
-          createCompanionCallback: ({
-            required String id,
-            i0.Value<DateTime> createdAt = const i0.Value.absent(),
-            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-            required String ownerId,
-            required String primaryAssetId,
-          }) =>
-              i1.StackEntityCompanion.insert(
-            id: id,
-            createdAt: createdAt,
-            updatedAt: updatedAt,
-            ownerId: ownerId,
-            primaryAssetId: primaryAssetId,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (
-                    e.readTable(table),
-                    i1.$$StackEntityTableReferences(db, table, e)
-                  ))
-              .toList(),
-          prefetchHooksCallback: ({ownerId = false, primaryAssetId = false}) {
-            return i0.PrefetchHooks(
-              db: db,
-              explicitlyWatchedTables: [],
-              addJoins: <
-                  T extends i0.TableManagerState<
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic>>(state) {
-                if (ownerId) {
-                  state = state.withJoin(
-                    currentTable: table,
-                    currentColumn: table.ownerId,
-                    referencedTable:
-                        i1.$$StackEntityTableReferences._ownerIdTable(db),
-                    referencedColumn:
-                        i1.$$StackEntityTableReferences._ownerIdTable(db).id,
-                  ) as T;
-                }
-                if (primaryAssetId) {
-                  state = state.withJoin(
-                    currentTable: table,
-                    currentColumn: table.primaryAssetId,
-                    referencedTable: i1.$$StackEntityTableReferences
-                        ._primaryAssetIdTable(db),
-                    referencedColumn: i1.$$StackEntityTableReferences
-                        ._primaryAssetIdTable(db)
-                        .id,
-                  ) as T;
-                }
-
-                return state;
-              },
-              getPrefetchedDataCallback: (items) async {
-                return [];
-              },
-            );
-          },
-        ));
-}
-
-typedef $$StackEntityTableProcessedTableManager = i0.ProcessedTableManager<
-    i0.GeneratedDatabase,
-    i1.$StackEntityTable,
-    i1.StackEntityData,
-    i1.$$StackEntityTableFilterComposer,
-    i1.$$StackEntityTableOrderingComposer,
-    i1.$$StackEntityTableAnnotationComposer,
-    $$StackEntityTableCreateCompanionBuilder,
-    $$StackEntityTableUpdateCompanionBuilder,
-    (i1.StackEntityData, i1.$$StackEntityTableReferences),
-    i1.StackEntityData,
-    i0.PrefetchHooks Function({bool ownerId, bool primaryAssetId})>;
-
-class $StackEntityTable extends i2.StackEntity
-    with i0.TableInfo<$StackEntityTable, i1.StackEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $StackEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
-  @override
-  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
-      'id', aliasedName, false,
-      type: i0.DriftSqlType.string, requiredDuringInsert: true);
-  static const i0.VerificationMeta _createdAtMeta =
-      const i0.VerificationMeta('createdAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> createdAt =
-      i0.GeneratedColumn<DateTime>('created_at', aliasedName, false,
-          type: i0.DriftSqlType.dateTime,
-          requiredDuringInsert: false,
-          defaultValue: i3.currentDateAndTime);
-  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);
-  static const i0.VerificationMeta _ownerIdMeta =
-      const i0.VerificationMeta('ownerId');
-  @override
-  late final i0.GeneratedColumn<String> ownerId = i0.GeneratedColumn<String>(
-      'owner_id', aliasedName, false,
-      type: i0.DriftSqlType.string,
-      requiredDuringInsert: true,
-      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-          'REFERENCES user_entity (id) ON DELETE CASCADE'));
-  static const i0.VerificationMeta _primaryAssetIdMeta =
-      const i0.VerificationMeta('primaryAssetId');
-  @override
-  late final i0.GeneratedColumn<String> primaryAssetId =
-      i0.GeneratedColumn<String>(
-          'primary_asset_id', aliasedName, false,
-          type: i0.DriftSqlType.string,
-          requiredDuringInsert: true,
-          defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-              'REFERENCES remote_asset_entity (id)'));
-  @override
-  List<i0.GeneratedColumn> get $columns =>
-      [id, createdAt, updatedAt, ownerId, primaryAssetId];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'stack_entity';
-  @override
-  i0.VerificationContext validateIntegrity(
-      i0.Insertable<i1.StackEntityData> instance,
-      {bool isInserting = false}) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('id')) {
-      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
-    } else if (isInserting) {
-      context.missing(_idMeta);
-    }
-    if (data.containsKey('created_at')) {
-      context.handle(_createdAtMeta,
-          createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
-    }
-    if (data.containsKey('updated_at')) {
-      context.handle(_updatedAtMeta,
-          updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta));
-    }
-    if (data.containsKey('owner_id')) {
-      context.handle(_ownerIdMeta,
-          ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta));
-    } else if (isInserting) {
-      context.missing(_ownerIdMeta);
-    }
-    if (data.containsKey('primary_asset_id')) {
-      context.handle(
-          _primaryAssetIdMeta,
-          primaryAssetId.isAcceptableOrUnknown(
-              data['primary_asset_id']!, _primaryAssetIdMeta));
-    } else if (isInserting) {
-      context.missing(_primaryAssetIdMeta);
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {id};
-  @override
-  i1.StackEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.StackEntityData(
-      id: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
-      createdAt: attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
-      updatedAt: attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
-      ownerId: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}owner_id'])!,
-      primaryAssetId: attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.string, data['${effectivePrefix}primary_asset_id'])!,
-    );
-  }
-
-  @override
-  $StackEntityTable createAlias(String alias) {
-    return $StackEntityTable(attachedDatabase, alias);
-  }
-
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class StackEntityData extends i0.DataClass
-    implements i0.Insertable<i1.StackEntityData> {
-  final String id;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final String ownerId;
-  final String primaryAssetId;
-  const StackEntityData(
-      {required this.id,
-      required this.createdAt,
-      required this.updatedAt,
-      required this.ownerId,
-      required this.primaryAssetId});
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['id'] = i0.Variable<String>(id);
-    map['created_at'] = i0.Variable<DateTime>(createdAt);
-    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
-    map['owner_id'] = i0.Variable<String>(ownerId);
-    map['primary_asset_id'] = i0.Variable<String>(primaryAssetId);
-    return map;
-  }
-
-  factory StackEntityData.fromJson(Map<String, dynamic> json,
-      {i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return StackEntityData(
-      id: serializer.fromJson<String>(json['id']),
-      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
-      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
-      ownerId: serializer.fromJson<String>(json['ownerId']),
-      primaryAssetId: serializer.fromJson<String>(json['primaryAssetId']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'id': serializer.toJson<String>(id),
-      'createdAt': serializer.toJson<DateTime>(createdAt),
-      'updatedAt': serializer.toJson<DateTime>(updatedAt),
-      'ownerId': serializer.toJson<String>(ownerId),
-      'primaryAssetId': serializer.toJson<String>(primaryAssetId),
-    };
-  }
-
-  i1.StackEntityData copyWith(
-          {String? id,
-          DateTime? createdAt,
-          DateTime? updatedAt,
-          String? ownerId,
-          String? primaryAssetId}) =>
-      i1.StackEntityData(
-        id: id ?? this.id,
-        createdAt: createdAt ?? this.createdAt,
-        updatedAt: updatedAt ?? this.updatedAt,
-        ownerId: ownerId ?? this.ownerId,
-        primaryAssetId: primaryAssetId ?? this.primaryAssetId,
-      );
-  StackEntityData copyWithCompanion(i1.StackEntityCompanion data) {
-    return StackEntityData(
-      id: data.id.present ? data.id.value : this.id,
-      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
-      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
-      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
-      primaryAssetId: data.primaryAssetId.present
-          ? data.primaryAssetId.value
-          : this.primaryAssetId,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('StackEntityData(')
-          ..write('id: $id, ')
-          ..write('createdAt: $createdAt, ')
-          ..write('updatedAt: $updatedAt, ')
-          ..write('ownerId: $ownerId, ')
-          ..write('primaryAssetId: $primaryAssetId')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode =>
-      Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.StackEntityData &&
-          other.id == this.id &&
-          other.createdAt == this.createdAt &&
-          other.updatedAt == this.updatedAt &&
-          other.ownerId == this.ownerId &&
-          other.primaryAssetId == this.primaryAssetId);
-}
-
-class StackEntityCompanion extends i0.UpdateCompanion<i1.StackEntityData> {
-  final i0.Value<String> id;
-  final i0.Value<DateTime> createdAt;
-  final i0.Value<DateTime> updatedAt;
-  final i0.Value<String> ownerId;
-  final i0.Value<String> primaryAssetId;
-  const StackEntityCompanion({
-    this.id = const i0.Value.absent(),
-    this.createdAt = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
-    this.ownerId = const i0.Value.absent(),
-    this.primaryAssetId = const i0.Value.absent(),
-  });
-  StackEntityCompanion.insert({
-    required String id,
-    this.createdAt = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
-    required String ownerId,
-    required String primaryAssetId,
-  })  : id = i0.Value(id),
-        ownerId = i0.Value(ownerId),
-        primaryAssetId = i0.Value(primaryAssetId);
-  static i0.Insertable<i1.StackEntityData> custom({
-    i0.Expression<String>? id,
-    i0.Expression<DateTime>? createdAt,
-    i0.Expression<DateTime>? updatedAt,
-    i0.Expression<String>? ownerId,
-    i0.Expression<String>? primaryAssetId,
-  }) {
-    return i0.RawValuesInsertable({
-      if (id != null) 'id': id,
-      if (createdAt != null) 'created_at': createdAt,
-      if (updatedAt != null) 'updated_at': updatedAt,
-      if (ownerId != null) 'owner_id': ownerId,
-      if (primaryAssetId != null) 'primary_asset_id': primaryAssetId,
-    });
-  }
-
-  i1.StackEntityCompanion copyWith(
-      {i0.Value<String>? id,
-      i0.Value<DateTime>? createdAt,
-      i0.Value<DateTime>? updatedAt,
-      i0.Value<String>? ownerId,
-      i0.Value<String>? primaryAssetId}) {
-    return i1.StackEntityCompanion(
-      id: id ?? this.id,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      ownerId: ownerId ?? this.ownerId,
-      primaryAssetId: primaryAssetId ?? this.primaryAssetId,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (id.present) {
-      map['id'] = i0.Variable<String>(id.value);
-    }
-    if (createdAt.present) {
-      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
-    }
-    if (updatedAt.present) {
-      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
-    }
-    if (ownerId.present) {
-      map['owner_id'] = i0.Variable<String>(ownerId.value);
-    }
-    if (primaryAssetId.present) {
-      map['primary_asset_id'] = i0.Variable<String>(primaryAssetId.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('StackEntityCompanion(')
-          ..write('id: $id, ')
-          ..write('createdAt: $createdAt, ')
-          ..write('updatedAt: $updatedAt, ')
-          ..write('ownerId: $ownerId, ')
-          ..write('primaryAssetId: $primaryAssetId')
-          ..write(')'))
-        .toString();
-  }
-}
--- a/mobile/lib/infrastructure/entities/store.entity.dart
+++ b/mobile/lib/infrastructure/entities/store.entity.dart
@@ -1,13 +1,13 @@
-import 'package:isar/isar.dart';
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

-part 'store.entity.g.dart';
+class StoreEntity extends Table with DriftDefaultsMixin {
+  const StoreEntity();

-/// Internal class for `Store`, do not use elsewhere.
-@Collection(inheritance: false)
-class StoreValue {
-  final Id id;
-  final int? intValue;
-  final String? strValue;
+  IntColumn get id => integer()();
+  IntColumn get intValue => integer().nullable()();
+  TextColumn get strValue => text().nullable()();

-  const StoreValue(this.id, {this.intValue, this.strValue});
+  @override
+  Set<Column> get primaryKey => {id};
 }
--- a/mobile/lib/infrastructure/entities/store.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/store.entity.drift.dart
@@ -0,0 +1,364 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/store.entity.dart' as i2;
+
+typedef $$StoreEntityTableCreateCompanionBuilder = i1.StoreEntityCompanion
+    Function({
+  required int id,
+  i0.Value<int?> intValue,
+  i0.Value<String?> strValue,
+});
+typedef $$StoreEntityTableUpdateCompanionBuilder = i1.StoreEntityCompanion
+    Function({
+  i0.Value<int> id,
+  i0.Value<int?> intValue,
+  i0.Value<String?> strValue,
+});
+
+class $$StoreEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
+  $$StoreEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get intValue => $composableBuilder(
+      column: $table.intValue, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get strValue => $composableBuilder(
+      column: $table.strValue, builder: (column) => i0.ColumnFilters(column));
+}
+
+class $$StoreEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
+  $$StoreEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get intValue => $composableBuilder(
+      column: $table.intValue, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get strValue => $composableBuilder(
+      column: $table.strValue, builder: (column) => i0.ColumnOrderings(column));
+}
+
+class $$StoreEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
+  $$StoreEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get intValue =>
+      $composableBuilder(column: $table.intValue, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get strValue =>
+      $composableBuilder(column: $table.strValue, builder: (column) => column);
+}
+
+class $$StoreEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$StoreEntityTable,
+    i1.StoreEntityData,
+    i1.$$StoreEntityTableFilterComposer,
+    i1.$$StoreEntityTableOrderingComposer,
+    i1.$$StoreEntityTableAnnotationComposer,
+    $$StoreEntityTableCreateCompanionBuilder,
+    $$StoreEntityTableUpdateCompanionBuilder,
+    (
+      i1.StoreEntityData,
+      i0.BaseReferences<i0.GeneratedDatabase, i1.$StoreEntityTable,
+          i1.StoreEntityData>
+    ),
+    i1.StoreEntityData,
+    i0.PrefetchHooks Function()> {
+  $$StoreEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$StoreEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$StoreEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$StoreEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$StoreEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<int> id = const i0.Value.absent(),
+            i0.Value<int?> intValue = const i0.Value.absent(),
+            i0.Value<String?> strValue = const i0.Value.absent(),
+          }) =>
+              i1.StoreEntityCompanion(
+            id: id,
+            intValue: intValue,
+            strValue: strValue,
+          ),
+          createCompanionCallback: ({
+            required int id,
+            i0.Value<int?> intValue = const i0.Value.absent(),
+            i0.Value<String?> strValue = const i0.Value.absent(),
+          }) =>
+              i1.StoreEntityCompanion.insert(
+            id: id,
+            intValue: intValue,
+            strValue: strValue,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ));
+}
+
+typedef $$StoreEntityTableProcessedTableManager = i0.ProcessedTableManager<
+    i0.GeneratedDatabase,
+    i1.$StoreEntityTable,
+    i1.StoreEntityData,
+    i1.$$StoreEntityTableFilterComposer,
+    i1.$$StoreEntityTableOrderingComposer,
+    i1.$$StoreEntityTableAnnotationComposer,
+    $$StoreEntityTableCreateCompanionBuilder,
+    $$StoreEntityTableUpdateCompanionBuilder,
+    (
+      i1.StoreEntityData,
+      i0.BaseReferences<i0.GeneratedDatabase, i1.$StoreEntityTable,
+          i1.StoreEntityData>
+    ),
+    i1.StoreEntityData,
+    i0.PrefetchHooks Function()>;
+
+class $StoreEntityTable extends i2.StoreEntity
+    with i0.TableInfo<$StoreEntityTable, i1.StoreEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $StoreEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
+  @override
+  late final i0.GeneratedColumn<int> id = i0.GeneratedColumn<int>(
+      'id', aliasedName, false,
+      type: i0.DriftSqlType.int, requiredDuringInsert: true);
+  static const i0.VerificationMeta _intValueMeta =
+      const i0.VerificationMeta('intValue');
+  @override
+  late final i0.GeneratedColumn<int> intValue = i0.GeneratedColumn<int>(
+      'int_value', aliasedName, true,
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+  static const i0.VerificationMeta _strValueMeta =
+      const i0.VerificationMeta('strValue');
+  @override
+  late final i0.GeneratedColumn<String> strValue = i0.GeneratedColumn<String>(
+      'str_value', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  @override
+  List<i0.GeneratedColumn> get $columns => [id, intValue, strValue];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'store_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.StoreEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('int_value')) {
+      context.handle(_intValueMeta,
+          intValue.isAcceptableOrUnknown(data['int_value']!, _intValueMeta));
+    }
+    if (data.containsKey('str_value')) {
+      context.handle(_strValueMeta,
+          strValue.isAcceptableOrUnknown(data['str_value']!, _strValueMeta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.StoreEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.StoreEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}id'])!,
+      intValue: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}int_value']),
+      strValue: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}str_value']),
+    );
+  }
+
+  @override
+  $StoreEntityTable createAlias(String alias) {
+    return $StoreEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class StoreEntityData extends i0.DataClass
+    implements i0.Insertable<i1.StoreEntityData> {
+  final int id;
+  final int? intValue;
+  final String? strValue;
+  const StoreEntityData({required this.id, this.intValue, this.strValue});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<int>(id);
+    if (!nullToAbsent || intValue != null) {
+      map['int_value'] = i0.Variable<int>(intValue);
+    }
+    if (!nullToAbsent || strValue != null) {
+      map['str_value'] = i0.Variable<String>(strValue);
+    }
+    return map;
+  }
+
+  factory StoreEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return StoreEntityData(
+      id: serializer.fromJson<int>(json['id']),
+      intValue: serializer.fromJson<int?>(json['intValue']),
+      strValue: serializer.fromJson<String?>(json['strValue']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'intValue': serializer.toJson<int?>(intValue),
+      'strValue': serializer.toJson<String?>(strValue),
+    };
+  }
+
+  i1.StoreEntityData copyWith(
+          {int? id,
+          i0.Value<int?> intValue = const i0.Value.absent(),
+          i0.Value<String?> strValue = const i0.Value.absent()}) =>
+      i1.StoreEntityData(
+        id: id ?? this.id,
+        intValue: intValue.present ? intValue.value : this.intValue,
+        strValue: strValue.present ? strValue.value : this.strValue,
+      );
+  StoreEntityData copyWithCompanion(i1.StoreEntityCompanion data) {
+    return StoreEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      intValue: data.intValue.present ? data.intValue.value : this.intValue,
+      strValue: data.strValue.present ? data.strValue.value : this.strValue,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('StoreEntityData(')
+          ..write('id: $id, ')
+          ..write('intValue: $intValue, ')
+          ..write('strValue: $strValue')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, intValue, strValue);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.StoreEntityData &&
+          other.id == this.id &&
+          other.intValue == this.intValue &&
+          other.strValue == this.strValue);
+}
+
+class StoreEntityCompanion extends i0.UpdateCompanion<i1.StoreEntityData> {
+  final i0.Value<int> id;
+  final i0.Value<int?> intValue;
+  final i0.Value<String?> strValue;
+  const StoreEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.intValue = const i0.Value.absent(),
+    this.strValue = const i0.Value.absent(),
+  });
+  StoreEntityCompanion.insert({
+    required int id,
+    this.intValue = const i0.Value.absent(),
+    this.strValue = const i0.Value.absent(),
+  }) : id = i0.Value(id);
+  static i0.Insertable<i1.StoreEntityData> custom({
+    i0.Expression<int>? id,
+    i0.Expression<int>? intValue,
+    i0.Expression<String>? strValue,
+  }) {
+    return i0.RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (intValue != null) 'int_value': intValue,
+      if (strValue != null) 'str_value': strValue,
+    });
+  }
+
+  i1.StoreEntityCompanion copyWith(
+      {i0.Value<int>? id,
+      i0.Value<int?>? intValue,
+      i0.Value<String?>? strValue}) {
+    return i1.StoreEntityCompanion(
+      id: id ?? this.id,
+      intValue: intValue ?? this.intValue,
+      strValue: strValue ?? this.strValue,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<int>(id.value);
+    }
+    if (intValue.present) {
+      map['int_value'] = i0.Variable<int>(intValue.value);
+    }
+    if (strValue.present) {
+      map['str_value'] = i0.Variable<String>(strValue.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('StoreEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('intValue: $intValue, ')
+          ..write('strValue: $strValue')
+          ..write(')'))
+        .toString();
+  }
+}
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -7,14 +7,13 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.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/log.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:isar/isar.dart';
@@ -49,13 +48,11 @@ class IsarDatabaseRepository implements IDatabaseRepository {
    RemoteAlbumEntity,
    RemoteAlbumAssetEntity,
    RemoteAlbumUserEntity,
-    MemoryEntity,
-    MemoryAssetEntity,
-    StackEntity,
+    StoreEntity,
+    LoggerMessageEntity,
  ],
  include: {
    'package:immich_mobile/infrastructure/entities/merged_asset.drift',
-    'package:immich_mobile/infrastructure/entities/asset_triggers.drift',
  },
 )
 class Drift extends $Drift implements IDatabaseRepository {
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -7,33 +7,29 @@ import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.
    as i2;
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
    as i3;
-import 'package:immich_mobile/infrastructure/entities/asset_triggers.drift.dart'
-    as i4;
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
-    as i5;
+    as i4;
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
-    as i6;
+    as i5;
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
-    as i7;
+    as i6;
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
-    as i8;
+    as i7;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
-    as i9;
+    as i8;
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
-    as i10;
+    as i9;
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
-    as i11;
+    as i10;
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
+    as i11;
+import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
    as i12;
-import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart'
    as i13;
-import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
-    as i14;
-import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
-    as i15;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i16;
-import 'package:drift/internal/modular.dart' as i17;
+    as i14;
+import 'package:drift/internal/modular.dart' as i15;

 abstract class $Drift extends i0.GeneratedDatabase {
  $Drift(i0.QueryExecutor e) : super(e);
@@ -43,28 +39,27 @@ abstract class $Drift extends i0.GeneratedDatabase {
      i2.$RemoteAssetEntityTable(this);
  late final i3.$LocalAssetEntityTable localAssetEntity =
      i3.$LocalAssetEntityTable(this);
-  late final i5.$UserMetadataEntityTable userMetadataEntity =
-      i5.$UserMetadataEntityTable(this);
-  late final i6.$PartnerEntityTable partnerEntity =
-      i6.$PartnerEntityTable(this);
-  late final i7.$LocalAlbumEntityTable localAlbumEntity =
-      i7.$LocalAlbumEntityTable(this);
-  late final i8.$LocalAlbumAssetEntityTable localAlbumAssetEntity =
-      i8.$LocalAlbumAssetEntityTable(this);
-  late final i9.$RemoteExifEntityTable remoteExifEntity =
-      i9.$RemoteExifEntityTable(this);
-  late final i10.$RemoteAlbumEntityTable remoteAlbumEntity =
-      i10.$RemoteAlbumEntityTable(this);
-  late final i11.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity =
-      i11.$RemoteAlbumAssetEntityTable(this);
-  late final i12.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
-      i12.$RemoteAlbumUserEntityTable(this);
-  late final i13.$MemoryEntityTable memoryEntity = i13.$MemoryEntityTable(this);
-  late final i14.$MemoryAssetEntityTable memoryAssetEntity =
-      i14.$MemoryAssetEntityTable(this);
-  late final i15.$StackEntityTable stackEntity = i15.$StackEntityTable(this);
-  i16.MergedAssetDrift get mergedAssetDrift => i17.ReadDatabaseContainer(this)
-      .accessor<i16.MergedAssetDrift>(i16.MergedAssetDrift.new);
+  late final i4.$UserMetadataEntityTable userMetadataEntity =
+      i4.$UserMetadataEntityTable(this);
+  late final i5.$PartnerEntityTable partnerEntity =
+      i5.$PartnerEntityTable(this);
+  late final i6.$LocalAlbumEntityTable localAlbumEntity =
+      i6.$LocalAlbumEntityTable(this);
+  late final i7.$LocalAlbumAssetEntityTable localAlbumAssetEntity =
+      i7.$LocalAlbumAssetEntityTable(this);
+  late final i8.$RemoteExifEntityTable remoteExifEntity =
+      i8.$RemoteExifEntityTable(this);
+  late final i9.$RemoteAlbumEntityTable remoteAlbumEntity =
+      i9.$RemoteAlbumEntityTable(this);
+  late final i10.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity =
+      i10.$RemoteAlbumAssetEntityTable(this);
+  late final i11.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
+      i11.$RemoteAlbumUserEntityTable(this);
+  late final i12.$StoreEntityTable storeEntity = i12.$StoreEntityTable(this);
+  late final i13.$LoggerMessageEntityTable loggerMessageEntity =
+      i13.$LoggerMessageEntityTable(this);
+  i14.MergedAssetDrift get mergedAssetDrift => i15.ReadDatabaseContainer(this)
+      .accessor<i14.MergedAssetDrift>(i14.MergedAssetDrift.new);
  @override
  Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
      allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -73,10 +68,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
        userEntity,
        remoteAssetEntity,
        localAssetEntity,
-        i4.trLocalAssetUpdateChecksumSetIds,
-        i4.trLocalAssetUpdateOldChecksumSetRemoteAssetLocalId,
-        i4.trLocalAssetDeleteUpdateRemoteAssetLocalId,
-        i4.trRemoteAssetInsertSetLocalId,
        i3.idxLocalAssetChecksum,
        i2.uQRemoteAssetOwnerChecksum,
        i2.idxRemoteAssetChecksum,
@@ -88,9 +79,8 @@ abstract class $Drift extends i0.GeneratedDatabase {
        remoteAlbumEntity,
        remoteAlbumAssetEntity,
        remoteAlbumUserEntity,
-        memoryEntity,
-        memoryAssetEntity,
-        stackEntity
+        storeEntity,
+        loggerMessageEntity
      ];
  @override
  i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -103,43 +93,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
              i0.TableUpdate('remote_asset_entity', kind: i0.UpdateKind.delete),
            ],
          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('local_asset_entity', kind: i0.UpdateKind.update),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('local_asset_entity',
-                limitUpdateKind: i0.UpdateKind.update),
-            result: [
-              i0.TableUpdate('local_asset_entity', kind: i0.UpdateKind.update),
-              i0.TableUpdate('remote_asset_entity', kind: i0.UpdateKind.update),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('local_asset_entity',
-                limitUpdateKind: i0.UpdateKind.update),
-            result: [
-              i0.TableUpdate('remote_asset_entity', kind: i0.UpdateKind.update),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('local_asset_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('remote_asset_entity', kind: i0.UpdateKind.update),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
-                limitUpdateKind: i0.UpdateKind.insert),
-            result: [
-              i0.TableUpdate('remote_asset_entity', kind: i0.UpdateKind.update),
-              i0.TableUpdate('local_asset_entity', kind: i0.UpdateKind.update),
-            ],
-          ),
          i0.WritePropagation(
            on: i0.TableUpdateQuery.onTableName('user_entity',
                limitUpdateKind: i0.UpdateKind.delete),
@@ -231,34 +184,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
                  kind: i0.UpdateKind.delete),
            ],
          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('user_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('memory_entity', kind: i0.UpdateKind.delete),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('memory_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('user_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('stack_entity', kind: i0.UpdateKind.delete),
-            ],
-          ),
        ],
      );
  @override
@@ -275,27 +200,25 @@ class $DriftManager {
      i2.$$RemoteAssetEntityTableTableManager(_db, _db.remoteAssetEntity);
  i3.$$LocalAssetEntityTableTableManager get localAssetEntity =>
      i3.$$LocalAssetEntityTableTableManager(_db, _db.localAssetEntity);
-  i5.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
-      i5.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
-  i6.$$PartnerEntityTableTableManager get partnerEntity =>
-      i6.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
-  i7.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
-      i7.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
-  i8.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i8
+  i4.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
+      i4.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
+  i5.$$PartnerEntityTableTableManager get partnerEntity =>
+      i5.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
+  i6.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
+      i6.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
+  i7.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i7
      .$$LocalAlbumAssetEntityTableTableManager(_db, _db.localAlbumAssetEntity);
-  i9.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
-      i9.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
-  i10.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
-      i10.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
-  i11.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
-      i11.$$RemoteAlbumAssetEntityTableTableManager(
+  i8.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
+      i8.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
+  i9.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
+      i9.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
+  i10.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
+      i10.$$RemoteAlbumAssetEntityTableTableManager(
          _db, _db.remoteAlbumAssetEntity);
-  i12.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i12
+  i11.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i11
      .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
-  i13.$$MemoryEntityTableTableManager get memoryEntity =>
-      i13.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
-  i14.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
-      i14.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
-  i15.$$StackEntityTableTableManager get stackEntity =>
-      i15.$$StackEntityTableTableManager(_db, _db.stackEntity);
+  i12.$$StoreEntityTableTableManager get storeEntity =>
+      i12.$$StoreEntityTableTableManager(_db, _db.storeEntity);
+  i13.$$LoggerMessageEntityTableTableManager get loggerMessageEntity =>
+      i13.$$LoggerMessageEntityTableTableManager(_db, _db.loggerMessageEntity);
 }
--- a/mobile/lib/infrastructure/repositories/drift_store.repository.dart
+++ b/mobile/lib/infrastructure/repositories/drift_store.repository.dart
@@ -0,0 +1,145 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/drift_user.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+
+final driftStoreRepositoryProvider = Provider<DriftStoreRepository>(
+  (ref) => DriftStoreRepository(ref.watch(driftProvider)),
+);
+
+class DriftStoreRepository implements IStoreRepository {
+  final Drift _db;
+  final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
+
+  DriftStoreRepository(this._db);
+
+  @override
+  Future<bool> deleteAll() async {
+    return await _db.transaction(() async {
+      await _db.delete(_db.storeEntity).go();
+      return true;
+    });
+  }
+
+  @override
+  Stream<StoreDto<Object>> watchAll() {
+    return (_db.select(_db.storeEntity)
+          ..where((tbl) => tbl.id.isIn(validStoreKeys)))
+        .watch()
+        .asyncExpand(
+          (entities) => Stream.fromFutures(
+            entities.map((e) async => _toUpdateEvent(e)),
+          ),
+        );
+  }
+
+  @override
+  Future<void> delete<T>(StoreKey<T> key) async {
+    return await _db.transaction(() async {
+      await (_db.delete(_db.storeEntity)..where((tbl) => tbl.id.equals(key.id)))
+          .go();
+    });
+  }
+
+  @override
+  Future<bool> insert<T>(StoreKey<T> key, T value) async {
+    return await _db.transaction(() async {
+      await _db
+          .into(_db.storeEntity)
+          .insertOnConflictUpdate(await _fromValue(key, value));
+      return true;
+    });
+  }
+
+  @override
+  Future<T?> tryGet<T>(StoreKey<T> key) async {
+    final entity = await (_db.select(_db.storeEntity)
+          ..where((tbl) => tbl.id.equals(key.id)))
+        .getSingleOrNull();
+    if (entity == null) {
+      return null;
+    }
+    return await _toValue(key, entity);
+  }
+
+  @override
+  Future<bool> update<T>(StoreKey<T> key, T value) async {
+    return await _db.transaction(() async {
+      await _db
+          .into(_db.storeEntity)
+          .insertOnConflictUpdate(await _fromValue(key, value));
+      return true;
+    });
+  }
+
+  @override
+  Stream<T?> watch<T>(StoreKey<T> key) async* {
+    yield* (_db.select(_db.storeEntity)..where((tbl) => tbl.id.equals(key.id)))
+        .watchSingleOrNull()
+        .asyncMap((e) async => e == null ? null : await _toValue(key, e));
+  }
+
+  Future<StoreDto<Object>> _toUpdateEvent(StoreEntityData entity) async {
+    final key = StoreKey.values.firstWhere((e) => e.id == entity.id)
+        as StoreKey<Object>;
+    final value = await _toValue(key, entity);
+    return StoreDto(key, value);
+  }
+
+  Future<T?> _toValue<T>(StoreKey<T> key, StoreEntityData entity) async =>
+      switch (key.type) {
+        const (int) => entity.intValue,
+        const (String) => entity.strValue,
+        const (bool) => entity.intValue == 1,
+        const (DateTime) => entity.intValue == null
+            ? null
+            : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
+        const (UserDto) => entity.strValue == null
+            ? null
+            : await DriftUserRepository(_db).getByUserId(entity.strValue!),
+        _ => null,
+      } as T?;
+
+  Future<StoreEntityData> _fromValue<T>(StoreKey<T> key, T value) async {
+    final (int? intValue, String? strValue) = switch (key.type) {
+      const (int) => (value as int, null),
+      const (String) => (null, value as String),
+      const (bool) => ((value as bool) ? 1 : 0, null),
+      const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null),
+      const (UserDto) => (
+          null,
+          (await DriftUserRepository(_db).update(value as UserDto)).id,
+        ),
+      _ => throw UnsupportedError(
+          "Unsupported primitive type: ${key.type} for key: ${key.name}",
+        ),
+    };
+    return StoreEntityData(
+      id: key.id,
+      intValue: intValue,
+      strValue: strValue,
+    );
+  }
+
+  @override
+  Future<List<StoreDto<Object>>> getAll() async {
+    final entities = await (_db.select(_db.storeEntity)
+          ..where((tbl) => tbl.id.isIn(validStoreKeys)))
+        .get();
+    return Future.wait(entities.map((e) => _toUpdateEvent(e)).toList());
+  }
+}
+
+abstract class IStoreRepository {
+  Future<bool> deleteAll();
+  Stream<StoreDto<Object>> watchAll();
+  Future<void> delete<T>(StoreKey<T> key);
+  Future<bool> insert<T>(StoreKey<T> key, T value);
+  Future<T?> tryGet<T>(StoreKey<T> key);
+  Future<bool> update<T>(StoreKey<T> key, T value);
+  Stream<T?> watch<T>(StoreKey<T> key);
+  Future<List<StoreDto<Object>>> getAll();
+}
--- a/mobile/lib/infrastructure/repositories/drift_user.repository.dart
+++ b/mobile/lib/infrastructure/repositories/drift_user.repository.dart
@@ -0,0 +1,117 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
+import 'package:immich_mobile/domain/models/user_metadata.model.dart';
+
+class DriftUserRepository {
+  final Drift _db;
+  const DriftUserRepository(this._db);
+
+  Future<void> delete(List<String> ids) async {
+    await _db.transaction(() async {
+      await (_db.delete(_db.userEntity)..where((tbl) => tbl.id.isIn(ids))).go();
+    });
+  }
+
+  Future<void> deleteAll() async {
+    await _db.transaction(() async {
+      await _db.delete(_db.userEntity).go();
+    });
+  }
+
+  Future<List<UserDto>> getAll({SortUserBy? sortBy}) async {
+    var query = _db.select(_db.userEntity);
+
+    if (sortBy != null) {
+      switch (sortBy) {
+        case SortUserBy.id:
+          query = query..orderBy([(u) => OrderingTerm.asc(u.id)]);
+      }
+    }
+
+    final users = await query.get();
+    return users.map((u) => _toDto(u)).toList();
+  }
+
+  Future<UserDto?> getByUserId(String id) async {
+    final user = await (_db.select(_db.userEntity)
+          ..where((tbl) => tbl.id.equals(id)))
+        .getSingleOrNull();
+    return user != null ? _toDto(user) : null;
+  }
+
+  Future<List<UserDto?>> getByUserIds(List<String> ids) async {
+    final users = await (_db.select(_db.userEntity)
+          ..where((tbl) => tbl.id.isIn(ids)))
+        .get();
+
+    // Create a map for quick lookup
+    final userMap = {for (var user in users) user.id: _toDto(user)};
+
+    // Return results in the same order as input ids
+    return ids.map((id) => userMap[id]).toList();
+  }
+
+  Future<bool> insert(UserDto user) async {
+    await _db.transaction(() async {
+      await _db.into(_db.userEntity).insertOnConflictUpdate(_fromDto(user));
+    });
+    return true;
+  }
+
+  Future<UserDto> update(UserDto user) async {
+    await _db.transaction(() async {
+      await _db.into(_db.userEntity).insertOnConflictUpdate(_fromDto(user));
+    });
+    return user;
+  }
+
+  Future<bool> updateAll(List<UserDto> users) async {
+    await _db.transaction(() async {
+      await _db.batch((batch) {
+        for (final user in users) {
+          batch.insert(_db.userEntity, _fromDto(user),
+              mode: InsertMode.insertOrReplace);
+        }
+      });
+    });
+    return true;
+  }
+
+  UserDto _toDto(UserEntityData entity) {
+    return UserDto(
+      id: entity.id,
+      updatedAt: entity.updatedAt,
+      email: entity.email,
+      name: entity.name,
+      isAdmin: entity.isAdmin,
+      profileImagePath: entity.profileImagePath ?? '',
+      // Note: These fields are not in the current UserEntity table but are in UserDto
+      // You may need to add them to the table or provide defaults
+      isPartnerSharedBy: false,
+      isPartnerSharedWith: false,
+      avatarColor: AvatarColor.primary,
+      memoryEnabled: true,
+      inTimeline: false,
+      quotaUsageInBytes: entity.quotaUsageInBytes,
+      quotaSizeInBytes: entity.quotaSizeInBytes ?? 0,
+    );
+  }
+
+  UserEntityCompanion _fromDto(UserDto dto) {
+    return UserEntityCompanion(
+      id: Value(dto.id),
+      name: Value(dto.name),
+      isAdmin: Value(dto.isAdmin),
+      email: Value(dto.email),
+      profileImagePath: Value.absentIfNull(
+          dto.profileImagePath?.isEmpty == true ? null : dto.profileImagePath),
+      updatedAt: Value(dto.updatedAt),
+      quotaSizeInBytes: Value.absentIfNull(
+          dto.quotaSizeInBytes == 0 ? null : dto.quotaSizeInBytes),
+      quotaUsageInBytes: Value(dto.quotaUsageInBytes),
+    );
+  }
+}
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -282,7 +282,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
          durationInSeconds: Value(asset.durationInSeconds),
          id: asset.id,
          checksum: const Value(null),
-          remoteId: const Value(null),
        );
        batch.insert<$LocalAssetEntityTable, LocalAssetEntityData>(
          _db.localAssetEntity,
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -1,6 +1,5 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-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/repositories/db.repository.dart';

@@ -8,13 +7,6 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
  final Drift _db;
  const DriftLocalAssetRepository(this._db) : super(_db);

-  Stream<LocalAsset?> watchAsset(String id) {
-    final query = _db.localAssetEntity.select()
-      ..where((row) => row.id.equals(id));
-
-    return query.map((row) => row.toDto()).watchSingleOrNull();
-  }
-
  Future<void> updateHashes(Iterable<LocalAsset> hashes) {
    if (hashes.isEmpty) {
      return Future.value();
--- a/mobile/lib/infrastructure/repositories/log.repository.dart
+++ b/mobile/lib/infrastructure/repositories/log.repository.dart
@@ -1,46 +1,99 @@
+import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:isar/isar.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';

-class IsarLogRepository extends IsarDatabaseRepository {
-  final Isar _db;
-  const IsarLogRepository(super.db) : _db = db;
+final driftLogRepositoryProvider = Provider<LogRepository>(
+  (ref) => LogRepository(ref.watch(driftProvider)),
+);
+
+class LogRepository {
+  final Drift _db;
+
+  const LogRepository(this._db);

  Future<bool> deleteAll() async {
-    await transaction(() async => await _db.loggerMessages.clear());
+    await _db.transaction(() async {
+      await _db.delete(_db.loggerMessageEntity).go();
+    });
    return true;
  }

  Future<List<LogMessage>> getAll() async {
-    final logs =
-        await _db.loggerMessages.where().sortByCreatedAtDesc().findAll();
-    return logs.map((l) => l.toDto()).toList();
+    final query = _db.select(_db.loggerMessageEntity)
+      ..orderBy([(t) => OrderingTerm.desc(t.createdAt)]);
+    final results = await query.get();
+    return results
+        .map(
+          (row) => LogMessage(
+            message: row.message,
+            level: row.level,
+            createdAt: row.createdAt,
+            logger: row.context1,
+            error: row.details,
+            stack: row.context2,
+          ),
+        )
+        .toList();
  }

  Future<bool> insert(LogMessage log) async {
-    final logEntity = LoggerMessage.fromDto(log);
-    await transaction(() async {
-      await _db.loggerMessages.put(logEntity);
+    await _db.transaction(() async {
+      await _db.into(_db.loggerMessageEntity).insert(
+            LoggerMessageEntityCompanion.insert(
+              id: 0, // Will be auto-incremented by the database
+              message: log.message,
+              details: Value(log.error),
+              level: log.level,
+              createdAt: log.createdAt,
+              context1: Value(log.logger),
+              context2: Value(log.stack),
+            ),
+          );
    });
    return true;
  }

  Future<bool> insertAll(Iterable<LogMessage> logs) async {
-    await transaction(() async {
-      final logEntities =
-          logs.map((log) => LoggerMessage.fromDto(log)).toList();
-      await _db.loggerMessages.putAll(logEntities);
+    await _db.transaction(() async {
+      for (final log in logs) {
+        await _db.into(_db.loggerMessageEntity).insert(
+              LoggerMessageEntityCompanion.insert(
+                id: 0, // Will be auto-incremented by the database
+                message: log.message,
+                details: Value(log.error),
+                level: log.level,
+                createdAt: log.createdAt,
+                context1: Value(log.logger),
+                context2: Value(log.stack),
+              ),
+            );
+      }
    });
    return true;
  }

  Future<void> truncate({int limit = 250}) async {
-    await transaction(() async {
-      final count = await _db.loggerMessages.count();
+    await _db.transaction(() async {
+      final countQuery = _db.selectOnly(_db.loggerMessageEntity)
+        ..addColumns([_db.loggerMessageEntity.id.count()]);
+      final countResult = await countQuery.getSingle();
+      final count = countResult.read(_db.loggerMessageEntity.id.count()) ?? 0;
+
      if (count <= limit) return;
+
      final toRemove = count - limit;
-      await _db.loggerMessages.where().limit(toRemove).deleteAll();
+      final oldestIds = await (_db.select(_db.loggerMessageEntity)
+            ..orderBy([(t) => OrderingTerm.asc(t.createdAt)])
+            ..limit(toRemove))
+          .get();
+
+      final idsToDelete = oldestIds.map((row) => row.id).toList();
+      await (_db.delete(_db.loggerMessageEntity)
+            ..where((tbl) => tbl.id.isIn(idsToDelete)))
+          .go();
    });
  }
 }
--- a/mobile/lib/infrastructure/repositories/memory.repository.dart
+++ b/mobile/lib/infrastructure/repositories/memory.repository.dart
@@ -1,81 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/memory.model.dart';
-import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-
-class DriftMemoryRepository extends DriftDatabaseRepository {
-  final Drift _db;
-  const DriftMemoryRepository(this._db) : super(_db);
-
-  Future<List<DriftMemory>> getAll(String ownerId) async {
-    final now = DateTime.now();
-    final localUtc = DateTime.utc(now.year, now.month, now.day, 0, 0, 0);
-
-    final query = _db.select(_db.memoryEntity).join([
-      leftOuterJoin(
-        _db.memoryAssetEntity,
-        _db.memoryAssetEntity.memoryId.equalsExp(_db.memoryEntity.id),
-      ),
-      leftOuterJoin(
-        _db.remoteAssetEntity,
-        _db.remoteAssetEntity.id.equalsExp(_db.memoryAssetEntity.assetId) &
-            _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline),
-      ),
-    ])
-      ..where(_db.memoryEntity.ownerId.equals(ownerId))
-      ..where(_db.memoryEntity.deletedAt.isNull())
-      ..where(
-        _db.memoryEntity.showAt.isSmallerOrEqualValue(localUtc),
-      )
-      ..where(
-        _db.memoryEntity.hideAt.isBiggerOrEqualValue(localUtc),
-      )
-      ..orderBy([
-        OrderingTerm.desc(_db.memoryEntity.memoryAt),
-        OrderingTerm.asc(_db.remoteAssetEntity.createdAt),
-      ]);
-
-    final rows = await query.get();
-
-    final Map<String, DriftMemory> memoriesMap = {};
-
-    for (final row in rows) {
-      final memory = row.readTable(_db.memoryEntity);
-      final asset = row.readTable(_db.remoteAssetEntity);
-
-      final existingMemory = memoriesMap[memory.id];
-      if (existingMemory != null) {
-        existingMemory.assets.add(asset.toDto());
-      } else {
-        final assets = [asset.toDto()];
-        memoriesMap[memory.id] = memory.toDto().copyWith(assets: assets);
-      }
-    }
-
-    return memoriesMap.values.toList();
-  }
-}
-
-extension on MemoryEntityData {
-  DriftMemory toDto() {
-    return DriftMemory(
-      id: id,
-      createdAt: createdAt,
-      updatedAt: updatedAt,
-      deletedAt: deletedAt,
-      ownerId: ownerId,
-      type: type,
-      data: MemoryData.fromJson(data),
-      isSaved: isSaved,
-      memoryAt: memoryAt,
-      seenAt: seenAt,
-      showAt: showAt,
-      hideAt: hideAt,
-      assets: [],
-    );
-  }
-}
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -10,48 +10,26 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
  const DriftRemoteAlbumRepository(this._db) : super(_db);

  Future<List<Album>> getAll({Set<SortRemoteAlbumsBy> sortBy = const {}}) {
-    final assetCount = _db.remoteAlbumAssetEntity.assetId.count();
-
-    final query = _db.remoteAlbumEntity.select().join([
-      leftOuterJoin(
-        _db.remoteAlbumAssetEntity,
-        _db.remoteAlbumAssetEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
-        useColumns: false,
-      ),
-      leftOuterJoin(
-        _db.userEntity,
-        _db.userEntity.id.equalsExp(_db.remoteAlbumEntity.ownerId),
-      ),
-    ]);
-    query
-      ..addColumns([assetCount])
-      ..groupBy([_db.remoteAlbumEntity.id]);
+    final query = _db.remoteAlbumEntity.select();

    if (sortBy.isNotEmpty) {
-      final orderings = <OrderingTerm>[];
+      final orderings = <OrderClauseGenerator<$RemoteAlbumEntityTable>>[];
      for (final sort in sortBy) {
        orderings.add(
          switch (sort) {
-            SortRemoteAlbumsBy.id => OrderingTerm.asc(_db.remoteAlbumEntity.id),
+            SortRemoteAlbumsBy.id => (row) => OrderingTerm.asc(row.id),
          },
        );
      }
      query.orderBy(orderings);
    }

-    return query
-        .map(
-          (row) => row.readTable(_db.remoteAlbumEntity).toDto(
-                assetCount: row.read(assetCount) ?? 0,
-                ownerName: row.readTable(_db.userEntity).name,
-              ),
-        )
-        .get();
+    return query.map((row) => row.toDto()).get();
  }
 }

 extension on RemoteAlbumEntityData {
-  Album toDto({int assetCount = 0, required String ownerName}) {
+  Album toDto() {
    return Album(
      id: id,
      name: name,
@@ -62,8 +40,6 @@ extension on RemoteAlbumEntityData {
      thumbnailAssetId: thumbnailAssetId,
      isActivityEnabled: isActivityEnabled,
      order: order,
-      assetCount: assetCount,
-      ownerName: ownerName,
    );
  }
 }
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -1,100 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
-    hide ExifInfo;
-import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:maplibre_gl/maplibre_gl.dart';
-
-class RemoteAssetRepository extends DriftDatabaseRepository {
-  final Drift _db;
-  const RemoteAssetRepository(this._db) : super(_db);
-
-  /// For testing purposes
-  Future<List<RemoteAsset>> getSome(String userId) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(10);
-
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<RemoteAsset?> watchAsset(String id) {
-    final query = _db.remoteAssetEntity.select()
-      ..where((row) => row.id.equals(id));
-
-    return query.map((row) => row.toDto()).watchSingleOrNull();
-  }
-
-  Future<ExifInfo?> getExif(String id) {
-    return _db.managers.remoteExifEntity
-        .filter((row) => row.assetId.id.equals(id))
-        .map((row) => row.toDto())
-        .getSingleOrNull();
-  }
-
-  Future<void> updateFavorite(List<String> ids, bool isFavorite) {
-    return _db.batch((batch) async {
-      for (final id in ids) {
-        batch.update(
-          _db.remoteAssetEntity,
-          RemoteAssetEntityCompanion(isFavorite: Value(isFavorite)),
-          where: (e) => e.id.equals(id),
-        );
-      }
-    });
-  }
-
-  Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) {
-    return _db.batch((batch) async {
-      for (final id in ids) {
-        batch.update(
-          _db.remoteAssetEntity,
-          RemoteAssetEntityCompanion(visibility: Value(visibility)),
-          where: (e) => e.id.equals(id),
-        );
-      }
-    });
-  }
-
-  Future<void> trash(List<String> ids) {
-    return _db.batch((batch) async {
-      for (final id in ids) {
-        batch.update(
-          _db.remoteAssetEntity,
-          RemoteAssetEntityCompanion(deletedAt: Value(DateTime.now())),
-          where: (e) => e.id.equals(id),
-        );
-      }
-    });
-  }
-
-  Future<void> delete(List<String> ids) {
-    return _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(ids));
-  }
-
-  Future<void> updateLocation(List<String> ids, LatLng location) {
-    return _db.batch((batch) async {
-      for (final id in ids) {
-        batch.update(
-          _db.remoteExifEntity,
-          RemoteExifEntityCompanion(
-            latitude: Value(location.latitude),
-            longitude: Value(location.longitude),
-          ),
-          where: (e) => e.assetId.equals(id),
-        );
-      }
-    });
-  }
-}
--- a/mobile/lib/infrastructure/repositories/stack.repository.dart
+++ b/mobile/lib/infrastructure/repositories/stack.repository.dart
@@ -1,30 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/stack.model.dart';
-import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-
-class DriftStackRepository extends DriftDatabaseRepository {
-  final Drift _db;
-  const DriftStackRepository(this._db) : super(_db);
-
-  Future<List<Stack>> getAll(String userId) {
-    final query = _db.stackEntity.select()
-      ..where((e) => e.ownerId.equals(userId));
-
-    return query.map((stack) {
-      return stack.toDto();
-    }).get();
-  }
-}
-
-extension on StackEntityData {
-  Stack toDto() {
-    return Stack(
-      id: id,
-      createdAt: createdAt,
-      updatedAt: updatedAt,
-      ownerId: ownerId,
-      primaryAssetId: primaryAssetId,
-    );
-  }
-}
--- a/mobile/lib/infrastructure/repositories/storage.repository.dart
+++ b/mobile/lib/infrastructure/repositories/storage.repository.dart
@@ -5,21 +5,20 @@ import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';

 class StorageRepository {
-  const StorageRepository();
+  final _log = Logger('StorageRepository');

  Future<File?> getFileForAsset(LocalAsset asset) async {
-    final log = Logger('StorageRepository');
    File? file;
    try {
      final entity = await AssetEntity.fromId(asset.id);
      file = await entity?.originFile;
      if (file == null) {
-        log.warning(
+        _log.warning(
          "Cannot get file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
        );
      }
    } catch (error, stackTrace) {
-      log.warning(
+      _log.warning(
        "Error getting file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
        error,
        stackTrace,
--- a/mobile/lib/infrastructure/repositories/store.repository.dart
+++ b/mobile/lib/infrastructure/repositories/store.repository.dart
@@ -1,16 +1,19 @@
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/isar_store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
 import 'package:isar/isar.dart';

-class IsarStoreRepository extends IsarDatabaseRepository {
+class IsarStoreRepository extends IsarDatabaseRepository
+    implements IStoreRepository {
  final Isar _db;
  final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();

  IsarStoreRepository(super.db) : _db = db;

+  @override
  Future<bool> deleteAll() async {
    return await transaction(() async {
      await _db.storeValues.clear();
@@ -18,6 +21,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
    });
  }

+  @override
  Stream<StoreDto<Object>> watchAll() {
    return _db.storeValues
        .filter()
@@ -30,10 +34,12 @@ class IsarStoreRepository extends IsarDatabaseRepository {
        );
  }

+  @override
  Future<void> delete<T>(StoreKey<T> key) async {
    return await transaction(() async => await _db.storeValues.delete(key.id));
  }

+  @override
  Future<bool> insert<T>(StoreKey<T> key, T value) async {
    return await transaction(() async {
      await _db.storeValues.put(await _fromValue(key, value));
@@ -41,6 +47,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
    });
  }

+  @override
  Future<T?> tryGet<T>(StoreKey<T> key) async {
    final entity = (await _db.storeValues.get(key.id));
    if (entity == null) {
@@ -49,6 +56,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
    return await _toValue(key, entity);
  }

+  @override
  Future<bool> update<T>(StoreKey<T> key, T value) async {
    return await transaction(() async {
      await _db.storeValues.put(await _fromValue(key, value));
@@ -56,6 +64,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
    });
  }

+  @override
  Stream<T?> watch<T>(StoreKey<T> key) async* {
    yield* _db.storeValues
        .watchObject(key.id, fireImmediately: true)
@@ -100,6 +109,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
    return StoreValue(key.id, intValue: intValue, strValue: strValue);
  }

+  @override
  Future<List<StoreDto<Object>>> getAll() async {
    final entities = await _db.storeValues
        .filter()
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -52,10 +52,6 @@ class SyncApiRepository {
          SyncRequestType.albumAssetsV1,
          SyncRequestType.albumAssetExifsV1,
          SyncRequestType.albumToAssetsV1,
-          SyncRequestType.memoriesV1,
-          SyncRequestType.memoryToAssetsV1,
-          SyncRequestType.stacksV1,
-          SyncRequestType.partnerStacksV1,
        ],
      ).toJson(),
    );
@@ -161,15 +157,6 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
  SyncEntityType.albumToAssetBackfillV1: SyncAlbumToAssetV1.fromJson,
  SyncEntityType.albumToAssetDeleteV1: SyncAlbumToAssetDeleteV1.fromJson,
  SyncEntityType.syncAckV1: _SyncAckV1.fromJson,
-  SyncEntityType.memoryV1: SyncMemoryV1.fromJson,
-  SyncEntityType.memoryDeleteV1: SyncMemoryDeleteV1.fromJson,
-  SyncEntityType.memoryToAssetV1: SyncMemoryAssetV1.fromJson,
-  SyncEntityType.memoryToAssetDeleteV1: SyncMemoryAssetDeleteV1.fromJson,
-  SyncEntityType.stackV1: SyncStackV1.fromJson,
-  SyncEntityType.stackDeleteV1: SyncStackDeleteV1.fromJson,
-  SyncEntityType.partnerStackV1: SyncStackV1.fromJson,
-  SyncEntityType.partnerStackBackfillV1: SyncStackV1.fromJson,
-  SyncEntityType.partnerStackDeleteV1: SyncStackDeleteV1.fromJson,
 };

 class _SyncAckV1 {
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -1,18 +1,12 @@
-import 'dart:convert';
-
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/memory.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:logging/logging.dart';
@@ -70,8 +64,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe('Error: SyncPartnerDeleteV1', error, stack);
+    } catch (e, s) {
+      _logger.severe('Error: SyncPartnerDeleteV1', e, s);
      rethrow;
    }
  }
@@ -93,8 +87,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe('Error: SyncPartnerV1', error, stack);
+    } catch (e, s) {
+      _logger.severe('Error: SyncPartnerV1', e, s);
      rethrow;
    }
  }
@@ -104,11 +98,10 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    String debugLabel = 'user',
  }) async {
    try {
-      await _db.remoteAssetEntity.deleteWhere(
-        (row) => row.id.isIn(data.map((e) => e.assetId)),
-      );
-    } catch (error, stack) {
-      _logger.severe('Error: deleteAssetsV1 - $debugLabel', error, stack);
+      await _db.remoteAssetEntity
+          .deleteWhere((row) => row.id.isIn(data.map((e) => e.assetId)));
+    } catch (e, s) {
+      _logger.severe('Error: deleteAssetsV1 - $debugLabel', e, s);
      rethrow;
    }
  }
@@ -143,8 +136,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateAssetsV1 - $debugLabel', error, stack);
+    } catch (e, s) {
+      _logger.severe('Error: updateAssetsV1 - $debugLabel', e, s);
      rethrow;
    }
  }
@@ -168,8 +161,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            fNumber: Value(exif.fNumber),
            fileSize: Value(exif.fileSizeInByte),
            focalLength: Value(exif.focalLength),
-            latitude: Value(exif.latitude?.toDouble()),
-            longitude: Value(exif.longitude?.toDouble()),
+            latitude: Value(exif.latitude),
+            longitude: Value(exif.longitude),
            iso: Value(exif.iso),
            make: Value(exif.make),
            model: Value(exif.model),
@@ -177,7 +170,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            timeZone: Value(exif.timeZone),
            rating: Value(exif.rating),
            projectionType: Value(exif.projectionType),
-            lens: Value(exif.lensModel),
          );

          batch.insert(
@@ -187,23 +179,18 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe(
-        'Error: updateAssetsExifV1 - $debugLabel',
-        error,
-        stack,
-      );
+    } catch (e, s) {
+      _logger.severe('Error: updateAssetsExifV1 - $debugLabel', e, s);
      rethrow;
    }
  }

  Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
    try {
-      await _db.remoteAlbumEntity.deleteWhere(
-        (row) => row.id.isIn(data.map((e) => e.albumId)),
-      );
-    } catch (error, stack) {
-      _logger.severe('Error: deleteAlbumsV1', error, stack);
+      await _db.remoteAlbumEntity
+          .deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumsV1', e, s);
      rethrow;
    }
  }
@@ -230,8 +217,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateAlbumsV1', error, stack);
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumsV1', e, s);
      rethrow;
    }
  }
@@ -249,8 +236,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe('Error: deleteAlbumUsersV1', error, stack);
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumUsersV1', e, s);
      rethrow;
    }
  }
@@ -276,12 +263,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe(
-        'Error: updateAlbumUsersV1 - $debugLabel',
-        error,
-        stack,
-      );
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumUsersV1 - $debugLabel', e, s);
      rethrow;
    }
  }
@@ -301,8 +284,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe('Error: deleteAlbumToAssetsV1', error, stack);
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumToAssetsV1', e, s);
      rethrow;
    }
  }
@@ -326,137 +309,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (error, stack) {
-      _logger.severe(
-        'Error: updateAlbumToAssetsV1 - $debugLabel',
-        error,
-        stack,
-      );
-      rethrow;
-    }
-  }
-
-  Future<void> updateMemoriesV1(Iterable<SyncMemoryV1> data) async {
-    try {
-      await _db.batch((batch) {
-        for (final memory in data) {
-          final companion = MemoryEntityCompanion(
-            createdAt: Value(memory.createdAt),
-            deletedAt: Value(memory.deletedAt),
-            ownerId: Value(memory.ownerId),
-            type: Value(memory.type.toMemoryType()),
-            data: Value(jsonEncode(memory.data)),
-            isSaved: Value(memory.isSaved),
-            memoryAt: Value(memory.memoryAt),
-            seenAt: Value.absentIfNull(memory.seenAt),
-            showAt: Value.absentIfNull(memory.showAt),
-            hideAt: Value.absentIfNull(memory.hideAt),
-          );
-
-          batch.insert(
-            _db.memoryEntity,
-            companion.copyWith(id: Value(memory.id)),
-            onConflict: DoUpdate((_) => companion),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateMemoriesV1', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> deleteMemoriesV1(Iterable<SyncMemoryDeleteV1> data) async {
-    try {
-      await _db.memoryEntity.deleteWhere(
-        (row) => row.id.isIn(data.map((e) => e.memoryId)),
-      );
-    } catch (error, stack) {
-      _logger.severe('Error: deleteMemoriesV1', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> updateMemoryAssetsV1(Iterable<SyncMemoryAssetV1> data) async {
-    try {
-      await _db.batch((batch) {
-        for (final asset in data) {
-          final companion = MemoryAssetEntityCompanion(
-            memoryId: Value(asset.memoryId),
-            assetId: Value(asset.assetId),
-          );
-
-          batch.insert(
-            _db.memoryAssetEntity,
-            companion,
-            onConflict: DoNothing(),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateMemoryAssetsV1', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> deleteMemoryAssetsV1(
-    Iterable<SyncMemoryAssetDeleteV1> data,
-  ) async {
-    try {
-      await _db.batch((batch) {
-        for (final asset in data) {
-          batch.delete(
-            _db.memoryAssetEntity,
-            MemoryAssetEntityCompanion(
-              memoryId: Value(asset.memoryId),
-              assetId: Value(asset.assetId),
-            ),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: deleteMemoryAssetsV1', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> updateStacksV1(
-    Iterable<SyncStackV1> data, {
-    String debugLabel = 'user',
-  }) async {
-    try {
-      await _db.batch((batch) {
-        for (final stack in data) {
-          final companion = StackEntityCompanion(
-            createdAt: Value(stack.createdAt),
-            updatedAt: Value(stack.updatedAt),
-            ownerId: Value(stack.ownerId),
-            primaryAssetId: Value(stack.primaryAssetId),
-          );
-
-          batch.insert(
-            _db.stackEntity,
-            companion.copyWith(id: Value(stack.id)),
-            onConflict: DoUpdate((_) => companion),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateStacksV1 - $debugLabel', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> deleteStacksV1(
-    Iterable<SyncStackDeleteV1> data, {
-    String debugLabel = 'user',
-  }) async {
-    try {
-      await _db.stackEntity.deleteWhere(
-        (row) => row.id.isIn(data.map((e) => e.stackId)),
-      );
-    } catch (error, stack) {
-      _logger.severe('Error: deleteStacksV1 - $debugLabel', error, stack);
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumToAssetsV1 - $debugLabel', e, s);
      rethrow;
    }
  }
@@ -480,13 +334,6 @@ extension on AssetOrder {
      };
 }

-extension on MemoryType {
-  MemoryTypeEnum toMemoryType() => switch (this) {
-        MemoryType.onThisDay => MemoryTypeEnum.onThisDay,
-        _ => throw Exception('Unknown MemoryType value: $this'),
-      };
-}
-
 extension on api.AlbumUserRole {
  AlbumUserRole toAlbumUserRole() => switch (this) {
        api.AlbumUserRole.editor => AlbumUserRole.editor,
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -70,41 +70,39 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    return _db.mergedAssetDrift
        .mergedAsset(userIds, limit: Limit(count, offset))
        .map(
-      (row) {
-        return row.remoteId != null && row.ownerId != null
-            ? RemoteAsset(
-                id: row.remoteId!,
-                localId: row.localId,
-                name: row.name,
-                ownerId: row.ownerId!,
-                checksum: row.checksum,
-                type: row.type,
-                createdAt: row.createdAt,
-                updatedAt: row.updatedAt,
-                thumbHash: row.thumbHash,
-                width: row.width,
-                height: row.height,
-                isFavorite: row.isFavorite,
-                durationInSeconds: row.durationInSeconds,
-              )
-            : LocalAsset(
-                id: row.localId!,
-                remoteId: row.remoteId,
-                name: row.name,
-                checksum: row.checksum,
-                type: row.type,
-                createdAt: row.createdAt,
-                updatedAt: row.updatedAt,
-                width: row.width,
-                height: row.height,
-                isFavorite: row.isFavorite,
-                durationInSeconds: row.durationInSeconds,
-              );
-      },
-    ).get();
+          (row) => row.remoteId != null
+              ? Asset(
+                  id: row.remoteId!,
+                  localId: row.localId,
+                  name: row.name,
+                  checksum: row.checksum,
+                  type: row.type,
+                  createdAt: row.createdAt,
+                  updatedAt: row.updatedAt,
+                  thumbHash: row.thumbHash,
+                  width: row.width,
+                  height: row.height,
+                  isFavorite: row.isFavorite,
+                  durationInSeconds: row.durationInSeconds,
+                )
+              : LocalAsset(
+                  id: row.localId!,
+                  remoteId: row.remoteId,
+                  name: row.name,
+                  checksum: row.checksum,
+                  type: row.type,
+                  createdAt: row.createdAt,
+                  updatedAt: row.updatedAt,
+                  width: row.width,
+                  height: row.height,
+                  isFavorite: row.isFavorite,
+                  durationInSeconds: row.durationInSeconds,
+                ),
+        )
+        .get();
  }

-  Stream<List<Bucket>> watchLocalAlbumBucket(
+  Stream<List<Bucket>> watchLocalBucket(
    String albumId, {
    GroupAssetsBy groupBy = GroupAssetsBy.day,
  }) {
@@ -137,7 +135,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    }).watch();
  }

-  Future<List<BaseAsset>> getLocalAlbumBucketAssets(
+  Future<List<BaseAsset>> getLocalBucketAssets(
    String albumId, {
    required int offset,
    required int count,
@@ -158,7 +156,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
        .get();
  }

-  Stream<List<Bucket>> watchRemoteAlbumBucket(
+  Stream<List<Bucket>> watchRemoteBucket(
    String albumId, {
    GroupAssetsBy groupBy = GroupAssetsBy.day,
  }) {
@@ -192,7 +190,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    }).watch();
  }

-  Future<List<BaseAsset>> getRemoteAlbumBucketAssets(
+  Future<List<BaseAsset>> getRemoteBucketAssets(
    String albumId, {
    required int offset,
    required int count,
@@ -213,317 +211,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
        .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
        .get();
  }
-
-  Stream<List<Bucket>> watchFavoriteBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.isFavorite.equals(true) & row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.isFavorite.equals(true),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getFavoriteBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) => row.isFavorite.equals(true) & row.ownerId.equals(userId),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
-
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchTrashBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNotNull() & row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.deletedAt.isNotNull(),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getTrashBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) => row.deletedAt.isNotNull() & row.ownerId.equals(userId),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
-
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchArchiveBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.visibility.equalsValue(AssetVisibility.archive) &
-                row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.archive),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getArchiveBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            row.ownerId.equals(userId) &
-            row.visibility.equalsValue(AssetVisibility.archive),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
-
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchLockedFolderBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.visibility.equalsValue(AssetVisibility.locked) &
-                row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.locked),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getLockedFolderBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            row.visibility.equalsValue(AssetVisibility.locked) &
-            row.ownerId.equals(userId),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
-
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchVideoBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.type.equalsValue(AssetType.video) &
-                row.visibility.equalsValue(AssetVisibility.timeline) &
-                row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.type.equalsValue(AssetType.video) &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getVideoBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            _db.remoteAssetEntity.type.equalsValue(AssetType.video) &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline) &
-            _db.remoteAssetEntity.ownerId.equals(userId),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
-
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchRemoteBucket(
-    List<String> userIds, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNull() &
-                row.visibility.equalsValue(AssetVisibility.timeline) &
-                row.ownerId.isIn(userIds),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline) &
-            _db.remoteAssetEntity.ownerId.isIn(userIds),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getRemoteBucketAssets(
-    List<String> userIds, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            row.deletedAt.isNull() &
-            row.visibility.equalsValue(AssetVisibility.timeline) &
-            row.ownerId.isIn(userIds),
-      )
-      ..orderBy([(t) => OrderingTerm.desc(t.createdAt)])
-      ..limit(count, offset: offset);
-
-    return query.map((row) => row.toDto()).get();
-  }
 }

 extension on Expression<DateTime> {
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -238,7 +238,7 @@ class GalleryViewerPage extends HookConsumerWidget {

    PhotoViewGalleryPageOptions buildImage(Asset asset) {
      return PhotoViewGalleryPageOptions(
-        onDragStart: (_, details, __, ___) {
+        onDragStart: (_, details, __) {
          localPosition.value = details.localPosition;
        },
        onDragUpdate: (_, details, __) {
@@ -267,7 +267,7 @@ class GalleryViewerPage extends HookConsumerWidget {

    PhotoViewGalleryPageOptions buildVideo(BuildContext context, Asset asset) {
      return PhotoViewGalleryPageOptions.customChild(
-        onDragStart: (_, details, __, ___) =>
+        onDragStart: (_, details, __) =>
            localPosition.value = details.localPosition,
        onDragUpdate: (_, details, __) => handleSwipeUpDown(details),
        heroAttributes: _getHeroAttributes(asset),
@@ -370,7 +370,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                  ),
              itemCount: totalAssets.value,
              scrollDirection: Axis.horizontal,
-              onPageChanged: (value, _) {
+              onPageChanged: (value) {
                final next = currentIndex.value < value ? value + 1 : value - 1;

                ref.read(hapticFeedbackProvider.notifier).selectionClick();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex Tran	b24637ba74	update schema	2025-06-28 22:20:02 -05:00
Alex Tran	d54def39ca	drift logs	2025-06-28 17:50:08 -05:00
Alex Tran	f0c9163364	feat: drift store migration	2025-06-27 15:40:48 -05:00
@@ -1 +1 @@
 .17.0
 .16.0