ci(release): support patch releases from release/* branches

- prepare-release: add `branch` input; validate branch/bump combination;
  skip Weblate merge, mobile build, and APK asset when not on main; point
  checkout, release target, and tag at the selected branch; backport the
  archived-versions.json entry to main via PR.
- build-mobile: gate Android release build and iOS TestFlight upload on
  `environment == production` instead of the branch name, so patch
  releases still produce production artifacts if ever re-enabled.
- docker: build on pushes to release/**; restrict retag-from-main jobs
  to PRs and main-branch pushes.
- docs-build: build on pushes to release/**; include release/** in the
  pre-job force-branches list.

.github/workflows/build-mobile.yml

@@ -143,9 +143,9 @@ jobs:
           ALIAS: ${{ secrets.ALIAS }}
           ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
           ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
-          IS_MAIN: ${{ github.ref == 'refs/heads/main' }}
+          IS_RELEASE: ${{ inputs.environment == 'production' || github.ref == 'refs/heads/main' }}
         run: |
-          if [[ $IS_MAIN == 'true' ]]; then
+          if [[ $IS_RELEASE == 'true' ]]; then
             flutter build apk --release
             flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
           else
@@ -268,20 +268,20 @@ jobs:
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
           ENVIRONMENT: ${{ inputs.environment || 'development' }}
           BUNDLE_ID_SUFFIX: ${{ inputs.environment == 'production' && '' || 'development' }}
-          GITHUB_REF: ${{ github.ref }}
+          IS_RELEASE: ${{ inputs.environment == 'production' || github.ref == 'refs/heads/main' }}
           FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 120
           FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 6
         working-directory: ./mobile/ios
         run: |
-          # Only upload to TestFlight on main branch
-          if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then
+          # Upload to TestFlight on main or when explicitly invoked as a production release.
+          if [[ "$IS_RELEASE" == "true" ]]; then
             if [[ "$ENVIRONMENT" == "development" ]]; then
               bundle exec fastlane gha_testflight_dev
             else
               bundle exec fastlane gha_release_prod
             fi
           else
-            # Build only, no TestFlight upload for non-main branches
+            # Build only, no TestFlight upload
             bundle exec fastlane gha_build_only
           fi
 

.github/workflows/docker.yml

@@ -3,7 +3,7 @@ name: Docker
 on:
   workflow_dispatch:
   push:
-    branches: [main]
+    branches: [main, 'release/**']
   pull_request:
   release:
     types: [published]
@@ -53,7 +53,8 @@ jobs:
     permissions:
       contents: read
       packages: write
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).machine-learning == false && !github.event.pull_request.head.repo.fork }}
+    # Retag sources from the :main image, so only retag for PRs and main-branch pushes.
+    if: ${{ fromJSON(needs.pre-job.outputs.should_run).machine-learning == false && !github.event.pull_request.head.repo.fork && (github.event_name == 'pull_request' || github.ref == 'refs/heads/main') }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -83,7 +84,8 @@ jobs:
     permissions:
       contents: read
       packages: write
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == false && !github.event.pull_request.head.repo.fork }}
+    # Retag sources from the :main image, so only retag for PRs and main-branch pushes.
+    if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == false && !github.event.pull_request.head.repo.fork && (github.event_name == 'pull_request' || github.ref == 'refs/heads/main') }}
     runs-on: ubuntu-latest
     strategy:
       matrix:

.github/workflows/docs-build.yml

@@ -1,7 +1,7 @@
 name: Docs build
 on:
   push:
-    branches: [main]
+    branches: [main, 'release/**']
   pull_request:
   release:
     types: [published]
@@ -39,7 +39,7 @@ jobs:
           force-filters: |
             - '.github/workflows/docs-build.yml'
           force-events: 'release'
-          force-branches: 'main'
+          force-branches: 'main,release/**'
 
   build:
     name: Docs Build

.github/workflows/prepare-release.yml

@@ -3,8 +3,13 @@ name: Prepare new release
 on:
   workflow_dispatch:
     inputs:
+      branch:
+        description: 'Branch to release from (must be main or release/*)'
+        required: true
+        default: 'main'
+        type: string
       serverBump:
-        description: 'Bump server version'
+        description: 'Bump server version (only patch allowed on release/* branches)'
         required: true
         default: 'false'
         type: choice
@@ -29,10 +34,31 @@ concurrency:
 permissions: {}
 
 jobs:
+  validate_inputs:
+    runs-on: ubuntu-latest
+    permissions: {}
+    steps:
+      - name: Validate branch and bump combination
+        env:
+          BRANCH: ${{ inputs.branch }}
+          SERVER_BUMP: ${{ inputs.serverBump }}
+        run: |
+          set -euo pipefail
+          if [[ "$BRANCH" != "main" && "$BRANCH" != release/* ]]; then
+            echo "::error::branch must be 'main' or start with 'release/' (got '$BRANCH')"
+            exit 1
+          fi
+          if [[ "$BRANCH" != "main" && "$SERVER_BUMP" != "false" && "$SERVER_BUMP" != "patch" ]]; then
+            echo "::error::only 'patch' (or 'false') serverBump is allowed on '$BRANCH'"
+            exit 1
+          fi
+
   merge_translations:
+    needs: [validate_inputs]
     uses: ./.github/workflows/merge-translations.yml
     with:
-      skip: ${{ inputs.skipTranslations }}
+      # Weblate tracks main only, so skip translations when releasing from a release/* branch.
+      skip: ${{ inputs.skipTranslations || inputs.branch != 'main' }}
     permissions:
       pull-requests: write
     secrets:
@@ -60,7 +86,7 @@ jobs:
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: true
-          ref: main
+          ref: ${{ inputs.branch }}
 
       - name: Install uv
         uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
@@ -94,6 +120,10 @@ jobs:
           push: true
 
   build_mobile:
+    # Mobile build numbers are monotonic per store; releasing from a release/* branch
+    # would collide with build numbers already shipped from main. Skip mobile on patch
+    # releases — handle mobile patches on main instead.
+    if: ${{ inputs.branch == 'main' }}
     uses: ./.github/workflows/build-mobile.yml
     needs: bump_version
     permissions:
@@ -118,6 +148,8 @@ jobs:
   prepare_release:
     runs-on: ubuntu-latest
     needs: [build_mobile, bump_version]
+    # Run even when build_mobile is skipped (patch release from release/* branch).
+    if: ${{ always() && needs.bump_version.result == 'success' && (needs.build_mobile.result == 'success' || needs.build_mobile.result == 'skipped') }}
     permissions:
       actions: read # To download the app artifact
       # No content permissions are needed because it uses the app-token
@@ -134,26 +166,83 @@ jobs:
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: false
+          ref: ${{ needs.bump_version.outputs.ref }}
 
       - name: Download APK
+        if: ${{ needs.build_mobile.result == 'success' }}
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: release-apk-signed
           github-token: ${{ steps.generate-token.outputs.token }}
 
+      - name: Assemble release assets
+        id: assets
+        env:
+          HAS_APK: ${{ needs.build_mobile.result == 'success' }}
+        run: |
+          {
+            echo 'files<<EOF'
+            echo 'docker/docker-compose.yml'
+            echo 'docker/docker-compose.rootless.yml'
+            echo 'docker/example.env'
+            echo 'docker/hwaccel.ml.yml'
+            echo 'docker/hwaccel.transcoding.yml'
+            echo 'docker/prometheus.yml'
+            if [[ "$HAS_APK" == "true" ]]; then
+              echo '*.apk'
+            fi
+            echo 'EOF'
+          } >> "$GITHUB_OUTPUT"
+
       - name: Create draft release
         uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2.6.2
         with:
           draft: true
           tag_name: ${{ needs.bump_version.outputs.version }}
+          target_commitish: ${{ inputs.branch }}
           token: ${{ steps.generate-token.outputs.token }}
           generate_release_notes: true
           body_path: misc/release/notes.tmpl
-          files: |
-            docker/docker-compose.yml
-            docker/docker-compose.rootless.yml
-            docker/example.env
-            docker/hwaccel.ml.yml
-            docker/hwaccel.transcoding.yml
-            docker/prometheus.yml
-            *.apk
+          files: ${{ steps.assets.outputs.files }}
+
+  backport_archived_versions:
+    # When releasing from a release/* branch, the archived-versions.json update
+    # lives on that branch only. Open a PR to mirror the new entry onto main so
+    # main's docs keep a complete archive list.
+    if: ${{ inputs.branch != 'main' && needs.bump_version.result == 'success' }}
+    runs-on: ubuntu-latest
+    needs: [bump_version, prepare_release]
+    permissions: {} # uses the app token
+    steps:
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
+        with:
+          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
+          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
+
+      - name: Checkout main
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          persist-credentials: false
+          ref: main
+
+      - name: Update archived versions on main
+        env:
+          VERSION: ${{ needs.bump_version.outputs.version }}
+        run: ./misc/release/archive-version.js "${VERSION#v}"
+
+      - name: Open backport PR
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          branch: backport/archived-versions-${{ needs.bump_version.outputs.version }}
+          base: main
+          commit-message: 'chore(docs): archive ${{ needs.bump_version.outputs.version }}'
+          title: 'chore(docs): archive ${{ needs.bump_version.outputs.version }}'
+          body: |
+            Backports the `archived-versions.json` entry for ${{ needs.bump_version.outputs.version }},
+            released from `${{ inputs.branch }}`, so main's docs archive list stays complete.
+          add-paths: docs/static/archived-versions.json
+          delete-branch: true

.github/workflows/test.yml

@@ -392,8 +392,6 @@ jobs:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
           cache-dependency-path: '**/pnpm-lock.yaml'
-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@035e80a7d4355d5f087ffb95db9e4a0944c04e56 # use-mise-action-v1.1.3
       - name: Run pnpm install
         run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm install --frozen-lockfile
       - name: Run medium tests

.vscode/settings.json

@@ -26,8 +26,7 @@
   },
   "[svelte]": {
     "editor.defaultFormatter": "svelte.svelte-vscode",
-    "editor.formatOnSave": true,
-    "tailwindCSS.lint.suggestCanonicalClasses": "ignore"
+    "editor.formatOnSave": true
   },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",

deployment/mise.toml

@@ -1,5 +1,5 @@
 [tools]
-terragrunt = "1.0.2"
+terragrunt = "1.0.1"
 opentofu = "1.11.6"
 
 [tasks."tg:fmt"]

docker/docker-compose.prod.yml

@@ -85,7 +85,7 @@ services:
     container_name: immich_prometheus
     ports:
       - 9090:9090
-    image: prom/prometheus@sha256:e4254400b85610324913f0dc4acf92603d9984e7519414c5a12811aa6146acc3
+    image: prom/prometheus@sha256:5550dc63da361dc30f6fe02ac0e4dfc736ededfef3c8d12a634db04a67824d78
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus

docs/docs/administration/postgres-standalone.md

@@ -81,7 +81,7 @@ VectorChord is the successor extension to pgvecto.rs, allowing for higher perfor
 
 ### Migrating from pgvecto.rs
 
-Support for pgvecto.rs has been dropped as of 3.0, hence all users currently using pgvecto.rs should migrate to VectorChord. There are two primary approaches to do so.
+Support for pgvecto.rs will be dropped in a later release, hence we recommend all users currently using pgvecto.rs to migrate to VectorChord at their convenience. There are two primary approaches to do so.
 
 The easiest option is to have both extensions installed during the migration:
 

docs/docs/guides/remote-access.md

@@ -39,7 +39,7 @@ You can learn how to set up Tailscale together with Immich with the [tutorial vi
 ### Cons
 
 - The Tailscale client usually needs to run as root on your devices and it increases the attack surface slightly compared to a minimal Wireguard server. e.g., an [RCE vulnerability](https://github.com/tailscale/tailscale/security/advisories/GHSA-vqp6-rc3h-83cp) was discovered in the Windows Tailscale client in November 2022.
-- Tailscale is a paid service. However, there is a generous [free tier](https://tailscale.com/pricing/) suitable for personal use.
+- Tailscale is a paid service. However, there is a generous [free tier](https://tailscale.com/pricing/) that permits up to 3 users and up to 100 devices.
 - Tailscale needs to be installed and running on both server-side and client-side.
 
 ## Option 3: Reverse Proxy

docs/docs/install/environment-variables.md

@@ -81,7 +81,7 @@ Information on the current workers can be found [here](/administration/jobs-work
 | `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`])                         |            | 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`    | database                       |
 

docs/docs/install/upgrading.md

@@ -130,3 +130,7 @@ These storage mediums have different performance characteristics. As a result, t
 #### Can I use the new database image as a general PostgreSQL image outside of Immich?
 
 It’s a standard PostgreSQL container image that additionally contains the VectorChord, pgvector, and (optionally) pgvecto.rs extensions. If you were using the previous pgvecto.rs image for other purposes, you can similarly do so with this image.
+
+#### If pgvecto.rs and pgvector still work, why should I switch to VectorChord?
+
+VectorChord is faster, more stable, uses less RAM, and (with the settings Immich uses) offers higher-quality results than pgvector and pgvecto.rs. This translates to better search and facial recognition experiences. In addition, pgvecto.rs support will be dropped in the future, so changing it sooner will avoid disruption.

e2e/src/responses.ts

@@ -2,44 +2,82 @@ import { expect } from 'vitest';
 
 export const errorDto = {
   unauthorized: {
+    error: 'Unauthorized',
+    statusCode: 401,
     message: 'Authentication required',
+    correlationId: expect.any(String),
   },
   unauthorizedWithMessage: (message: string) => ({
+    error: 'Unauthorized',
+    statusCode: 401,
     message,
+    correlationId: expect.any(String),
   }),
   forbidden: {
+    error: 'Forbidden',
+    statusCode: 403,
     message: expect.any(String),
+    correlationId: expect.any(String),
   },
   missingPermission: (permission: string) => ({
+    error: 'Forbidden',
+    statusCode: 403,
     message: `Missing required permission: ${permission}`,
+    correlationId: expect.any(String),
   }),
   wrongPassword: {
+    error: 'Bad Request',
+    statusCode: 400,
     message: 'Wrong password',
+    correlationId: expect.any(String),
   },
   invalidToken: {
+    error: 'Unauthorized',
+    statusCode: 401,
     message: 'Invalid user token',
+    correlationId: expect.any(String),
   },
   invalidShareKey: {
+    error: 'Unauthorized',
+    statusCode: 401,
     message: 'Invalid share key',
+    correlationId: expect.any(String),
   },
   passwordRequired: {
+    error: 'Unauthorized',
+    statusCode: 401,
     message: 'Password required',
+    correlationId: expect.any(String),
   },
   badRequest: (message: any = null) => ({
+    error: 'Bad Request',
+    statusCode: 400,
     message: message ?? expect.anything(),
-  }),
-  validationError: (errors?: ReadonlyArray<{ path: ReadonlyArray<string | number>; message: string }>) => ({
-    message: 'Validation failed',
-    errors: errors ? expect.arrayContaining(errors.map((e) => expect.objectContaining(e))) : expect.any(Array),
+    correlationId: expect.any(String),
   }),
   noPermission: {
+    error: 'Bad Request',
+    statusCode: 400,
     message: expect.stringContaining('Not found or no'),
+    correlationId: expect.any(String),
   },
   incorrectLogin: {
+    error: 'Unauthorized',
+    statusCode: 401,
     message: 'Incorrect email or password',
+    correlationId: expect.any(String),
   },
   alreadyHasAdmin: {
+    error: 'Bad Request',
+    statusCode: 400,
     message: 'The server already has an admin',
+    correlationId: expect.any(String),
+  },
+  invalidEmail: {
+    error: 'Bad Request',
+    statusCode: 400,
+    message: ['email must be an email'],
+    correlationId: expect.any(String),
   },
 };
 

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

@@ -110,9 +110,7 @@ describe('/libraries', () => {
         });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['importPaths'], message: 'Array must have unique items' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[importPaths] Array must have unique items']));
     });
 
     it('should not create an external library with duplicate exclusion patterns', async () => {
@@ -127,9 +125,7 @@ describe('/libraries', () => {
         });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['exclusionPatterns'], message: 'Array must have unique items' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[exclusionPatterns] Array must have unique items']));
     });
   });
 
@@ -161,9 +157,7 @@ describe('/libraries', () => {
         .send({ name: '' });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['name'], message: 'Too small: expected string to have >=1 characters' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[name] Too small: expected string to have >=1 characters']));
     });
 
     it('should change the import paths', async () => {
@@ -187,9 +181,7 @@ describe('/libraries', () => {
         .send({ importPaths: [''] });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['importPaths'], message: 'Array items must not be empty' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[importPaths] Array items must not be empty']));
     });
 
     it('should reject duplicate import paths', async () => {
@@ -199,9 +191,7 @@ describe('/libraries', () => {
         .send({ importPaths: ['/path', '/path'] });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['importPaths'], message: 'Array must have unique items' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[importPaths] Array must have unique items']));
     });
 
     it('should change the exclusion pattern', async () => {
@@ -225,9 +215,7 @@ describe('/libraries', () => {
         .send({ exclusionPatterns: ['**/*.jpg', '**/*.jpg'] });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['exclusionPatterns'], message: 'Array must have unique items' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[exclusionPatterns] Array must have unique items']));
     });
 
     it('should reject an empty exclusion pattern', async () => {
@@ -237,9 +225,7 @@ describe('/libraries', () => {
         .send({ exclusionPatterns: [''] });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['exclusionPatterns'], message: 'Array items must not be empty' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[exclusionPatterns] Array items must not be empty']));
     });
   });
 

e2e/src/specs/server/api/map.e2e-spec.ts

@@ -109,9 +109,7 @@ describe('/map', () => {
         .get('/map/reverse-geocode?lon=123')
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['lat'], message: 'Invalid input: expected number, received NaN' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[lat] Invalid input: expected number, received NaN']));
     });
 
     it('should throw an error if a lat is not a number', async () => {
@@ -119,9 +117,7 @@ describe('/map', () => {
         .get('/map/reverse-geocode?lat=abc&lon=123.456')
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['lat'], message: 'Invalid input: expected number, received NaN' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[lat] Invalid input: expected number, received NaN']));
     });
 
     it('should throw an error if a lat is out of range', async () => {
@@ -129,9 +125,7 @@ describe('/map', () => {
         .get('/map/reverse-geocode?lat=91&lon=123.456')
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['lat'], message: 'Too big: expected number to be <=90' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[lat] Too big: expected number to be <=90']));
     });
 
     it('should throw an error if a lon is not provided', async () => {
@@ -139,9 +133,7 @@ describe('/map', () => {
         .get('/map/reverse-geocode?lat=75')
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['lon'], message: 'Invalid input: expected number, received NaN' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[lon] Invalid input: expected number, received NaN']));
     });
 
     const reverseGeocodeTestCases = [

e2e/src/specs/server/api/oauth.e2e-spec.ts

@@ -105,11 +105,7 @@ describe(`/oauth`, () => {
     it(`should throw an error if a redirect uri is not provided`, async () => {
       const { status, body } = await request(app).post('/oauth/authorize').send({});
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([
-          { path: ['redirectUri'], message: 'Invalid input: expected string, received undefined' },
-        ]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[redirectUri] Invalid input: expected string, received undefined']));
     });
 
     it('should return a redirect uri', async () => {
@@ -168,17 +164,13 @@ describe(`/oauth`, () => {
     it(`should throw an error if a url is not provided`, async () => {
       const { status, body } = await request(app).post('/oauth/callback').send({});
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['url'], message: 'Invalid input: expected string, received undefined' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[url] Invalid input: expected string, received undefined']));
     });
 
     it(`should throw an error if the url is empty`, async () => {
       const { status, body } = await request(app).post('/oauth/callback').send({ url: '' });
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['url'], message: 'Too small: expected string to have >=1 characters' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[url] Too small: expected string to have >=1 characters']));
     });
 
     it(`should throw an error if the state is not provided`, async () => {
@@ -340,7 +332,9 @@ describe(`/oauth`, () => {
       const { status, body } = await request(app).post('/oauth/callback').send(callbackParams);
       expect(status).toBe(500);
       expect(body).toMatchObject({
+        error: 'Internal Server Error',
         message: 'Failed to finish oauth',
+        statusCode: 500,
       });
     });
 
@@ -359,7 +353,7 @@ describe(`/oauth`, () => {
         const callbackParams = await loginWithOAuth('oauth-no-auto-register');
         const { status, body } = await request(app).post('/oauth/callback').send(callbackParams);
         expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest('OAuth authentication failed'));
+        expect(body).toEqual(errorDto.badRequest('User does not exist and auto registering is disabled.'));
       });
 
       it('should link to an existing user by email', async () => {
@@ -383,11 +377,7 @@ describe(`/oauth`, () => {
     it(`should throw an error if the logout_token is not provided`, async () => {
       const { status, body } = await request(app).post('/oauth/backchannel-logout').send({});
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([
-          { path: ['logout_token'], message: 'Invalid input: expected string, received undefined' },
-        ]),
-      );
+      expect(body).toEqual(errorDto.badRequest(['[logout_token] Invalid input: expected string, received undefined']));
     });
 
     it(`should throw an error if an invalid logout token is provided`, async () => {
@@ -505,10 +495,11 @@ describe(`/oauth`, () => {
     });
 
     it('should reject OAuth discovery over HTTP', async () => {
-      const { status } = await request(app)
+      const { status, body } = await request(app)
         .post('/oauth/authorize')
         .send({ redirectUri: 'http://127.0.0.1:2285/auth/login' });
       expect(status).toBe(500);
+      expect(body).toMatchObject({ statusCode: 500 });
     });
   });
 });

e2e/src/specs/server/api/shared-link.e2e-spec.ts

@@ -341,9 +341,7 @@ describe('/shared-links', () => {
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: [], message: 'Invalid input: expected object, received undefined' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest());
     });
 
     it('should require an asset/album id', async () => {

e2e/src/specs/server/api/stack.e2e-spec.ts

@@ -41,9 +41,7 @@ describe('/stacks', () => {
         .send({ assetIds: [asset.id] });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([{ path: ['assetIds'], message: 'Too small: expected array to have >=2 items' }]),
-      );
+      expect(body).toEqual(errorDto.badRequest());
     });
 
     it('should require a valid id', async () => {
@@ -53,12 +51,7 @@ describe('/stacks', () => {
         .send({ assetIds: [uuidDto.invalid, uuidDto.invalid] });
 
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([
-          { path: ['assetIds', 0], message: 'Invalid UUID' },
-          { path: ['assetIds', 1], message: 'Invalid UUID' },
-        ]),
-      );
+      expect(body).toEqual(errorDto.badRequest());
     });
 
     it('should require access', async () => {

e2e/src/specs/server/api/tag.e2e-spec.ts

@@ -309,7 +309,7 @@ describe('/tags', () => {
         .get(`/tags/${uuidDto.invalid}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.validationError([{ path: ['id'], message: 'Invalid UUID' }]));
+      expect(body).toEqual(errorDto.badRequest(['[id] Invalid UUID']));
     });
 
     it('should get tag details', async () => {
@@ -427,7 +427,7 @@ describe('/tags', () => {
         .delete(`/tags/${uuidDto.invalid}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.validationError([{ path: ['id'], message: 'Invalid UUID' }]));
+      expect(body).toEqual(errorDto.badRequest(['[id] Invalid UUID']));
     });
 
     it('should delete a tag', async () => {

e2e/src/specs/server/api/user-admin.e2e-spec.ts

@@ -108,20 +108,14 @@ describe('/admin/users', () => {
       expect(body).toEqual(errorDto.forbidden);
     });
 
-    for (const [key, message] of [
-      ['password', 'Invalid input: expected string, received null'],
-      ['email', 'Invalid input: expected email, received object'],
-      ['name', 'Invalid input: expected string, received null'],
-      ['shouldChangePassword', 'Invalid input: expected boolean, received null'],
-      ['notify', 'Invalid input: expected boolean, received null'],
-    ] as const) {
+    for (const key of ['password', 'email', 'name', 'quotaSizeInBytes', 'shouldChangePassword', 'notify']) {
       it(`should not allow null ${key}`, async () => {
         const { status, body } = await request(app)
           .post(`/admin/users`)
           .set('Authorization', `Bearer ${admin.accessToken}`)
           .send({ ...createUserDto.user1, [key]: null });
         expect(status).toBe(400);
-        expect(body).toEqual(errorDto.validationError([{ path: [key], message }]));
+        expect(body).toEqual(errorDto.badRequest());
       });
     }
 
@@ -159,19 +153,14 @@ describe('/admin/users', () => {
       expect(body).toEqual(errorDto.forbidden);
     });
 
-    for (const [key, message] of [
-      ['password', 'Invalid input: expected string, received null'],
-      ['email', 'Invalid input: expected email, received object'],
-      ['name', 'Invalid input: expected string, received null'],
-      ['shouldChangePassword', 'Invalid input: expected boolean, received null'],
-    ] as const) {
+    for (const key of ['password', 'email', 'name', 'shouldChangePassword']) {
       it(`should not allow null ${key}`, async () => {
         const { status, body } = await request(app)
           .put(`/admin/users/${uuidDto.notFound}`)
           .set('Authorization', `Bearer ${admin.accessToken}`)
           .send({ [key]: null });
         expect(status).toBe(400);
-        expect(body).toEqual(errorDto.validationError([{ path: [key], message }]));
+        expect(body).toEqual(errorDto.badRequest());
       });
     }
 

e2e/src/specs/server/api/user.e2e-spec.ts

@@ -120,7 +120,7 @@ describe('/users', () => {
         .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toMatchObject(errorDto.badRequest('Email is not available'));
+      expect(body).toMatchObject(errorDto.badRequest('Email already in use by another account'));
     });
 
     it('should update my email', async () => {
@@ -179,9 +179,7 @@ describe('/users', () => {
 
       expect(status).toBe(400);
       expect(body).toEqual(
-        errorDto.validationError([
-          { path: ['download', 'archiveSize'], message: 'Invalid input: expected int, received number' },
-        ]),
+        errorDto.badRequest(['[download.archiveSize] Invalid input: expected int, received number']),
       );
     });
 
@@ -209,9 +207,7 @@ describe('/users', () => {
 
       expect(status).toBe(400);
       expect(body).toEqual(
-        errorDto.validationError([
-          { path: ['download', 'includeEmbeddedVideos'], message: 'Invalid input: expected boolean, received number' },
-        ]),
+        errorDto.badRequest(['[download.includeEmbeddedVideos] Invalid input: expected boolean, received number']),
       );
     });
 

e2e/src/ui/generators/timeline/model-objects.ts

@@ -32,12 +32,8 @@ export function generateThumbhash(rng: SeededRandom): string {
   return Array.from({ length: 10 }, () => rng.nextInt(0, 256).toString(16).padStart(2, '0')).join('');
 }
 
-export function generateDuration(rng: SeededRandom): number {
-  return (
-    rng.nextInt(GENERATION_CONSTANTS.MIN_VIDEO_DURATION_SECONDS, GENERATION_CONSTANTS.MAX_VIDEO_DURATION_SECONDS) *
-      1000 +
-    rng.nextInt(0, 1000)
-  );
+export function generateDuration(rng: SeededRandom): string {
+  return `${rng.nextInt(GENERATION_CONSTANTS.MIN_VIDEO_DURATION_SECONDS, GENERATION_CONSTANTS.MAX_VIDEO_DURATION_SECONDS)}.${rng.nextInt(0, 1000).toString().padStart(3, '0')}`;
 }
 
 export function generateUUID(): string {

e2e/src/ui/generators/timeline/timeline-config.ts

@@ -43,7 +43,7 @@ export type MockTimelineAsset = {
   isTrashed: boolean;
   isVideo: boolean;
   isImage: boolean;
-  duration: number | null;
+  duration: string | null;
   projectionType: string | null;
   livePhotoVideoId: string | null;
   city: string | null;

e2e/src/ui/specs/timeline/timeline.e2e-spec.ts

@@ -304,7 +304,7 @@ test.describe('Timeline', () => {
       await page.keyboard.down('Shift');
       await thumbnailUtils.withAssetId(page, assets[2].id).hover();
       await expect(
-        thumbnailUtils.locator(page).locator('.absolute.top-0.size-full.bg-immich-primary.opacity-40'),
+        thumbnailUtils.locator(page).locator('.absolute.top-0.h-full.w-full.bg-immich-primary.opacity-40'),
       ).toHaveCount(3);
       await thumbnailUtils.selectButton(page, assets[2].id).click();
       await page.keyboard.up('Shift');

i18n/en.json

@@ -1761,7 +1761,6 @@
   "play_original_video": "Play original video",
   "play_original_video_setting_description": "Prefer playback of original videos rather than transcoded videos. If original asset is not compatible it may not playback correctly.",
   "play_transcoded_video": "Play transcoded video",
-  "playback_speed": "Playback speed",
   "please_auth_to_access": "Please authenticate to access",
   "port": "Port",
   "preferences_settings_subtitle": "Manage the app's preferences",
@@ -2437,7 +2436,6 @@
   "workflows": "Workflows",
   "workflows_help_text": "Workflows automate actions on your assets based on triggers and filters",
   "wrong_pin_code": "Wrong PIN code",
-  "x_of_total": "{x}/{total}",
   "year": "Year",
   "years_ago": "{years, plural, one {# year} other {# years}} ago",
   "yes": "Yes",

machine-learning/Dockerfile

@@ -48,14 +48,14 @@ FROM python:3.13-slim-trixie@sha256:d168b8d9eb761f4d3fe305ebd04aeb7e7f2de0297cec
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -yqq ocl-icd-libopencl1 wget && \
-    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.32.7/intel-igc-core-2_2.32.7+21184_amd64.deb && \
-    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.32.7/intel-igc-opencl-2_2.32.7+21184_amd64.deb && \
-    wget -nv https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/intel-opencl-icd_26.14.37833.4-0_amd64.deb &&  \
+    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.28.4/intel-igc-core-2_2.28.4+20760_amd64.deb && \
+    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.28.4/intel-igc-opencl-2_2.28.4+20760_amd64.deb && \
+    wget -nv https://github.com/intel/compute-runtime/releases/download/26.05.37020.3/intel-opencl-icd_26.05.37020.3-0_amd64.deb &&  \
     wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-core_1.0.17537.24_amd64.deb && \
     wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-opencl_1.0.17537.24_amd64.deb && \
     wget -nv https://github.com/intel/compute-runtime/releases/download/24.35.30872.36/intel-opencl-icd-legacy1_24.35.30872.36_amd64.deb && \
     # TODO: Figure out how to get renovate to manage this differently versioned libigdgmm file
-    wget -nv https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/libigdgmm12_22.9.0_amd64.deb && \
+    wget -nv https://github.com/intel/compute-runtime/releases/download/26.05.37020.3/libigdgmm12_22.9.0_amd64.deb && \
     dpkg -i *.deb && \
     rm *.deb && \
     apt-get remove wget -yqq && \
@@ -68,7 +68,7 @@ ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2 \
 
 RUN apt-get update && \
     # Pascal support was dropped in 9.11
-    apt-get install --no-install-recommends -yqq libcudnn9-cuda-12=9.10.2.21-1 tzdata && \
+    apt-get install --no-install-recommends -yqq libcudnn9-cuda-12=9.10.2.21-1 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -112,7 +112,7 @@ ARG RKNN_TOOLKIT_VERSION="v2.3.0"
 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2 \
     MACHINE_LEARNING_MODEL_ARENA=false
 
-ADD --chmod=644 --checksum=sha256:73993ed4b440460825f21611731564503cc1d5a0c123746477da6cd574f34885 "https://github.com/airockchip/rknn-toolkit2/raw/refs/tags/${RKNN_TOOLKIT_VERSION}/rknpu2/runtime/Linux/librknn_api/aarch64/librknnrt.so" /usr/lib/
+ADD --checksum=sha256:73993ed4b440460825f21611731564503cc1d5a0c123746477da6cd574f34885 "https://github.com/airockchip/rknn-toolkit2/raw/refs/tags/${RKNN_TOOLKIT_VERSION}/rknpu2/runtime/Linux/librknn_api/aarch64/librknnrt.so" /usr/lib/
 
 FROM prod-${DEVICE} AS prod
 

machine-learning/immich_ml/main.py

@@ -183,10 +183,7 @@ async def predict(
     text: str | None = Form(default=None),
 ) -> Any:
     if image is not None:
-        decoded = await run(lambda: decode_pil(image))
-        if decoded.width == 0 or decoded.height == 0:
-            raise HTTPException(400, "Image has zero width or height")
-        inputs: Image | str = decoded
+        inputs: Image | str = await run(lambda: decode_pil(image))
     elif text is not None:
         inputs = text
     else:

machine-learning/pyproject.toml

@@ -9,12 +9,12 @@ dependencies = [
     "aiocache>=0.12.1,<1.0",
     "fastapi>=0.95.2,<1.0",
     "gunicorn>=21.1.0",
-    "huggingface-hub>=1.0,<2.0",
+    "huggingface-hub>=0.20.1,<1.0",
     "insightface>=0.7.3,<1.0",
     "numpy<2.4.0",
     "opencv-python-headless>=4.7.0.72,<5.0",
     "orjson>=3.9.5",
-    "pillow>=12.2,<13",
+    "pillow>=12.2,<12.3",
     "pydantic>=2.0.0,<3",
     "pydantic-settings>=2.5.2,<3",
     "python-multipart>=0.0.6,<1.0",

machine-learning/test_main.py

@@ -1198,19 +1198,6 @@ class TestLoad:
         mock_model.model_format = ModelFormat.ONNX
 
 
-@pytest.mark.parametrize("size", [(0, 100), (100, 0), (0, 0)])
-def test_predict_rejects_empty_image(size: tuple[int, int], deployed_app: TestClient) -> None:
-    with mock.patch("immich_ml.main.decode_pil", return_value=Image.new("RGB", size)):
-        response = deployed_app.post(
-            "http://localhost:3003/predict",
-            data={"entries": json.dumps({"clip": {"visual": {"modelName": "ViT-B-32__openai"}}})},
-            files={"image": b"fake image bytes"},
-        )
-
-    assert response.status_code == 400
-    assert "zero" in response.json()["detail"].lower()
-
-
 def test_root_endpoint(deployed_app: TestClient) -> None:
     response = deployed_app.get("http://localhost:3003")
 

mise.toml

@@ -15,26 +15,17 @@ config_roots = [
 
 [tools]
 node = "24.15.0"
-flutter = "3.41.7"
-pnpm = "10.33.1"
-terragrunt = "1.0.2"
+flutter = "3.41.6"
+pnpm = "10.33.0"
+terragrunt = "1.0.1"
 opentofu = "1.11.6"
 java = "21.0.2"
 
 [tools."github:CQLabs/homebrew-dcm"]
-version = "1.37.0"
+version = "1.35.1"
 bin = "dcm"
 postinstall = "chmod +x $MISE_TOOL_INSTALL_PATH/dcm"
 
-[tools."github:jellyfin/jellyfin-ffmpeg"]
-version = "7.1.3-6"
-
-[tools."github:jellyfin/jellyfin-ffmpeg".platforms]
-linux-x64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_linux64-gpl.tar.xz" }
-linux-arm64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz" }
-macos-x64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz" }
-macos-arm64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz" }
-
 [settings]
 experimental = true
 pin = true

mobile/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.41.9",
+  "dart.flutterSdkPath": ".fvm/versions/3.41.7",
   "dart.lineLength": 120,
   "[dart]": {
     "editor.rulers": [

mobile/dcm_global.yaml

@@ -1 +1 @@
-version: '>=1.29.0 <=1.37.0'
+version: '>=1.29.0 <=1.36.0'

mobile/ios/fastlane/Appfile

@@ -1,5 +1,5 @@
 app_identifier "app.alextran.immich" # The bundle identifier of your app
-apple_id "altran@futo.org" # Your Apple email address
+apple_id "alex.tran1502@gmail.com" # Your Apple email address
 
 
 # For more information about the Appfile, see:

mobile/ios/fastlane/Fastfile

@@ -17,11 +17,10 @@ default_platform(:ios)
 
 platform :ios do
   # Constants
-  TEAM_ID = "2W7AC6T8T5"
-  CODE_SIGN_IDENTITY = "Apple Distribution: FUTO Holdings, Inc. (#{TEAM_ID})"
+  TEAM_ID = "2F67MQ8R79"
+  CODE_SIGN_IDENTITY = "Apple Distribution: Hau Tran (#{TEAM_ID})"
   BASE_BUNDLE_ID = "app.alextran.immich"
-  DEV_BUNDLE_ID  = "tech.futo.immich.testflight"
-
+  
   # Helper method to get App Store Connect API key
   def get_api_key
     app_store_connect_api_key(
@@ -45,45 +44,47 @@ def get_version_from_pubspec
 end
   
   # Helper method to configure code signing for all targets
-  def configure_code_signing(base_bundle_id:, profile_name_main:, profile_name_share:, profile_name_widget:)
+  def configure_code_signing(bundle_id_suffix: "", profile_name_main:, profile_name_share:, profile_name_widget:)
+    bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
+    
     # Runner (main app)
     update_code_signing_settings(
       use_automatic_signing: false,
       path: "./Runner.xcodeproj",
       team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
       code_sign_identity: CODE_SIGN_IDENTITY,
-      bundle_identifier: base_bundle_id,
+      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}",
       profile_name: profile_name_main,
       targets: ["Runner"]
     )
-
+    
     # ShareExtension
     update_code_signing_settings(
       use_automatic_signing: false,
       path: "./Runner.xcodeproj",
       team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
       code_sign_identity: CODE_SIGN_IDENTITY,
-      bundle_identifier: "#{base_bundle_id}.ShareExtension",
+      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}.ShareExtension",
       profile_name: profile_name_share,
       targets: ["ShareExtension"]
     )
-
+    
     # WidgetExtension
     update_code_signing_settings(
       use_automatic_signing: false,
       path: "./Runner.xcodeproj",
       team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
       code_sign_identity: CODE_SIGN_IDENTITY,
-      bundle_identifier: "#{base_bundle_id}.Widget",
+      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}.Widget",
       profile_name: profile_name_widget,
       targets: ["WidgetExtension"]
     )
   end
-
+  
   # Helper method to build and upload to TestFlight
   def build_and_upload(
     api_key:,
-    base_bundle_id:,
+    bundle_id_suffix: "",
     configuration: "Release",
     distribute_external: true,
     version_number: nil,
@@ -91,8 +92,9 @@ end
     profile_name_share:,
     profile_name_widget:
   )
-    app_identifier = base_bundle_id
-
+    bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
+    app_identifier = "#{BASE_BUNDLE_ID}#{bundle_suffix}"
+    
     # Set version number if provided
     if version_number
       increment_version_number(version_number: version_number)
@@ -136,31 +138,31 @@ end
   desc "iOS Development Build to TestFlight (requires separate bundle ID)"
   lane :gha_testflight_dev do
     api_key = get_api_key
-
+    
     # Download and install provisioning profiles from App Store Connect
     # Certificate is imported by GHA workflow into build.keychain
     # Capture profile names after each sigh call
-    sigh(api_key: api_key, app_identifier: DEV_BUNDLE_ID, force: true)
+    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development", force: true)
     main_profile_name = lane_context[SharedValues::SIGH_NAME]
-
-    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.ShareExtension", force: true)
+    
+    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.ShareExtension", force: true)
     share_profile_name = lane_context[SharedValues::SIGH_NAME]
-
-    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.Widget", force: true)
+    
+    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.Widget", force: true)
     widget_profile_name = lane_context[SharedValues::SIGH_NAME]
-
+    
     # Configure code signing for dev bundle IDs using the downloaded profile names
     configure_code_signing(
-      base_bundle_id: DEV_BUNDLE_ID,
+      bundle_id_suffix: "development",
       profile_name_main: main_profile_name,
       profile_name_share: share_profile_name,
       profile_name_widget: widget_profile_name
     )
-
+    
     # Build and upload
     build_and_upload(
       api_key: api_key,
-      base_bundle_id: DEV_BUNDLE_ID,
+      bundle_id_suffix: "development",
       configuration: "Profile",
       distribute_external: false,
       profile_name_main: main_profile_name,
@@ -187,7 +189,6 @@ end
     
     # Configure code signing for production bundle IDs
     configure_code_signing(
-      base_bundle_id: BASE_BUNDLE_ID,
       profile_name_main: main_profile_name,
       profile_name_share: share_profile_name,
       profile_name_widget: widget_profile_name
@@ -196,7 +197,6 @@ end
     # Build and upload with version number
     build_and_upload(
       api_key: api_key,
-      base_bundle_id: BASE_BUNDLE_ID,
       version_number: get_version_from_pubspec,
       distribute_external: false,
       profile_name_main: main_profile_name,
@@ -243,30 +243,30 @@ end
 
   desc "iOS Build Only (no TestFlight upload)"
   lane :gha_build_only do
-    # Use the same build process as the dev TestFlight lane, just skip the upload
-    # This ensures PR builds validate the same way as dev TestFlight builds
-
+    # Use the same build process as production, just skip the upload
+    # This ensures PR builds validate the same way as production builds
+    
     api_key = get_api_key
-
+    
     # Download and install provisioning profiles from App Store Connect
     # Certificate is imported by GHA workflow into build.keychain
-    sigh(api_key: api_key, app_identifier: DEV_BUNDLE_ID, force: true)
+    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development", force: true)
     main_profile_name = lane_context[SharedValues::SIGH_NAME]
-
-    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.ShareExtension", force: true)
+    
+    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.ShareExtension", force: true)
     share_profile_name = lane_context[SharedValues::SIGH_NAME]
-
-    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.Widget", force: true)
+    
+    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.Widget", force: true)
     widget_profile_name = lane_context[SharedValues::SIGH_NAME]
-
+    
     # Configure code signing for dev bundle IDs
     configure_code_signing(
-      base_bundle_id: DEV_BUNDLE_ID,
+      bundle_id_suffix: "development",
       profile_name_main: main_profile_name,
       profile_name_share: share_profile_name,
       profile_name_widget: widget_profile_name
     )
-
+    
     # Build the app (same as gha_testflight_dev but without upload)
     build_app(
       scheme: "Runner",
@@ -277,9 +277,9 @@ end
       xcargs: "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
       export_options: {
         provisioningProfiles: {
-          DEV_BUNDLE_ID => main_profile_name,
-          "#{DEV_BUNDLE_ID}.ShareExtension" => share_profile_name,
-          "#{DEV_BUNDLE_ID}.Widget" => widget_profile_name
+          "#{BASE_BUNDLE_ID}.development" => main_profile_name,
+          "#{BASE_BUNDLE_ID}.development.ShareExtension" => share_profile_name,
+          "#{BASE_BUNDLE_ID}.development.Widget" => widget_profile_name
         },
         signingStyle: "manual",
         signingCertificate: CODE_SIGN_IDENTITY

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

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

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

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

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

@@ -3,7 +3,6 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
@@ -193,22 +192,17 @@ class SyncStreamService {
         final remoteSyncAssets = data.cast<SyncAssetV1>();
         await _syncStreamRepository.updateAssetsV1(remoteSyncAssets);
         if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
-          await _syncAssetTrashStatus(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.id).toList());
-        }
-        return;
-      case SyncEntityType.assetV2:
-        final remoteSyncAssets = data.cast<SyncAssetV2>();
-        await _syncStreamRepository.updateAssetsV2(remoteSyncAssets);
-        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
-          await _syncAssetTrashStatus(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.id).toList());
+          final hasPermission = await _localFilesManager.hasManageMediaPermission();
+          if (hasPermission) {
+            await _handleRemoteTrashed(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.checksum));
+            await _applyRemoteRestoreToLocal();
+          } else {
+            _logger.warning("sync Trashed Assets cannot proceed because MANAGE_MEDIA permission is missing");
+          }
         }
         return;
       case SyncEntityType.assetDeleteV1:
-        final remoteSyncAssets = data.cast<SyncAssetDeleteV1>();
-        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
-          await _syncAssetDeletion(remoteSyncAssets.map((e) => e.assetId).toList());
-        }
-        return _syncStreamRepository.deleteAssetsV1(remoteSyncAssets);
+        return _syncStreamRepository.deleteAssetsV1(data.cast());
       case SyncEntityType.assetExifV1:
         return _syncStreamRepository.updateAssetsExifV1(data.cast());
       case SyncEntityType.assetEditV1:
@@ -221,12 +215,8 @@ class SyncStreamService {
         return _syncStreamRepository.deleteAssetsMetadataV1(data.cast());
       case SyncEntityType.partnerAssetV1:
         return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'partner');
-      case SyncEntityType.partnerAssetV2:
-        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'partner');
       case SyncEntityType.partnerAssetBackfillV1:
         return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'partner backfill');
-      case SyncEntityType.partnerAssetBackfillV2:
-        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'partner backfill');
       case SyncEntityType.partnerAssetDeleteV1:
         return _syncStreamRepository.deleteAssetsV1(data.cast(), debugLabel: "partner");
       case SyncEntityType.partnerAssetExifV1:
@@ -247,16 +237,10 @@ class SyncStreamService {
         return _syncStreamRepository.deleteAlbumUsersV1(data.cast());
       case SyncEntityType.albumAssetCreateV1:
         return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset create');
-      case SyncEntityType.albumAssetCreateV2:
-        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'album asset create');
       case SyncEntityType.albumAssetUpdateV1:
         return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset update');
-      case SyncEntityType.albumAssetUpdateV2:
-        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'album asset update');
       case SyncEntityType.albumAssetBackfillV1:
         return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset backfill');
-      case SyncEntityType.albumAssetBackfillV2:
-        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'album asset backfill');
       case SyncEntityType.albumAssetExifCreateV1:
         return _syncStreamRepository.updateAssetsExifV1(data.cast(), debugLabel: 'album asset exif create');
       case SyncEntityType.albumAssetExifUpdateV1:
@@ -312,10 +296,6 @@ class SyncStreamService {
         return _syncStreamRepository.updateAssetFacesV2(data.cast());
       case SyncEntityType.assetFaceDeleteV1:
         return _syncStreamRepository.deleteAssetFacesV1(data.cast());
-      case SyncEntityType.assetOcrV1:
-        return _syncStreamRepository.updateAssetOcrV1(data.cast());
-      case SyncEntityType.assetOcrDeleteV1:
-        return _syncStreamRepository.deleteAssetOcrV1(data.cast());
       default:
         _logger.warning("Unknown sync data type: $type");
     }
@@ -362,47 +342,6 @@ class SyncStreamService {
     }
   }
 
-  Future<void> handleWsAssetUploadReadyV2Batch(List<dynamic> batchData) async {
-    if (batchData.isEmpty) return;
-
-    _logger.info('Processing batch of ${batchData.length} AssetUploadReadyV2 events');
-
-    final List<SyncAssetV2> assets = [];
-    final List<SyncAssetExifV1> exifs = [];
-
-    try {
-      for (final data in batchData) {
-        if (data is! Map<String, dynamic>) {
-          continue;
-        }
-
-        final payload = data;
-        final assetData = payload['asset'];
-        final exifData = payload['exif'];
-
-        if (assetData == null || exifData == null) {
-          continue;
-        }
-
-        final asset = SyncAssetV2.fromJson(assetData);
-        final exif = SyncAssetExifV1.fromJson(exifData);
-
-        if (asset != null && exif != null) {
-          assets.add(asset);
-          exifs.add(exif);
-        }
-      }
-
-      if (assets.isNotEmpty && exifs.isNotEmpty) {
-        await _syncStreamRepository.updateAssetsV2(assets, debugLabel: 'websocket-batch');
-        await _syncStreamRepository.updateAssetsExifV1(exifs, debugLabel: 'websocket-batch');
-        _logger.info('Successfully processed ${assets.length} assets in batch');
-      }
-    } catch (error, stackTrace) {
-      _logger.severe("Error processing AssetUploadReadyV2 websocket batch events", error, stackTrace);
-    }
-  }
-
   Future<void> handleWsAssetEditReadyV1(dynamic data) async {
     _logger.info('Processing AssetEditReadyV1 event');
 
@@ -443,67 +382,28 @@ class SyncStreamService {
     }
   }
 
-  Future<void> handleWsAssetEditReadyV2(dynamic data) async {
-    _logger.info('Processing AssetEditReadyV2 event');
-
-    try {
-      if (data is! Map<String, dynamic>) {
-        throw ArgumentError("Invalid data format for AssetEditReadyV2 event");
-      }
-
-      final payload = data;
-
-      if (payload['asset'] == null) {
-        throw ArgumentError("Missing 'asset' field in AssetEditReadyV2 event data");
-      }
-
-      final asset = SyncAssetV2.fromJson(payload['asset']);
-      if (asset == null) {
-        throw ArgumentError("Failed to parse 'asset' field in AssetEditReadyV2 event data");
-      }
-
-      final assetEdits = (payload['edit'] as List<dynamic>)
-          .map((e) => SyncAssetEditV1.fromJson(e))
-          .whereType<SyncAssetEditV1>()
-          .toList();
-
-      await _syncStreamRepository.updateAssetsV2([asset], debugLabel: 'websocket-edit');
-      await _syncStreamRepository.replaceAssetEditsV1(asset.id, assetEdits, debugLabel: 'websocket-edit');
-
-      _logger.info(
-        'Successfully processed AssetEditReadyV2 event for asset ${asset.id} with ${assetEdits.length} edits',
-      );
-    } catch (error, stackTrace) {
-      _logger.severe("Error processing AssetEditReadyV2 websocket event", error, stackTrace);
-    }
-  }
-
-  Future<void> _handleRemoteDeleted(Iterable<String> remoteIds) async {
-    if (remoteIds.isEmpty) {
+  Future<void> _handleRemoteTrashed(Iterable<String> checksums) async {
+    if (checksums.isEmpty) {
       return Future.value();
     } else {
-      final localAssetsToTrash = await _localAssetRepository.getAssetsFromBackupAlbums(remoteIds);
+      final localAssetsToTrash = await _localAssetRepository.getAssetsFromBackupAlbums(checksums);
       if (localAssetsToTrash.isNotEmpty) {
-        await _trashLocalAssets(localAssetsToTrash);
+        final mediaUrls = await Future.wait(
+          localAssetsToTrash.values
+              .expand((e) => e)
+              .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
+        );
+        _logger.info("Moving to trash ${mediaUrls.join(", ")} assets");
+        final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
+        if (result) {
+          await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
+        }
       } else {
-        _logger.info("No assets found in backup-enabled albums for remote assets: $remoteIds");
+        _logger.info("No assets found in backup-enabled albums for assets: $checksums");
       }
     }
   }
 
-  Future<void> _trashLocalAssets(Map<String, List<LocalAsset>> localAssetsToTrash) async {
-    final mediaUrls = await Future.wait(
-      localAssetsToTrash.values
-          .expand((e) => e)
-          .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
-    );
-    _logger.info("Moving to trash ${mediaUrls.join(", ")} assets");
-    final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
-    if (result) {
-      await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
-    }
-  }
-
   Future<void> _applyRemoteRestoreToLocal() async {
     final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
     if (assetsToRestore.isNotEmpty) {
@@ -513,23 +413,4 @@ class SyncStreamService {
       _logger.info("No remote assets found for restoration");
     }
   }
-
-  Future<void> _syncAssetTrashStatus(List<String> remoteIds) async {
-    if (!(await _localFilesManager.hasManageMediaPermission())) {
-      _logger.warning("Syncing asset trash status cannot proceed because MANAGE_MEDIA permission is missing");
-      return;
-    }
-
-    await _handleRemoteDeleted(remoteIds);
-    await _applyRemoteRestoreToLocal();
-  }
-
-  Future<void> _syncAssetDeletion(List<String> remoteIds) async {
-    if (!(await _localFilesManager.hasManageMediaPermission())) {
-      _logger.warning("Syncing asset deletion cannot proceed because MANAGE_MEDIA permission is missing");
-      return;
-    }
-
-    await _handleRemoteDeleted(remoteIds);
-  }
 }

mobile/lib/domain/utils/background_sync.dart

@@ -186,7 +186,7 @@ class BackgroundSyncManager {
         });
   }
 
-  Future<void> syncWebsocketBatchV1(List<dynamic> batchData) {
+  Future<void> syncWebsocketBatch(List<dynamic> batchData) {
     if (_syncWebsocketTask != null) {
       return _syncWebsocketTask!.future;
     }
@@ -196,17 +196,7 @@ class BackgroundSyncManager {
     });
   }
 
-  Future<void> syncWebsocketBatchV2(List<dynamic> batchData) {
-    if (_syncWebsocketTask != null) {
-      return _syncWebsocketTask!.future;
-    }
-    _syncWebsocketTask = _handleWsAssetUploadReadyV2Batch(batchData);
-    return _syncWebsocketTask!.whenComplete(() {
-      _syncWebsocketTask = null;
-    });
-  }
-
-  Future<void> syncWebsocketEditV1(dynamic data) {
+  Future<void> syncWebsocketEdit(dynamic data) {
     if (_syncWebsocketTask != null) {
       return _syncWebsocketTask!.future;
     }
@@ -216,16 +206,6 @@ class BackgroundSyncManager {
     });
   }
 
-  Future<void> syncWebsocketEditV2(dynamic data) {
-    if (_syncWebsocketTask != null) {
-      return _syncWebsocketTask!.future;
-    }
-    _syncWebsocketTask = _handleWsAssetEditReadyV2(data);
-    return _syncWebsocketTask!.whenComplete(() {
-      _syncWebsocketTask = null;
-    });
-  }
-
   Future<void> syncLinkedAlbum() {
     if (_linkedAlbumSyncTask != null) {
       return _linkedAlbumSyncTask!.future;
@@ -262,17 +242,7 @@ Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => ru
   debugLabel: 'websocket-batch',
 );
 
-Cancelable<void> _handleWsAssetUploadReadyV2Batch(List<dynamic> batchData) => runInIsolateGentle(
-  computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetUploadReadyV2Batch(batchData),
-  debugLabel: 'websocket-batch',
-);
-
 Cancelable<void> _handleWsAssetEditReadyV1(dynamic data) => runInIsolateGentle(
   computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetEditReadyV1(data),
   debugLabel: 'websocket-edit',
 );
-
-Cancelable<void> _handleWsAssetEditReadyV2(dynamic data) => runInIsolateGentle(
-  computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetEditReadyV2(data),
-  debugLabel: 'websocket-edit',
-);

mobile/lib/extensions/asset_extensions.dart

@@ -1,5 +1,6 @@
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:openapi/api.dart' as api;
 
@@ -13,7 +14,7 @@ extension DTOToAsset on api.AssetResponseDto {
       updatedAt: updatedAt,
       ownerId: ownerId,
       visibility: visibility.toAssetVisibility(),
-      durationMs: duration,
+      durationMs: duration?.toDuration()?.inMilliseconds ?? 0,
       height: height?.toInt(),
       width: width?.toInt(),
       isFavorite: isFavorite,
@@ -35,7 +36,7 @@ extension DTOToAsset on api.AssetResponseDto {
       updatedAt: updatedAt,
       ownerId: ownerId,
       visibility: visibility.toAssetVisibility(),
-      durationMs: duration,
+      durationMs: duration?.toDuration()?.inMilliseconds ?? 0,
       height: height?.toInt(),
       width: width?.toInt(),
       isFavorite: isFavorite,

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

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

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

@@ -5,7 +5,6 @@ import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
@@ -54,7 +53,6 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.da
     StoreEntity,
     TrashedLocalAssetEntity,
     AssetEditEntity,
-    AssetOcrEntity,
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -86,7 +84,7 @@ class Drift extends $Drift {
   }
 
   @override
-  int get schemaVersion => 25;
+  int get schemaVersion => 24;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -252,9 +250,6 @@ class Drift extends $Drift {
             await customStatement('DROP INDEX IF EXISTS idx_remote_album_owner_id');
             await m.alterTable(TableMigration(v24.remoteAlbumEntity));
           },
-          from24To25: (m, v25) async {
-            await m.create(v25.assetOcrEntity);
-          },
         ),
       );
 

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

@@ -43,11 +43,9 @@ import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity
     as i20;
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart'
     as i21;
-import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart'
-    as i22;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i23;
-import 'package:drift/internal/modular.dart' as i24;
+    as i22;
+import 'package:drift/internal/modular.dart' as i23;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -91,12 +89,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
       .$TrashedLocalAssetEntityTable(this);
   late final i21.$AssetEditEntityTable assetEditEntity = i21
       .$AssetEditEntityTable(this);
-  late final i22.$AssetOcrEntityTable assetOcrEntity = i22.$AssetOcrEntityTable(
+  i22.MergedAssetDrift get mergedAssetDrift => i23.ReadDatabaseContainer(
     this,
-  );
-  i23.MergedAssetDrift get mergedAssetDrift => i24.ReadDatabaseContainer(
-    this,
-  ).accessor<i23.MergedAssetDrift>(i23.MergedAssetDrift.new);
+  ).accessor<i22.MergedAssetDrift>(i22.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -134,7 +129,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
     storeEntity,
     trashedLocalAssetEntity,
     assetEditEntity,
-    assetOcrEntity,
     i10.idxPartnerSharedWithId,
     i11.idxLatLng,
     i12.idxRemoteAlbumAssetAlbumAsset,
@@ -334,13 +328,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
       ),
       result: [i0.TableUpdate('asset_edit_entity', kind: i0.UpdateKind.delete)],
     ),
-    i0.WritePropagation(
-      on: i0.TableUpdateQuery.onTableName(
-        'remote_asset_entity',
-        limitUpdateKind: i0.UpdateKind.delete,
-      ),
-      result: [i0.TableUpdate('asset_ocr_entity', kind: i0.UpdateKind.delete)],
-    ),
   ]);
   @override
   i0.DriftDatabaseOptions get options =>
@@ -402,6 +389,4 @@ class $DriftManager {
       );
   i21.$$AssetEditEntityTableTableManager get assetEditEntity =>
       i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
-  i22.$$AssetOcrEntityTableTableManager get assetOcrEntity =>
-      i22.$$AssetOcrEntityTableTableManager(_db, _db.assetOcrEntity);
 }

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

@@ -12375,683 +12375,6 @@ class Shape48 extends i0.VersionedTable {
       columnsByName['order']! as i1.GeneratedColumn<int>;
 }
 
-final class Schema25 extends i0.VersionedSchema {
-  Schema25({required super.database}) : super(version: 25);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAlbumAssetAlbumAsset,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxStackPrimaryAssetId,
-    idxRemoteAssetOwnerChecksum,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    idxRemoteAssetStackId,
-    idxRemoteAssetLocalDateTimeDay,
-    idxRemoteAssetLocalDateTimeMonth,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    assetEditEntity,
-    assetOcrEntity,
-    idxPartnerSharedWithId,
-    idxLatLng,
-    idxRemoteAlbumAssetAlbumAsset,
-    idxRemoteAssetCloudId,
-    idxPersonOwnerId,
-    idxAssetFacePersonId,
-    idxAssetFaceAssetId,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-    idxAssetEditAssetId,
-  ];
-  late final Shape33 userEntity = Shape33(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_110,
-        _column_111,
-        _column_112,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape34 remoteAssetEntity = Shape34(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_119,
-        _column_120,
-        _column_121,
-        _column_122,
-        _column_123,
-        _column_124,
-        _column_125,
-        _column_126,
-        _column_127,
-        _column_128,
-        _column_129,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape35 stackEntity = Shape35(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_130,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape36 localAssetEntity = Shape36(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_133,
-        _column_134,
-        _column_135,
-        _column_136,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape48 remoteAlbumEntity = Shape48(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_138,
-        _column_114,
-        _column_115,
-        _column_139,
-        _column_140,
-        _column_141,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape38 localAlbumEntity = Shape38(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_115,
-        _column_142,
-        _column_143,
-        _column_144,
-        _column_145,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape39 localAlbumAssetEntity = Shape39(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_146, _column_147, _column_145],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
-    'idx_local_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxStackPrimaryAssetId = i1.Index(
-    'idx_stack_primary_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
-    'idx_remote_asset_owner_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  final i1.Index idxRemoteAssetStackId = i1.Index(
-    'idx_remote_asset_stack_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
-  );
-  final i1.Index idxRemoteAssetLocalDateTimeDay = i1.Index(
-    'idx_remote_asset_local_date_time_day',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME(\'%Y-%m-%d\', local_date_time))',
-  );
-  final i1.Index idxRemoteAssetLocalDateTimeMonth = i1.Index(
-    'idx_remote_asset_local_date_time_month',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME(\'%Y-%m\', local_date_time))',
-  );
-  late final Shape40 authUserEntity = Shape40(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_148,
-        _column_110,
-        _column_111,
-        _column_149,
-        _column_150,
-        _column_151,
-        _column_152,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_153, _column_154, _column_155],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape41 partnerEntity = Shape41(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_156, _column_157, _column_158],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape42 remoteExifEntity = Shape42(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_160,
-        _column_161,
-        _column_162,
-        _column_163,
-        _column_164,
-        _column_117,
-        _column_116,
-        _column_165,
-        _column_166,
-        _column_167,
-        _column_168,
-        _column_135,
-        _column_136,
-        _column_169,
-        _column_170,
-        _column_171,
-        _column_172,
-        _column_173,
-        _column_174,
-        _column_175,
-        _column_176,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_159, _column_177],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_177, _column_153, _column_178],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape43 remoteAssetCloudIdEntity = Shape43(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_179,
-        _column_180,
-        _column_134,
-        _column_135,
-        _column_136,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape44 memoryEntity = Shape44(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_124,
-        _column_121,
-        _column_113,
-        _column_181,
-        _column_182,
-        _column_183,
-        _column_184,
-        _column_185,
-        _column_186,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_159, _column_187],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape45 personEntity = Shape45(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_108,
-        _column_188,
-        _column_189,
-        _column_190,
-        _column_191,
-        _column_192,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape46 assetFaceEntity = Shape46(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_193,
-        _column_194,
-        _column_195,
-        _column_196,
-        _column_197,
-        _column_198,
-        _column_199,
-        _column_200,
-        _column_201,
-        _column_124,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_202, _column_203, _column_204],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape47 trashedLocalAssetEntity = Shape47(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_205,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_206,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape32 assetEditEntity = Shape32(
-    source: i0.VersionedTable(
-      entityName: 'asset_edit_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_207,
-        _column_208,
-        _column_209,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape49 assetOcrEntity = Shape49(
-    source: i0.VersionedTable(
-      entityName: 'asset_ocr_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_210,
-        _column_211,
-        _column_212,
-        _column_213,
-        _column_214,
-        _column_215,
-        _column_216,
-        _column_217,
-        _column_218,
-        _column_219,
-        _column_220,
-        _column_201,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxPartnerSharedWithId = i1.Index(
-    'idx_partner_shared_with_id',
-    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
-    'idx_remote_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxRemoteAssetCloudId = i1.Index(
-    'idx_remote_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
-  );
-  final i1.Index idxPersonOwnerId = i1.Index(
-    'idx_person_owner_id',
-    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
-  );
-  final i1.Index idxAssetFacePersonId = i1.Index(
-    'idx_asset_face_person_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
-  );
-  final i1.Index idxAssetFaceAssetId = i1.Index(
-    'idx_asset_face_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-  final i1.Index idxAssetEditAssetId = i1.Index(
-    'idx_asset_edit_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
-  );
-}
-
-class Shape49 extends i0.VersionedTable {
-  Shape49({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<double> get x1 =>
-      columnsByName['x1']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get y1 =>
-      columnsByName['y1']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get x2 =>
-      columnsByName['x2']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get y2 =>
-      columnsByName['y2']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get x3 =>
-      columnsByName['x3']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get y3 =>
-      columnsByName['y3']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get x4 =>
-      columnsByName['x4']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get y4 =>
-      columnsByName['y4']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get boxScore =>
-      columnsByName['box_score']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get textScore =>
-      columnsByName['text_score']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<String> get recognizedText =>
-      columnsByName['recognized_text']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get isVisible =>
-      columnsByName['is_visible']! as i1.GeneratedColumn<int>;
-}
-
-i1.GeneratedColumn<double> _column_210(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'x1',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_211(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'y1',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_212(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'x2',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_213(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'y2',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_214(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'x3',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_215(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'y3',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_216(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'x4',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_217(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'y4',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_218(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'box_score',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<double> _column_219(String aliasedName) =>
-    i1.GeneratedColumn<double>(
-      'text_score',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.double,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<String> _column_220(String aliasedName) =>
-    i1.GeneratedColumn<String>(
-      'recognized_text',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.string,
-      $customConstraints: 'NOT NULL',
-    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -13076,7 +12399,6 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema22 schema) from21To22,
   required Future<void> Function(i1.Migrator m, Schema23 schema) from22To23,
   required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
-  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -13195,11 +12517,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from23To24(migrator, schema);
         return 24;
-      case 24:
-        final schema = Schema25(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from24To25(migrator, schema);
-        return 25;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -13230,7 +12547,6 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema22 schema) from21To22,
   required Future<void> Function(i1.Migrator m, Schema23 schema) from22To23,
   required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
-  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -13256,6 +12572,5 @@ i1.OnUpgrade stepByStep({
     from21To22: from21To22,
     from22To23: from22To23,
     from23To24: from23To24,
-    from24To25: from24To25,
   ),
 );

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

@@ -109,40 +109,31 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     return query.map((localAlbum) => localAlbum.toDto()).get();
   }
 
-  Future<Map<String, List<LocalAsset>>> getAssetsFromBackupAlbums(Iterable<String> remoteIds) async {
-    if (remoteIds.isEmpty) {
+  Future<Map<String, List<LocalAsset>>> getAssetsFromBackupAlbums(Iterable<String> checksums) async {
+    if (checksums.isEmpty) {
       return {};
     }
 
     final result = <String, List<LocalAsset>>{};
 
-    for (final slice in remoteIds.toSet().slices(kDriftMaxChunk)) {
+    for (final slice in checksums.toSet().slices(kDriftMaxChunk)) {
       final rows =
           await (_db.select(_db.localAlbumAssetEntity).join([
-                innerJoin(
-                  _db.localAlbumEntity,
-                  _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
-                  useColumns: false,
-                ),
+                innerJoin(_db.localAlbumEntity, _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id)),
                 innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
-                innerJoin(
-                  _db.remoteAssetEntity,
-                  _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
-                  useColumns: false,
-                ),
               ])..where(
                 _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
-                    _db.remoteAssetEntity.id.isIn(slice),
+                    _db.localAssetEntity.checksum.isIn(slice),
               ))
               .get();
 
       for (final row in rows) {
         final albumId = row.readTable(_db.localAlbumAssetEntity).albumId;
-        final asset = row.readTable(_db.localAssetEntity).toDto();
+        final assetData = row.readTable(_db.localAssetEntity);
+        final asset = assetData.toDto();
         (result[albumId] ??= <LocalAsset>[]).add(asset);
       }
     }
-
     return result;
   }
 

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

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

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

@@ -46,25 +46,19 @@ class SyncApiRepository {
         types: [
           SyncRequestType.authUsersV1,
           SyncRequestType.usersV1,
-          serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)
-              ? SyncRequestType.assetsV2
-              : SyncRequestType.assetsV1,
+          SyncRequestType.assetsV1,
           SyncRequestType.assetExifsV1,
           if (serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetEditsV1,
           SyncRequestType.assetMetadataV1,
           SyncRequestType.partnersV1,
-          serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)
-              ? SyncRequestType.partnerAssetsV2
-              : SyncRequestType.partnerAssetsV1,
+          SyncRequestType.partnerAssetsV1,
           SyncRequestType.partnerAssetExifsV1,
           if (serverVersion < const SemVer(major: 3, minor: 0, patch: 0))
             SyncRequestType.albumsV1
           else
             SyncRequestType.albumsV2,
           SyncRequestType.albumUsersV1,
-          serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)
-              ? SyncRequestType.albumAssetsV2
-              : SyncRequestType.albumAssetsV1,
+          SyncRequestType.albumAssetsV1,
           SyncRequestType.albumAssetExifsV1,
           SyncRequestType.albumToAssetsV1,
           SyncRequestType.memoriesV1,
@@ -73,10 +67,8 @@ class SyncApiRepository {
           SyncRequestType.partnerStacksV1,
           SyncRequestType.userMetadataV1,
           SyncRequestType.peopleV1,
-          serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)
-              ? SyncRequestType.assetFacesV2
-              : SyncRequestType.assetFacesV1,
-          if (serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)) SyncRequestType.assetOcrV1,
+          if (serverVersion < const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetFacesV1,
+          if (serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetFacesV2,
         ],
         reset: shouldReset,
       ).toJson(),
@@ -161,7 +153,6 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.partnerV1: SyncPartnerV1.fromJson,
   SyncEntityType.partnerDeleteV1: SyncPartnerDeleteV1.fromJson,
   SyncEntityType.assetV1: SyncAssetV1.fromJson,
-  SyncEntityType.assetV2: SyncAssetV2.fromJson,
   SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson,
   SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson,
   SyncEntityType.assetEditV1: SyncAssetEditV1.fromJson,
@@ -169,9 +160,7 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.assetMetadataV1: SyncAssetMetadataV1.fromJson,
   SyncEntityType.assetMetadataDeleteV1: SyncAssetMetadataDeleteV1.fromJson,
   SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson,
-  SyncEntityType.partnerAssetV2: SyncAssetV2.fromJson,
   SyncEntityType.partnerAssetBackfillV1: SyncAssetV1.fromJson,
-  SyncEntityType.partnerAssetBackfillV2: SyncAssetV2.fromJson,
   SyncEntityType.partnerAssetDeleteV1: SyncAssetDeleteV1.fromJson,
   SyncEntityType.partnerAssetExifV1: SyncAssetExifV1.fromJson,
   SyncEntityType.partnerAssetExifBackfillV1: SyncAssetExifV1.fromJson,
@@ -182,11 +171,8 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.albumUserBackfillV1: SyncAlbumUserV1.fromJson,
   SyncEntityType.albumUserDeleteV1: SyncAlbumUserDeleteV1.fromJson,
   SyncEntityType.albumAssetCreateV1: SyncAssetV1.fromJson,
-  SyncEntityType.albumAssetCreateV2: SyncAssetV2.fromJson,
   SyncEntityType.albumAssetUpdateV1: SyncAssetV1.fromJson,
-  SyncEntityType.albumAssetUpdateV2: SyncAssetV2.fromJson,
   SyncEntityType.albumAssetBackfillV1: SyncAssetV1.fromJson,
-  SyncEntityType.albumAssetBackfillV2: SyncAssetV2.fromJson,
   SyncEntityType.albumAssetExifCreateV1: SyncAssetExifV1.fromJson,
   SyncEntityType.albumAssetExifUpdateV1: SyncAssetExifV1.fromJson,
   SyncEntityType.albumAssetExifBackfillV1: SyncAssetExifV1.fromJson,
@@ -211,8 +197,6 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.assetFaceV1: SyncAssetFaceV1.fromJson,
   SyncEntityType.assetFaceV2: SyncAssetFaceV2.fromJson,
   SyncEntityType.assetFaceDeleteV1: SyncAssetFaceDeleteV1.fromJson,
-  SyncEntityType.assetOcrV1: SyncAssetOcrV1.fromJson,
-  SyncEntityType.assetOcrDeleteV1: SyncAssetOcrDeleteV1.fromJson,
   SyncEntityType.syncCompleteV1: _SyncEmptyDto.fromJson,
 };
 

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

@@ -12,7 +12,6 @@ import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
@@ -63,7 +62,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           await _db.userMetadataEntity.deleteAll();
           await _db.remoteAssetCloudIdEntity.deleteAll();
           await _db.assetEditEntity.deleteAll();
-          await _db.assetOcrEntity.deleteAll();
         });
         await _db.customStatement('PRAGMA foreign_keys = ON');
       });
@@ -222,44 +220,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     }
   }
 
-  Future<void> updateAssetsV2(Iterable<SyncAssetV2> data, {String debugLabel = 'user'}) async {
-    try {
-      await _db.batch((batch) {
-        for (final asset in data) {
-          final companion = RemoteAssetEntityCompanion(
-            name: Value(asset.originalFileName),
-            type: Value(asset.type.toAssetType()),
-            createdAt: Value.absentIfNull(asset.fileCreatedAt),
-            updatedAt: Value.absentIfNull(asset.fileModifiedAt),
-            durationMs: Value(asset.duration),
-            checksum: Value(asset.checksum),
-            isFavorite: Value(asset.isFavorite),
-            ownerId: Value(asset.ownerId),
-            localDateTime: Value(asset.localDateTime),
-            thumbHash: Value(asset.thumbhash),
-            deletedAt: Value(asset.deletedAt),
-            visibility: Value(asset.visibility.toAssetVisibility()),
-            livePhotoVideoId: Value(asset.livePhotoVideoId),
-            stackId: Value(asset.stackId),
-            libraryId: Value(asset.libraryId),
-            width: Value(asset.width),
-            height: Value(asset.height),
-            isEdited: Value(asset.isEdited),
-          );
-
-          batch.insert(
-            _db.remoteAssetEntity,
-            companion.copyWith(id: Value(asset.id)),
-            onConflict: DoUpdate((_) => companion),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateAssetsV2 - $debugLabel', error, stack);
-      rethrow;
-    }
-  }
-
   Future<void> updateAssetsExifV1(Iterable<SyncAssetExifV1> data, {String debugLabel = 'user'}) async {
     try {
       await _db.batch((batch) {
@@ -837,52 +797,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     }
   }
 
-  Future<void> updateAssetOcrV1(Iterable<SyncAssetOcrV1> data) async {
-    try {
-      await _db.batch((batch) {
-        for (final assetOcr in data) {
-          final companion = AssetOcrEntityCompanion(
-            assetId: Value(assetOcr.assetId),
-            recognizedText: Value(assetOcr.text),
-            x1: Value(assetOcr.x1),
-            y1: Value(assetOcr.y1),
-            x2: Value(assetOcr.x2),
-            y2: Value(assetOcr.y2),
-            x3: Value(assetOcr.x3),
-            y3: Value(assetOcr.y3),
-            x4: Value(assetOcr.x4),
-            y4: Value(assetOcr.y4),
-            boxScore: Value(assetOcr.boxScore),
-            textScore: Value(assetOcr.textScore),
-            isVisible: Value(assetOcr.isVisible),
-          );
-
-          batch.insert(
-            _db.assetOcrEntity,
-            companion.copyWith(id: Value(assetOcr.id)),
-            onConflict: DoUpdate((_) => companion),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateAssetOcrV1', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> deleteAssetOcrV1(Iterable<SyncAssetOcrDeleteV1> data) async {
-    try {
-      await _db.batch((batch) {
-        for (final assetOcr in data) {
-          batch.deleteWhere(_db.assetOcrEntity, (row) => row.id.equals(assetOcr.id));
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: deleteAssetOcrV1', error, stack);
-      rethrow;
-    }
-  }
-
   Future<void> pruneAssets() async {
     try {
       await _db.transaction(() async {

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

@@ -7,14 +7,12 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.widget.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/ocr_overlay.widget.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
@@ -358,7 +356,6 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     _showingDetails = ref.watch(assetViewerProvider.select((s) => s.showingDetails));
     final stackIndex = ref.watch(assetViewerProvider.select((s) => s.stackIndex));
     final isPlayingMotionVideo = ref.watch(isPlayingMotionVideoProvider);
-    final showingOcr = ref.watch(assetViewerProvider.select((s) => s.showingOcr));
 
     final asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
     if (asset == null) {
@@ -366,8 +363,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     }
 
     BaseAsset displayAsset = asset;
-    final showAssetStack = ref.watch(timelineServiceProvider.select((s) => s.origin != TimelineOrigin.trash));
-    final stackChildren = showAssetStack ? ref.watch(stackChildrenNotifier(asset)).valueOrNull : null;
+    final stackChildren = ref.watch(stackChildrenNotifier(asset)).valueOrNull;
     if (stackChildren != null && stackChildren.isNotEmpty) {
       displayAsset = stackChildren.elementAt(stackIndex);
     }
@@ -408,15 +404,6 @@ class _AssetPageState extends ConsumerState<AssetPage> {
                     isPlayingMotionVideo: isPlayingMotionVideo,
                   ),
                 ),
-                if (showingOcr && displayAsset.width != null && displayAsset.height != null)
-                  Positioned.fill(
-                    child: OcrOverlay(
-                      asset: displayAsset,
-                      imageSize: Size(displayAsset.width!.toDouble(), displayAsset.height!.toDouble()),
-                      viewportSize: Size(viewportWidth, viewportHeight),
-                      controller: _viewController,
-                    ),
-                  ),
                 IgnorePointer(
                   ignoring: !_showingDetails,
                   child: Column(

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

@@ -1,10 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 
 class AssetStackRow extends ConsumerWidget {
   final List<RemoteAsset> stack;
@@ -17,11 +15,6 @@ class AssetStackRow extends ConsumerWidget {
       return const SizedBox.shrink();
     }
 
-    final hideAssetStack = ref.read(timelineServiceProvider).origin == TimelineOrigin.trash;
-    if (hideAssetStack) {
-      return const SizedBox.shrink();
-    }
-
     final showingControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
     double opacity = ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity)) * (showingControls ? 1 : 0);
 

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

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

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

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

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

@@ -21,7 +21,6 @@ class ThumbnailTile extends ConsumerStatefulWidget {
     this.showStorageIndicator = false,
     this.lockSelection = false,
     this.heroOffset,
-    this.showStackIndicator = false,
     super.key,
   });
 
@@ -31,7 +30,6 @@ class ThumbnailTile extends ConsumerStatefulWidget {
   final bool showStorageIndicator;
   final bool lockSelection;
   final int? heroOffset;
-  final bool showStackIndicator;
 
   @override
   ConsumerState<ThumbnailTile> createState() => _ThumbnailTileState();
@@ -141,14 +139,7 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
                     duration: Durations.short4,
                     child: Align(
                       alignment: Alignment.topRight,
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        crossAxisAlignment: CrossAxisAlignment.end,
-                        children: [
-                          _AssetTypeIcons(asset: asset),
-                          if (widget.showStackIndicator) _StackIndicator(asset: asset),
-                        ],
-                      ),
+                      child: _AssetTypeIcons(asset: asset),
                     ),
                   ),
                 if (storageIndicator && asset != null)
@@ -295,8 +286,8 @@ class _AssetTypeIcons extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final remoteAsset = asset is RemoteAsset ? asset as RemoteAsset : null;
-    final isLivePhoto = remoteAsset?.livePhotoVideoId != null;
+    final hasStack = asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
+    final isLivePhoto = asset is RemoteAsset && asset.livePhotoVideoId != null;
 
     return Column(
       mainAxisSize: MainAxisSize.min,
@@ -304,6 +295,11 @@ class _AssetTypeIcons extends StatelessWidget {
       children: [
         if (asset.isVideo)
           Padding(padding: const EdgeInsets.only(right: 10.0, top: 6.0), child: _VideoIndicator(asset.duration)),
+        if (hasStack)
+          const Padding(
+            padding: EdgeInsets.only(right: 10.0, top: 6.0),
+            child: _TileOverlayIcon(Icons.burst_mode_rounded),
+          ),
         if (isLivePhoto)
           const Padding(
             padding: EdgeInsets.only(right: 10.0, top: 6.0),
@@ -316,24 +312,6 @@ class _AssetTypeIcons extends StatelessWidget {
   }
 }
 
-class _StackIndicator extends StatelessWidget {
-  final BaseAsset asset;
-
-  const _StackIndicator({required this.asset});
-
-  @override
-  Widget build(BuildContext context) {
-    if (asset is! RemoteAsset || (asset as RemoteAsset).stackId == null) {
-      return const SizedBox.shrink();
-    }
-
-    return const Padding(
-      padding: EdgeInsets.only(right: 10.0, top: 6.0),
-      child: _TileOverlayIcon(Icons.burst_mode_rounded),
-    );
-  }
-}
-
 class _UploadProgressOverlay extends StatelessWidget {
   final double progress;
 

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -244,7 +244,6 @@ class _AssetTileWidget extends ConsumerWidget {
     final lockSelection = _getLockSelectionStatus(ref);
     final showStorageIndicator = ref.watch(timelineArgsProvider.select((args) => args.showStorageIndicator));
     final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
-    final showStackIndicator = ref.read(timelineServiceProvider).origin != TimelineOrigin.trash;
 
     return RepaintBoundary(
       child: GestureDetector(
@@ -254,7 +253,6 @@ class _AssetTileWidget extends ConsumerWidget {
           asset,
           lockSelection: lockSelection,
           showStorageIndicator: showStorageIndicator,
-          showStackIndicator: showStackIndicator,
           heroOffset: heroOffset,
         ),
       ),

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

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

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

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

mobile/lib/providers/websocket.provider.dart

@@ -94,10 +94,8 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
           state = const WebsocketState(isConnected: false, socket: null);
         });
 
-        socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReadyV1);
-        socket.on('AssetUploadReadyV2', _handleSyncAssetUploadReadyV2);
-        socket.on('AssetEditReadyV1', _handleSyncAssetEditReadyV1);
-        socket.on('AssetEditReadyV2', _handleSyncAssetEditReadyV2);
+        socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
+        socket.on('AssetEditReadyV1', _handleSyncAssetEditReady);
         socket.on('on_config_update', _handleOnConfigUpdate);
         socket.on('on_new_release', _handleReleaseUpdates);
       } catch (e) {
@@ -165,25 +163,16 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     _ref.read(serverInfoProvider.notifier).handleReleaseInfo(serverVersion, releaseVersion);
   }
 
-  void _handleSyncAssetUploadReadyV1(dynamic data) {
+  void _handleSyncAssetUploadReady(dynamic data) {
     _batchedAssetUploadReady.add(data);
-    _batchDebouncer.run(_processBatchedAssetUploadReadyV1);
+    _batchDebouncer.run(_processBatchedAssetUploadReady);
   }
 
-  void _handleSyncAssetUploadReadyV2(dynamic data) {
-    _batchedAssetUploadReady.add(data);
-    _batchDebouncer.run(_processBatchedAssetUploadReadyV2);
+  void _handleSyncAssetEditReady(dynamic data) {
+    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEdit(data));
   }
 
-  void _handleSyncAssetEditReadyV1(dynamic data) {
-    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV1(data));
-  }
-
-  void _handleSyncAssetEditReadyV2(dynamic data) {
-    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV2(data));
-  }
-
-  void _processBatchedAssetUploadReadyV1() {
+  void _processBatchedAssetUploadReady() {
     if (_batchedAssetUploadReady.isEmpty) {
       return;
     }
@@ -191,7 +180,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     final isSyncAlbumEnabled = Store.get(StoreKey.syncAlbums, false);
     try {
       unawaited(
-        _ref.read(backgroundSyncProvider).syncWebsocketBatchV1(_batchedAssetUploadReady.toList()).then((_) {
+        _ref.read(backgroundSyncProvider).syncWebsocketBatch(_batchedAssetUploadReady.toList()).then((_) {
           if (isSyncAlbumEnabled) {
             _ref.read(backgroundSyncProvider).syncLinkedAlbum();
           }
@@ -203,27 +192,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 
     _batchedAssetUploadReady.clear();
   }
-
-  void _processBatchedAssetUploadReadyV2() {
-    if (_batchedAssetUploadReady.isEmpty) {
-      return;
-    }
-
-    final isSyncAlbumEnabled = Store.get(StoreKey.syncAlbums, false);
-    try {
-      unawaited(
-        _ref.read(backgroundSyncProvider).syncWebsocketBatchV2(_batchedAssetUploadReady.toList()).then((_) {
-          if (isSyncAlbumEnabled) {
-            _ref.read(backgroundSyncProvider).syncLinkedAlbum();
-          }
-        }),
-      );
-    } catch (error) {
-      _log.severe("Error processing batched AssetUploadReadyV2 events: $error");
-    }
-
-    _batchedAssetUploadReady.clear();
-  }
 }
 
 final websocketProvider = StateNotifierProvider<WebsocketNotifier, WebsocketState>((ref) {

mobile/lib/utils/action_button.utils.dart

@@ -148,7 +148,6 @@ enum ActionButtonType {
             context.selectedCount == 1,
       ActionButtonType.unstack =>
         context.isOwner && //
-            context.timelineOrigin != TimelineOrigin.trash &&
             !context.isInLockedView && //
             context.isStacked,
       ActionButtonType.openInBrowser => context.asset.hasRemote && !context.isInLockedView,

mobile/mise.toml

@@ -1,5 +1,5 @@
 [tools]
-flutter = "3.41.9"
+flutter = "3.41.7"
 
 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.30.0"

mobile/openapi/README.md

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

mobile/openapi/lib/api.dart

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

mobile/openapi/lib/api/assets_api.dart

@@ -1234,8 +1234,8 @@ class AssetsApi {
   /// * [String] xImmichChecksum:
   ///   sha1 checksum that can be used for duplicate detection before the file is uploaded
   ///
-  /// * [int] duration:
-  ///   Duration in milliseconds (for videos)
+  /// * [String] duration:
+  ///   Duration (for videos)
   ///
   /// * [String] filename:
   ///   Filename
@@ -1253,7 +1253,7 @@ class AssetsApi {
   ///   Sidecar file data
   ///
   /// * [AssetVisibility] visibility:
-  Future<Response> uploadAssetWithHttpInfo(MultipartFile assetData, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? xImmichChecksum, int? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, List<AssetMetadataUpsertItemDto>? metadata, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
+  Future<Response> uploadAssetWithHttpInfo(MultipartFile assetData, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, List<AssetMetadataUpsertItemDto>? metadata, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets';
 
@@ -1358,8 +1358,8 @@ class AssetsApi {
   /// * [String] xImmichChecksum:
   ///   sha1 checksum that can be used for duplicate detection before the file is uploaded
   ///
-  /// * [int] duration:
-  ///   Duration in milliseconds (for videos)
+  /// * [String] duration:
+  ///   Duration (for videos)
   ///
   /// * [String] filename:
   ///   Filename
@@ -1377,7 +1377,7 @@ class AssetsApi {
   ///   Sidecar file data
   ///
   /// * [AssetVisibility] visibility:
-  Future<AssetMediaResponseDto?> uploadAsset(MultipartFile assetData, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? xImmichChecksum, int? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, List<AssetMetadataUpsertItemDto>? metadata, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
+  Future<AssetMediaResponseDto?> uploadAsset(MultipartFile assetData, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, List<AssetMetadataUpsertItemDto>? metadata, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
     final response = await uploadAssetWithHttpInfo(assetData, fileCreatedAt, fileModifiedAt,  key: key, slug: slug, xImmichChecksum: xImmichChecksum, duration: duration, filename: filename, isFavorite: isFavorite, livePhotoVideoId: livePhotoVideoId, metadata: metadata, sidecarData: sidecarData, visibility: visibility, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));

mobile/openapi/lib/api/people_api.dart

@@ -183,15 +183,15 @@ class PeopleApi {
   /// * [String] closestPersonId:
   ///   Closest person ID for similarity search
   ///
-  /// * [int] page:
+  /// * [num] page:
   ///   Page number for pagination
   ///
-  /// * [int] size:
+  /// * [num] size:
   ///   Number of items per page
   ///
   /// * [bool] withHidden:
   ///   Include hidden people
-  Future<Response> getAllPeopleWithHttpInfo({ String? closestAssetId, String? closestPersonId, int? page, int? size, bool? withHidden, }) async {
+  Future<Response> getAllPeopleWithHttpInfo({ String? closestAssetId, String? closestPersonId, num? page, num? size, bool? withHidden, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/people';
 
@@ -244,15 +244,15 @@ class PeopleApi {
   /// * [String] closestPersonId:
   ///   Closest person ID for similarity search
   ///
-  /// * [int] page:
+  /// * [num] page:
   ///   Page number for pagination
   ///
-  /// * [int] size:
+  /// * [num] size:
   ///   Number of items per page
   ///
   /// * [bool] withHidden:
   ///   Include hidden people
-  Future<PeopleResponseDto?> getAllPeople({ String? closestAssetId, String? closestPersonId, int? page, int? size, bool? withHidden, }) async {
+  Future<PeopleResponseDto?> getAllPeople({ String? closestAssetId, String? closestPersonId, num? page, num? size, bool? withHidden, }) async {
     final response = await getAllPeopleWithHttpInfo( closestAssetId: closestAssetId, closestPersonId: closestPersonId, page: page, size: size, withHidden: withHidden, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));

mobile/openapi/lib/api/search_api.dart

@@ -404,10 +404,10 @@ class SearchApi {
   /// * [List<String>] personIds:
   ///   Filter by person IDs
   ///
-  /// * [int] rating:
+  /// * [num] rating:
   ///   Filter by rating [1-5], or null for unrated
   ///
-  /// * [int] size:
+  /// * [num] size:
   ///   Number of results to return
   ///
   /// * [String] state:
@@ -443,7 +443,7 @@ class SearchApi {
   ///
   /// * [bool] withExif:
   ///   Include EXIF data in response
-  Future<Response> searchLargeAssetsWithHttpInfo({ List<String>? albumIds, String? city, String? country, DateTime? createdAfter, DateTime? createdBefore, bool? isEncoded, bool? isFavorite, bool? isMotion, bool? isNotInAlbum, bool? isOffline, String? lensModel, String? libraryId, String? make, int? minFileSize, String? model, String? ocr, List<String>? personIds, int? rating, int? size, String? state, List<String>? tagIds, DateTime? takenAfter, DateTime? takenBefore, DateTime? trashedAfter, DateTime? trashedBefore, AssetTypeEnum? type, DateTime? updatedAfter, DateTime? updatedBefore, AssetVisibility? visibility, bool? withDeleted, bool? withExif, }) async {
+  Future<Response> searchLargeAssetsWithHttpInfo({ List<String>? albumIds, String? city, String? country, DateTime? createdAfter, DateTime? createdBefore, bool? isEncoded, bool? isFavorite, bool? isMotion, bool? isNotInAlbum, bool? isOffline, String? lensModel, String? libraryId, String? make, int? minFileSize, String? model, String? ocr, List<String>? personIds, num? rating, num? size, String? state, List<String>? tagIds, DateTime? takenAfter, DateTime? takenBefore, DateTime? trashedAfter, DateTime? trashedBefore, AssetTypeEnum? type, DateTime? updatedAfter, DateTime? updatedBefore, AssetVisibility? visibility, bool? withDeleted, bool? withExif, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/search/large-assets';
 
@@ -619,10 +619,10 @@ class SearchApi {
   /// * [List<String>] personIds:
   ///   Filter by person IDs
   ///
-  /// * [int] rating:
+  /// * [num] rating:
   ///   Filter by rating [1-5], or null for unrated
   ///
-  /// * [int] size:
+  /// * [num] size:
   ///   Number of results to return
   ///
   /// * [String] state:
@@ -658,7 +658,7 @@ class SearchApi {
   ///
   /// * [bool] withExif:
   ///   Include EXIF data in response
-  Future<List<AssetResponseDto>?> searchLargeAssets({ List<String>? albumIds, String? city, String? country, DateTime? createdAfter, DateTime? createdBefore, bool? isEncoded, bool? isFavorite, bool? isMotion, bool? isNotInAlbum, bool? isOffline, String? lensModel, String? libraryId, String? make, int? minFileSize, String? model, String? ocr, List<String>? personIds, int? rating, int? size, String? state, List<String>? tagIds, DateTime? takenAfter, DateTime? takenBefore, DateTime? trashedAfter, DateTime? trashedBefore, AssetTypeEnum? type, DateTime? updatedAfter, DateTime? updatedBefore, AssetVisibility? visibility, bool? withDeleted, bool? withExif, }) async {
+  Future<List<AssetResponseDto>?> searchLargeAssets({ List<String>? albumIds, String? city, String? country, DateTime? createdAfter, DateTime? createdBefore, bool? isEncoded, bool? isFavorite, bool? isMotion, bool? isNotInAlbum, bool? isOffline, String? lensModel, String? libraryId, String? make, int? minFileSize, String? model, String? ocr, List<String>? personIds, num? rating, num? size, String? state, List<String>? tagIds, DateTime? takenAfter, DateTime? takenBefore, DateTime? trashedAfter, DateTime? trashedBefore, AssetTypeEnum? type, DateTime? updatedAfter, DateTime? updatedBefore, AssetVisibility? visibility, bool? withDeleted, bool? withExif, }) async {
     final response = await searchLargeAssetsWithHttpInfo( albumIds: albumIds, city: city, country: country, createdAfter: createdAfter, createdBefore: createdBefore, isEncoded: isEncoded, isFavorite: isFavorite, isMotion: isMotion, isNotInAlbum: isNotInAlbum, isOffline: isOffline, lensModel: lensModel, libraryId: libraryId, make: make, minFileSize: minFileSize, model: model, ocr: ocr, personIds: personIds, rating: rating, size: size, state: state, tagIds: tagIds, takenAfter: takenAfter, takenBefore: takenBefore, trashedAfter: trashedAfter, trashedBefore: trashedBefore, type: type, updatedAfter: updatedAfter, updatedBefore: updatedBefore, visibility: visibility, withDeleted: withDeleted, withExif: withExif, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));

mobile/openapi/lib/api_client.dart

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

mobile/openapi/lib/model/asset_bulk_update_dto.dart

@@ -37,15 +37,12 @@ class AssetBulkUpdateDto {
 
   /// Relative time offset in seconds
   ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? dateTimeRelative;
+  num? dateTimeRelative;
 
   /// Asset description
   ///
@@ -216,7 +213,7 @@ class AssetBulkUpdateDto {
 
       return AssetBulkUpdateDto(
         dateTimeOriginal: mapValueOfType<String>(json, r'dateTimeOriginal'),
-        dateTimeRelative: mapValueOfType<int>(json, r'dateTimeRelative'),
+        dateTimeRelative: num.parse('${json[r'dateTimeRelative']}'),
         description: mapValueOfType<String>(json, r'description'),
         duplicateId: mapValueOfType<String>(json, r'duplicateId'),
         ids: json[r'ids'] is Iterable

mobile/openapi/lib/model/asset_edit_action_item_dto_parameters.dart

@@ -24,26 +24,22 @@ class AssetEditActionItemDtoParameters {
   /// Height of the crop
   ///
   /// Minimum value: 1
-  /// Maximum value: 9007199254740991
-  int height;
+  num height;
 
   /// Width of the crop
   ///
   /// Minimum value: 1
-  /// Maximum value: 9007199254740991
-  int width;
+  num width;
 
   /// Top-Left X coordinate of crop
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int x;
+  num x;
 
   /// Top-Left Y coordinate of crop
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int y;
+  num y;
 
   /// Rotation angle in degrees
   num angle;
@@ -92,10 +88,10 @@ class AssetEditActionItemDtoParameters {
       final json = value.cast<String, dynamic>();
 
       return AssetEditActionItemDtoParameters(
-        height: mapValueOfType<int>(json, r'height')!,
-        width: mapValueOfType<int>(json, r'width')!,
-        x: mapValueOfType<int>(json, r'x')!,
-        y: mapValueOfType<int>(json, r'y')!,
+        height: num.parse('${json[r'height']}'),
+        width: num.parse('${json[r'width']}'),
+        x: num.parse('${json[r'x']}'),
+        y: num.parse('${json[r'y']}'),
         angle: num.parse('${json[r'angle']}'),
         axis: MirrorAxis.fromJson(json[r'axis'])!,
       );

mobile/openapi/lib/model/asset_response_dto.dart

@@ -57,11 +57,8 @@ class AssetResponseDto {
   /// Duplicate group ID
   String? duplicateId;
 
-  /// Video/gif duration in milliseconds (null for static images)
-  ///
-  /// Minimum value: 0
-  /// Maximum value: 2147483647
-  int? duration;
+  /// Video/gif duration in hh:mm:ss.SSS format (null for static images)
+  String? duration;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -83,8 +80,7 @@ class AssetResponseDto {
   /// Asset height
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int? height;
+  num? height;
 
   /// Asset ID
   String id;
@@ -169,8 +165,7 @@ class AssetResponseDto {
   /// Asset width
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int? width;
+  num? width;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is AssetResponseDto &&
@@ -346,12 +341,14 @@ class AssetResponseDto {
         checksum: mapValueOfType<String>(json, r'checksum')!,
         createdAt: mapDateTime(json, r'createdAt', r'')!,
         duplicateId: mapValueOfType<String>(json, r'duplicateId'),
-        duration: mapValueOfType<int>(json, r'duration'),
+        duration: mapValueOfType<String>(json, r'duration'),
         exifInfo: ExifResponseDto.fromJson(json[r'exifInfo']),
         fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r'')!,
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r'')!,
         hasMetadata: mapValueOfType<bool>(json, r'hasMetadata')!,
-        height: mapValueOfType<int>(json, r'height'),
+        height: json[r'height'] == null
+            ? null
+            : num.parse('${json[r'height']}'),
         id: mapValueOfType<String>(json, r'id')!,
         isArchived: mapValueOfType<bool>(json, r'isArchived')!,
         isEdited: mapValueOfType<bool>(json, r'isEdited')!,
@@ -375,7 +372,9 @@ class AssetResponseDto {
         unassignedFaces: AssetFaceWithoutPersonResponseDto.listFromJson(json[r'unassignedFaces']),
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
         visibility: AssetVisibility.fromJson(json[r'visibility'])!,
-        width: mapValueOfType<int>(json, r'width'),
+        width: json[r'width'] == null
+            ? null
+            : num.parse('${json[r'width']}'),
       );
     }
     return null;

mobile/openapi/lib/model/crop_parameters.dart

@@ -22,26 +22,22 @@ class CropParameters {
   /// Height of the crop
   ///
   /// Minimum value: 1
-  /// Maximum value: 9007199254740991
-  int height;
+  num height;
 
   /// Width of the crop
   ///
   /// Minimum value: 1
-  /// Maximum value: 9007199254740991
-  int width;
+  num width;
 
   /// Top-Left X coordinate of crop
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int x;
+  num x;
 
   /// Top-Left Y coordinate of crop
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int y;
+  num y;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is CropParameters &&
@@ -79,10 +75,10 @@ class CropParameters {
       final json = value.cast<String, dynamic>();
 
       return CropParameters(
-        height: mapValueOfType<int>(json, r'height')!,
-        width: mapValueOfType<int>(json, r'width')!,
-        x: mapValueOfType<int>(json, r'x')!,
-        y: mapValueOfType<int>(json, r'y')!,
+        height: num.parse('${json[r'height']}'),
+        width: num.parse('${json[r'width']}'),
+        x: num.parse('${json[r'x']}'),
+        y: num.parse('${json[r'y']}'),
       );
     }
     return null;

mobile/openapi/lib/model/database_backup_config.dart

@@ -27,8 +27,7 @@ class DatabaseBackupConfig {
   /// Keep last amount
   ///
   /// Minimum value: 1
-  /// Maximum value: 9007199254740991
-  int keepLastAmount;
+  num keepLastAmount;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupConfig &&
@@ -65,7 +64,7 @@ class DatabaseBackupConfig {
       return DatabaseBackupConfig(
         cronExpression: mapValueOfType<String>(json, r'cronExpression')!,
         enabled: mapValueOfType<bool>(json, r'enabled')!,
-        keepLastAmount: mapValueOfType<int>(json, r'keepLastAmount')!,
+        keepLastAmount: num.parse('${json[r'keepLastAmount']}'),
       );
     }
     return null;

mobile/openapi/lib/model/database_backup_dto.dart

@@ -22,10 +22,7 @@ class DatabaseBackupDto {
   String filename;
 
   /// Backup file size
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int filesize;
+  num filesize;
 
   /// Backup timezone
   String timezone;
@@ -64,7 +61,7 @@ class DatabaseBackupDto {
 
       return DatabaseBackupDto(
         filename: mapValueOfType<String>(json, r'filename')!,
-        filesize: mapValueOfType<int>(json, r'filesize')!,
+        filesize: num.parse('${json[r'filesize']}'),
         timezone: mapValueOfType<String>(json, r'timezone')!,
       );
     }

mobile/openapi/lib/model/exif_response_dto.dart

@@ -52,14 +52,12 @@ class ExifResponseDto {
   /// Image height in pixels
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int? exifImageHeight;
+  num? exifImageHeight;
 
   /// Image width in pixels
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int? exifImageWidth;
+  num? exifImageWidth;
 
   /// Exposure time
   String? exposureTime;
@@ -77,10 +75,7 @@ class ExifResponseDto {
   num? focalLength;
 
   /// ISO sensitivity
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int? iso;
+  num? iso;
 
   /// GPS latitude
   num? latitude;
@@ -107,10 +102,7 @@ class ExifResponseDto {
   String? projectionType;
 
   /// Rating
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int? rating;
+  num? rating;
 
   /// State/province name
   String? state;
@@ -300,8 +292,12 @@ class ExifResponseDto {
         country: mapValueOfType<String>(json, r'country'),
         dateTimeOriginal: mapDateTime(json, r'dateTimeOriginal', r''),
         description: mapValueOfType<String>(json, r'description'),
-        exifImageHeight: mapValueOfType<int>(json, r'exifImageHeight'),
-        exifImageWidth: mapValueOfType<int>(json, r'exifImageWidth'),
+        exifImageHeight: json[r'exifImageHeight'] == null
+            ? null
+            : num.parse('${json[r'exifImageHeight']}'),
+        exifImageWidth: json[r'exifImageWidth'] == null
+            ? null
+            : num.parse('${json[r'exifImageWidth']}'),
         exposureTime: mapValueOfType<String>(json, r'exposureTime'),
         fNumber: json[r'fNumber'] == null
             ? null
@@ -310,7 +306,9 @@ class ExifResponseDto {
         focalLength: json[r'focalLength'] == null
             ? null
             : num.parse('${json[r'focalLength']}'),
-        iso: mapValueOfType<int>(json, r'iso'),
+        iso: json[r'iso'] == null
+            ? null
+            : num.parse('${json[r'iso']}'),
         latitude: json[r'latitude'] == null
             ? null
             : num.parse('${json[r'latitude']}'),
@@ -323,7 +321,9 @@ class ExifResponseDto {
         modifyDate: mapDateTime(json, r'modifyDate', r''),
         orientation: mapValueOfType<String>(json, r'orientation'),
         projectionType: mapValueOfType<String>(json, r'projectionType'),
-        rating: mapValueOfType<int>(json, r'rating'),
+        rating: json[r'rating'] == null
+            ? null
+            : num.parse('${json[r'rating']}'),
         state: mapValueOfType<String>(json, r'state'),
         timeZone: mapValueOfType<String>(json, r'timeZone'),
       );

mobile/openapi/lib/model/machine_learning_availability_checks_dto.dart

@@ -21,13 +21,9 @@ class MachineLearningAvailabilityChecksDto {
   /// Enabled
   bool enabled;
 
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int interval;
+  num interval;
 
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int timeout;
+  num timeout;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is MachineLearningAvailabilityChecksDto &&
@@ -63,8 +59,8 @@ class MachineLearningAvailabilityChecksDto {
 
       return MachineLearningAvailabilityChecksDto(
         enabled: mapValueOfType<bool>(json, r'enabled')!,
-        interval: mapValueOfType<int>(json, r'interval')!,
-        timeout: mapValueOfType<int>(json, r'timeout')!,
+        interval: num.parse('${json[r'interval']}'),
+        timeout: num.parse('${json[r'timeout']}'),
       );
     }
     return null;

mobile/openapi/lib/model/maintenance_detect_install_storage_folder_dto.dart

@@ -20,10 +20,7 @@ class MaintenanceDetectInstallStorageFolderDto {
   });
 
   /// Number of files in the folder
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int files;
+  num files;
 
   StorageFolder folder;
 
@@ -69,7 +66,7 @@ class MaintenanceDetectInstallStorageFolderDto {
       final json = value.cast<String, dynamic>();
 
       return MaintenanceDetectInstallStorageFolderDto(
-        files: mapValueOfType<int>(json, r'files')!,
+        files: num.parse('${json[r'files']}'),
         folder: StorageFolder.fromJson(json[r'folder'])!,
         readable: mapValueOfType<bool>(json, r'readable')!,
         writable: mapValueOfType<bool>(json, r'writable')!,

mobile/openapi/lib/model/maintenance_status_response_dto.dart

@@ -32,15 +32,13 @@ class MaintenanceStatusResponseDto {
   ///
   String? error;
 
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? progress;
+  num? progress;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -104,7 +102,7 @@ class MaintenanceStatusResponseDto {
         action: MaintenanceAction.fromJson(json[r'action'])!,
         active: mapValueOfType<bool>(json, r'active')!,
         error: mapValueOfType<String>(json, r'error'),
-        progress: mapValueOfType<int>(json, r'progress'),
+        progress: num.parse('${json[r'progress']}'),
         task: mapValueOfType<String>(json, r'task'),
       );
     }

mobile/openapi/lib/model/metadata_search_dto.dart

@@ -215,14 +215,13 @@ class MetadataSearchDto {
   /// Page number
   ///
   /// Minimum value: 1
-  /// Maximum value: 9007199254740991
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? page;
+  num? page;
 
   /// Filter by person IDs
   List<String> personIds;
@@ -240,7 +239,7 @@ class MetadataSearchDto {
   ///
   /// Minimum value: -1
   /// Maximum value: 5
-  int? rating;
+  num? rating;
 
   /// Number of results to return
   ///
@@ -252,7 +251,7 @@ class MetadataSearchDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? size;
+  num? size;
 
   /// Filter by state/province name
   String? state;
@@ -725,13 +724,15 @@ class MetadataSearchDto {
         order: AssetOrder.fromJson(json[r'order']),
         originalFileName: mapValueOfType<String>(json, r'originalFileName'),
         originalPath: mapValueOfType<String>(json, r'originalPath'),
-        page: mapValueOfType<int>(json, r'page'),
+        page: num.parse('${json[r'page']}'),
         personIds: json[r'personIds'] is Iterable
             ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         previewPath: mapValueOfType<String>(json, r'previewPath'),
-        rating: mapValueOfType<int>(json, r'rating'),
-        size: mapValueOfType<int>(json, r'size'),
+        rating: json[r'rating'] == null
+            ? null
+            : num.parse('${json[r'rating']}'),
+        size: num.parse('${json[r'size']}'),
         state: mapValueOfType<String>(json, r'state'),
         tagIds: json[r'tagIds'] is Iterable
             ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)

mobile/openapi/lib/model/random_search_dto.dart

@@ -147,7 +147,7 @@ class RandomSearchDto {
   ///
   /// Minimum value: -1
   /// Maximum value: 5
-  int? rating;
+  num? rating;
 
   /// Number of results to return
   ///
@@ -159,7 +159,7 @@ class RandomSearchDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? size;
+  num? size;
 
   /// Filter by state/province name
   String? state;
@@ -549,8 +549,10 @@ class RandomSearchDto {
         personIds: json[r'personIds'] is Iterable
             ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        rating: mapValueOfType<int>(json, r'rating'),
-        size: mapValueOfType<int>(json, r'size'),
+        rating: json[r'rating'] == null
+            ? null
+            : num.parse('${json[r'rating']}'),
+        size: num.parse('${json[r'size']}'),
         state: mapValueOfType<String>(json, r'state'),
         tagIds: json[r'tagIds'] is Iterable
             ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)

mobile/openapi/lib/model/session_create_dto.dart

@@ -39,14 +39,13 @@ class SessionCreateDto {
   /// Session duration in seconds
   ///
   /// Minimum value: 1
-  /// Maximum value: 9007199254740991
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? duration;
+  num? duration;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is SessionCreateDto &&
@@ -95,7 +94,7 @@ class SessionCreateDto {
       return SessionCreateDto(
         deviceOS: mapValueOfType<String>(json, r'deviceOS'),
         deviceType: mapValueOfType<String>(json, r'deviceType'),
-        duration: mapValueOfType<int>(json, r'duration'),
+        duration: num.parse('${json[r'duration']}'),
       );
     }
     return null;

mobile/openapi/lib/model/smart_search_dto.dart

@@ -154,14 +154,13 @@ class SmartSearchDto {
   /// Page number
   ///
   /// Minimum value: 1
-  /// Maximum value: 9007199254740991
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? page;
+  num? page;
 
   /// Filter by person IDs
   List<String> personIds;
@@ -188,7 +187,7 @@ class SmartSearchDto {
   ///
   /// Minimum value: -1
   /// Maximum value: 5
-  int? rating;
+  num? rating;
 
   /// Number of results to return
   ///
@@ -200,7 +199,7 @@ class SmartSearchDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? size;
+  num? size;
 
   /// Filter by state/province name
   String? state;
@@ -584,14 +583,16 @@ class SmartSearchDto {
         make: mapValueOfType<String>(json, r'make'),
         model: mapValueOfType<String>(json, r'model'),
         ocr: mapValueOfType<String>(json, r'ocr'),
-        page: mapValueOfType<int>(json, r'page'),
+        page: num.parse('${json[r'page']}'),
         personIds: json[r'personIds'] is Iterable
             ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         query: mapValueOfType<String>(json, r'query'),
         queryAssetId: mapValueOfType<String>(json, r'queryAssetId'),
-        rating: mapValueOfType<int>(json, r'rating'),
-        size: mapValueOfType<int>(json, r'size'),
+        rating: json[r'rating'] == null
+            ? null
+            : num.parse('${json[r'rating']}'),
+        size: num.parse('${json[r'size']}'),
         state: mapValueOfType<String>(json, r'state'),
         tagIds: json[r'tagIds'] is Iterable
             ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)

mobile/openapi/lib/model/statistics_search_dto.dart

@@ -152,7 +152,7 @@ class StatisticsSearchDto {
   ///
   /// Minimum value: -1
   /// Maximum value: 5
-  int? rating;
+  num? rating;
 
   /// Filter by state/province name
   String? state;
@@ -479,7 +479,9 @@ class StatisticsSearchDto {
         personIds: json[r'personIds'] is Iterable
             ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        rating: mapValueOfType<int>(json, r'rating'),
+        rating: json[r'rating'] == null
+            ? null
+            : num.parse('${json[r'rating']}'),
         state: mapValueOfType<String>(json, r'state'),
         tagIds: json[r'tagIds'] is Iterable
             ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)

mobile/openapi/lib/model/sync_asset_ocr_delete_v1.dart

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

mobile/openapi/lib/model/sync_asset_ocr_v1.dart

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

mobile/openapi/lib/model/sync_asset_v2.dart

@@ -1,321 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class SyncAssetV2 {
-  /// Returns a new [SyncAssetV2] instance.
-  SyncAssetV2({
-    required this.checksum,
-    required this.deletedAt,
-    required this.duration,
-    required this.fileCreatedAt,
-    required this.fileModifiedAt,
-    required this.height,
-    required this.id,
-    required this.isEdited,
-    required this.isFavorite,
-    required this.libraryId,
-    required this.livePhotoVideoId,
-    required this.localDateTime,
-    required this.originalFileName,
-    required this.ownerId,
-    required this.stackId,
-    required this.thumbhash,
-    required this.type,
-    required this.visibility,
-    required this.width,
-  });
-
-  /// Checksum
-  String checksum;
-
-  /// Deleted at
-  DateTime? deletedAt;
-
-  /// Duration
-  ///
-  /// Minimum value: 0
-  /// Maximum value: 2147483647
-  int? duration;
-
-  /// File created at
-  DateTime? fileCreatedAt;
-
-  /// File modified at
-  DateTime? fileModifiedAt;
-
-  /// Asset height
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int? height;
-
-  /// Asset ID
-  String id;
-
-  /// Is edited
-  bool isEdited;
-
-  /// Is favorite
-  bool isFavorite;
-
-  /// Library ID
-  String? libraryId;
-
-  /// Live photo video ID
-  String? livePhotoVideoId;
-
-  /// Local date time
-  DateTime? localDateTime;
-
-  /// Original file name
-  String originalFileName;
-
-  /// Owner ID
-  String ownerId;
-
-  /// Stack ID
-  String? stackId;
-
-  /// Thumbhash
-  String? thumbhash;
-
-  AssetTypeEnum type;
-
-  AssetVisibility visibility;
-
-  /// Asset width
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int? width;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is SyncAssetV2 &&
-    other.checksum == checksum &&
-    other.deletedAt == deletedAt &&
-    other.duration == duration &&
-    other.fileCreatedAt == fileCreatedAt &&
-    other.fileModifiedAt == fileModifiedAt &&
-    other.height == height &&
-    other.id == id &&
-    other.isEdited == isEdited &&
-    other.isFavorite == isFavorite &&
-    other.libraryId == libraryId &&
-    other.livePhotoVideoId == livePhotoVideoId &&
-    other.localDateTime == localDateTime &&
-    other.originalFileName == originalFileName &&
-    other.ownerId == ownerId &&
-    other.stackId == stackId &&
-    other.thumbhash == thumbhash &&
-    other.type == type &&
-    other.visibility == visibility &&
-    other.width == width;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (checksum.hashCode) +
-    (deletedAt == null ? 0 : deletedAt!.hashCode) +
-    (duration == null ? 0 : duration!.hashCode) +
-    (fileCreatedAt == null ? 0 : fileCreatedAt!.hashCode) +
-    (fileModifiedAt == null ? 0 : fileModifiedAt!.hashCode) +
-    (height == null ? 0 : height!.hashCode) +
-    (id.hashCode) +
-    (isEdited.hashCode) +
-    (isFavorite.hashCode) +
-    (libraryId == null ? 0 : libraryId!.hashCode) +
-    (livePhotoVideoId == null ? 0 : livePhotoVideoId!.hashCode) +
-    (localDateTime == null ? 0 : localDateTime!.hashCode) +
-    (originalFileName.hashCode) +
-    (ownerId.hashCode) +
-    (stackId == null ? 0 : stackId!.hashCode) +
-    (thumbhash == null ? 0 : thumbhash!.hashCode) +
-    (type.hashCode) +
-    (visibility.hashCode) +
-    (width == null ? 0 : width!.hashCode);
-
-  @override
-  String toString() => 'SyncAssetV2[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, height=$height, id=$id, isEdited=$isEdited, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility, width=$width]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'checksum'] = this.checksum;
-    if (this.deletedAt != null) {
-      json[r'deletedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
-        ? this.deletedAt!.millisecondsSinceEpoch
-        : this.deletedAt!.toUtc().toIso8601String();
-    } else {
-    //  json[r'deletedAt'] = null;
-    }
-    if (this.duration != null) {
-      json[r'duration'] = this.duration;
-    } else {
-    //  json[r'duration'] = null;
-    }
-    if (this.fileCreatedAt != null) {
-      json[r'fileCreatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
-        ? this.fileCreatedAt!.millisecondsSinceEpoch
-        : this.fileCreatedAt!.toUtc().toIso8601String();
-    } else {
-    //  json[r'fileCreatedAt'] = null;
-    }
-    if (this.fileModifiedAt != null) {
-      json[r'fileModifiedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
-        ? this.fileModifiedAt!.millisecondsSinceEpoch
-        : this.fileModifiedAt!.toUtc().toIso8601String();
-    } else {
-    //  json[r'fileModifiedAt'] = null;
-    }
-    if (this.height != null) {
-      json[r'height'] = this.height;
-    } else {
-    //  json[r'height'] = null;
-    }
-      json[r'id'] = this.id;
-      json[r'isEdited'] = this.isEdited;
-      json[r'isFavorite'] = this.isFavorite;
-    if (this.libraryId != null) {
-      json[r'libraryId'] = this.libraryId;
-    } else {
-    //  json[r'libraryId'] = null;
-    }
-    if (this.livePhotoVideoId != null) {
-      json[r'livePhotoVideoId'] = this.livePhotoVideoId;
-    } else {
-    //  json[r'livePhotoVideoId'] = null;
-    }
-    if (this.localDateTime != null) {
-      json[r'localDateTime'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
-        ? this.localDateTime!.millisecondsSinceEpoch
-        : this.localDateTime!.toUtc().toIso8601String();
-    } else {
-    //  json[r'localDateTime'] = null;
-    }
-      json[r'originalFileName'] = this.originalFileName;
-      json[r'ownerId'] = this.ownerId;
-    if (this.stackId != null) {
-      json[r'stackId'] = this.stackId;
-    } else {
-    //  json[r'stackId'] = null;
-    }
-    if (this.thumbhash != null) {
-      json[r'thumbhash'] = this.thumbhash;
-    } else {
-    //  json[r'thumbhash'] = null;
-    }
-      json[r'type'] = this.type;
-      json[r'visibility'] = this.visibility;
-    if (this.width != null) {
-      json[r'width'] = this.width;
-    } else {
-    //  json[r'width'] = null;
-    }
-    return json;
-  }
-
-  /// Returns a new [SyncAssetV2] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static SyncAssetV2? fromJson(dynamic value) {
-    upgradeDto(value, "SyncAssetV2");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return SyncAssetV2(
-        checksum: mapValueOfType<String>(json, r'checksum')!,
-        deletedAt: mapDateTime(json, r'deletedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
-        duration: mapValueOfType<int>(json, r'duration'),
-        fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
-        fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
-        height: mapValueOfType<int>(json, r'height'),
-        id: mapValueOfType<String>(json, r'id')!,
-        isEdited: mapValueOfType<bool>(json, r'isEdited')!,
-        isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
-        libraryId: mapValueOfType<String>(json, r'libraryId'),
-        livePhotoVideoId: mapValueOfType<String>(json, r'livePhotoVideoId'),
-        localDateTime: mapDateTime(json, r'localDateTime', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
-        originalFileName: mapValueOfType<String>(json, r'originalFileName')!,
-        ownerId: mapValueOfType<String>(json, r'ownerId')!,
-        stackId: mapValueOfType<String>(json, r'stackId'),
-        thumbhash: mapValueOfType<String>(json, r'thumbhash'),
-        type: AssetTypeEnum.fromJson(json[r'type'])!,
-        visibility: AssetVisibility.fromJson(json[r'visibility'])!,
-        width: mapValueOfType<int>(json, r'width'),
-      );
-    }
-    return null;
-  }
-
-  static List<SyncAssetV2> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <SyncAssetV2>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = SyncAssetV2.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, SyncAssetV2> mapFromJson(dynamic json) {
-    final map = <String, SyncAssetV2>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = SyncAssetV2.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of SyncAssetV2-objects as value to a dart map
-  static Map<String, List<SyncAssetV2>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<SyncAssetV2>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = SyncAssetV2.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'checksum',
-    'deletedAt',
-    'duration',
-    'fileCreatedAt',
-    'fileModifiedAt',
-    'height',
-    'id',
-    'isEdited',
-    'isFavorite',
-    'libraryId',
-    'livePhotoVideoId',
-    'localDateTime',
-    'originalFileName',
-    'ownerId',
-    'stackId',
-    'thumbhash',
-    'type',
-    'visibility',
-    'width',
-  };
-}
-

mobile/openapi/lib/model/sync_entity_type.dart

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

mobile/openapi/lib/model/sync_request_type.dart

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

mobile/openapi/lib/model/system_config_o_auth_dto.dart

@@ -57,8 +57,7 @@ class SystemConfigOAuthDto {
   /// Default storage quota
   ///
   /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int? defaultStorageQuota;
+  num? defaultStorageQuota;
 
   /// Enabled
   bool enabled;
@@ -201,7 +200,9 @@ class SystemConfigOAuthDto {
         buttonText: mapValueOfType<String>(json, r'buttonText')!,
         clientId: mapValueOfType<String>(json, r'clientId')!,
         clientSecret: mapValueOfType<String>(json, r'clientSecret')!,
-        defaultStorageQuota: mapValueOfType<int>(json, r'defaultStorageQuota'),
+        defaultStorageQuota: json[r'defaultStorageQuota'] == null
+            ? null
+            : num.parse('${json[r'defaultStorageQuota']}'),
         enabled: mapValueOfType<bool>(json, r'enabled')!,
         endSessionEndpoint: mapValueOfType<String>(json, r'endSessionEndpoint')!,
         issuerUrl: mapValueOfType<String>(json, r'issuerUrl')!,

mobile/openapi/lib/model/system_config_smtp_transport_dto.dart

@@ -34,7 +34,7 @@ class SystemConfigSmtpTransportDto {
   ///
   /// Minimum value: 0
   /// Maximum value: 65535
-  int port;
+  num port;
 
   /// Whether to use secure connection (TLS/SSL)
   bool secure;
@@ -87,7 +87,7 @@ class SystemConfigSmtpTransportDto {
         host: mapValueOfType<String>(json, r'host')!,
         ignoreCert: mapValueOfType<bool>(json, r'ignoreCert')!,
         password: mapValueOfType<String>(json, r'password')!,
-        port: mapValueOfType<int>(json, r'port')!,
+        port: num.parse('${json[r'port']}'),
         secure: mapValueOfType<bool>(json, r'secure')!,
         username: mapValueOfType<String>(json, r'username')!,
       );

mobile/openapi/lib/model/time_bucket_asset_response_dto.dart

@@ -39,8 +39,8 @@ class TimeBucketAssetResponseDto {
   /// Array of country names extracted from EXIF GPS data
   List<String?> country;
 
-  /// Array of video/gif durations in milliseconds (null for static images)
-  List<int?> duration;
+  /// Array of video/gif durations in hh:mm:ss.SSS format (null for static images)
+  List<String?> duration;
 
   /// Array of file creation timestamps in UTC
   List<String> fileCreatedAt;
@@ -172,7 +172,7 @@ class TimeBucketAssetResponseDto {
             ? (json[r'country'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         duration: json[r'duration'] is Iterable
-            ? (json[r'duration'] as Iterable).cast<int>().toList(growable: false)
+            ? (json[r'duration'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         fileCreatedAt: json[r'fileCreatedAt'] is Iterable
             ? (json[r'fileCreatedAt'] as Iterable).cast<String>().toList(growable: false)

mobile/openapi/lib/model/workflow_action_response_dto.dart

@@ -26,10 +26,7 @@ class WorkflowActionResponseDto {
   String id;
 
   /// Action order
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int order;
+  num order;
 
   /// Plugin action ID
   String pluginActionId;
@@ -82,7 +79,7 @@ class WorkflowActionResponseDto {
       return WorkflowActionResponseDto(
         actionConfig: mapCastOfType<String, Object>(json, r'actionConfig'),
         id: mapValueOfType<String>(json, r'id')!,
-        order: mapValueOfType<int>(json, r'order')!,
+        order: num.parse('${json[r'order']}'),
         pluginActionId: mapValueOfType<String>(json, r'pluginActionId')!,
         workflowId: mapValueOfType<String>(json, r'workflowId')!,
       );

mobile/openapi/lib/model/workflow_filter_response_dto.dart

@@ -26,10 +26,7 @@ class WorkflowFilterResponseDto {
   String id;
 
   /// Filter order
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int order;
+  num order;
 
   /// Plugin filter ID
   String pluginFilterId;
@@ -82,7 +79,7 @@ class WorkflowFilterResponseDto {
       return WorkflowFilterResponseDto(
         filterConfig: mapCastOfType<String, Object>(json, r'filterConfig'),
         id: mapValueOfType<String>(json, r'id')!,
-        order: mapValueOfType<int>(json, r'order')!,
+        order: num.parse('${json[r'order']}'),
         pluginFilterId: mapValueOfType<String>(json, r'pluginFilterId')!,
         workflowId: mapValueOfType<String>(json, r'workflowId')!,
       );

mobile/pubspec.lock

@@ -1989,4 +1989,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.11.0 <4.0.0"
-  flutter: "3.41.9"
+  flutter: "3.41.7"

mobile/pubspec.yaml

@@ -6,7 +6,7 @@ version: 2.7.5+3046
 
 environment:
   sdk: '>=3.11.0 <4.0.0'
-  flutter: 3.41.9
+  flutter: 3.41.7
 
 dependencies:
   async: ^2.13.1

mobile/test/domain/services/sync_stream_service_test.dart

@@ -419,8 +419,8 @@ void main() {
         'album-b': [mergedAsset],
       };
       when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer((invocation) async {
-        final Iterable<String> requestedRemoteIds = invocation.positionalArguments.first as Iterable<String>;
-        expect(requestedRemoteIds.toSet(), equals({'remote-1', 'remote-2', 'remote-3'}));
+        final Iterable<String> requestedChecksums = invocation.positionalArguments.first as Iterable<String>;
+        expect(requestedChecksums.toSet(), equals({'checksum-local', 'checksum-merged', 'checksum-remote-only'}));
         return assetsByAlbum;
       });
 
@@ -482,18 +482,12 @@ void main() {
       verifyNever(() => mockTrashedLocalAssetRepo.trashLocalAsset(any()));
     });
 
-    test("requests local deletions lookup by remote ids for permanent remote delete events", () async {
-      when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer((invocation) async {
-        final Iterable<String> requestedRemoteIds = invocation.positionalArguments.first as Iterable<String>;
-        expect(requestedRemoteIds.toSet(), equals({'remote-asset'}));
-        return {};
-      });
-
+    test("does not request local deletions for permanent remote delete events", () async {
       final events = [SyncStreamStub.assetDeleteV1];
 
       await simulateEvents(events);
 
-      verify(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).called(1);
+      verifyNever(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any()));
       verifyNever(() => mockLocalFilesManagerRepo.moveToTrash(any()));
       verify(() => mockSyncStreamRepo.deleteAssetsV1(any())).called(1);
     });

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

@@ -28,7 +28,6 @@ import 'schema_v21.dart' as v21;
 import 'schema_v22.dart' as v22;
 import 'schema_v23.dart' as v23;
 import 'schema_v24.dart' as v24;
-import 'schema_v25.dart' as v25;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -82,8 +81,6 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v23.DatabaseAtV23(db);
       case 24:
         return v24.DatabaseAtV24(db);
-      case 25:
-        return v25.DatabaseAtV25(db);
       default:
         throw MissingSchemaException(version, versions);
     }
@@ -114,6 +111,5 @@ class GeneratedHelper implements SchemaInstantiationHelper {
     22,
     23,
     24,
-    25,
   ];
 }

open-api/immich-openapi-specs.json

@@ -7964,9 +7964,8 @@
             "description": "Page number for pagination",
             "schema": {
               "minimum": 1,
-              "maximum": 9007199254740991,
               "default": 1,
-              "type": "integer"
+              "type": "number"
             }
           },
           {
@@ -7978,7 +7977,7 @@
               "minimum": 1,
               "maximum": 1000,
               "default": 500,
-              "type": "integer"
+              "type": "number"
             }
           },
           {
@@ -9373,7 +9372,7 @@
             ],
             "x-immich-state": "Stable",
             "schema": {
-              "type": "integer",
+              "type": "number",
               "minimum": -1,
               "maximum": 5,
               "nullable": true
@@ -9387,7 +9386,7 @@
             "schema": {
               "minimum": 1,
               "maximum": 1000,
-              "type": "integer"
+              "type": "number"
             }
           },
           {
@@ -15637,9 +15636,7 @@
           },
           "dateTimeRelative": {
             "description": "Relative time offset in seconds",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "type": "integer"
+            "type": "number"
           },
           "description": {
             "description": "Asset description",
@@ -16261,10 +16258,8 @@
             "type": "string"
           },
           "duration": {
-            "description": "Duration in milliseconds (for videos)",
-            "maximum": 2147483647,
-            "minimum": 0,
-            "type": "integer"
+            "description": "Duration (for videos)",
+            "type": "string"
           },
           "fileCreatedAt": {
             "description": "File creation date",
@@ -16632,11 +16627,9 @@
             "type": "string"
           },
           "duration": {
-            "description": "Video/gif duration in milliseconds (null for static images)",
-            "maximum": 2147483647,
-            "minimum": 0,
+            "description": "Video/gif duration in hh:mm:ss.SSS format (null for static images)",
             "nullable": true,
-            "type": "integer"
+            "type": "string"
           },
           "exifInfo": {
             "$ref": "#/components/schemas/ExifResponseDto"
@@ -16657,10 +16650,9 @@
           },
           "height": {
             "description": "Asset height",
-            "maximum": 9007199254740991,
             "minimum": 0,
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "id": {
             "description": "Asset ID",
@@ -16803,10 +16795,9 @@
           },
           "width": {
             "description": "Asset width",
-            "maximum": 9007199254740991,
             "minimum": 0,
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           }
         },
         "required": [
@@ -17223,27 +17214,23 @@
         "properties": {
           "height": {
             "description": "Height of the crop",
-            "maximum": 9007199254740991,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           },
           "width": {
             "description": "Width of the crop",
-            "maximum": 9007199254740991,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           },
           "x": {
             "description": "Top-Left X coordinate of crop",
-            "maximum": 9007199254740991,
             "minimum": 0,
-            "type": "integer"
+            "type": "number"
           },
           "y": {
             "description": "Top-Left Y coordinate of crop",
-            "maximum": 9007199254740991,
             "minimum": 0,
-            "type": "integer"
+            "type": "number"
           }
         },
         "required": [
@@ -17267,9 +17254,8 @@
           },
           "keepLastAmount": {
             "description": "Keep last amount",
-            "maximum": 9007199254740991,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           }
         },
         "required": [
@@ -17302,9 +17288,7 @@
           },
           "filesize": {
             "description": "Backup file size",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "type": "integer"
+            "type": "number"
           },
           "timezone": {
             "description": "Backup timezone",
@@ -17643,18 +17627,16 @@
           "exifImageHeight": {
             "default": null,
             "description": "Image height in pixels",
-            "maximum": 9007199254740991,
             "minimum": 0,
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "exifImageWidth": {
             "default": null,
             "description": "Image width in pixels",
-            "maximum": 9007199254740991,
             "minimum": 0,
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "exposureTime": {
             "default": null,
@@ -17685,10 +17667,8 @@
           "iso": {
             "default": null,
             "description": "ISO sensitivity",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "latitude": {
             "default": null,
@@ -17742,10 +17722,8 @@
           "rating": {
             "default": null,
             "description": "Rating",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "state": {
             "default": null,
@@ -18172,14 +18150,10 @@
             "type": "boolean"
           },
           "interval": {
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "type": "integer"
+            "type": "number"
           },
           "timeout": {
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "type": "integer"
+            "type": "number"
           }
         },
         "required": [
@@ -18229,9 +18203,7 @@
         "properties": {
           "files": {
             "description": "Number of files in the folder",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "type": "integer"
+            "type": "number"
           },
           "folder": {
             "$ref": "#/components/schemas/StorageFolder"
@@ -18274,9 +18246,7 @@
             "type": "string"
           },
           "progress": {
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "type": "integer"
+            "type": "number"
           },
           "task": {
             "type": "string"
@@ -18753,9 +18723,8 @@
           },
           "page": {
             "description": "Page number",
-            "maximum": 9007199254740991,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           },
           "personIds": {
             "description": "Filter by person IDs",
@@ -18775,7 +18744,7 @@
             "maximum": 5,
             "minimum": -1,
             "nullable": true,
-            "type": "integer",
+            "type": "number",
             "x-immich-history": [
               {
                 "version": "v1",
@@ -18797,7 +18766,7 @@
             "description": "Number of results to return",
             "maximum": 1000,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           },
           "state": {
             "description": "Filter by state/province name",
@@ -20628,7 +20597,7 @@
             "maximum": 5,
             "minimum": -1,
             "nullable": true,
-            "type": "integer",
+            "type": "number",
             "x-immich-history": [
               {
                 "version": "v1",
@@ -20650,7 +20619,7 @@
             "description": "Number of results to return",
             "maximum": 1000,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           },
           "state": {
             "description": "Filter by state/province name",
@@ -21468,9 +21437,8 @@
           },
           "duration": {
             "description": "Session duration in seconds",
-            "maximum": 9007199254740991,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           }
         },
         "type": "object"
@@ -21984,9 +21952,8 @@
           },
           "page": {
             "description": "Page number",
-            "maximum": 9007199254740991,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           },
           "personIds": {
             "description": "Filter by person IDs",
@@ -22012,7 +21979,7 @@
             "maximum": 5,
             "minimum": -1,
             "nullable": true,
-            "type": "integer",
+            "type": "number",
             "x-immich-history": [
               {
                 "version": "v1",
@@ -22034,7 +22001,7 @@
             "description": "Number of results to return",
             "maximum": 1000,
             "minimum": 1,
-            "type": "integer"
+            "type": "number"
           },
           "state": {
             "description": "Filter by state/province name",
@@ -22272,7 +22239,7 @@
             "maximum": 5,
             "minimum": -1,
             "nullable": true,
-            "type": "integer",
+            "type": "number",
             "x-immich-history": [
               {
                 "version": "v1",
@@ -23052,118 +23019,6 @@
         ],
         "type": "object"
       },
-      "SyncAssetOcrDeleteV1": {
-        "properties": {
-          "assetId": {
-            "description": "Original asset ID of the deleted OCR entry",
-            "type": "string"
-          },
-          "deletedAt": {
-            "description": "Timestamp when the OCR entry was deleted",
-            "example": "2024-01-01T00:00:00.000Z",
-            "format": "date-time",
-            "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$",
-            "type": "string"
-          },
-          "id": {
-            "description": "Audit row ID of the deleted OCR entry",
-            "type": "string"
-          }
-        },
-        "required": [
-          "assetId",
-          "deletedAt",
-          "id"
-        ],
-        "type": "object"
-      },
-      "SyncAssetOcrV1": {
-        "properties": {
-          "assetId": {
-            "description": "Asset ID",
-            "type": "string"
-          },
-          "boxScore": {
-            "description": "Confidence score of the bounding box",
-            "format": "double",
-            "type": "number"
-          },
-          "id": {
-            "description": "OCR entry ID",
-            "type": "string"
-          },
-          "isVisible": {
-            "description": "Whether the OCR entry is visible",
-            "type": "boolean"
-          },
-          "text": {
-            "description": "Recognized text content",
-            "type": "string"
-          },
-          "textScore": {
-            "description": "Confidence score of the recognized text",
-            "format": "double",
-            "type": "number"
-          },
-          "x1": {
-            "description": "Top-left X coordinate (normalized 0–1)",
-            "format": "double",
-            "type": "number"
-          },
-          "x2": {
-            "description": "Top-right X coordinate (normalized 0–1)",
-            "format": "double",
-            "type": "number"
-          },
-          "x3": {
-            "description": "Bottom-right X coordinate (normalized 0–1)",
-            "format": "double",
-            "type": "number"
-          },
-          "x4": {
-            "description": "Bottom-left X coordinate (normalized 0–1)",
-            "format": "double",
-            "type": "number"
-          },
-          "y1": {
-            "description": "Top-left Y coordinate (normalized 0–1)",
-            "format": "double",
-            "type": "number"
-          },
-          "y2": {
-            "description": "Top-right Y coordinate (normalized 0–1)",
-            "format": "double",
-            "type": "number"
-          },
-          "y3": {
-            "description": "Bottom-right Y coordinate (normalized 0–1)",
-            "format": "double",
-            "type": "number"
-          },
-          "y4": {
-            "description": "Bottom-left Y coordinate (normalized 0–1)",
-            "format": "double",
-            "type": "number"
-          }
-        },
-        "required": [
-          "assetId",
-          "boxScore",
-          "id",
-          "isVisible",
-          "text",
-          "textScore",
-          "x1",
-          "x2",
-          "x3",
-          "x4",
-          "y1",
-          "y2",
-          "y3",
-          "y4"
-        ],
-        "type": "object"
-      },
       "SyncAssetV1": {
         "properties": {
           "checksum": {
@@ -23291,135 +23146,6 @@
         ],
         "type": "object"
       },
-      "SyncAssetV2": {
-        "properties": {
-          "checksum": {
-            "description": "Checksum",
-            "type": "string"
-          },
-          "deletedAt": {
-            "description": "Deleted at",
-            "example": "2024-01-01T00:00:00.000Z",
-            "format": "date-time",
-            "nullable": true,
-            "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$",
-            "type": "string"
-          },
-          "duration": {
-            "description": "Duration",
-            "maximum": 2147483647,
-            "minimum": 0,
-            "nullable": true,
-            "type": "integer"
-          },
-          "fileCreatedAt": {
-            "description": "File created at",
-            "example": "2024-01-01T00:00:00.000Z",
-            "format": "date-time",
-            "nullable": true,
-            "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$",
-            "type": "string"
-          },
-          "fileModifiedAt": {
-            "description": "File modified at",
-            "example": "2024-01-01T00:00:00.000Z",
-            "format": "date-time",
-            "nullable": true,
-            "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$",
-            "type": "string"
-          },
-          "height": {
-            "description": "Asset height",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "nullable": true,
-            "type": "integer"
-          },
-          "id": {
-            "description": "Asset ID",
-            "type": "string"
-          },
-          "isEdited": {
-            "description": "Is edited",
-            "type": "boolean"
-          },
-          "isFavorite": {
-            "description": "Is favorite",
-            "type": "boolean"
-          },
-          "libraryId": {
-            "description": "Library ID",
-            "nullable": true,
-            "type": "string"
-          },
-          "livePhotoVideoId": {
-            "description": "Live photo video ID",
-            "nullable": true,
-            "type": "string"
-          },
-          "localDateTime": {
-            "description": "Local date time",
-            "example": "2024-01-01T00:00:00.000Z",
-            "format": "date-time",
-            "nullable": true,
-            "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$",
-            "type": "string"
-          },
-          "originalFileName": {
-            "description": "Original file name",
-            "type": "string"
-          },
-          "ownerId": {
-            "description": "Owner ID",
-            "type": "string"
-          },
-          "stackId": {
-            "description": "Stack ID",
-            "nullable": true,
-            "type": "string"
-          },
-          "thumbhash": {
-            "description": "Thumbhash",
-            "nullable": true,
-            "type": "string"
-          },
-          "type": {
-            "$ref": "#/components/schemas/AssetTypeEnum"
-          },
-          "visibility": {
-            "$ref": "#/components/schemas/AssetVisibility"
-          },
-          "width": {
-            "description": "Asset width",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "nullable": true,
-            "type": "integer"
-          }
-        },
-        "required": [
-          "checksum",
-          "deletedAt",
-          "duration",
-          "fileCreatedAt",
-          "fileModifiedAt",
-          "height",
-          "id",
-          "isEdited",
-          "isFavorite",
-          "libraryId",
-          "livePhotoVideoId",
-          "localDateTime",
-          "originalFileName",
-          "ownerId",
-          "stackId",
-          "thumbhash",
-          "type",
-          "visibility",
-          "width"
-        ],
-        "type": "object"
-      },
       "SyncAuthUserV1": {
         "properties": {
           "avatarColor": {
@@ -23520,21 +23246,16 @@
           "UserV1",
           "UserDeleteV1",
           "AssetV1",
-          "AssetV2",
           "AssetDeleteV1",
           "AssetExifV1",
           "AssetEditV1",
           "AssetEditDeleteV1",
           "AssetMetadataV1",
           "AssetMetadataDeleteV1",
-          "AssetOcrV1",
-          "AssetOcrDeleteV1",
           "PartnerV1",
           "PartnerDeleteV1",
           "PartnerAssetV1",
-          "PartnerAssetV2",
           "PartnerAssetBackfillV1",
-          "PartnerAssetBackfillV2",
           "PartnerAssetDeleteV1",
           "PartnerAssetExifV1",
           "PartnerAssetExifBackfillV1",
@@ -23548,11 +23269,8 @@
           "AlbumUserBackfillV1",
           "AlbumUserDeleteV1",
           "AlbumAssetCreateV1",
-          "AlbumAssetCreateV2",
           "AlbumAssetUpdateV1",
-          "AlbumAssetUpdateV2",
           "AlbumAssetBackfillV1",
-          "AlbumAssetBackfillV2",
           "AlbumAssetExifCreateV1",
           "AlbumAssetExifUpdateV1",
           "AlbumAssetExifBackfillV1",
@@ -23844,20 +23562,16 @@
           "AlbumUsersV1",
           "AlbumToAssetsV1",
           "AlbumAssetsV1",
-          "AlbumAssetsV2",
           "AlbumAssetExifsV1",
           "AssetsV1",
-          "AssetsV2",
           "AssetExifsV1",
           "AssetEditsV1",
           "AssetMetadataV1",
-          "AssetOcrV1",
           "AuthUsersV1",
           "MemoriesV1",
           "MemoryToAssetsV1",
           "PartnersV1",
           "PartnerAssetsV1",
-          "PartnerAssetsV2",
           "PartnerAssetExifsV1",
           "PartnerStacksV1",
           "StacksV1",
@@ -24657,10 +24371,9 @@
           },
           "defaultStorageQuota": {
             "description": "Default storage quota",
-            "maximum": 9007199254740991,
             "minimum": 0,
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "enabled": {
             "description": "Enabled",
@@ -24835,7 +24548,7 @@
             "description": "SMTP server port",
             "maximum": 65535,
             "minimum": 0,
-            "type": "integer"
+            "type": "number"
           },
           "secure": {
             "description": "Whether to use secure connection (TLS/SSL)",
@@ -25251,12 +24964,10 @@
             "type": "array"
           },
           "duration": {
-            "description": "Array of video/gif durations in milliseconds (null for static images)",
+            "description": "Array of video/gif durations in hh:mm:ss.SSS format (null for static images)",
             "items": {
-              "maximum": 2147483647,
-              "minimum": 0,
               "nullable": true,
-              "type": "integer"
+              "type": "string"
             },
             "type": "array"
           },
@@ -26255,9 +25966,7 @@
           },
           "order": {
             "description": "Action order",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "type": "integer"
+            "type": "number"
           },
           "pluginActionId": {
             "description": "Plugin action ID",
@@ -26356,9 +26065,7 @@
           },
           "order": {
             "description": "Filter order",
-            "maximum": 9007199254740991,
-            "minimum": -9007199254740991,
-            "type": "integer"
+            "type": "number"
           },
           "pluginFilterId": {
             "description": "Plugin filter ID",

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

@@ -614,8 +614,8 @@ export type AssetMetadataUpsertItemDto = {
 export type AssetMediaCreateDto = {
     /** Asset file data */
     assetData: Blob;
-    /** Duration in milliseconds (for videos) */
-    duration?: number;
+    /** Duration (for videos) */
+    duration?: string;
     /** File creation date */
     fileCreatedAt: string;
     /** File modification date */
@@ -854,8 +854,8 @@ export type AssetResponseDto = {
     createdAt: string;
     /** Duplicate group ID */
     duplicateId?: string | null;
-    /** Video/gif duration in milliseconds (null for static images) */
-    duration: number | null;
+    /** Video/gif duration in hh:mm:ss.SSS format (null for static images) */
+    duration: string | null;
     exifInfo?: ExifResponseDto;
     /** The actual UTC timestamp when the file was created/captured, preserving timezone information. This is the authoritative timestamp for chronological sorting within timeline groups. Combined with timezone data, this can be used to determine the exact moment the photo was taken. */
     fileCreatedAt: string;
@@ -2673,8 +2673,8 @@ export type TimeBucketAssetResponseDto = {
     city: (string | null)[];
     /** Array of country names extracted from EXIF GPS data */
     country: (string | null)[];
-    /** Array of video/gif durations in milliseconds (null for static images) */
-    duration: (number | null)[];
+    /** Array of video/gif durations in hh:mm:ss.SSS format (null for static images) */
+    duration: (string | null)[];
     /** Array of file creation timestamps in UTC */
     fileCreatedAt: string[];
     /** Array of asset IDs in the time bucket */
@@ -3037,44 +3037,6 @@ export type SyncAssetMetadataV1 = {
         [key: string]: any;
     };
 };
-export type SyncAssetOcrDeleteV1 = {
-    /** Original asset ID of the deleted OCR entry */
-    assetId: string;
-    /** Timestamp when the OCR entry was deleted */
-    deletedAt: string;
-    /** Audit row ID of the deleted OCR entry */
-    id: string;
-};
-export type SyncAssetOcrV1 = {
-    /** Asset ID */
-    assetId: string;
-    /** Confidence score of the bounding box */
-    boxScore: number;
-    /** OCR entry ID */
-    id: string;
-    /** Whether the OCR entry is visible */
-    isVisible: boolean;
-    /** Recognized text content */
-    text: string;
-    /** Confidence score of the recognized text */
-    textScore: number;
-    /** Top-left X coordinate (normalized 0–1) */
-    x1: number;
-    /** Top-right X coordinate (normalized 0–1) */
-    x2: number;
-    /** Bottom-right X coordinate (normalized 0–1) */
-    x3: number;
-    /** Bottom-left X coordinate (normalized 0–1) */
-    x4: number;
-    /** Top-left Y coordinate (normalized 0–1) */
-    y1: number;
-    /** Top-right Y coordinate (normalized 0–1) */
-    y2: number;
-    /** Bottom-right Y coordinate (normalized 0–1) */
-    y3: number;
-    /** Bottom-left Y coordinate (normalized 0–1) */
-    y4: number;
-};
 export type SyncAssetV1 = {
     /** Checksum */
     checksum: string;
@@ -3113,44 +3075,6 @@ export type SyncAssetV1 = {
     /** Asset width */
     width: number | null;
 };
-export type SyncAssetV2 = {
-    /** Checksum */
-    checksum: string;
-    /** Deleted at */
-    deletedAt: string | null;
-    /** Duration */
-    duration: number | null;
-    /** File created at */
-    fileCreatedAt: string | null;
-    /** File modified at */
-    fileModifiedAt: string | null;
-    /** Asset height */
-    height: number | null;
-    /** Asset ID */
-    id: string;
-    /** Is edited */
-    isEdited: boolean;
-    /** Is favorite */
-    isFavorite: boolean;
-    /** Library ID */
-    libraryId: string | null;
-    /** Live photo video ID */
-    livePhotoVideoId: string | null;
-    /** Local date time */
-    localDateTime: string | null;
-    /** Original file name */
-    originalFileName: string;
-    /** Owner ID */
-    ownerId: string;
-    /** Stack ID */
-    stackId: string | null;
-    /** Thumbhash */
-    thumbhash: string | null;
-    "type": AssetTypeEnum;
-    visibility: AssetVisibility;
-    /** Asset width */
-    width: number | null;
-};
 export type SyncAuthUserV1 = {
     avatarColor?: (UserAvatarColor) | null;
     /** User deleted at */
@@ -7185,21 +7109,16 @@ export enum SyncEntityType {
     UserV1 = "UserV1",
     UserDeleteV1 = "UserDeleteV1",
     AssetV1 = "AssetV1",
-    AssetV2 = "AssetV2",
     AssetDeleteV1 = "AssetDeleteV1",
     AssetExifV1 = "AssetExifV1",
     AssetEditV1 = "AssetEditV1",
     AssetEditDeleteV1 = "AssetEditDeleteV1",
     AssetMetadataV1 = "AssetMetadataV1",
     AssetMetadataDeleteV1 = "AssetMetadataDeleteV1",
-    AssetOcrV1 = "AssetOcrV1",
-    AssetOcrDeleteV1 = "AssetOcrDeleteV1",
     PartnerV1 = "PartnerV1",
     PartnerDeleteV1 = "PartnerDeleteV1",
     PartnerAssetV1 = "PartnerAssetV1",
-    PartnerAssetV2 = "PartnerAssetV2",
     PartnerAssetBackfillV1 = "PartnerAssetBackfillV1",
-    PartnerAssetBackfillV2 = "PartnerAssetBackfillV2",
     PartnerAssetDeleteV1 = "PartnerAssetDeleteV1",
     PartnerAssetExifV1 = "PartnerAssetExifV1",
     PartnerAssetExifBackfillV1 = "PartnerAssetExifBackfillV1",
@@ -7213,11 +7132,8 @@ export enum SyncEntityType {
     AlbumUserBackfillV1 = "AlbumUserBackfillV1",
     AlbumUserDeleteV1 = "AlbumUserDeleteV1",
     AlbumAssetCreateV1 = "AlbumAssetCreateV1",
-    AlbumAssetCreateV2 = "AlbumAssetCreateV2",
     AlbumAssetUpdateV1 = "AlbumAssetUpdateV1",
-    AlbumAssetUpdateV2 = "AlbumAssetUpdateV2",
     AlbumAssetBackfillV1 = "AlbumAssetBackfillV1",
-    AlbumAssetBackfillV2 = "AlbumAssetBackfillV2",
     AlbumAssetExifCreateV1 = "AlbumAssetExifCreateV1",
     AlbumAssetExifUpdateV1 = "AlbumAssetExifUpdateV1",
     AlbumAssetExifBackfillV1 = "AlbumAssetExifBackfillV1",
@@ -7247,20 +7163,16 @@ export enum SyncRequestType {
     AlbumUsersV1 = "AlbumUsersV1",
     AlbumToAssetsV1 = "AlbumToAssetsV1",
     AlbumAssetsV1 = "AlbumAssetsV1",
-    AlbumAssetsV2 = "AlbumAssetsV2",
     AlbumAssetExifsV1 = "AlbumAssetExifsV1",
     AssetsV1 = "AssetsV1",
-    AssetsV2 = "AssetsV2",
     AssetExifsV1 = "AssetExifsV1",
     AssetEditsV1 = "AssetEditsV1",
     AssetMetadataV1 = "AssetMetadataV1",
-    AssetOcrV1 = "AssetOcrV1",
     AuthUsersV1 = "AuthUsersV1",
     MemoriesV1 = "MemoriesV1",
     MemoryToAssetsV1 = "MemoryToAssetsV1",
     PartnersV1 = "PartnersV1",
     PartnerAssetsV1 = "PartnerAssetsV1",
-    PartnerAssetsV2 = "PartnerAssetsV2",
     PartnerAssetExifsV1 = "PartnerAssetExifsV1",
     PartnerStacksV1 = "PartnerStacksV1",
     StacksV1 = "StacksV1",

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

@@ -1,16 +1,9 @@
 import { HttpError } from '@oazapfts/runtime';
 
-export interface ApiValidationError {
-  code: string;
-  path: (string | number)[];
-  message: string;
-}
-
 export interface ApiExceptionResponse {
   message: string;
   error?: string;
   statusCode: number;
-  errors?: ApiValidationError[];
 }
 
 export interface ApiHttpError extends HttpError {