Remaining

.devcontainer/server/container-common.sh

@@ -74,7 +74,7 @@ install_dependencies() {
     (
         cd "${IMMICH_WORKSPACE}" || exit 1
         export CI=1 FROZEN=1 OFFLINE=1
-        run_cmd make setup-web-dev setup-server-dev
+        run_cmd make setup-dev
     )
     log ""
 }

.devcontainer/server/container-start-backend.sh

@@ -10,8 +10,9 @@ cd "${IMMICH_WORKSPACE}/server" || (
     exit 1
 )
 
+CI=1 pnpm install
 while true; do
-    run_cmd node ./node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch
+    run_cmd pnpm exec nest start --debug "0.0.0.0:9230" --watch
     log "Nest API Server crashed with exit code $?.  Respawning in 3s ..."
     sleep 3
 done

.devcontainer/server/container-start-frontend.sh

@@ -16,7 +16,7 @@ until curl --output /dev/null --silent --head --fail "http://127.0.0.1:${IMMICH_
 done
 
 while true; do
-    run_cmd node ./node_modules/.bin/vite dev --host 0.0.0.0 --port "${DEV_PORT}"
+    run_cmd pnpm exec vite dev --host 0.0.0.0 --port "${DEV_PORT}"
     log "Web crashed with exit code $?.  Respawning in 3s ..."
     sleep 3
 done

.github/package-lock.json

@@ -1,28 +0,0 @@
-{
-  "name": ".github",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "devDependencies": {
-        "prettier": "^3.5.3"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    }
-  }
-}

.github/workflows/build-mobile.yml

@@ -122,17 +122,17 @@ jobs:
           IS_MAIN: ${{ github.ref == 'refs/heads/main' }}
         run: |
           if [[ $IS_MAIN == 'true' ]]; then
-            flutter build apk --release --flavor production
-            flutter build apk --release --flavor production --split-per-abi --target-platform android-arm,android-arm64,android-x64
+            flutter build apk --release
+            flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
           else
-            flutter build apk --debug --flavor production --split-per-abi --target-platform android-arm64
+            flutter build apk --debug --split-per-abi --target-platform android-arm64
           fi
 
       - name: Publish Android Artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: release-apk-signed
-          path: mobile/build/app/outputs/flutter-apk/**/*.apk
+          path: mobile/build/app/outputs/flutter-apk/*.apk
 
       - name: Save Gradle Cache
         id: cache-gradle-save

.github/workflows/cli.yml

@@ -33,21 +33,24 @@ jobs:
         with:
           persist-credentials: false
 
-      # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
-        with:
-          node-version-file: './cli/.nvmrc'
-          registry-url: 'https://registry.npmjs.org'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
-      - name: Prepare SDK
-        run: npm ci --prefix ../open-api/typescript-sdk/
-      - name: Build SDK
-        run: npm run build --prefix ../open-api/typescript-sdk/
-      - run: npm ci
-      - run: npm run build
-      - run: npm publish
+      - name: Setup Node
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version-file: './server/.nvmrc'
+          registry-url: 'https://registry.npmjs.org'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
+
+      - name: Setup typescript-sdk
+        run: pnpm install && pnpm run build
+        working-directory: ./open-api/typescript-sdk
+
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm build
+      - run: pnpm publish
         if: ${{ github.event_name == 'release' }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docker.yml

@@ -131,7 +131,7 @@ jobs:
             tag-suffix: '-rocm'
             platforms: linux/amd64
             runner-mapping: '{"linux/amd64": "mich"}'
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@129aeda75a450666ce96e8bc8126652e717917a7 # multi-runner-build-workflow-0.1.1
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@094bfb927b8cd75b343abaac27b3241be0fccfe9 # multi-runner-build-workflow-0.1.0
     permissions:
       contents: read
       actions: read
@@ -154,7 +154,7 @@ jobs:
     name: Build and Push Server
     needs: pre-job
     if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@129aeda75a450666ce96e8bc8126652e717917a7 # multi-runner-build-workflow-0.1.1
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@094bfb927b8cd75b343abaac27b3241be0fccfe9 # multi-runner-build-workflow-0.1.0
     permissions:
       contents: read
       actions: read

.github/workflows/docs-build.yml

@@ -53,21 +53,24 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './docs/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './cli/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
-      - name: Run npm install
-        run: npm ci
+      - name: Run install
+        run: pnpm install
 
       - name: Check formatting
-        run: npm run format
+        run: pnpm format
 
       - name: Run build
-        run: npm run build
+        run: pnpm build
 
       - name: Upload build output
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/fix-format.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           node-version-file: './server/.nvmrc'
           cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Fix formatting
         run: make install-all && make format-all

.github/workflows/org-checks.yml

@@ -1,13 +0,0 @@
-name: Org Checks
-
-on:
-  pull_request_review:
-  pull_request:
-
-jobs:
-  check-approvals:
-    name: Check for Team/Admin Review
-    uses: immich-app/devtools/.github/workflows/required-approval.yml@main
-    permissions:
-      pull-requests: read
-      contents: read

.github/workflows/sdk.yml

@@ -20,18 +20,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './open-api/typescript-sdk/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
       - name: Install deps
-        run: npm ci
+        run: pnpm install --frozen-lockfile
       - name: Build
-        run: npm run build
+        run: pnpm build
       - name: Publish
-        run: npm publish
+        run: pnpm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/static_analysis.yml

@@ -42,9 +42,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-    defaults:
-      run:
-        working-directory: ./mobile
     steps:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -59,22 +56,27 @@ jobs:
 
       - name: Install dependencies
         run: dart pub get
+        working-directory: ./mobile
 
       - name: Install DCM
-        uses: CQLabs/setup-dcm@8697ae0790c0852e964a6ef1d768d62a6675481a # v2.0.1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          version: auto
-          working-directory: ./mobile
+        run: |
+          sudo apt-get update
+          wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
+          echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
+          sudo apt-get update
+          sudo apt-get install dcm
 
       - name: Generate translation file
         run: make translation
+        working-directory: ./mobile
 
       - name: Run Build Runner
         run: make build
+        working-directory: ./mobile
 
       - name: Generate platform API
         run: make pigeon
+        working-directory: ./mobile
 
       - name: Find file changes
         uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -96,16 +98,19 @@ jobs:
 
       - name: Run dart analyze
         run: dart analyze --fatal-infos
+        working-directory: ./mobile
 
       - name: Run dart format
         run: dart format lib/ --set-exit-if-changed
+        working-directory: ./mobile
 
       - name: Run dart custom_lint
         run: dart run custom_lint
+        working-directory: ./mobile
 
-      # TODO: Use https://github.com/CQLabs/dcm-action
       - name: Run DCM
         run: dcm analyze lib --fatal-style --fatal-warnings
+        working-directory: ./mobile
 
   zizmor:
     name: zizmor
@@ -129,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif
           category: zizmor

.github/workflows/test.yml

@@ -80,30 +80,33 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
-      - name: Run npm install
-        run: npm ci
+      - name: Run package manager install
+        run: pnpm install
 
       - name: Run linter
-        run: npm run lint
+        run: pnpm lint
         if: ${{ !cancelled() }}
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
       - name: Run tsc
-        run: npm run check
+        run: pnpm check
         if: ${{ !cancelled() }}
 
       - name: Run small tests & coverage
-        run: npm test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   cli-unit-tests:
@@ -123,34 +126,37 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './cli/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install && pnpm run build
         working-directory: ./open-api/typescript-sdk
 
       - name: Install deps
-        run: npm ci
+        run: pnpm install
 
       - name: Run linter
-        run: npm run lint
+        run: pnpm lint
         if: ${{ !cancelled() }}
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
       - name: Run tsc
-        run: npm run check
+        run: pnpm check
         if: ${{ !cancelled() }}
 
       - name: Run unit tests & coverage
-        run: npm run test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   cli-unit-tests-win:
@@ -170,27 +176,30 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './cli/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
 
       - name: Install deps
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       # Skip linter & formatter in Windows test.
       - name: Run tsc
-        run: npm run check
+        run: pnpm check
         if: ${{ !cancelled() }}
 
       - name: Run unit tests & coverage
-        run: npm run test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   web-lint:
@@ -210,30 +219,33 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './web/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
 
       - name: Run npm install
-        run: npm ci
+        run: pnpm rebuild && pnpm install --frozen-lockfile
 
       - name: Run linter
-        run: npm run lint:p
+        run: pnpm lint:p
         if: ${{ !cancelled() }}
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
       - name: Run svelte checks
-        run: npm run check:svelte
+        run: pnpm check:svelte
         if: ${{ !cancelled() }}
 
   web-unit-tests:
@@ -253,26 +265,29 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './web/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
 
       - name: Run npm install
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Run tsc
-        run: npm run check:typescript
+        run: pnpm check:typescript
         if: ${{ !cancelled() }}
 
       - name: Run unit tests & coverage
-        run: npm run test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   i18n-tests:
@@ -288,18 +303,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './web/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
-        run: npm --prefix=web ci
+        run: pnpm --filter=immich-web install --frozen-lockfile
 
       - name: Format
-        run: npm --prefix=web run format:i18n
+        run: pnpm --filter=immich-web format:i18n
 
       - name: Find file changes
         uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -334,32 +352,35 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './e2e/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
         if: ${{ !cancelled() }}
 
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
         if: ${{ !cancelled() }}
 
       - name: Run linter
-        run: npm run lint
+        run: pnpm lint
         if: ${{ !cancelled() }}
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
       - name: Run tsc
-        run: npm run check
+        run: pnpm check
         if: ${{ !cancelled() }}
 
   server-medium-tests:
@@ -379,18 +400,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run npm install
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Run medium tests
-        run: npm run test:medium
+        run: pnpm test:medium
         if: ${{ !cancelled() }}
 
   e2e-tests-server-cli:
@@ -414,25 +438,33 @@ jobs:
           persist-credentials: false
           submodules: 'recursive'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './e2e/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
         if: ${{ !cancelled() }}
 
+      - name: Run setup web
+        run: pnpm install --frozen-lockfile && pnpm exec svelte-kit sync
+        working-directory: ./web
+        if: ${{ !cancelled() }}
+
       - name: Run setup cli
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./cli
         if: ${{ !cancelled() }}
 
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
         if: ${{ !cancelled() }}
 
       - name: Docker build
@@ -440,7 +472,7 @@ jobs:
         if: ${{ !cancelled() }}
 
       - name: Run e2e tests (api & cli)
-        run: npm run test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   e2e-tests-web:
@@ -464,20 +496,23 @@ jobs:
           persist-credentials: false
           submodules: 'recursive'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './e2e/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
         if: ${{ !cancelled() }}
 
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
         if: ${{ !cancelled() }}
 
       - name: Install Playwright Browsers
@@ -584,18 +619,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './.github/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run npm install
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
   shellcheck:
@@ -627,18 +665,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install server dependencies
-        run: npm --prefix=server ci
+        run: pnpm --filter immich install --frozen-lockfile
 
       - name: Build the app
-        run: npm --prefix=server run build
+        run: pnpm --filter immich build
 
       - name: Run API generation
         run: make open-api
@@ -690,28 +731,31 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install server dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Build the app
-        run: npm run build
+        run: pnpm build
 
       - name: Run existing migrations
-        run: npm run migrations:run
+        run: pnpm migrations:run
 
       - name: Test npm run schema:reset command works
-        run: npm run schema:reset
+        run: pnpm schema:reset
 
       - name: Generate new migrations
         continue-on-error: true
-        run: npm run migrations:generate src/TestMigration
+        run: pnpm migrations:generate src/TestMigration
 
       - name: Find file changes
         uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -730,7 +774,7 @@ jobs:
           exit 1
 
       - name: Run SQL generation
-        run: npm run sync:sql
+        run: pnpm sync:sql
         env:
           DB_URL: postgres://postgres:postgres@localhost:5432/immich
 

.vscode/launch.json

@@ -18,25 +18,6 @@
       "name": "Immich Workers",
       "remoteRoot": "/usr/src/app",
       "localRoot": "${workspaceFolder}/server"
-    },
-    {
-      "name": "Flavor - Production",
-      "request": "launch",
-      "type": "dart",
-      "codeLens": {
-        "for": [
-          "run-test",
-          "run-test-file",
-          "run-file",
-          "debug-test",
-          "debug-test-file",
-          "debug-file",
-        ],
-        "title": "${debugType}",
-      },
-      "args": [
-        "--flavor", "production"
-      ],
     }
   ]
 }

Makefile

@@ -40,7 +40,7 @@ open-api-typescript:
 	cd ./open-api && bash ./bin/generate-open-api.sh typescript
 
 sql:
-	npm --prefix server run sync:sql
+	pnpm --filter immich run sync:sql
 
 attach-server:
 	docker exec -it docker_immich-server_1 sh
@@ -50,31 +50,40 @@ renovate:
 
 MODULES = e2e server web cli sdk docs .github
 
+# directory to package name mapping function
+#   cli     = @immich/cli
+#   docs    = documentation
+#   e2e     = immich-e2e
+#   open-api/typescript-sdk = @immich/sdk
+#   server  = immich
+#   web     = immich-web
+map-package = $(subst sdk,@immich/sdk,$(subst cli,@immich/cli,$(subst docs,documentation,$(subst e2e,immich-e2e,$(subst server,immich,$(subst web,immich-web,$1))))))
+
 audit-%:
-	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) audit fix
+	pnpm --filter $(call map-package,$*) audit fix
 install-%:
-	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) i
-ci-%:
-	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) ci
+	pnpm --filter $(call map-package,$*) install $(if $(FROZEN),--frozen-lockfile) $(if $(OFFLINE),--offline)
 build-cli: build-sdk
 build-web: build-sdk
 build-%: install-%
-	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) run build
+	pnpm --filter $(call map-package,$*) run build
 format-%:
-	npm --prefix $* run format:fix
+	pnpm --filter $(call map-package,$*) run format:fix
 lint-%:
-	npm --prefix $* run lint:fix
+	pnpm --filter $(call map-package,$*) run lint:fix
+lint-web:
+	pnpm --filter $(call map-package,$*) run lint:p
 check-%:
-	npm --prefix $* run check
+	pnpm --filter $(call map-package,$*) run check
 check-web:
-	npm --prefix web run check:typescript
-	npm --prefix web run check:svelte
+	pnpm --filter immich-web run check:typescript
+	pnpm --filter immich-web run check:svelte
 test-%:
-	npm --prefix $* run test
+	pnpm --filter $(call map-package,$*) run test
 test-e2e:
 	docker compose -f ./e2e/docker-compose.yml build
-	npm --prefix e2e run test
-	npm --prefix e2e run test:web
+	pnpm --filter immich-e2e run test
+	pnpm --filter immich-e2e run test:web
 test-medium:
 	docker run \
     --rm \
@@ -84,19 +93,28 @@ test-medium:
     -v ./server/tsconfig.json:/usr/src/app/tsconfig.json \
     -e NODE_ENV=development \
     immich-server:latest \
-    -c "npm ci && npm run test:medium -- --run"
+    -c "pnpm test:medium -- --run"
 test-medium-dev:
-	docker exec -it immich_server /bin/sh -c "npm run test:medium"
+	docker exec -it immich_server /bin/sh -c "pnpm run test:medium"
 
-build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ;
-install-all: $(foreach M,$(MODULES),install-$M) ;
-ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ;
-check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ;
-lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ;
-format-all: $(foreach M,$(filter-out sdk,$(MODULES)),format-$M) ;
-audit-all:  $(foreach M,$(MODULES),audit-$M) ;
-hygiene-all: lint-all format-all check-all sql audit-all;
-test-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),test-$M) ;
+install-all:
+	pnpm -r --filter '!documentation' install
+
+build-all: $(foreach M,$(filter-out e2e docs .github,$(MODULES)),build-$M) ;
+
+check-all:
+	pnpm -r --filter '!documentation' run "/^(check|check\:svelte|check\:typescript)$/"
+lint-all:
+	pnpm -r --filter '!documentation' run lint:fix
+format-all:
+	pnpm -r --filter '!documentation' run format:fix
+audit-all:
+	pnpm -r --filter '!documentation' audit fix
+hygiene-all: audit-all
+	pnpm -r --filter '!documentation' run "/(format:fix|check|check:svelte|check:typescript|sql)/"
+
+test-all:
+	pnpm -r --filter '!documentation' run "/^test/"
 
 clean:
 	find . -name "node_modules" -type d -prune -exec rm -rf {} +
@@ -105,6 +123,4 @@ clean:
 	find . -name "svelte-kit" -type d -prune -exec rm -rf '{}' +
 	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
 	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true
-
-setup-server-dev: install-server
-setup-web-dev: install-sdk build-sdk install-web
+setup-dev: install-server install-sdk build-sdk install-web

cli/Dockerfile

@@ -1,19 +1,41 @@
 FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS core
 
-WORKDIR /usr/src/open-api/typescript-sdk
-COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./
-RUN npm ci
-COPY open-api/typescript-sdk/ ./
-RUN npm run build
+ENV COREPACK_ENABLE_AUTO_PIN=0 \
+    COREPACK_ENABLE_DOWNLOAD_PROMPT=0 
+
+RUN corepack enable && \
+    corepack install -g pnpm 
 
 WORKDIR /usr/src/app
+COPY --chown=node:node . .
 
-COPY cli/package.json cli/package-lock.json ./
-RUN npm ci
+WORKDIR /usr/src/app/web
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+    pnpm install --frozen-lockfile && \
+    pnpm exec svelte-kit sync
 
-COPY cli .
-RUN npm run build
+WORKDIR /usr/src/app/open-api/typescript-sdk
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+    pnpm install --frozen-lockfile && \
+    pnpm build
+
+WORKDIR /usr/src/app/cli
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+    pnpm install --frozen-lockfile --prod --no-optional && \
+    pnpm build
+
+RUN rm -rf /usr/src/app/web && \
+    rm -rf /usr/src/app/open-api && \
+    rm -rf /usr/src/app/cli/src && \
+    rm -rf /usr/src/app/cli/src && \
+    rm -rf /usr/src/app/server && \
+    rm -rf /usr/src/app/i18n && \
+    rm -rf /usr/src/app/e2e && \
+    rm -rf /usr/src/app/docs && \
+    rm -rf /usr/src/app/readme_i18n && \
+    rm -rf /usr/src/app/deployment && \
+    rm -rf /usr/src/app/docker 
 
 WORKDIR /import
 
-ENTRYPOINT ["node", "/usr/src/app/dist"]
+ENTRYPOINT ["node", "/usr/src/app/cli/dist"]

cli/README.md

@@ -6,8 +6,10 @@ Please see the [Immich CLI documentation](https://immich.app/docs/features/comma
 
 Before building the CLI, you must build the immich server and the open-api client. To build the server run the following in the server folder:
 
-    $ npm install
-    $ npm run build
+    # if you don't have node installed
+    $ npm install -g pnpm 
+    $ pnpm install
+    $ pnpm build
 
 Then, to build the open-api client run the following in the open-api folder:
 
@@ -15,8 +17,10 @@ Then, to build the open-api client run the following in the open-api folder:
 
 To run the Immich CLI from source, run the following in the cli folder:
 
-    $ npm install
-    $ npm run build
+    # if you don't have node installed
+    $ npm install -g pnpm 
+    $ pnpm install
+    $ pnpm build
     $ ts-node .
 
 You'll need ts-node, the easiest way to install it is to use npm:

cli/package.json

@@ -36,7 +36,7 @@
     "prettier-plugin-organize-imports": "^4.0.0",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.28.0",
-    "vite": "^7.0.0",
+    "vite": "^6.0.0",
     "vite-tsconfig-paths": "^5.0.0",
     "vitest": "^3.0.0",
     "vitest-fetch-mock": "^0.4.0",

docker/docker-compose.dev.yml

@@ -16,7 +16,7 @@ name: immich-dev
 services:
   immich-server:
     container_name: immich_server
-    command: ['/usr/src/app/bin/immich-dev']
+    command: ['/usr/src/app/server/bin/immich-dev']
     image: immich-server-dev:latest
     # extends:
     #   file: hwaccel.transcoding.yml
@@ -24,13 +24,12 @@ services:
     build:
       context: ../
       dockerfile: server/Dockerfile
-      target: dev
+      target: dev-docker
     restart: unless-stopped
     volumes:
-      - ../server:/usr/src/app
-      - ../open-api:/usr/src/open-api
-      - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
-      - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/upload/upload
+      - ..:/usr/src/app
+      - ${UPLOAD_LOCATION}/photos:/usr/src/app/server/upload
+      - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/server/upload/upload
       - /usr/src/app/node_modules
       - /etc/localtime:/etc/localtime:ro
     env_file:
@@ -69,17 +68,16 @@ services:
     # Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
     # user: 0:0
     build:
-      context: ../web
-    command: ['/usr/src/app/bin/immich-web']
+      context: ../
+      dockerfile: web/Dockerfile
+    command: ['/usr/src/app/web/bin/immich-web']
     env_file:
       - .env
     ports:
       - 3000:3000
       - 24678:24678
     volumes:
-      - ../web:/usr/src/app
-      - ../i18n:/usr/src/i18n
-      - ../open-api/:/usr/src/open-api/
+      - ..:/usr/src/app
       # - ../../ui:/usr/ui
       - /usr/src/app/node_modules
     ulimits:
@@ -116,7 +114,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:facc1d2c3462975c34e10fccb167bfa92b0e0dbd992fc282c29a61c3243afb11
+    image: docker.io/valkey/valkey:8-bookworm@sha256:fec42f399876eb6faf9e008570597741c87ff7662a54185593e74b09ce83d177
     healthcheck:
       test: redis-cli ping || exit 1
 

docker/docker-compose.prod.yml

@@ -56,7 +56,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:facc1d2c3462975c34e10fccb167bfa92b0e0dbd992fc282c29a61c3243afb11
+    image: docker.io/valkey/valkey:8-bookworm@sha256:fec42f399876eb6faf9e008570597741c87ff7662a54185593e74b09ce83d177
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always
@@ -83,7 +83,7 @@ services:
     container_name: immich_prometheus
     ports:
       - 9090:9090
-    image: prom/prometheus@sha256:63805ebb8d2b3920190daf1cb14a60871b16fd38bed42b857a3182bc621f4996
+    image: prom/prometheus@sha256:7a34573f0b9c952286b33d537f233cd5b708e12263733aa646e50c33f598f16c
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus

docker/docker-compose.yml

@@ -49,7 +49,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:facc1d2c3462975c34e10fccb167bfa92b0e0dbd992fc282c29a61c3243afb11
+    image: docker.io/valkey/valkey:8-bookworm@sha256:fec42f399876eb6faf9e008570597741c87ff7662a54185593e74b09ce83d177
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

docs/.prettierignore

@@ -1,2 +1,7 @@
 build/
 .docusaurus/
+
+# Ignore files for PNPM, NPM and YARN
+pnpm-lock.yaml
+package-lock.json
+yarn.lock

docs/README.md

@@ -5,7 +5,7 @@ This website is built using [Docusaurus](https://docusaurus.io/), a modern stati
 ### Installation
 
 ```
-$ npm install
+$ pnpm install
 ```
 
 ### Local Development

docs/docs/administration/jobs-workers.md

@@ -46,12 +46,6 @@ services:
 
 When a new asset is uploaded it kicks off a series of jobs, which include metadata extraction, thumbnail generation, machine learning tasks, and storage template migration, if enabled. To view the status of a job navigate to the Administration -> Jobs page.
 
+Additionally, some jobs run on a schedule, which is every night at midnight. This schedule, with the exception of [External Libraries](/docs/features/libraries) scanning, cannot be changed.
+
 <img src={require('./img/admin-jobs.webp').default} width="60%" title="Admin jobs" />
-
-Additionally, some jobs (such as memories generation) run on a schedule, which is every night at midnight by default. To change when they run or enable/disable a job navigate to System Settings -> [Nightly Tasks Settings](https://my.immich.app/admin/system-settings?isOpen=nightly-tasks).
-
-<img src={require('./img/admin-nightly-tasks.webp').default} width="60%" title="Admin nightly tasks" />
-
-:::note
-Some jobs ([External Libraries](/docs/features/libraries) scanning, Database Dump) are configured in their own sections in System Settings.
-:::

docs/docs/administration/oauth.md

@@ -62,7 +62,6 @@ Once you have a new OAuth client application configured, Immich can be configure
 | Scope                                                | string  | openid email profile | Full list of scopes to send with the request (space delimited)                      |
 | Signing Algorithm                                    | string  | RS256                | The algorithm used to sign the id token (examples: RS256, HS256)                    |
 | Storage Label Claim                                  | string  | preferred_username   | Claim mapping for the user's storage label**¹**                                     |
-| Role Claim                                           | string  | immich_role          | Claim mapping for the user's role. (should return "user" or "admin")**¹**           |
 | Storage Quota Claim                                  | string  | immich_quota         | Claim mapping for the user's storage**¹**                                           |
 | Default Storage Quota (GiB)                          | number  | 0                    | Default quota for user without storage quota claim (Enter 0 for unlimited quota)    |
 | Button Text                                          | string  | Login with OAuth     | Text for the OAuth button on the web                                                |

docs/docs/developer/devcontainers.md

@@ -200,7 +200,7 @@ When the Dev Container starts, it automatically:
 
 1. **Runs post-create script** (`container-server-post-create.sh`):
    - Adjusts file permissions for the `node` user
-   - Installs dependencies: `npm install` in all packages
+   - Installs dependencies: `pnpm install` in all packages
    - Builds TypeScript SDK: `npm run build` in `open-api/typescript-sdk`
 
 2. **Starts development servers** via VS Code tasks:

docs/docs/developer/setup.md

@@ -56,7 +56,7 @@ If you only want to do web development connected to an existing, remote backend,
 
 1. Build the Immich SDK - `cd open-api/typescript-sdk && npm i && npm run build && cd -`
 2. Enter the web directory - `cd web/`
-3. Install web dependencies - `npm i`
+3. Install web dependencies - `pnpm i`
 4. Start the web development server
 
 ```bash

docs/docs/developer/testing.md

@@ -5,7 +5,7 @@
 ### Unit tests
 
 Unit are run by calling `npm run test` from the `server/` directory.
-You need to run `npm install` (in `server/`) before _once_.
+You need to run `pnpm install` (in `server/`) before _once_.
 
 ### End to end tests
 

docs/docs/features/folder-view.md

@@ -2,7 +2,7 @@
 
 Folder view provides an additional view besides the timeline that is similar to a file explorer. It allows you to navigate through the folders and files in the library. This feature is handy for a highly curated and customized external library or a nicely configured storage template.
 
-You can enable this feature under [`Account Settings > Features > Folders`](https://my.immich.app/user-settings?isOpen=feature+folders)
+You can enable this feature under [`Account Settings > Features > Folder View`](https://my.immich.app/user-settings?isOpen=feature+folders)
 
 ## Enable folder view
 

docs/docs/features/libraries.md

@@ -56,7 +56,7 @@ Internally, Immich uses the [glob](https://www.npmjs.com/package/glob) package t
 
 ### Automatic watching (EXPERIMENTAL)
 
-This feature is considered experimental and for advanced users only. If enabled, it will allow automatic watching of the filesystem which means new assets are automatically imported to Immich without needing to rescan.
+This feature - currently hidden in the config file - is considered experimental and for advanced users only. If enabled, it will allow automatic watching of the filesystem which means new assets are automatically imported to Immich without needing to rescan.
 
 If your photos are on a network drive, automatic file watching likely won't work. In that case, you will have to rely on a periodic library refresh to pull in your changes.
 
@@ -112,7 +112,7 @@ _Remember to run `docker compose up -d` to register the changes. Make sure you c
 
 These actions must be performed by the Immich administrator.
 
-- Click on your avatar in the upper right corner
+- Click on your avatar on the upper right corner
 - Click on Administration -> External Libraries
 - Click on Create an external library…
 - Select which user owns the library, this can not be changed later
@@ -159,7 +159,9 @@ Within seconds, the assets from the old-pics and videos folders should show up i
 
 Folder view provides an additional view besides the timeline that is similar to a file explorer. It allows you to navigate through the folders and files in the library. This feature is handy for a highly curated and customized external library or a nicely configured storage template.
 
-You can enable this feature under [`Account Settings > Features > Folders`](https://my.immich.app/user-settings?isOpen=feature+folders)
+You can enable this feature under [`Account Settings > Features > Folder View`](https://my.immich.app/user-settings?isOpen=feature+folders)
+
+The UI is currently only available for the web; mobile will come in a subsequent release.
 
 <img src={require('./img/folder-view-1.webp').default} width="100%" title='Folder-view' />
 
@@ -169,7 +171,7 @@ You can enable this feature under [`Account Settings > Features > Folders`](http
 Only an admin can do this.
 :::
 
-You can define a custom interval for the trigger external library rescan under Administration -> Settings -> External Library.  
+You can define a custom interval for the trigger external library rescan under Administration -> Settings -> Library.  
 You can set the scanning interval using the preset or cron format. For more information you can refer to [Crontab Guru](https://crontab.guru/).
 
 <img src={require('./img/library-custom-scan-interval.webp').default} width="75%" title='Set custom scan interval for external library' />

docs/docs/features/supported-formats.md

@@ -16,7 +16,7 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a
 | `HEIC`      | `.heic`                       | :white_check_mark: |                 |
 | `HEIF`      | `.heif`                       | :white_check_mark: |                 |
 | `JPEG 2000` | `.jp2`                        | :white_check_mark: |                 |
-| `JPEG`      | `.jpeg` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
+| `JPEG`      | `.webp` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
 | `JPEG XL`   | `.jxl`                        | :white_check_mark: |                 |
 | `PNG`       | `.png`                        | :white_check_mark: |                 |
 | `PSD`       | `.psd`                        | :white_check_mark: | Adobe Photoshop |

docs/docs/guides/external-library.md

@@ -41,7 +41,7 @@ In the Immich web UI:
 - Click Add path
   <img src={require('./img/add-path-button.webp').default} width="50%" title="Add Path button" />
 
-- Enter **/home/user/photos1** as the path and click Add
+- Enter **/usr/src/app/external** as the path and click Add
   <img src={require('./img/add-path-field.webp').default} width="50%" title="Add Path field" />
 
 - Save the new path

docs/src/pages/roadmap.tsx

@@ -85,7 +85,6 @@ import React from 'react';
 import { Item, Timeline } from '../components/timeline';
 
 const releases = {
-  'v1.135.0': new Date(2025, 5, 18),
   'v1.133.0': new Date(2025, 4, 21),
   'v1.130.0': new Date(2025, 2, 25),
   'v1.127.0': new Date(2025, 1, 26),
@@ -197,6 +196,14 @@ const roadmap: Item[] = [
     description: 'Automate tasks with workflows',
     getDateLabel: () => 'Planned for 2025',
   },
+  {
+    done: false,
+    icon: mdiTableKey,
+    iconColor: 'gray',
+    title: 'Fine grained access controls',
+    description: 'Granular access controls for users and api keys',
+    getDateLabel: () => 'Planned for 2025',
+  },
   {
     done: false,
     icon: mdiImageEdit,
@@ -232,26 +239,12 @@ const roadmap: Item[] = [
 ];
 
 const milestones: Item[] = [
-  {
-    icon: mdiStar,
-    iconColor: 'gold',
-    title: '70,000 Stars',
-    description: 'Reached 70K Stars on GitHub!',
-    getDateLabel: withLanguage(new Date(2025, 6, 9)),
-  },
-  withRelease({
-    icon: mdiTableKey,
-    iconColor: 'gray',
-    title: 'Fine grained access controls',
-    description: 'Granular access controls for api keys',
-    release: 'v1.135.0',
-  }),
   withRelease({
     icon: mdiCast,
     iconColor: 'aqua',
-    title: 'Google Cast (web and mobile)',
+    title: 'Google Cast (web)',
     description: 'Cast assets to Google Cast/Chromecast compatible devices',
-    release: 'v1.135.0',
+    release: 'v1.133.0',
   }),
   withRelease({
     icon: mdiLockOutline,

docs/static/_redirects

@@ -1,5 +1,4 @@
-/docs /docs/overview/welcome 307
-/docs/ /docs/overview/welcome 307
+/docs /docs/overview/introduction 307
 /docs/mobile-app-beta-program /docs/features/mobile-app 307
 /docs/contribution-guidelines /docs/overview/support-the-project#contributing 307
 /docs/install /docs/install/docker-compose 307
@@ -31,4 +30,4 @@
 /docs/guides/api-album-sync /docs/community-projects 307
 /docs/guides/remove-offline-files /docs/community-projects 307
 /milestones /roadmap 307
-/docs/overview/introduction /docs/overview/welcome 307
+/docs/overview/introduction /docs/overview/welcome 307

e2e/docker-compose.yml

@@ -36,7 +36,7 @@ services:
       - 2285:2285
 
   redis:
-    image: redis:6.2-alpine@sha256:03fd052257735b41cd19f3d8ae9782926bf9b704fb6a9dc5e29f9ccfbe8827f0
+    image: redis:6.2-alpine@sha256:3211c33a618c457e5d241922c975dbc4f446d0bdb2dc75694f5573ef8e2d01fa
 
   database:
     image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:3aef84a0a4fabbda17ef115c3019ba0c914ec73e9f6e59203674322d858b8eea

e2e/package.json

@@ -24,7 +24,6 @@
     "@immich/cli": "file:../cli",
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.44.1",
-    "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
     "@types/node": "^22.15.33",
     "@types/oidc-provider": "^9.0.0",

e2e/src/api/specs/activity.e2e-spec.ts

@@ -7,7 +7,6 @@ import {
   ReactionType,
   createActivity as create,
   createAlbum,
-  removeAssetFromAlbum,
 } from '@immich/sdk';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
@@ -343,36 +342,5 @@ describe('/activities', () => {
 
       expect(status).toBe(204);
     });
-
-    it('should return empty list when asset is removed', async () => {
-      const album3 = await createAlbum(
-        {
-          createAlbumDto: {
-            albumName: 'Album 3',
-            assetIds: [asset.id],
-          },
-        },
-        { headers: asBearerAuth(admin.accessToken) },
-      );
-
-      await createActivity({ albumId: album3.id, assetId: asset.id, type: ReactionType.Like });
-
-      await removeAssetFromAlbum(
-        {
-          id: album3.id,
-          bulkIdsDto: {
-            ids: [asset.id],
-          },
-        },
-        { headers: asBearerAuth(admin.accessToken) },
-      );
-
-      const { status, body } = await request(app)
-        .get('/activities')
-        .query({ albumId: album.id })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toEqual(200);
-      expect(body).toEqual([]);
-    });
   });
 });

e2e/src/api/specs/api-key.e2e-spec.ts

@@ -20,7 +20,7 @@ describe('/api-keys', () => {
   });
 
   beforeEach(async () => {
-    await utils.resetDatabase(['api_key']);
+    await utils.resetDatabase(['api_keys']);
   });
 
   describe('POST /api-keys', () => {

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

@@ -227,21 +227,6 @@ describe(`/oauth`, () => {
       expect(user.storageLabel).toBe('user-username');
     });
 
-    it('should set the admin status from a role claim', async () => {
-      const callbackParams = await loginWithOAuth(OAuthUser.WITH_ROLE);
-      const { status, body } = await request(app).post('/oauth/callback').send(callbackParams);
-      expect(status).toBe(201);
-      expect(body).toMatchObject({
-        accessToken: expect.any(String),
-        userId: expect.any(String),
-        userEmail: 'oauth-with-role@immich.app',
-        isAdmin: true,
-      });
-
-      const user = await getMyUser({ headers: asBearerAuth(body.accessToken) });
-      expect(user.isAdmin).toBe(true);
-    });
-
     it('should work with RS256 signed tokens', async () => {
       await setupOAuth(admin.accessToken, {
         enabled: true,

e2e/src/api/specs/system-config.e2e-spec.ts

@@ -15,6 +15,12 @@ describe('/system-config', () => {
   });
 
   describe('PUT /system-config', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).put('/system-config');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
     it('should always return the new config', async () => {
       const config = await getSystemConfig(admin.accessToken);
 

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

@@ -37,7 +37,7 @@ describe('/tags', () => {
   beforeEach(async () => {
     //  tagging assets eventually triggers metadata extraction which can impact other tests
     await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
-    await utils.resetDatabase(['tag']);
+    await utils.resetDatabase(['tags']);
   });
 
   describe('POST /tags', () => {

e2e/src/cli/specs/upload.e2e-spec.ts

@@ -97,7 +97,7 @@ describe(`immich upload`, () => {
   });
 
   beforeEach(async () => {
-    await utils.resetDatabase(['asset', 'album']);
+    await utils.resetDatabase(['assets', 'albums']);
   });
 
   describe(`immich upload /path/to/file.jpg`, () => {

e2e/src/responses.ts

@@ -116,7 +116,6 @@ export const deviceDto = {
     createdAt: expect.any(String),
     updatedAt: expect.any(String),
     current: true,
-    isPendingSyncReset: false,
     deviceOS: '',
     deviceType: '',
   },

e2e/src/setup/auth-server.ts

@@ -12,7 +12,6 @@ export enum OAuthUser {
   NO_NAME = 'no-name',
   WITH_QUOTA = 'with-quota',
   WITH_USERNAME = 'with-username',
-  WITH_ROLE = 'with-role',
 }
 
 const claims = [
@@ -35,12 +34,6 @@ const claims = [
     preferred_username: 'user-quota',
     immich_quota: 25,
   },
-  {
-    sub: OAuthUser.WITH_ROLE,
-    email: 'oauth-with-role@immich.app',
-    email_verified: true,
-    immich_role: 'admin',
-  },
 ];
 
 const withDefaultClaims = (sub: string) => ({
@@ -71,15 +64,7 @@ const setup = async () => {
     claims: {
       openid: ['sub'],
       email: ['email', 'email_verified'],
-      profile: [
-        'name',
-        'given_name',
-        'family_name',
-        'preferred_username',
-        'immich_quota',
-        'immich_username',
-        'immich_role',
-      ],
+      profile: ['name', 'given_name', 'family_name', 'preferred_username', 'immich_quota', 'immich_username'],
     },
     features: {
       jwtUserinfo: {

e2e/src/utils.ts

@@ -79,7 +79,7 @@ export const tempDir = tmpdir();
 export const asBearerAuth = (accessToken: string) => ({ Authorization: `Bearer ${accessToken}` });
 export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
 export const immichCli = (args: string[]) =>
-  executeCommand('node', ['node_modules/.bin/immich', '-d', `/${tempDir}/immich/`, ...args]).promise;
+  executeCommand('pnpm', ['exec', 'immich', '-d', `/${tempDir}/immich/`, ...args], { cwd: '../cli' }).promise;
 export const immichAdmin = (args: string[]) =>
   executeCommand('docker', ['exec', '-i', 'immich-e2e-server', '/bin/bash', '-c', `immich-admin ${args.join(' ')}`]);
 export const specialCharStrings = ["'", '"', ',', '{', '}', '*'];
@@ -154,19 +154,19 @@ export const utils = {
 
       tables = tables || [
         // TODO e2e test for deleting a stack, since it is quite complex
-        'stack',
-        'library',
-        'shared_link',
+        'asset_stack',
+        'libraries',
+        'shared_links',
         'person',
-        'album',
-        'asset',
-        'asset_face',
+        'albums',
+        'assets',
+        'asset_faces',
         'activity',
-        'api_key',
-        'session',
-        'user',
+        'api_keys',
+        'sessions',
+        'users',
         'system_metadata',
-        'tag',
+        'tags',
       ];
 
       const sql: string[] = [];
@@ -175,7 +175,7 @@ export const utils = {
         if (table === 'system_metadata') {
           sql.push(`DELETE FROM "system_metadata" where "key" NOT IN ('reverse-geocoding-state', 'system-flags');`);
         } else {
-          sql.push(`DELETE FROM "${table}" CASCADE;`);
+          sql.push(`DELETE FROM ${table} CASCADE;`);
         }
       }
 
@@ -451,7 +451,7 @@ export const utils = {
       return;
     }
 
-    await client.query('INSERT INTO asset_face ("assetId", "personId") VALUES ($1, $2)', [assetId, personId]);
+    await client.query('INSERT INTO asset_faces ("assetId", "personId") VALUES ($1, $2)', [assetId, personId]);
   },
 
   setPersonThumbnail: async (personId: string) => {

i18n/en.json

@@ -166,20 +166,6 @@
     "metadata_settings_description": "Manage metadata settings",
     "migration_job": "Migration",
     "migration_job_description": "Migrate thumbnails for assets and faces to the latest folder structure",
-    "nightly_tasks_cluster_faces_setting_description": "Run facial recognition on newly detected faces",
-    "nightly_tasks_cluster_new_faces_setting": "Cluster new faces",
-    "nightly_tasks_database_cleanup_setting": "Database cleanup tasks",
-    "nightly_tasks_database_cleanup_setting_description": "Clean up old, expired data from the database",
-    "nightly_tasks_generate_memories_setting": "Generate memories",
-    "nightly_tasks_generate_memories_setting_description": "Create new memories from assets",
-    "nightly_tasks_missing_thumbnails_setting": "Generate missing thumbnails",
-    "nightly_tasks_missing_thumbnails_setting_description": "Queue assets without thumbnails for thumbnail generation",
-    "nightly_tasks_settings": "Nightly Tasks Settings",
-    "nightly_tasks_settings_description": "Manage nightly tasks",
-    "nightly_tasks_start_time_setting": "Start time",
-    "nightly_tasks_start_time_setting_description": "The time at which the server starts running the nightly tasks",
-    "nightly_tasks_sync_quota_usage_setting": "Sync quota usage",
-    "nightly_tasks_sync_quota_usage_setting_description": "Update user storage quota, based on current usage",
     "no_paths_added": "No paths added",
     "no_pattern_added": "No pattern added",
     "note_apply_storage_label_previous_assets": "Note: To apply the Storage Label to previously uploaded assets, run the",
@@ -210,8 +196,6 @@
     "oauth_mobile_redirect_uri": "Mobile redirect URI",
     "oauth_mobile_redirect_uri_override": "Mobile redirect URI override",
     "oauth_mobile_redirect_uri_override_description": "Enable when OAuth provider does not allow a mobile URI, like ''{callback}''",
-    "oauth_role_claim": "Role Claim",
-    "oauth_role_claim_description": "Automatically grant admin access based on the presence of this claim. The claim may have either 'user' or 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Manage OAuth login settings",
     "oauth_settings_more_details": "For more details about this feature, refer to the <link>docs</link>.",
@@ -735,7 +719,6 @@
   "default_locale": "Default Locale",
   "default_locale_description": "Format dates and numbers based on your browser locale",
   "delete": "Delete",
-  "delete_action_prompt": "{count} deleted permanently",
   "delete_album": "Delete album",
   "delete_api_key_prompt": "Are you sure you want to delete this API key?",
   "delete_dialog_alert": "These items will be permanently deleted from Immich and from your device",
@@ -749,7 +732,6 @@
   "delete_key": "Delete key",
   "delete_library": "Delete Library",
   "delete_link": "Delete link",
-  "delete_local_action_prompt": "{count} deleted locally",
   "delete_local_dialog_ok_backed_up_only": "Delete Backed Up Only",
   "delete_local_dialog_ok_force": "Delete Anyway",
   "delete_others": "Delete others",
@@ -1147,7 +1129,6 @@
   "library_page_sort_created": "Created date",
   "library_page_sort_last_modified": "Last modified",
   "library_page_sort_title": "Album title",
-  "licenses": "Licenses",
   "light": "Light",
   "like_deleted": "Like deleted",
   "link_motion_video": "Link motion video",
@@ -1517,7 +1498,6 @@
   "remove_custom_date_range": "Remove custom date range",
   "remove_deleted_assets": "Remove Deleted Assets",
   "remove_from_album": "Remove from album",
-  "remove_from_album_action_prompt": "{count} removed from the album",
   "remove_from_favorites": "Remove from favorites",
   "remove_from_lock_folder_action_prompt": "{count} removed from the locked folder",
   "remove_from_locked_folder": "Remove from locked folder",
@@ -1862,7 +1842,6 @@
   "total": "Total",
   "total_usage": "Total usage",
   "trash": "Trash",
-  "trash_action_prompt": "{count} moved to trash",
   "trash_all": "Trash All",
   "trash_count": "Trash {count, number}",
   "trash_delete_asset": "Trash/Delete Asset",
@@ -1880,11 +1859,9 @@
   "unable_to_change_pin_code": "Unable to change PIN code",
   "unable_to_setup_pin_code": "Unable to setup PIN code",
   "unarchive": "Unarchive",
-  "unarchive_action_prompt": "{count} removed from Archive",
   "unarchived_count": "{count, plural, other {Unarchived #}}",
   "undo": "Undo",
   "unfavorite": "Unfavorite",
-  "unfavorite_action_prompt": "{count} removed from Favorites",
   "unhide_person": "Unhide person",
   "unknown": "Unknown",
   "unknown_country": "Unknown Country",
@@ -1903,7 +1880,6 @@
   "unselect_all_in": "Unselect all in {group}",
   "unstack": "Un-stack",
   "unstacked_assets_count": "Un-stacked {count, plural, one {# asset} other {# assets}}",
-  "untagged": "Untagged",
   "up_next": "Up next",
   "updated_at": "Updated",
   "updated_password": "Updated password",
@@ -1940,7 +1916,6 @@
   "user_usage_stats_description": "View account usage statistics",
   "username": "Username",
   "users": "Users",
-  "users_added_to_album_count": "Added {count, plural, one {# user} other {# users}} to the album",
   "utilities": "Utilities",
   "validate": "Validate",
   "validate_endpoint_error": "Please enter a valid URL",

machine-learning/scripts/healthcheck.py

@@ -4,12 +4,9 @@ import sys
 import requests
 
 port = os.getenv("IMMICH_PORT", 3003)
-host = os.getenv("IMMICH_HOST", "0.0.0.0")
-
-host = "localhost" if host == "0.0.0.0" else host
 
 try:
-    response = requests.get(f"http://{host}:{port}/ping", timeout=2)
+    response = requests.get(f"http://localhost:{port}/ping", timeout=2)
     if response.status_code == 200:
         sys.exit(0)
     sys.exit(1)

machine-learning/uv.lock

@@ -517,16 +517,16 @@ wheels = [
 
 [[package]]
 name = "fastapi"
-version = "0.115.14"
+version = "0.115.13"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pydantic" },
     { name = "starlette" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ca/53/8c38a874844a8b0fa10dd8adf3836ac154082cf88d3f22b544e9ceea0a15/fastapi-0.115.14.tar.gz", hash = "sha256:b1de15cdc1c499a4da47914db35d0e4ef8f1ce62b624e94e0e5824421df99739", size = 296263, upload-time = "2025-06-26T15:29:08.21Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/20/64/ec0788201b5554e2a87c49af26b77a4d132f807a0fa9675257ac92c6aa0e/fastapi-0.115.13.tar.gz", hash = "sha256:55d1d25c2e1e0a0a50aceb1c8705cd932def273c102bff0b1c1da88b3c6eb307", size = 295680, upload-time = "2025-06-17T11:49:45.575Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/53/50/b1222562c6d270fea83e9c9075b8e8600b8479150a18e4516a6138b980d1/fastapi-0.115.14-py3-none-any.whl", hash = "sha256:6c0c8bf9420bd58f565e585036d971872472b4f7d3f6c73b698e10cffdefb3ca", size = 95514, upload-time = "2025-06-26T15:29:06.49Z" },
+    { url = "https://files.pythonhosted.org/packages/59/4a/e17764385382062b0edbb35a26b7cf76d71e27e456546277a42ba6545c6e/fastapi-0.115.13-py3-none-any.whl", hash = "sha256:0a0cab59afa7bab22f5eb347f8c9864b681558c278395e94035a741fc10cd865", size = 95315, upload-time = "2025-06-17T11:49:44.106Z" },
 ]
 
 [[package]]
@@ -900,7 +900,7 @@ wheels = [
 
 [[package]]
 name = "huggingface-hub"
-version = "0.33.2"
+version = "0.33.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "filelock" },
@@ -912,9 +912,9 @@ dependencies = [
     { name = "tqdm" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/fa/42/8a95c5632080ae312c0498744b2b852195e10b05a20b1be11c5141092f4c/huggingface_hub-0.33.2.tar.gz", hash = "sha256:84221defaec8fa09c090390cd68c78b88e3c4c2b7befba68d3dc5aacbc3c2c5f", size = 426637, upload-time = "2025-07-02T06:26:05.156Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/91/8a/1362d565fefabaa4185cf3ae842a98dbc5b35146f5694f7080f043a6952f/huggingface_hub-0.33.0.tar.gz", hash = "sha256:aa31f70d29439d00ff7a33837c03f1f9dd83971ce4e29ad664d63ffb17d3bb97", size = 426179, upload-time = "2025-06-11T17:08:07.913Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/44/f4/5f3f22e762ad1965f01122b42dae5bf0e009286e2dba601ce1d0dba72424/huggingface_hub-0.33.2-py3-none-any.whl", hash = "sha256:3749498bfa91e8cde2ddc2c1db92c79981f40e66434c20133b39e5928ac9bcc5", size = 515373, upload-time = "2025-07-02T06:26:03.072Z" },
+    { url = "https://files.pythonhosted.org/packages/33/fb/53587a89fbc00799e4179796f51b3ad713c5de6bb680b2becb6d37c94649/huggingface_hub-0.33.0-py3-none-any.whl", hash = "sha256:e8668875b40c68f9929150d99727d39e5ebb8a05a98e4191b908dc7ded9074b3", size = 514799, upload-time = "2025-06-11T17:08:05.757Z" },
 ]
 
 [[package]]
@@ -1044,7 +1044,7 @@ requires-dist = [
     { name = "onnxruntime", marker = "extra == 'armnn'", specifier = ">=1.15.0,<2" },
     { name = "onnxruntime", marker = "extra == 'cpu'", specifier = ">=1.15.0,<2" },
     { name = "onnxruntime", marker = "extra == 'rknn'", specifier = ">=1.15.0,<2" },
-    { name = "onnxruntime-gpu", marker = "extra == 'cuda'", specifier = ">=1.17.0,<2", index = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple" },
+    { name = "onnxruntime-gpu", marker = "extra == 'cuda'", specifier = ">=1.17.0,<2", index = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/" },
     { name = "onnxruntime-openvino", marker = "extra == 'openvino'", specifier = ">=1.17.1,<1.19.0" },
     { name = "opencv-python-headless", specifier = ">=4.7.0.72,<5.0" },
     { name = "orjson", specifier = ">=3.9.5" },
@@ -1568,7 +1568,7 @@ wheels = [
 [[package]]
 name = "onnxruntime-gpu"
 version = "1.19.2"
-source = { registry = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple" }
+source = { registry = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/" }
 dependencies = [
     { name = "coloredlogs" },
     { name = "flatbuffers" },
@@ -1936,16 +1936,16 @@ wheels = [
 
 [[package]]
 name = "pydantic-settings"
-version = "2.10.1"
+version = "2.9.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pydantic" },
     { name = "python-dotenv" },
     { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/68/85/1ea668bbab3c50071ca613c6ab30047fb36ab0da1b92fa8f17bbc38fd36c/pydantic_settings-2.10.1.tar.gz", hash = "sha256:06f0062169818d0f5524420a360d632d5857b83cffd4d42fe29597807a1614ee", size = 172583, upload-time = "2025-06-24T13:26:46.841Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/67/1d/42628a2c33e93f8e9acbde0d5d735fa0850f3e6a2f8cb1eb6c40b9a732ac/pydantic_settings-2.9.1.tar.gz", hash = "sha256:c509bf79d27563add44e8446233359004ed85066cd096d8b510f715e6ef5d268", size = 163234, upload-time = "2025-04-18T16:44:48.265Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/58/f0/427018098906416f580e3cf1366d3b1abfb408a0652e9f31600c24a1903c/pydantic_settings-2.10.1-py3-none-any.whl", hash = "sha256:a60952460b99cf661dc25c29c0ef171721f98bfcb52ef8d9ea4c943d7c8cc796", size = 45235, upload-time = "2025-06-24T13:26:45.485Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/5f/d6d641b490fd3ec2c4c13b4244d68deea3a1b970a97be64f34fb5504ff72/pydantic_settings-2.9.1-py3-none-any.whl", hash = "sha256:59b4f431b1defb26fe620c71a7d3968a710d719f5f4cdbbdb7926edeb770f6ef", size = 44356, upload-time = "2025-04-18T16:44:46.617Z" },
 ]
 
 [[package]]
@@ -2304,27 +2304,27 @@ wheels = [
 
 [[package]]
 name = "ruff"
-version = "0.12.2"
+version = "0.12.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/6c/3d/d9a195676f25d00dbfcf3cf95fdd4c685c497fcfa7e862a44ac5e4e96480/ruff-0.12.2.tar.gz", hash = "sha256:d7b4f55cd6f325cb7621244f19c873c565a08aff5a4ba9c69aa7355f3f7afd3e", size = 4432239, upload-time = "2025-07-03T16:40:19.566Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/24/90/5255432602c0b196a0da6720f6f76b93eb50baef46d3c9b0025e2f9acbf3/ruff-0.12.0.tar.gz", hash = "sha256:4d047db3662418d4a848a3fdbfaf17488b34b62f527ed6f10cb8afd78135bc5c", size = 4376101, upload-time = "2025-06-17T15:19:26.217Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/74/b6/2098d0126d2d3318fd5bec3ad40d06c25d377d95749f7a0c5af17129b3b1/ruff-0.12.2-py3-none-linux_armv6l.whl", hash = "sha256:093ea2b221df1d2b8e7ad92fc6ffdca40a2cb10d8564477a987b44fd4008a7be", size = 10369761, upload-time = "2025-07-03T16:39:38.847Z" },
-    { url = "https://files.pythonhosted.org/packages/b1/4b/5da0142033dbe155dc598cfb99262d8ee2449d76920ea92c4eeb9547c208/ruff-0.12.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:09e4cf27cc10f96b1708100fa851e0daf21767e9709e1649175355280e0d950e", size = 11155659, upload-time = "2025-07-03T16:39:42.294Z" },
-    { url = "https://files.pythonhosted.org/packages/3e/21/967b82550a503d7c5c5c127d11c935344b35e8c521f52915fc858fb3e473/ruff-0.12.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:8ae64755b22f4ff85e9c52d1f82644abd0b6b6b6deedceb74bd71f35c24044cc", size = 10537769, upload-time = "2025-07-03T16:39:44.75Z" },
-    { url = "https://files.pythonhosted.org/packages/33/91/00cff7102e2ec71a4890fb7ba1803f2cdb122d82787c7d7cf8041fe8cbc1/ruff-0.12.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3eb3a6b2db4d6e2c77e682f0b988d4d61aff06860158fdb413118ca133d57922", size = 10717602, upload-time = "2025-07-03T16:39:47.652Z" },
-    { url = "https://files.pythonhosted.org/packages/9b/eb/928814daec4e1ba9115858adcda44a637fb9010618721937491e4e2283b8/ruff-0.12.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:73448de992d05517170fc37169cbca857dfeaeaa8c2b9be494d7bcb0d36c8f4b", size = 10198772, upload-time = "2025-07-03T16:39:49.641Z" },
-    { url = "https://files.pythonhosted.org/packages/50/fa/f15089bc20c40f4f72334f9145dde55ab2b680e51afb3b55422effbf2fb6/ruff-0.12.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b8b94317cbc2ae4a2771af641739f933934b03555e51515e6e021c64441532d", size = 11845173, upload-time = "2025-07-03T16:39:52.069Z" },
-    { url = "https://files.pythonhosted.org/packages/43/9f/1f6f98f39f2b9302acc161a4a2187b1e3a97634fe918a8e731e591841cf4/ruff-0.12.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:45fc42c3bf1d30d2008023a0a9a0cfb06bf9835b147f11fe0679f21ae86d34b1", size = 12553002, upload-time = "2025-07-03T16:39:54.551Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/70/08991ac46e38ddd231c8f4fd05ef189b1b94be8883e8c0c146a025c20a19/ruff-0.12.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce48f675c394c37e958bf229fb5c1e843e20945a6d962cf3ea20b7a107dcd9f4", size = 12171330, upload-time = "2025-07-03T16:39:57.55Z" },
-    { url = "https://files.pythonhosted.org/packages/88/a9/5a55266fec474acfd0a1c73285f19dd22461d95a538f29bba02edd07a5d9/ruff-0.12.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:793d8859445ea47591272021a81391350205a4af65a9392401f418a95dfb75c9", size = 11774717, upload-time = "2025-07-03T16:39:59.78Z" },
-    { url = "https://files.pythonhosted.org/packages/87/e5/0c270e458fc73c46c0d0f7cf970bb14786e5fdb88c87b5e423a4bd65232b/ruff-0.12.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6932323db80484dda89153da3d8e58164d01d6da86857c79f1961934354992da", size = 11646659, upload-time = "2025-07-03T16:40:01.934Z" },
-    { url = "https://files.pythonhosted.org/packages/b7/b6/45ab96070c9752af37f0be364d849ed70e9ccede07675b0ec4e3ef76b63b/ruff-0.12.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6aa7e623a3a11538108f61e859ebf016c4f14a7e6e4eba1980190cacb57714ce", size = 10604012, upload-time = "2025-07-03T16:40:04.363Z" },
-    { url = "https://files.pythonhosted.org/packages/86/91/26a6e6a424eb147cc7627eebae095cfa0b4b337a7c1c413c447c9ebb72fd/ruff-0.12.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2a4a20aeed74671b2def096bdf2eac610c7d8ffcbf4fb0e627c06947a1d7078d", size = 10176799, upload-time = "2025-07-03T16:40:06.514Z" },
-    { url = "https://files.pythonhosted.org/packages/f5/0c/9f344583465a61c8918a7cda604226e77b2c548daf8ef7c2bfccf2b37200/ruff-0.12.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:71a4c550195612f486c9d1f2b045a600aeba851b298c667807ae933478fcef04", size = 11241507, upload-time = "2025-07-03T16:40:08.708Z" },
-    { url = "https://files.pythonhosted.org/packages/1c/b7/99c34ded8fb5f86c0280278fa89a0066c3760edc326e935ce0b1550d315d/ruff-0.12.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:4987b8f4ceadf597c927beee65a5eaf994c6e2b631df963f86d8ad1bdea99342", size = 11717609, upload-time = "2025-07-03T16:40:10.836Z" },
-    { url = "https://files.pythonhosted.org/packages/51/de/8589fa724590faa057e5a6d171e7f2f6cffe3287406ef40e49c682c07d89/ruff-0.12.2-py3-none-win32.whl", hash = "sha256:369ffb69b70cd55b6c3fc453b9492d98aed98062db9fec828cdfd069555f5f1a", size = 10523823, upload-time = "2025-07-03T16:40:13.203Z" },
-    { url = "https://files.pythonhosted.org/packages/94/47/8abf129102ae4c90cba0c2199a1a9b0fa896f6f806238d6f8c14448cc748/ruff-0.12.2-py3-none-win_amd64.whl", hash = "sha256:dca8a3b6d6dc9810ed8f328d406516bf4d660c00caeaef36eb831cf4871b0639", size = 11629831, upload-time = "2025-07-03T16:40:15.478Z" },
-    { url = "https://files.pythonhosted.org/packages/e2/1f/72d2946e3cc7456bb837e88000eb3437e55f80db339c840c04015a11115d/ruff-0.12.2-py3-none-win_arm64.whl", hash = "sha256:48d6c6bfb4761df68bc05ae630e24f506755e702d4fb08f08460be778c7ccb12", size = 10735334, upload-time = "2025-07-03T16:40:17.677Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/fd/b46bb20e14b11ff49dbc74c61de352e0dc07fb650189513631f6fb5fc69f/ruff-0.12.0-py3-none-linux_armv6l.whl", hash = "sha256:5652a9ecdb308a1754d96a68827755f28d5dfb416b06f60fd9e13f26191a8848", size = 10311554, upload-time = "2025-06-17T15:18:45.792Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/d3/021dde5a988fa3e25d2468d1dadeea0ae89dc4bc67d0140c6e68818a12a1/ruff-0.12.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:05ed0c914fabc602fc1f3b42c53aa219e5736cb030cdd85640c32dbc73da74a6", size = 11118435, upload-time = "2025-06-17T15:18:49.064Z" },
+    { url = "https://files.pythonhosted.org/packages/07/a2/01a5acf495265c667686ec418f19fd5c32bcc326d4c79ac28824aecd6a32/ruff-0.12.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:07a7aa9b69ac3fcfda3c507916d5d1bca10821fe3797d46bad10f2c6de1edda0", size = 10466010, upload-time = "2025-06-17T15:18:51.341Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/57/7caf31dd947d72e7aa06c60ecb19c135cad871a0a8a251723088132ce801/ruff-0.12.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7731c3eec50af71597243bace7ec6104616ca56dda2b99c89935fe926bdcd48", size = 10661366, upload-time = "2025-06-17T15:18:53.29Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/ba/aa393b972a782b4bc9ea121e0e358a18981980856190d7d2b6187f63e03a/ruff-0.12.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:952d0630eae628250ab1c70a7fffb641b03e6b4a2d3f3ec6c1d19b4ab6c6c807", size = 10173492, upload-time = "2025-06-17T15:18:55.262Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/50/9349ee777614bc3062fc6b038503a59b2034d09dd259daf8192f56c06720/ruff-0.12.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c021f04ea06966b02614d442e94071781c424ab8e02ec7af2f037b4c1e01cc82", size = 11761739, upload-time = "2025-06-17T15:18:58.906Z" },
+    { url = "https://files.pythonhosted.org/packages/04/8f/ad459de67c70ec112e2ba7206841c8f4eb340a03ee6a5cabc159fe558b8e/ruff-0.12.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:7d235618283718ee2fe14db07f954f9b2423700919dc688eacf3f8797a11315c", size = 12537098, upload-time = "2025-06-17T15:19:01.316Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/50/15ad9c80ebd3c4819f5bd8883e57329f538704ed57bac680d95cb6627527/ruff-0.12.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0758038f81beec8cc52ca22de9685b8ae7f7cc18c013ec2050012862cc9165", size = 12154122, upload-time = "2025-06-17T15:19:03.727Z" },
+    { url = "https://files.pythonhosted.org/packages/76/e6/79b91e41bc8cc3e78ee95c87093c6cacfa275c786e53c9b11b9358026b3d/ruff-0.12.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:139b3d28027987b78fc8d6cfb61165447bdf3740e650b7c480744873688808c2", size = 11363374, upload-time = "2025-06-17T15:19:05.875Z" },
+    { url = "https://files.pythonhosted.org/packages/db/c3/82b292ff8a561850934549aa9dc39e2c4e783ab3c21debe55a495ddf7827/ruff-0.12.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68853e8517b17bba004152aebd9dd77d5213e503a5f2789395b25f26acac0da4", size = 11587647, upload-time = "2025-06-17T15:19:08.246Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/42/d5760d742669f285909de1bbf50289baccb647b53e99b8a3b4f7ce1b2001/ruff-0.12.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3a9512af224b9ac4757f7010843771da6b2b0935a9e5e76bb407caa901a1a514", size = 10527284, upload-time = "2025-06-17T15:19:10.37Z" },
+    { url = "https://files.pythonhosted.org/packages/19/f6/fcee9935f25a8a8bba4adbae62495c39ef281256693962c2159e8b284c5f/ruff-0.12.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b08df3d96db798e5beb488d4df03011874aff919a97dcc2dd8539bb2be5d6a88", size = 10158609, upload-time = "2025-06-17T15:19:12.286Z" },
+    { url = "https://files.pythonhosted.org/packages/37/fb/057febf0eea07b9384787bfe197e8b3384aa05faa0d6bd844b94ceb29945/ruff-0.12.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6a315992297a7435a66259073681bb0d8647a826b7a6de45c6934b2ca3a9ed51", size = 11141462, upload-time = "2025-06-17T15:19:15.195Z" },
+    { url = "https://files.pythonhosted.org/packages/10/7c/1be8571011585914b9d23c95b15d07eec2d2303e94a03df58294bc9274d4/ruff-0.12.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1e55e44e770e061f55a7dbc6e9aed47feea07731d809a3710feda2262d2d4d8a", size = 11641616, upload-time = "2025-06-17T15:19:17.6Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/ef/b960ab4818f90ff59e571d03c3f992828d4683561095e80f9ef31f3d58b7/ruff-0.12.0-py3-none-win32.whl", hash = "sha256:7162a4c816f8d1555eb195c46ae0bd819834d2a3f18f98cc63819a7b46f474fb", size = 10525289, upload-time = "2025-06-17T15:19:19.688Z" },
+    { url = "https://files.pythonhosted.org/packages/34/93/8b16034d493ef958a500f17cda3496c63a537ce9d5a6479feec9558f1695/ruff-0.12.0-py3-none-win_amd64.whl", hash = "sha256:d00b7a157b8fb6d3827b49d3324da34a1e3f93492c1f97b08e222ad7e9b291e0", size = 11598311, upload-time = "2025-06-17T15:19:21.785Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/33/4d3e79e4a84533d6cd526bfb42c020a23256ae5e4265d858bd1287831f7d/ruff-0.12.0-py3-none-win_arm64.whl", hash = "sha256:8cd24580405ad8c1cc64d61725bca091d6b6da7eb3d36f72cc605467069d7e8b", size = 10724946, upload-time = "2025-06-17T15:19:23.952Z" },
 ]
 
 [[package]]
@@ -2504,27 +2504,27 @@ wheels = [
 
 [[package]]
 name = "tokenizers"
-version = "0.21.2"
+version = "0.21.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "huggingface-hub" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ab/2d/b0fce2b8201635f60e8c95990080f58461cc9ca3d5026de2e900f38a7f21/tokenizers-0.21.2.tar.gz", hash = "sha256:fdc7cffde3e2113ba0e6cc7318c40e3438a4d74bbc62bf04bcc63bdfb082ac77", size = 351545, upload-time = "2025-06-24T10:24:52.449Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/92/76/5ac0c97f1117b91b7eb7323dcd61af80d72f790b4df71249a7850c195f30/tokenizers-0.21.1.tar.gz", hash = "sha256:a1bb04dc5b448985f86ecd4b05407f5a8d97cb2c0532199b2a302a604a0165ab", size = 343256, upload-time = "2025-03-13T10:51:18.189Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/1d/cc/2936e2d45ceb130a21d929743f1e9897514691bec123203e10837972296f/tokenizers-0.21.2-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:342b5dfb75009f2255ab8dec0041287260fed5ce00c323eb6bab639066fef8ec", size = 2875206, upload-time = "2025-06-24T10:24:42.755Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/e6/33f41f2cc7861faeba8988e7a77601407bf1d9d28fc79c5903f8f77df587/tokenizers-0.21.2-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:126df3205d6f3a93fea80c7a8a266a78c1bd8dd2fe043386bafdd7736a23e45f", size = 2732655, upload-time = "2025-06-24T10:24:41.56Z" },
-    { url = "https://files.pythonhosted.org/packages/33/2b/1791eb329c07122a75b01035b1a3aa22ad139f3ce0ece1b059b506d9d9de/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a32cd81be21168bd0d6a0f0962d60177c447a1aa1b1e48fa6ec9fc728ee0b12", size = 3019202, upload-time = "2025-06-24T10:24:31.791Z" },
-    { url = "https://files.pythonhosted.org/packages/05/15/fd2d8104faa9f86ac68748e6f7ece0b5eb7983c7efc3a2c197cb98c99030/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8bd8999538c405133c2ab999b83b17c08b7fc1b48c1ada2469964605a709ef91", size = 2934539, upload-time = "2025-06-24T10:24:34.567Z" },
-    { url = "https://files.pythonhosted.org/packages/a5/2e/53e8fd053e1f3ffbe579ca5f9546f35ac67cf0039ed357ad7ec57f5f5af0/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e9944e61239b083a41cf8fc42802f855e1dca0f499196df37a8ce219abac6eb", size = 3248665, upload-time = "2025-06-24T10:24:39.024Z" },
-    { url = "https://files.pythonhosted.org/packages/00/15/79713359f4037aa8f4d1f06ffca35312ac83629da062670e8830917e2153/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:514cd43045c5d546f01142ff9c79a96ea69e4b5cda09e3027708cb2e6d5762ab", size = 3451305, upload-time = "2025-06-24T10:24:36.133Z" },
-    { url = "https://files.pythonhosted.org/packages/38/5f/959f3a8756fc9396aeb704292777b84f02a5c6f25c3fc3ba7530db5feb2c/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1b9405822527ec1e0f7d8d2fdb287a5730c3a6518189c968254a8441b21faae", size = 3214757, upload-time = "2025-06-24T10:24:37.784Z" },
-    { url = "https://files.pythonhosted.org/packages/c5/74/f41a432a0733f61f3d21b288de6dfa78f7acff309c6f0f323b2833e9189f/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fed9a4d51c395103ad24f8e7eb976811c57fbec2af9f133df471afcd922e5020", size = 3121887, upload-time = "2025-06-24T10:24:40.293Z" },
-    { url = "https://files.pythonhosted.org/packages/3c/6a/bc220a11a17e5d07b0dfb3b5c628621d4dcc084bccd27cfaead659963016/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2c41862df3d873665ec78b6be36fcc30a26e3d4902e9dd8608ed61d49a48bc19", size = 9091965, upload-time = "2025-06-24T10:24:44.431Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/bd/ac386d79c4ef20dc6f39c4706640c24823dca7ebb6f703bfe6b5f0292d88/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed21dc7e624e4220e21758b2e62893be7101453525e3d23264081c9ef9a6d00d", size = 9053372, upload-time = "2025-06-24T10:24:46.455Z" },
-    { url = "https://files.pythonhosted.org/packages/63/7b/5440bf203b2a5358f074408f7f9c42884849cd9972879e10ee6b7a8c3b3d/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:0e73770507e65a0e0e2a1affd6b03c36e3bc4377bd10c9ccf51a82c77c0fe365", size = 9298632, upload-time = "2025-06-24T10:24:48.446Z" },
-    { url = "https://files.pythonhosted.org/packages/a4/d2/faa1acac3f96a7427866e94ed4289949b2524f0c1878512516567d80563c/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:106746e8aa9014a12109e58d540ad5465b4c183768ea96c03cbc24c44d329958", size = 9470074, upload-time = "2025-06-24T10:24:50.378Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/a5/896e1ef0707212745ae9f37e84c7d50269411aef2e9ccd0de63623feecdf/tokenizers-0.21.2-cp39-abi3-win32.whl", hash = "sha256:cabda5a6d15d620b6dfe711e1af52205266d05b379ea85a8a301b3593c60e962", size = 2330115, upload-time = "2025-06-24T10:24:55.069Z" },
-    { url = "https://files.pythonhosted.org/packages/13/c3/cc2755ee10be859c4338c962a35b9a663788c0c0b50c0bdd8078fb6870cf/tokenizers-0.21.2-cp39-abi3-win_amd64.whl", hash = "sha256:58747bb898acdb1007f37a7bbe614346e98dc28708ffb66a3fd50ce169ac6c98", size = 2509918, upload-time = "2025-06-24T10:24:53.71Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/1f/328aee25f9115bf04262e8b4e5a2050b7b7cf44b59c74e982db7270c7f30/tokenizers-0.21.1-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:e78e413e9e668ad790a29456e677d9d3aa50a9ad311a40905d6861ba7692cf41", size = 2780767, upload-time = "2025-03-13T10:51:09.459Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/1a/4526797f3719b0287853f12c5ad563a9be09d446c44ac784cdd7c50f76ab/tokenizers-0.21.1-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:cd51cd0a91ecc801633829fcd1fda9cf8682ed3477c6243b9a095539de4aecf3", size = 2650555, upload-time = "2025-03-13T10:51:07.692Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/7a/a209b29f971a9fdc1da86f917fe4524564924db50d13f0724feed37b2a4d/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28da6b72d4fb14ee200a1bd386ff74ade8992d7f725f2bde2c495a9a98cf4d9f", size = 2937541, upload-time = "2025-03-13T10:50:56.679Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/1e/b788b50ffc6191e0b1fc2b0d49df8cff16fe415302e5ceb89f619d12c5bc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:34d8cfde551c9916cb92014e040806122295a6800914bab5865deb85623931cf", size = 2819058, upload-time = "2025-03-13T10:50:59.525Z" },
+    { url = "https://files.pythonhosted.org/packages/36/aa/3626dfa09a0ecc5b57a8c58eeaeb7dd7ca9a37ad9dd681edab5acd55764c/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aaa852d23e125b73d283c98f007e06d4595732104b65402f46e8ef24b588d9f8", size = 3133278, upload-time = "2025-03-13T10:51:04.678Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/4d/8fbc203838b3d26269f944a89459d94c858f5b3f9a9b6ee9728cdcf69161/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a21a15d5c8e603331b8a59548bbe113564136dc0f5ad8306dd5033459a226da0", size = 3144253, upload-time = "2025-03-13T10:51:01.261Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/1b/2bd062adeb7c7511b847b32e356024980c0ffcf35f28947792c2d8ad2288/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2fdbd4c067c60a0ac7eca14b6bd18a5bebace54eb757c706b47ea93204f7a37c", size = 3398225, upload-time = "2025-03-13T10:51:03.243Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/63/38be071b0c8e06840bc6046991636bcb30c27f6bb1e670f4f4bc87cf49cc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2dd9a0061e403546f7377df940e866c3e678d7d4e9643d0461ea442b4f89e61a", size = 3038874, upload-time = "2025-03-13T10:51:06.235Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/83/afa94193c09246417c23a3c75a8a0a96bf44ab5630a3015538d0c316dd4b/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:db9484aeb2e200c43b915a1a0150ea885e35f357a5a8fabf7373af333dcc8dbf", size = 9014448, upload-time = "2025-03-13T10:51:10.927Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/b3/0e1a37d4f84c0f014d43701c11eb8072704f6efe8d8fc2dcdb79c47d76de/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed248ab5279e601a30a4d67bdb897ecbe955a50f1e7bb62bd99f07dd11c2f5b6", size = 8937877, upload-time = "2025-03-13T10:51:12.688Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/33/ff08f50e6d615eb180a4a328c65907feb6ded0b8f990ec923969759dc379/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:9ac78b12e541d4ce67b4dfd970e44c060a2147b9b2a21f509566d556a509c67d", size = 9186645, upload-time = "2025-03-13T10:51:14.723Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/aa/8ae85f69a9f6012c6f8011c6f4aa1c96154c816e9eea2e1b758601157833/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:e5a69c1a4496b81a5ee5d2c1f3f7fbdf95e90a0196101b0ee89ed9956b8a168f", size = 9384380, upload-time = "2025-03-13T10:51:16.526Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/5b/a5d98c89f747455e8b7a9504910c865d5e51da55e825a7ae641fb5ff0a58/tokenizers-0.21.1-cp39-abi3-win32.whl", hash = "sha256:1039a3a5734944e09de1d48761ade94e00d0fa760c0e0551151d4dd851ba63e3", size = 2239506, upload-time = "2025-03-13T10:51:20.643Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/b6/072a8e053ae600dcc2ac0da81a23548e3b523301a442a6ca900e92ac35be/tokenizers-0.21.1-cp39-abi3-win_amd64.whl", hash = "sha256:0f0dcbcc9f6e13e675a66d7a5f2f225a736745ce484c1a4e07476a89ccdad382", size = 2435481, upload-time = "2025-03-13T10:51:19.243Z" },
 ]
 
 [[package]]
@@ -2628,16 +2628,16 @@ wheels = [
 
 [[package]]
 name = "uvicorn"
-version = "0.35.0"
+version = "0.34.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "click" },
     { name = "h11" },
     { name = "typing-extensions", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/5e/42/e0e305207bb88c6b8d3061399c6a961ffe5fbb7e2aa63c9234df7259e9cd/uvicorn-0.35.0.tar.gz", hash = "sha256:bc662f087f7cf2ce11a1d7fd70b90c9f98ef2e2831556dd078d131b96cc94a01", size = 78473, upload-time = "2025-06-28T16:15:46.058Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/de/ad/713be230bcda622eaa35c28f0d328c3675c371238470abdea52417f17a8e/uvicorn-0.34.3.tar.gz", hash = "sha256:35919a9a979d7a59334b6b10e05d77c1d0d574c50e0fc98b8b1a0f165708b55a", size = 76631, upload-time = "2025-06-01T07:48:17.531Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d2/e2/dc81b1bd1dcfe91735810265e9d26bc8ec5da45b4c0f6237e286819194c3/uvicorn-0.35.0-py3-none-any.whl", hash = "sha256:197535216b25ff9b785e29a0b79199f55222193d47f820816e7da751e9bc8d4a", size = 66406, upload-time = "2025-06-28T16:15:44.816Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/0d/8adfeaa62945f90d19ddc461c55f4a50c258af7662d34b6a3d5d1f8646f6/uvicorn-0.34.3-py3-none-any.whl", hash = "sha256:16246631db62bdfbf069b0645177d6e8a77ba950cfedbfd093acef9444e4d885", size = 62431, upload-time = "2025-06-01T07:48:15.664Z" },
 ]
 
 [package.optional-dependencies]

mobile/.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.6"
+  "flutter": "3.29.3"
 }

mobile/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.32.6",
+  "dart.flutterSdkPath": ".fvm/versions/3.29.3",
   "search.exclude": {
     "**/.fvm": true
   },

mobile/android/app/build.gradle

@@ -66,20 +66,6 @@ android {
     }
   }
 
-  flavorDimensions "default"
-  productFlavors {
-    production {
-      dimension "default"
-      applicationId "app.alextran.immich"
-    }
-    
-    beta {
-      dimension "default"
-      applicationId "app.alextran.immich.beta"
-      versionNameSuffix "-BETA"
-    }
-  }
-
   buildTypes {
     debug {
       applicationIdSuffix '.debug'

mobile/android/app/src/beta/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-  <application android:label="Immich Beta" tools:replace="android:label" />
-</manifest>

mobile/android/app/src/main/AndroidManifest.xml

@@ -100,24 +100,24 @@
 
       <!-- my.immich.app deep link -->
       <intent-filter android:autoVerify="true">
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
+          <action android:name="android.intent.action.VIEW" />
+          <category android:name="android.intent.category.DEFAULT" />
+          <category android:name="android.intent.category.BROWSABLE" />
 
-        <data android:scheme="https" />
+          <data android:scheme="https" />
 
-        <data
-          android:host="my.immich.app"
-          android:path="/" />
-        <data
-          android:host="my.immich.app"
-          android:pathPrefix="/albums/" />
-        <data
-          android:host="my.immich.app"
-          android:pathPrefix="/memories/" />
-        <data
-          android:host="my.immich.app"
-          android:pathPrefix="/photos/" />
+          <data
+              android:host="my.immich.app"
+              android:path="/" />
+          <data
+              android:host="my.immich.app"
+              android:pathPrefix="/albums/" />
+          <data
+              android:host="my.immich.app"
+              android:pathPrefix="/memories/" />
+          <data
+              android:host="my.immich.app"
+              android:pathPrefix="/photos/" />
       </intent-filter>
     </activity>
 

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

@@ -87,8 +87,7 @@ data class PlatformAsset (
   val updatedAt: Long? = null,
   val width: Long? = null,
   val height: Long? = null,
-  val durationInSeconds: Long,
-  val orientation: Long
+  val durationInSeconds: Long
 )
  {
   companion object {
@@ -101,8 +100,7 @@ data class PlatformAsset (
       val width = pigeonVar_list[5] as Long?
       val height = pigeonVar_list[6] as Long?
       val durationInSeconds = pigeonVar_list[7] as Long
-      val orientation = pigeonVar_list[8] as Long
-      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation)
+      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds)
     }
   }
   fun toList(): List<Any?> {
@@ -115,7 +113,6 @@ data class PlatformAsset (
       width,
       height,
       durationInSeconds,
-      orientation,
     )
   }
   override fun equals(other: Any?): Boolean {

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.database.Cursor
 import android.provider.MediaStore
 import android.util.Log
-import androidx.core.database.getStringOrNull
 import java.io.File
 import java.io.FileInputStream
 import java.security.MessageDigest
@@ -40,8 +39,7 @@ open class NativeSyncApiImplBase(context: Context) {
       MediaStore.MediaColumns.BUCKET_ID,
       MediaStore.MediaColumns.WIDTH,
       MediaStore.MediaColumns.HEIGHT,
-      MediaStore.MediaColumns.DURATION,
-      MediaStore.MediaColumns.ORIENTATION,
+      MediaStore.MediaColumns.DURATION
     )
 
     const val HASH_BUFFER_SIZE = 2 * 1024 * 1024
@@ -75,8 +73,6 @@ open class NativeSyncApiImplBase(context: Context) {
         val widthColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.WIDTH)
         val heightColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.HEIGHT)
         val durationColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.DURATION)
-        val orientationColumn =
-          c.getColumnIndexOrThrow(MediaStore.MediaColumns.ORIENTATION)
 
         while (c.moveToNext()) {
           val id = c.getLong(idColumn).toString()
@@ -104,7 +100,6 @@ open class NativeSyncApiImplBase(context: Context) {
           val duration = if (mediaType == MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE) 0
           else c.getLong(durationColumn) / 1000
           val bucketId = c.getString(bucketIdColumn)
-          val orientation = c.getInt(orientationColumn)
 
           val asset = PlatformAsset(
             id,
@@ -114,8 +109,7 @@ open class NativeSyncApiImplBase(context: Context) {
             modifiedAt,
             width,
             height,
-            duration,
-            orientation.toLong(),
+            duration
           )
           yield(AssetResult.ValidAsset(asset, bucketId))
         }
@@ -158,8 +152,7 @@ open class NativeSyncApiImplBase(context: Context) {
           continue
         }
 
-        // MediaStore might return null for bucket name (commonly for the Root Directory), so default to "Internal Storage"
-        val name = cursor.getStringOrNull(bucketNameColumn) ?: "Internal Storage"
+        val name = cursor.getString(bucketNameColumn)
         val updatedAt = cursor.getLong(dateModified)
         albums.add(PlatformAlbum(id, name, updatedAt, false, 0))
         albumsCount[id] = 1

mobile/immich_lint/pubspec.lock

@@ -5,34 +5,34 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f
+      sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
       url: "https://pub.dev"
     source: hosted
-    version: "82.0.0"
+    version: "80.0.0"
   analyzer:
     dependency: "direct main"
     description:
       name: analyzer
-      sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0"
+      sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
       url: "https://pub.dev"
     source: hosted
-    version: "7.4.5"
+    version: "7.3.0"
   analyzer_plugin:
     dependency: "direct main"
     description:
       name: analyzer_plugin
-      sha256: ee188b6df6c85f1441497c7171c84f1392affadc0384f71089cb10a3bc508cef
+      sha256: b3075265c5ab222f8b3188342dcb50b476286394a40323e85d1fa725035d40a4
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.1"
+    version: "0.13.0"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.6.0"
   async:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.3"
   ci:
     dependency: transitive
     description:
@@ -125,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: custom_lint_visitor
-      sha256: cba5b6d7a6217312472bf4468cdf68c949488aed7ffb0eab792cd0b6c435054d
+      sha256: "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0+7.4.5"
+    version: "1.0.0+7.3.0"
   dart_style:
     dependency: transitive
     description:
@@ -157,10 +157,10 @@ packages:
     dependency: transitive
     description:
       name: freezed_annotation
-      sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
+      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.0.0"
   glob:
     dependency: "direct main"
     description:
@@ -213,18 +213,18 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.16.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.1"
   path:
     dependency: transitive
     description:
@@ -317,10 +317,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.6"
+    version: "0.7.4"
   typed_data:
     dependency: transitive
     description:
@@ -341,18 +341,18 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "15.0.2"
+    version: "15.0.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
+      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
   yaml:
     dependency: transitive
     description:
@@ -362,4 +362,4 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.8.0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"

mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -44,7 +43,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       disableMainThreadChecker = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"

mobile/ios/Runner/Sync/Messages.g.swift

@@ -138,7 +138,6 @@ struct PlatformAsset: Hashable {
   var width: Int64? = nil
   var height: Int64? = nil
   var durationInSeconds: Int64
-  var orientation: Int64
 
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -151,7 +150,6 @@ struct PlatformAsset: Hashable {
     let width: Int64? = nilOrValue(pigeonVar_list[5])
     let height: Int64? = nilOrValue(pigeonVar_list[6])
     let durationInSeconds = pigeonVar_list[7] as! Int64
-    let orientation = pigeonVar_list[8] as! Int64
 
     return PlatformAsset(
       id: id,
@@ -161,8 +159,7 @@ struct PlatformAsset: Hashable {
       updatedAt: updatedAt,
       width: width,
       height: height,
-      durationInSeconds: durationInSeconds,
-      orientation: orientation
+      durationInSeconds: durationInSeconds
     )
   }
   func toList() -> [Any?] {
@@ -175,7 +172,6 @@ struct PlatformAsset: Hashable {
       width,
       height,
       durationInSeconds,
-      orientation,
     ]
   }
   static func == (lhs: PlatformAsset, rhs: PlatformAsset) -> Bool {

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -27,8 +27,7 @@ extension PHAsset {
       updatedAt: modificationDate.map { Int64($0.timeIntervalSince1970) },
       width: Int64(pixelWidth),
       height: Int64(pixelHeight),
-      durationInSeconds: Int64(duration),
-      orientation: 0
+      durationInSeconds: Int64(duration)
     )
   }
 }
@@ -170,8 +169,7 @@ class NativeSyncApiImpl: NativeSyncApi {
             id: asset.localIdentifier,
             name: "",
             type: 0,
-            durationInSeconds: 0,
-            orientation: 0
+            durationInSeconds: 0
           )
           if (updatedAssets.contains(AssetWrapper(with: predicate))) {
             continue

mobile/ios/WidgetExtension/EntryGenerators.swift

@@ -0,0 +1,59 @@
+import SwiftUI
+import WidgetKit
+
+func buildEntry(
+  api: ImmichAPI,
+  asset: Asset,
+  dateOffset: Int,
+  subtitle: String? = nil
+)
+  async throws -> ImageEntry
+{
+  let entryDate = Calendar.current.date(
+    byAdding: .minute,
+    value: dateOffset * 20,
+    to: Date.now
+  )!
+  let image = try await api.fetchImage(asset: asset)
+
+  return ImageEntry(date: entryDate, image: image, subtitle: subtitle, deepLink: asset.deepLink)
+}
+
+func generateRandomEntries(
+  api: ImmichAPI,
+  now: Date,
+  count: Int,
+  albumId: String? = nil,
+  subtitle: String? = nil
+)
+  async throws -> [ImageEntry]
+{
+
+  var entries: [ImageEntry] = []
+  let albumIds = albumId != nil ? [albumId!] : []
+
+  let randomAssets = try await api.fetchSearchResults(
+    with: SearchFilters(size: count, albumIds: albumIds)
+  )
+
+  await withTaskGroup(of: ImageEntry?.self) { group in
+    for (dateOffset, asset) in randomAssets.enumerated() {
+      group.addTask {
+        return try? await buildEntry(
+          api: api,
+          asset: asset,
+          dateOffset: dateOffset,
+          subtitle: subtitle
+        )
+      }
+    }
+
+    for await result in group {
+      if let entry = result {
+        entries.append(entry)
+      }
+    }
+  }
+
+  return entries
+}

mobile/ios/WidgetExtension/ImageEntry.swift

@@ -1,148 +0,0 @@
-import SwiftUI
-import WidgetKit
-
-typealias EntryMetadata = ImageEntry.Metadata
-
-struct ImageEntry: TimelineEntry {
-  let date: Date
-  var image: UIImage?
-  var metadata: Metadata = Metadata()
-
-  struct Metadata: Codable {
-    var subtitle: String? = nil
-    var error: WidgetError? = nil
-    var deepLink: URL? = nil
-  }
-
-  static func build(
-    api: ImmichAPI,
-    asset: Asset,
-    dateOffset: Int,
-    subtitle: String? = nil
-  )
-    async throws -> Self
-  {
-    let entryDate = Calendar.current.date(
-      byAdding: .minute,
-      value: dateOffset * 20,
-      to: Date.now
-    )!
-    let image = try await api.fetchImage(asset: asset)
-
-    return Self(
-      date: entryDate,
-      image: image,
-      metadata: EntryMetadata(
-        subtitle: subtitle,
-        deepLink: asset.deepLink
-      )
-    )
-  }
-
-  func cache(for key: String) throws {
-    if let containerURL = FileManager.default.containerURL(
-      forSecurityApplicationGroupIdentifier: IMMICH_SHARE_GROUP
-    ) {
-      let imageURL = containerURL.appendingPathComponent("\(key)_image.png")
-      let metadataURL = containerURL.appendingPathComponent(
-        "\(key)_metadata.json"
-      )
-
-      // build metadata JSON
-      let entryMetadata = try JSONEncoder().encode(self.metadata)
-
-      // write to disk
-      try self.image?.pngData()?.write(to: imageURL, options: .atomic)
-      try entryMetadata.write(to: metadataURL, options: .atomic)
-    }
-  }
-
-  static func loadCached(for key: String, at date: Date = Date.now)
-    -> ImageEntry?
-  {
-    if let containerURL = FileManager.default.containerURL(
-      forSecurityApplicationGroupIdentifier: IMMICH_SHARE_GROUP
-    ) {
-      let imageURL = containerURL.appendingPathComponent("\(key)_image.png")
-      let metadataURL = containerURL.appendingPathComponent(
-        "\(key)_metadata.json"
-      )
-
-      guard let imageData = try? Data(contentsOf: imageURL),
-        let metadataJSON = try? Data(contentsOf: metadataURL),
-        let decodedMetadata = try? JSONDecoder().decode(
-          Metadata.self,
-          from: metadataJSON
-        )
-      else {
-        return nil
-      }
-
-      return ImageEntry(
-        date: date,
-        image: UIImage(data: imageData),
-        metadata: decodedMetadata
-      )
-    }
-
-    return nil
-  }
-
-  static func handleError(
-    for key: String,
-    error: WidgetError = .fetchFailed
-  ) -> Timeline<ImageEntry> {
-    var timelineEntry = ImageEntry(
-      date: Date.now,
-      image: nil,
-      metadata: EntryMetadata(error: error)
-    )
-
-    // use cache if generic failed error
-    // we want to show the other errors to the user since without intervention,
-    // it will never succeed
-    if error == .fetchFailed, let cachedEntry = ImageEntry.loadCached(for: key)
-    {
-      timelineEntry = cachedEntry
-    }
-
-    return Timeline(entries: [timelineEntry], policy: .atEnd)
-  }
-
-}
-
-func generateRandomEntries(
-  api: ImmichAPI,
-  now: Date,
-  count: Int,
-  filter: SearchFilter = Album.NONE.filter,
-  subtitle: String? = nil
-)
-  async throws -> [ImageEntry]
-{
-
-  var entries: [ImageEntry] = []
-
-  let randomAssets = try await api.fetchSearchResults(with: filter)
-
-  await withTaskGroup(of: ImageEntry?.self) { group in
-    for (dateOffset, asset) in randomAssets.enumerated() {
-      group.addTask {
-        return try? await ImageEntry.build(
-          api: api,
-          asset: asset,
-          dateOffset: dateOffset,
-          subtitle: subtitle
-        )
-      }
-    }
-
-    for await result in group {
-      if let entry = result {
-        entries.append(entry)
-      }
-    }
-  }
-
-  return entries
-}

mobile/ios/WidgetExtension/ImageWidgetView.swift

@@ -1,14 +1,23 @@
 import SwiftUI
 import WidgetKit
 
-extension Image {
-  @ViewBuilder
-  func tintedWidgetImageModifier() -> some View {
-    if #available(iOS 18.0, *) {
-      self
-        .widgetAccentedRenderingMode(.accentedDesaturated)
-    } else {
-      self
+struct ImageEntry: TimelineEntry {
+  let date: Date
+  var image: UIImage?
+  var subtitle: String? = nil
+  var error: WidgetError? = nil
+  var deepLink: URL? = nil
+
+  // Resizes the stored image to a maximum width of 450 pixels
+  mutating func resize() {
+    if (image == nil || image!.size.height < 450 || image!.size.width < 450 ) {
+      return
+    }
+    
+    image = image?.resized(toWidth: 450)
+    
+    if image == nil {
+      error = .unableToResize
     }
   }
 }
@@ -20,8 +29,7 @@ struct ImmichWidgetView: View {
     if entry.image == nil {
       VStack {
         Image("LaunchImage")
-          .tintedWidgetImageModifier()
-        Text(entry.metadata.error?.errorDescription ?? "")
+        Text(entry.error?.errorDescription ?? "")
           .minimumScaleFactor(0.25)
           .multilineTextAlignment(.center)
           .foregroundStyle(.secondary)
@@ -32,13 +40,11 @@ struct ImmichWidgetView: View {
         Color.clear.overlay(
           Image(uiImage: entry.image!)
             .resizable()
-            .tintedWidgetImageModifier()
             .scaledToFill()
-
         )
         VStack {
           Spacer()
-          if let subtitle = entry.metadata.subtitle {
+          if let subtitle = entry.subtitle {
             Text(subtitle)
               .foregroundColor(.white)
               .padding(8)
@@ -49,7 +55,7 @@ struct ImmichWidgetView: View {
         }
         .padding(16)
       }
-      .widgetURL(entry.metadata.deepLink)
+      .widgetURL(entry.deepLink)
     }
   }
 }
@@ -64,9 +70,7 @@ struct ImmichWidgetView: View {
     ImageEntry(
       date: date,
       image: UIImage(named: "ImmichLogo"),
-      metadata: EntryMetadata(
-        subtitle: "1 year ago"
-      )
+      subtitle: "1 year ago"
     )
   }
 )

mobile/ios/WidgetExtension/ImmichAPI.swift

@@ -2,20 +2,14 @@ import Foundation
 import SwiftUI
 import WidgetKit
 
-let IMMICH_SHARE_GROUP = "group.app.immich.share"
-
-enum WidgetError: Error, Codable {
+enum WidgetError: Error {
   case noLogin
   case fetchFailed
+  case unknown
   case albumNotFound
-  case noAssetsAvailable
-}
-
-enum FetchError: Error {
   case unableToResize
   case invalidImage
   case invalidURL
-  case fetchFailed
 }
 
 extension WidgetError: LocalizedError {
@@ -29,9 +23,15 @@ extension WidgetError: LocalizedError {
 
     case .albumNotFound:
       return "Album not found"
+        
+    case .invalidURL:
+      return "An invalid URL was used"
+        
+    case .invalidImage:
+      return "An invalid image was received"
 
-    case .noAssetsAvailable:
-      return "No assets available"
+    default:
+      return "An unknown error occured"
     }
   }
 }
@@ -46,17 +46,16 @@ enum AssetType: String, Codable {
 struct Asset: Codable {
   let id: String
   let type: AssetType
-
+  
   var deepLink: URL? {
     return URL(string: "immich://asset?id=\(id)")
   }
 }
 
-struct SearchFilter: Codable {
-  var type = AssetType.image
-  var size = 1
+struct SearchFilters: Codable {
+  var type: AssetType = .image
+  let size: Int
   var albumIds: [String] = []
-  var isFavorite: Bool? = nil
 }
 
 struct MemoryResult: Codable {
@@ -71,34 +70,9 @@ struct MemoryResult: Codable {
   let data: MemoryData
 }
 
-struct Album: Codable, Equatable {
+struct Album: Codable {
   let id: String
   let albumName: String
-
-  static let NONE = Album(id: "NONE", albumName: "None")
-  static let FAVORITES = Album(id: "FAVORITES", albumName: "Favorites")
-
-  var filter: SearchFilter {
-    switch self {
-    case Album.NONE:
-      return SearchFilter()
-    case Album.FAVORITES:
-      return SearchFilter(isFavorite: true)
-
-    // regular album
-    default:
-      return SearchFilter(albumIds: [id])
-    }
-  }
-
-  var isVirtual: Bool {
-    switch self {
-    case Album.NONE, Album.FAVORITES:
-      return true
-    default:
-      return false
-    }
-  }
 }
 
 // MARK: API
@@ -112,7 +86,7 @@ class ImmichAPI {
 
   init() async throws {
     // fetch the credentials from the UserDefaults store that dart placed here
-    guard let defaults = UserDefaults(suiteName: IMMICH_SHARE_GROUP),
+    guard let defaults = UserDefaults(suiteName: "group.app.immich.share"),
       let serverURL = defaults.string(forKey: "widget_server_url"),
       let sessionKey = defaults.string(forKey: "widget_auth_token")
     else {
@@ -156,8 +130,7 @@ class ImmichAPI {
     return components?.url
   }
 
-  func fetchSearchResults(with filters: SearchFilter = Album.NONE.filter)
-    async throws
+  func fetchSearchResults(with filters: SearchFilters) async throws
     -> [Asset]
   {
     // get URL
@@ -203,7 +176,7 @@ class ImmichAPI {
     return try JSONDecoder().decode([MemoryResult].self, from: data)
   }
 
-  func fetchImage(asset: Asset) async throws(FetchError) -> UIImage {
+  func fetchImage(asset: Asset) async throws(WidgetError) -> UIImage {
     let thumbnailParams = [URLQueryItem(name: "size", value: "preview")]
     let assetEndpoint = "/assets/" + asset.id + "/thumbnail"
 
@@ -216,25 +189,18 @@ class ImmichAPI {
     else {
       throw .invalidURL
     }
-
-    guard let imageSource = CGImageSourceCreateWithURL(fetchURL as CFURL, nil)
-    else {
+    
+    guard let imageSource = CGImageSourceCreateWithURL(fetchURL as CFURL, nil) else {
       throw .invalidURL
     }
 
     let decodeOptions: [NSString: Any] = [
-      kCGImageSourceCreateThumbnailFromImageAlways: true,
-      kCGImageSourceThumbnailMaxPixelSize: 512,
-      kCGImageSourceCreateThumbnailWithTransform: true,
+        kCGImageSourceCreateThumbnailFromImageAlways: true,
+        kCGImageSourceThumbnailMaxPixelSize: 400,
+        kCGImageSourceCreateThumbnailWithTransform: true
     ]
-
-    guard
-      let thumbnail = CGImageSourceCreateThumbnailAtIndex(
-        imageSource,
-        0,
-        decodeOptions as CFDictionary
-      )
-    else {
+    
+    guard let thumbnail = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, decodeOptions as CFDictionary) else {
       throw .fetchFailed
     }
 

mobile/ios/WidgetExtension/Info.plist

@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

mobile/ios/WidgetExtension/UIImage+Resize.swift

@@ -7,17 +7,14 @@
 import UIKit
 
 extension UIImage {
-  /// Crops the image to ensure width and height do not exceed maxSize.
-  /// Keeps original aspect ratio and crops excess equally from edges (center crop).
-  func resized(toWidth width: CGFloat, isOpaque: Bool = true) -> UIImage? {
-    let canvas = CGSize(
-      width: width,
-      height: CGFloat(ceil(width / size.width * size.height))
-    )
-    let format = imageRendererFormat
-    format.opaque = isOpaque
-    return UIGraphicsImageRenderer(size: canvas, format: format).image {
-      _ in draw(in: CGRect(origin: .zero, size: canvas))
+    /// Crops the image to ensure width and height do not exceed maxSize.
+    /// Keeps original aspect ratio and crops excess equally from edges (center crop).
+    func resized(toWidth width: CGFloat, isOpaque: Bool = true) -> UIImage? {
+      let canvas = CGSize(width: width, height: CGFloat(ceil(width/size.width * size.height)))
+      let format = imageRendererFormat
+      format.opaque = isOpaque
+      return UIGraphicsImageRenderer(size: canvas, format: format).image {
+        _ in draw(in: CGRect(origin: .zero, size: canvas))
+      }
     }
-  }
 }

mobile/ios/WidgetExtension/widgets/MemoryWidget.swift

@@ -19,31 +19,28 @@ struct ImmichMemoryProvider: TimelineProvider {
     in context: Context,
     completion: @escaping @Sendable (ImageEntry) -> Void
   ) {
-    let cacheKey = "memory_\(context.family.rawValue)"
-
     Task {
       guard let api = try? await ImmichAPI() else {
-        completion(
-          ImageEntry.handleError(for: cacheKey, error: .noLogin).entries.first!
-        )
+        completion(ImageEntry(date: Date(), image: nil, error: .noLogin))
         return
       }
 
       guard let memories = try? await api.fetchMemory(for: Date.now)
       else {
-        completion(ImageEntry.handleError(for: cacheKey).entries.first!)
+        completion(ImageEntry(date: Date(), image: nil, error: .fetchFailed))
         return
       }
 
       for memory in memories {
         if let asset = memory.assets.first(where: { $0.type == .image }),
-          let entry = try? await ImageEntry.build(
+          var entry = try? await buildEntry(
             api: api,
             asset: asset,
             dateOffset: 0,
             subtitle: getYearDifferenceSubtitle(assetYear: memory.data.year)
           )
         {
+          entry.resize()
           completion(entry)
           return
         }
@@ -51,17 +48,26 @@ struct ImmichMemoryProvider: TimelineProvider {
 
       // fallback to random image
       guard
-        let randomImage = try? await api.fetchSearchResults().first,
-        let imageEntry = try? await ImageEntry.build(
+        let randomImage = try? await api.fetchSearchResults(
+          with: SearchFilters(size: 1)
+        ).first
+      else {
+        completion(ImageEntry(date: Date(), image: nil, error: .fetchFailed))
+        return
+      }
+
+      guard
+        var imageEntry = try? await buildEntry(
           api: api,
           asset: randomImage,
           dateOffset: 0
         )
       else {
-        completion(ImageEntry.handleError(for: cacheKey).entries.first!)
+        completion(ImageEntry(date: Date(), image: nil, error: .fetchFailed))
         return
       }
 
+      imageEntry.resize()
       completion(imageEntry)
     }
   }
@@ -74,12 +80,9 @@ struct ImmichMemoryProvider: TimelineProvider {
       var entries: [ImageEntry] = []
       let now = Date()
 
-      let cacheKey = "memory_\(context.family.rawValue)"
-
       guard let api = try? await ImmichAPI() else {
-        completion(
-          ImageEntry.handleError(for: cacheKey, error: .noLogin)
-        )
+        entries.append(ImageEntry(date: now, image: nil, error: .noLogin))
+        completion(Timeline(entries: entries, policy: .atEnd))
         return
       }
 
@@ -92,7 +95,7 @@ struct ImmichMemoryProvider: TimelineProvider {
           for asset in memory.assets {
             if asset.type == .image && totalAssets < 12 {
               group.addTask {
-                try? await ImageEntry.build(
+                try? await buildEntry(
                   api: api,
                   asset: asset,
                   dateOffset: totalAssets,
@@ -117,32 +120,25 @@ struct ImmichMemoryProvider: TimelineProvider {
       // If we didnt add any memory images (some failure occured or no images in memory),
       // default to 12 hours of random photos
       if entries.count == 0 {
-        // this must be a do/catch since we need to
-        // distinguish between a network fail and an empty search
-        do {
-          let search = try await generateRandomEntries(
+        entries.append(
+          contentsOf: (try? await generateRandomEntries(
             api: api,
             now: now,
             count: 12
-          )
-
-          // Load or save a cached asset for when network conditions are bad
-          if search.count == 0 {
-            completion(
-              ImageEntry.handleError(for: cacheKey, error: .noAssetsAvailable)
-            )
-            return
-          }
-
-          entries.append(contentsOf: search)
-        } catch {
-          completion(ImageEntry.handleError(for: cacheKey))
-          return
-        }
+          )) ?? []
+        )
       }
 
-      // cache the last image
-      try? entries.last!.cache(for: cacheKey)
+      // If we fail to fetch images, we still want to add an entry
+      // with a nil image and an error
+      if entries.count == 0 {
+        entries.append(ImageEntry(date: now, image: nil, error: .fetchFailed))
+      }
+
+      // Resize all images to something that can be stored by iOS
+      for i in entries.indices {
+        entries[i].resize()
+      }
 
       completion(Timeline(entries: entries, policy: .atEnd))
     }

mobile/ios/WidgetExtension/widgets/RandomWidget.swift

@@ -8,21 +8,20 @@ extension Album: @unchecked Sendable, AppEntity, Identifiable {
 
   struct AlbumQuery: EntityQuery {
     func entities(for identifiers: [Album.ID]) async throws -> [Album] {
-      return await suggestedEntities().filter {
+      // use cached albums to search
+      var albums = (try? await AlbumCache.shared.getAlbums()) ?? []
+      albums.insert(NO_ALBUM, at: 0)
+
+      return albums.filter {
         identifiers.contains($0.id)
       }
     }
 
-    func suggestedEntities() async -> [Album] {
-      let albums = (try? await AlbumCache.shared.getAlbums()) ?? []
+    func suggestedEntities() async throws -> [Album] {
+      var albums = (try? await AlbumCache.shared.getAlbums(refresh: true)) ?? []
+      albums.insert(NO_ALBUM, at: 0)
 
-      let options =
-        [
-          NONE,
-          FAVORITES,
-        ] + albums
-
-      return options
+      return albums
     }
   }
 
@@ -36,6 +35,8 @@ extension Album: @unchecked Sendable, AppEntity, Identifiable {
   }
 }
 
+let NO_ALBUM = Album(id: "NONE", albumName: "None")
+
 struct RandomConfigurationAppIntent: WidgetConfigurationIntent {
   static var title: LocalizedStringResource { "Select Album" }
   static var description: IntentDescription {
@@ -44,7 +45,7 @@ struct RandomConfigurationAppIntent: WidgetConfigurationIntent {
 
   @Parameter(title: "Album")
   var album: Album?
-
+  
   @Parameter(title: "Show Album Name", default: false)
   var showAlbumName: Bool
 }
@@ -53,7 +54,7 @@ struct RandomConfigurationAppIntent: WidgetConfigurationIntent {
 
 struct ImmichRandomProvider: AppIntentTimelineProvider {
   func placeholder(in context: Context) -> ImageEntry {
-    ImageEntry(date: Date())
+    ImageEntry(date: Date(), image: nil)
   }
 
   func snapshot(
@@ -62,26 +63,30 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
   ) async
     -> ImageEntry
   {
-    let cacheKey = "random_none_\(context.family.rawValue)"
-
     guard let api = try? await ImmichAPI() else {
-      return ImageEntry.handleError(for: cacheKey, error: .noLogin).entries
-        .first!
+      return ImageEntry(date: Date(), image: nil, error: .noLogin)
     }
 
     guard
       let randomImage = try? await api.fetchSearchResults(
-        with: Album.NONE.filter
-      ).first,
-      let entry = try? await ImageEntry.build(
+        with: SearchFilters(size: 1)
+      ).first
+    else {
+      return ImageEntry(date: Date(), image: nil, error: .fetchFailed)
+    }
+
+    guard
+      var entry = try? await buildEntry(
         api: api,
         asset: randomImage,
         dateOffset: 0
       )
     else {
-      return ImageEntry.handleError(for: cacheKey).entries.first!
+      return ImageEntry(date: Date(), image: nil, error: .fetchFailed)
     }
 
+    entry.resize()
+
     return entry
   }
 
@@ -94,41 +99,50 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
     var entries: [ImageEntry] = []
     let now = Date()
 
-    // nil if album is NONE or nil
-    let album = configuration.album ?? Album.NONE
-    let albumName = album.isVirtual ? nil : album.albumName
-
-    let cacheKey = "random_\(album.id)_\(context.family.rawValue)"
-
     // If we don't have a server config, return an entry with an error
     guard let api = try? await ImmichAPI() else {
-      return ImageEntry.handleError(for: cacheKey, error: .noLogin)
+      entries.append(ImageEntry(date: now, image: nil, error: .noLogin))
+      return Timeline(entries: entries, policy: .atEnd)
     }
 
-    // build entries
-    // this must be a do/catch since we need to
-    // distinguish between a network fail and an empty search
-    do {
-      let search = try await generateRandomEntries(
+    // nil if album is NONE or nil
+    let albumId =
+      configuration.album?.id != "NONE" ? configuration.album?.id : nil
+    var albumName: String? = albumId != nil ? configuration.album?.albumName : nil
+    
+    if albumId != nil {
+      // make sure the album exists on server, otherwise show error
+      guard let albums = try? await api.fetchAlbums() else {
+        entries.append(ImageEntry(date: now, image: nil, error: .fetchFailed))
+        return Timeline(entries: entries, policy: .atEnd)
+      }
+
+      if !albums.contains(where: { $0.id == albumId }) {
+        entries.append(ImageEntry(date: now, image: nil, error: .albumNotFound))
+        return Timeline(entries: entries, policy: .atEnd)
+      }
+    }
+
+    entries.append(
+      contentsOf: (try? await generateRandomEntries(
         api: api,
         now: now,
         count: 12,
-        filter: album.filter,
+        albumId: albumId,
         subtitle: configuration.showAlbumName ? albumName : nil
-      )
+      ))
+        ?? []
+    )
 
-      // Load or save a cached asset for when network conditions are bad
-      if search.count == 0 {
-        return ImageEntry.handleError(for: cacheKey, error: .noAssetsAvailable)
-      }
-
-      entries.append(contentsOf: search)
-    } catch {
-      return ImageEntry.handleError(for: cacheKey)
+    // If we fail to fetch images, we still want to add an entry with a nil image and an error
+    if entries.count == 0 {
+      entries.append(ImageEntry(date: now, image: nil, error: .fetchFailed))
     }
 
-    // cache the last image
-    try? entries.last!.cache(for: cacheKey)
+    // Resize all images to something that can be stored by iOS
+    for i in entries.indices {
+      entries[i].resize()
+    }
 
     return Timeline(entries: entries, policy: .atEnd)
   }

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

@@ -11,7 +11,7 @@ enum AlbumUserRole {
 }
 
 // Model for an album stored in the server
-class RemoteAlbum {
+class Album {
   final String id;
   final String name;
   final String ownerId;
@@ -24,7 +24,7 @@ class RemoteAlbum {
   final int assetCount;
   final String ownerName;
 
-  const RemoteAlbum({
+  const Album({
     required this.id,
     required this.name,
     required this.ownerId,
@@ -57,7 +57,7 @@ class RemoteAlbum {
 
   @override
   bool operator ==(Object other) {
-    if (other is! RemoteAlbum) return false;
+    if (other is! Album) return false;
     if (identical(this, other)) return true;
     return id == other.id &&
         name == other.name &&
@@ -86,32 +86,4 @@ class RemoteAlbum {
         assetCount.hashCode ^
         ownerName.hashCode;
   }
-
-  RemoteAlbum copyWith({
-    String? id,
-    String? name,
-    String? ownerId,
-    String? description,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    String? thumbnailAssetId,
-    bool? isActivityEnabled,
-    AlbumAssetOrder? order,
-    int? assetCount,
-    String? ownerName,
-  }) {
-    return RemoteAlbum(
-      id: id ?? this.id,
-      name: name ?? this.name,
-      ownerId: ownerId ?? this.ownerId,
-      description: description ?? this.description,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      thumbnailAssetId: thumbnailAssetId ?? this.thumbnailAssetId,
-      isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
-      order: order ?? this.order,
-      assetCount: assetCount ?? this.assetCount,
-      ownerName: ownerName ?? this.ownerName,
-    );
-  }
 }

mobile/lib/domain/models/asset/base_asset.model.dart

@@ -1,5 +1,5 @@
-part 'local_asset.model.dart';
 part 'remote_asset.model.dart';
+part 'local_asset.model.dart';
 
 enum AssetType {
   // do not change this order!
@@ -25,7 +25,6 @@ sealed class BaseAsset {
   final int? height;
   final int? durationInSeconds;
   final bool isFavorite;
-  final String? livePhotoVideoId;
 
   const BaseAsset({
     required this.name,
@@ -37,32 +36,11 @@ sealed class BaseAsset {
     this.height,
     this.durationInSeconds,
     this.isFavorite = false,
-    this.livePhotoVideoId,
   });
 
   bool get isImage => type == AssetType.image;
   bool get isVideo => type == AssetType.video;
-
-  bool get isMotionPhoto => livePhotoVideoId != null;
-
-  Duration get duration {
-    final durationInSeconds = this.durationInSeconds;
-    if (durationInSeconds != null) {
-      return Duration(seconds: durationInSeconds);
-    }
-    return const Duration();
-  }
-
-  bool get hasRemote =>
-      storage == AssetState.remote || storage == AssetState.merged;
-  bool get hasLocal =>
-      storage == AssetState.local || storage == AssetState.merged;
-  bool get isLocalOnly => storage == AssetState.local;
-  bool get isRemoteOnly => storage == AssetState.remote;
-
-  // Overridden in subclasses
   AssetState get storage;
-  String get heroTag;
 
   @override
   String toString() {

mobile/lib/domain/models/asset/local_asset.model.dart

@@ -3,7 +3,6 @@ part of 'base_asset.model.dart';
 class LocalAsset extends BaseAsset {
   final String id;
   final String? remoteId;
-  final int orientation;
 
   const LocalAsset({
     required this.id,
@@ -17,17 +16,12 @@ class LocalAsset extends BaseAsset {
     super.height,
     super.durationInSeconds,
     super.isFavorite = false,
-    super.livePhotoVideoId,
-    this.orientation = 0,
   });
 
   @override
   AssetState get storage =>
       remoteId == null ? AssetState.local : AssetState.merged;
 
-  @override
-  String get heroTag => '${id}_${remoteId ?? checksum}';
-
   @override
   String toString() {
     return '''LocalAsset {
@@ -41,7 +35,6 @@ class LocalAsset extends BaseAsset {
    durationInSeconds: ${durationInSeconds ?? "<NA>"},
    remoteId: ${remoteId ?? "<NA>"}
    isFavorite: $isFavorite,
-  orientation: $orientation,
  }''';
   }
 
@@ -49,12 +42,11 @@ class LocalAsset extends BaseAsset {
   bool operator ==(Object other) {
     if (other is! LocalAsset) return false;
     if (identical(this, other)) return true;
-    return super == other && id == other.id && orientation == other.orientation;
+    return super == other && id == other.id && remoteId == other.remoteId;
   }
 
   @override
-  int get hashCode =>
-      super.hashCode ^ id.hashCode ^ remoteId.hashCode ^ orientation.hashCode;
+  int get hashCode => super.hashCode ^ id.hashCode ^ remoteId.hashCode;
 
   LocalAsset copyWith({
     String? id,
@@ -68,7 +60,6 @@ class LocalAsset extends BaseAsset {
     int? height,
     int? durationInSeconds,
     bool? isFavorite,
-    int? orientation,
   }) {
     return LocalAsset(
       id: id ?? this.id,
@@ -82,7 +73,6 @@ class LocalAsset extends BaseAsset {
       height: height ?? this.height,
       durationInSeconds: durationInSeconds ?? this.durationInSeconds,
       isFavorite: isFavorite ?? this.isFavorite,
-      orientation: orientation ?? this.orientation,
     );
   }
 }

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -30,16 +30,12 @@ class RemoteAsset extends BaseAsset {
     super.isFavorite = false,
     this.thumbHash,
     this.visibility = AssetVisibility.timeline,
-    super.livePhotoVideoId,
   });
 
   @override
   AssetState get storage =>
       localId == null ? AssetState.remote : AssetState.merged;
 
-  @override
-  String get heroTag => '${localId ?? checksum}_$id';
-
   @override
   String toString() {
     return '''Asset {
@@ -66,6 +62,7 @@ class RemoteAsset extends BaseAsset {
     return super == other &&
         id == other.id &&
         ownerId == other.ownerId &&
+        localId == other.localId &&
         thumbHash == other.thumbHash &&
         visibility == other.visibility;
   }
@@ -78,40 +75,4 @@ class RemoteAsset extends BaseAsset {
       localId.hashCode ^
       thumbHash.hashCode ^
       visibility.hashCode;
-
-  RemoteAsset copyWith({
-    String? id,
-    String? localId,
-    String? name,
-    String? ownerId,
-    String? checksum,
-    AssetType? type,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    int? width,
-    int? height,
-    int? durationInSeconds,
-    bool? isFavorite,
-    String? thumbHash,
-    AssetVisibility? visibility,
-    String? livePhotoVideoId,
-  }) {
-    return RemoteAsset(
-      id: id ?? this.id,
-      localId: localId ?? this.localId,
-      name: name ?? this.name,
-      ownerId: ownerId ?? this.ownerId,
-      checksum: checksum ?? this.checksum,
-      type: type ?? this.type,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      width: width ?? this.width,
-      height: height ?? this.height,
-      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
-      isFavorite: isFavorite ?? this.isFavorite,
-      thumbHash: thumbHash ?? this.thumbHash,
-      visibility: visibility ?? this.visibility,
-      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
-    );
-  }
 }

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

@@ -3,8 +3,6 @@ class ExifInfo {
   final int? fileSize;
   final String? description;
   final bool isFlipped;
-  final double? width;
-  final double? height;
   final String? orientation;
   final String? timeZone;
   final DateTime? dateTimeOriginal;
@@ -47,8 +45,6 @@ class ExifInfo {
     this.fileSize,
     this.description,
     this.orientation,
-    this.width,
-    this.height,
     this.timeZone,
     this.dateTimeOriginal,
     this.isFlipped = false,
@@ -72,9 +68,6 @@ class ExifInfo {
 
     return other.fileSize == fileSize &&
         other.description == description &&
-        other.isFlipped == isFlipped &&
-        other.width == width &&
-        other.height == height &&
         other.orientation == orientation &&
         other.timeZone == timeZone &&
         other.dateTimeOriginal == dateTimeOriginal &&
@@ -98,9 +91,6 @@ class ExifInfo {
     return fileSize.hashCode ^
         description.hashCode ^
         orientation.hashCode ^
-        isFlipped.hashCode ^
-        width.hashCode ^
-        height.hashCode ^
         timeZone.hashCode ^
         dateTimeOriginal.hashCode ^
         latitude.hashCode ^
@@ -124,9 +114,6 @@ class ExifInfo {
 fileSize: ${fileSize ?? 'NA'},
 description: ${description ?? 'NA'},
 orientation: ${orientation ?? 'NA'},
-width: ${width ?? 'NA'},
-height: ${height ?? 'NA'},
-isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
 latitude: ${latitude ?? 'NA'},

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

@@ -1,166 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'dart:convert';
-
-import 'package:collection/collection.dart';
-
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-enum MemoryTypeEnum {
-  // do not change this order!
-  onThisDay,
-}
-
-class MemoryData {
-  final int year;
-
-  const MemoryData({
-    required this.year,
-  });
-
-  MemoryData copyWith({
-    int? year,
-  }) {
-    return MemoryData(
-      year: year ?? this.year,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'year': year,
-    };
-  }
-
-  factory MemoryData.fromMap(Map<String, dynamic> map) {
-    return MemoryData(
-      year: map['year'] as int,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory MemoryData.fromJson(String source) =>
-      MemoryData.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() => 'MemoryData(year: $year)';
-
-  @override
-  bool operator ==(covariant MemoryData other) {
-    if (identical(this, other)) return true;
-
-    return other.year == year;
-  }
-
-  @override
-  int get hashCode => year.hashCode;
-}
-
-// Model for a memory stored in the server
-class DriftMemory {
-  final String id;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final DateTime? deletedAt;
-  final String ownerId;
-
-  // enum
-  final MemoryTypeEnum type;
-  final MemoryData data;
-  final bool isSaved;
-  final DateTime memoryAt;
-  final DateTime? seenAt;
-  final DateTime? showAt;
-  final DateTime? hideAt;
-  final List<RemoteAsset> assets;
-
-  const DriftMemory({
-    required this.id,
-    required this.createdAt,
-    required this.updatedAt,
-    this.deletedAt,
-    required this.ownerId,
-    required this.type,
-    required this.data,
-    required this.isSaved,
-    required this.memoryAt,
-    this.seenAt,
-    this.showAt,
-    this.hideAt,
-    required this.assets,
-  });
-
-  DriftMemory copyWith({
-    String? id,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    DateTime? deletedAt,
-    String? ownerId,
-    MemoryTypeEnum? type,
-    MemoryData? data,
-    bool? isSaved,
-    DateTime? memoryAt,
-    DateTime? seenAt,
-    DateTime? showAt,
-    DateTime? hideAt,
-    List<RemoteAsset>? assets,
-  }) {
-    return DriftMemory(
-      id: id ?? this.id,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      deletedAt: deletedAt ?? this.deletedAt,
-      ownerId: ownerId ?? this.ownerId,
-      type: type ?? this.type,
-      data: data ?? this.data,
-      isSaved: isSaved ?? this.isSaved,
-      memoryAt: memoryAt ?? this.memoryAt,
-      seenAt: seenAt ?? this.seenAt,
-      showAt: showAt ?? this.showAt,
-      hideAt: hideAt ?? this.hideAt,
-      assets: assets ?? this.assets,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'Memory(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, ownerId: $ownerId, type: $type, data: $data, isSaved: $isSaved, memoryAt: $memoryAt, seenAt: $seenAt, showAt: $showAt, hideAt: $hideAt, assets: $assets)';
-  }
-
-  @override
-  bool operator ==(covariant DriftMemory other) {
-    if (identical(this, other)) return true;
-    final listEquals = const DeepCollectionEquality().equals;
-
-    return other.id == id &&
-        other.createdAt == createdAt &&
-        other.updatedAt == updatedAt &&
-        other.deletedAt == deletedAt &&
-        other.ownerId == ownerId &&
-        other.type == type &&
-        other.data == data &&
-        other.isSaved == isSaved &&
-        other.memoryAt == memoryAt &&
-        other.seenAt == seenAt &&
-        other.showAt == showAt &&
-        other.hideAt == hideAt &&
-        listEquals(other.assets, assets);
-  }
-
-  @override
-  int get hashCode {
-    return id.hashCode ^
-        createdAt.hashCode ^
-        updatedAt.hashCode ^
-        deletedAt.hashCode ^
-        ownerId.hashCode ^
-        type.hashCode ^
-        data.hashCode ^
-        isSaved.hashCode ^
-        memoryAt.hashCode ^
-        seenAt.hashCode ^
-        showAt.hashCode ^
-        hideAt.hashCode ^
-        assets.hashCode;
-  }
-}

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

@@ -3,12 +3,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 enum Setting<T> {
   tilesPerRow<int>(StoreKey.tilesPerRow, 4),
   groupAssetsBy<int>(StoreKey.groupAssetsBy, 0),
-  showStorageIndicator<bool>(StoreKey.storageIndicator, true),
-  loadOriginal<bool>(StoreKey.loadOriginal, false),
-  loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, false),
-  preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),
-  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
-  ;
+  showStorageIndicator<bool>(StoreKey.storageIndicator, true);
 
   const Setting(this.storeKey, this.defaultValue);
 

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

@@ -1,84 +0,0 @@
-import 'dart:convert';
-
-// Model for a stack stored in the server
-class Stack {
-  final String id;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final String ownerId;
-  final String primaryAssetId;
-
-  const Stack({
-    required this.id,
-    required this.createdAt,
-    required this.updatedAt,
-    required this.ownerId,
-    required this.primaryAssetId,
-  });
-
-  Stack copyWith({
-    String? id,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    String? ownerId,
-    String? primaryAssetId,
-  }) {
-    return Stack(
-      id: id ?? this.id,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      ownerId: ownerId ?? this.ownerId,
-      primaryAssetId: primaryAssetId ?? this.primaryAssetId,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'id': id,
-      'createdAt': createdAt.millisecondsSinceEpoch,
-      'updatedAt': updatedAt.millisecondsSinceEpoch,
-      'ownerId': ownerId,
-      'primaryAssetId': primaryAssetId,
-    };
-  }
-
-  factory Stack.fromMap(Map<String, dynamic> map) {
-    return Stack(
-      id: map['id'] as String,
-      createdAt: DateTime.fromMillisecondsSinceEpoch(map['createdAt'] as int),
-      updatedAt: DateTime.fromMillisecondsSinceEpoch(map['updatedAt'] as int),
-      ownerId: map['ownerId'] as String,
-      primaryAssetId: map['primaryAssetId'] as String,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory Stack.fromJson(String source) =>
-      Stack.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() {
-    return 'Stack(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, ownerId: $ownerId, primaryAssetId: $primaryAssetId)';
-  }
-
-  @override
-  bool operator ==(covariant Stack other) {
-    if (identical(this, other)) return true;
-
-    return other.id == id &&
-        other.createdAt == createdAt &&
-        other.updatedAt == updatedAt &&
-        other.ownerId == ownerId &&
-        other.primaryAssetId == primaryAssetId;
-  }
-
-  @override
-  int get hashCode {
-    return id.hashCode ^
-        createdAt.hashCode ^
-        updatedAt.hashCode ^
-        ownerId.hashCode ^
-        primaryAssetId.hashCode;
-  }
-}

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

@@ -1,12 +1,5 @@
 import 'dart:ui';
 
-enum UserMetadataKey {
-  // do not change this order!
-  onboarding,
-  preferences,
-  license,
-}
-
 enum AvatarColor {
   // do not change this order or reuse indices for other purposes, adding is OK
   primary("primary"),
@@ -38,45 +31,7 @@ enum AvatarColor {
       };
 }
 
-class Onboarding {
-  final bool isOnboarded;
-
-  const Onboarding({required this.isOnboarded});
-
-  Onboarding copyWith({bool? isOnboarded}) {
-    return Onboarding(isOnboarded: isOnboarded ?? this.isOnboarded);
-  }
-
-  Map<String, Object?> toMap() {
-    final onboarding = <String, Object?>{};
-    onboarding["isOnboarded"] = isOnboarded;
-    return onboarding;
-  }
-
-  factory Onboarding.fromMap(Map<String, Object?> map) {
-    return Onboarding(isOnboarded: map["isOnboarded"] as bool);
-  }
-
-  @override
-  String toString() {
-    return '''Onboarding {
-isOnboarded: $isOnboarded,
-}''';
-  }
-
-  @override
-  bool operator ==(covariant Onboarding other) {
-    if (identical(this, other)) return true;
-
-    return isOnboarded == other.isOnboarded;
-  }
-
-  @override
-  int get hashCode => isOnboarded.hashCode;
-}
-
-// TODO: wait to be overwritten
-class Preferences {
+class UserPreferences {
   final bool foldersEnabled;
   final bool memoriesEnabled;
   final bool peopleEnabled;
@@ -86,7 +41,7 @@ class Preferences {
   final AvatarColor userAvatarColor;
   final bool showSupportBadge;
 
-  const Preferences({
+  const UserPreferences({
     this.foldersEnabled = false,
     this.memoriesEnabled = true,
     this.peopleEnabled = true,
@@ -97,7 +52,7 @@ class Preferences {
     this.showSupportBadge = true,
   });
 
-  Preferences copyWith({
+  UserPreferences copyWith({
     bool? foldersEnabled,
     bool? memoriesEnabled,
     bool? peopleEnabled,
@@ -107,7 +62,7 @@ class Preferences {
     AvatarColor? userAvatarColor,
     bool? showSupportBadge,
   }) {
-    return Preferences(
+    return UserPreferences(
       foldersEnabled: foldersEnabled ?? this.foldersEnabled,
       memoriesEnabled: memoriesEnabled ?? this.memoriesEnabled,
       peopleEnabled: peopleEnabled ?? this.peopleEnabled,
@@ -132,8 +87,8 @@ class Preferences {
     return preferences;
   }
 
-  factory Preferences.fromMap(Map<String, Object?> map) {
-    return Preferences(
+  factory UserPreferences.fromMap(Map<String, Object?> map) {
+    return UserPreferences(
       foldersEnabled: map["folders-Enabled"] as bool? ?? false,
       memoriesEnabled: map["memories-Enabled"] as bool? ?? true,
       peopleEnabled: map["people-Enabled"] as bool? ?? true,
@@ -147,173 +102,4 @@ class Preferences {
       showSupportBadge: map["purchase-ShowSupportBadge"] as bool? ?? true,
     );
   }
-
-  @override
-  String toString() {
-    return '''Preferences: {
-foldersEnabled: $foldersEnabled,
-memoriesEnabled: $memoriesEnabled,
-peopleEnabled: $peopleEnabled,
-ratingsEnabled: $ratingsEnabled,
-sharedLinksEnabled: $sharedLinksEnabled,
-tagsEnabled: $tagsEnabled,
-userAvatarColor: $userAvatarColor,
-showSupportBadge: $showSupportBadge,
-}''';
-  }
-
-  @override
-  bool operator ==(covariant Preferences other) {
-    if (identical(this, other)) return true;
-
-    return other.foldersEnabled == foldersEnabled &&
-        other.memoriesEnabled == memoriesEnabled &&
-        other.peopleEnabled == peopleEnabled &&
-        other.ratingsEnabled == ratingsEnabled &&
-        other.sharedLinksEnabled == sharedLinksEnabled &&
-        other.tagsEnabled == tagsEnabled &&
-        other.userAvatarColor == userAvatarColor &&
-        other.showSupportBadge == showSupportBadge;
-  }
-
-  @override
-  int get hashCode {
-    return foldersEnabled.hashCode ^
-        memoriesEnabled.hashCode ^
-        peopleEnabled.hashCode ^
-        ratingsEnabled.hashCode ^
-        sharedLinksEnabled.hashCode ^
-        tagsEnabled.hashCode ^
-        userAvatarColor.hashCode ^
-        showSupportBadge.hashCode;
-  }
-}
-
-class License {
-  final DateTime activatedAt;
-  final String activationKey;
-  final String licenseKey;
-
-  const License({
-    required this.activatedAt,
-    required this.activationKey,
-    required this.licenseKey,
-  });
-
-  License copyWith({
-    DateTime? activatedAt,
-    String? activationKey,
-    String? licenseKey,
-  }) {
-    return License(
-      activatedAt: activatedAt ?? this.activatedAt,
-      activationKey: activationKey ?? this.activationKey,
-      licenseKey: licenseKey ?? this.licenseKey,
-    );
-  }
-
-  Map<String, Object?> toMap() {
-    final license = <String, Object?>{};
-    license["activatedAt"] = activatedAt;
-    license["activationKey"] = activationKey;
-    license["licenseKey"] = licenseKey;
-    return license;
-  }
-
-  factory License.fromMap(Map<String, Object?> map) {
-    return License(
-      activatedAt: map["activatedAt"] as DateTime,
-      activationKey: map["activationKey"] as String,
-      licenseKey: map["licenseKey"] as String,
-    );
-  }
-
-  @override
-  String toString() {
-    return '''License {
-activatedAt: $activatedAt,
-activationKey: $activationKey,
-licenseKey: $licenseKey,
-}''';
-  }
-
-  @override
-  bool operator ==(covariant License other) {
-    if (identical(this, other)) return true;
-
-    return activatedAt == other.activatedAt &&
-        activationKey == other.activationKey &&
-        licenseKey == other.licenseKey;
-  }
-
-  @override
-  int get hashCode =>
-      activatedAt.hashCode ^ activationKey.hashCode ^ licenseKey.hashCode;
-}
-
-// Model for a user metadata stored in the server
-class UserMetadata {
-  final String userId;
-  final UserMetadataKey key;
-  final Onboarding? onboarding;
-  final Preferences? preferences;
-  final License? license;
-
-  const UserMetadata({
-    required this.userId,
-    required this.key,
-    this.onboarding,
-    this.preferences,
-    this.license,
-  }) : assert(
-          onboarding != null || preferences != null || license != null,
-          'One of onboarding, preferences and license must be provided',
-        );
-
-  UserMetadata copyWith({
-    String? userId,
-    UserMetadataKey? key,
-    Onboarding? onboarding,
-    Preferences? preferences,
-    License? license,
-  }) {
-    return UserMetadata(
-      userId: userId ?? this.userId,
-      key: key ?? this.key,
-      onboarding: onboarding ?? this.onboarding,
-      preferences: preferences ?? this.preferences,
-      license: license ?? this.license,
-    );
-  }
-
-  @override
-  String toString() {
-    return '''UserMetadata: {
-userId: $userId,
-key: $key,
-onboarding: ${onboarding ?? "<NA>"},
-preferences: ${preferences ?? "<NA>"},
-license: ${license ?? "<NA>"},
-}''';
-  }
-
-  @override
-  bool operator ==(covariant UserMetadata other) {
-    if (identical(this, other)) return true;
-
-    return other.userId == userId &&
-        other.key == key &&
-        other.onboarding == onboarding &&
-        other.preferences == preferences &&
-        other.license == license;
-  }
-
-  @override
-  int get hashCode {
-    return userId.hashCode ^
-        key.hashCode ^
-        onboarding.hashCode ^
-        preferences.hashCode ^
-        license.hashCode;
-  }
 }

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

@@ -1,68 +0,0 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
-import 'package:platform/platform.dart';
-
-class AssetService {
-  final RemoteAssetRepository _remoteAssetRepository;
-  final DriftLocalAssetRepository _localAssetRepository;
-  final Platform _platform;
-
-  const AssetService({
-    required RemoteAssetRepository remoteAssetRepository,
-    required DriftLocalAssetRepository localAssetRepository,
-  })  : _remoteAssetRepository = remoteAssetRepository,
-        _localAssetRepository = localAssetRepository,
-        _platform = const LocalPlatform();
-
-  Stream<BaseAsset?> watchAsset(BaseAsset asset) {
-    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
-    return asset is LocalAsset
-        ? _localAssetRepository.watchAsset(id)
-        : _remoteAssetRepository.watchAsset(id);
-  }
-
-  Future<ExifInfo?> getExif(BaseAsset asset) async {
-    if (!asset.hasRemote) {
-      return null;
-    }
-
-    final id =
-        asset is LocalAsset ? asset.remoteId! : (asset as RemoteAsset).id;
-    return _remoteAssetRepository.getExif(id);
-  }
-
-  Future<double> getAspectRatio(BaseAsset asset) async {
-    bool isFlipped;
-    double? width;
-    double? height;
-
-    if (asset.hasRemote) {
-      final exif = await getExif(asset);
-      isFlipped = ExifDtoConverter.isOrientationFlipped(exif?.orientation);
-      width = exif?.width ?? asset.width?.toDouble();
-      height = exif?.height ?? asset.height?.toDouble();
-    } else if (asset is LocalAsset) {
-      isFlipped = _platform.isAndroid &&
-          (asset.orientation == 90 || asset.orientation == 270);
-      width = asset.width?.toDouble();
-      height = asset.height?.toDouble();
-    } else {
-      isFlipped = false;
-    }
-
-    final orientedWidth = isFlipped ? height : width;
-    final orientedHeight = isFlipped ? width : height;
-    if (orientedWidth != null && orientedHeight != null && orientedHeight > 0) {
-      return orientedWidth / orientedHeight;
-    }
-
-    return 1.0;
-  }
-
-  Future<List<(String, String)>> getPlaces() {
-    return _remoteAssetRepository.getPlaces();
-  }
-}

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

@@ -61,7 +61,7 @@ class HashService {
     final toHash = <_AssetToPath>[];
 
     for (final asset in assetsToHash) {
-      final file = await _storageRepository.getFileForAsset(asset.id);
+      final file = await _storageRepository.getFileForAsset(asset);
       if (file == null) {
         continue;
       }

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

@@ -1,17 +0,0 @@
-import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
-
-class LocalAlbumService {
-  final DriftLocalAlbumRepository _repository;
-
-  const LocalAlbumService(this._repository);
-
-  Future<List<LocalAlbum>> getAll() {
-    return _repository.getAll();
-  }
-
-  Future<LocalAsset?> getThumbnail(String albumId) {
-    return _repository.getThumbnail(albumId);
-  }
-}

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

@@ -359,7 +359,6 @@ extension on Iterable<PlatformAsset> {
         width: e.width,
         height: e.height,
         durationInSeconds: e.durationInSeconds,
-        orientation: e.orientation,
       ),
     ).toList();
   }

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

@@ -1,15 +0,0 @@
-import 'package:immich_mobile/domain/models/memory.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/memory.repository.dart';
-import 'package:logging/logging.dart';
-
-class DriftMemoryService {
-  final log = Logger("DriftMemoryService");
-
-  final DriftMemoryRepository _repository;
-
-  DriftMemoryService(this._repository);
-
-  Future<List<DriftMemory>> getMemoryLane(String ownerId) {
-    return _repository.getAll(ownerId);
-  }
-}

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

@@ -1,43 +1,33 @@
-import 'dart:async';
-
 import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
-import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/utils/remote_album.utils.dart';
 
 class RemoteAlbumService {
   final DriftRemoteAlbumRepository _repository;
-  final DriftAlbumApiRepository _albumApiRepository;
 
-  const RemoteAlbumService(this._repository, this._albumApiRepository);
+  const RemoteAlbumService(this._repository);
 
-  Stream<RemoteAlbum?> watchAlbum(String albumId) {
-    return _repository.watchAlbum(albumId);
-  }
-
-  Future<List<RemoteAlbum>> getAll() {
+  Future<List<Album>> getAll() {
     return _repository.getAll();
   }
 
-  List<RemoteAlbum> sortAlbums(
-    List<RemoteAlbum> albums,
+  List<Album> sortAlbums(
+    List<Album> albums,
     RemoteAlbumSortMode sortMode, {
     bool isReverse = false,
   }) {
     return sortMode.sortFn(albums, isReverse);
   }
 
-  List<RemoteAlbum> searchAlbums(
-    List<RemoteAlbum> albums,
+  List<Album> searchAlbums(
+    List<Album> albums,
     String query,
     String? userId, [
     QuickFilterMode filterMode = QuickFilterMode.all,
   ]) {
     final lowerQuery = query.toLowerCase();
-    List<RemoteAlbum> filtered = albums;
+    List<Album> filtered = albums;
 
     // Apply text search filter
     if (query.isNotEmpty) {
@@ -67,84 +57,4 @@ class RemoteAlbumService {
 
     return filtered;
   }
-
-  Future<RemoteAlbum> createAlbum({
-    required String title,
-    required List<String> assetIds,
-    String? description,
-  }) async {
-    final album = await _albumApiRepository.createDriftAlbum(
-      title,
-      description: description,
-      assetIds: assetIds,
-    );
-
-    await _repository.create(album, assetIds);
-
-    return album;
-  }
-
-  Future<RemoteAlbum> updateAlbum(
-    String albumId, {
-    String? name,
-    String? description,
-    String? thumbnailAssetId,
-    bool? isActivityEnabled,
-    AlbumAssetOrder? order,
-  }) async {
-    final updatedAlbum = await _albumApiRepository.updateAlbum(
-      albumId,
-      name: name,
-      description: description,
-      thumbnailAssetId: thumbnailAssetId,
-      isActivityEnabled: isActivityEnabled,
-      order: order,
-    );
-
-    // Update the local database
-    await _repository.update(updatedAlbum);
-
-    return updatedAlbum;
-  }
-
-  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
-    return _repository.getDateRange(albumId);
-  }
-
-  Future<List<UserDto>> getSharedUsers(String albumId) {
-    return _repository.getSharedUsers(albumId);
-  }
-
-  Future<List<RemoteAsset>> getAssets(String albumId) {
-    return _repository.getAssets(albumId);
-  }
-
-  Future<int> addAssets({
-    required String albumId,
-    required List<String> assetIds,
-  }) async {
-    final album = await _albumApiRepository.addAssets(
-      albumId,
-      assetIds,
-    );
-
-    await _repository.addAssets(albumId, album.added);
-
-    return album.added.length;
-  }
-
-  Future<void> deleteAlbum(String albumId) async {
-    await _albumApiRepository.deleteAlbum(albumId);
-
-    await _repository.deleteAlbum(albumId);
-  }
-
-  Future<void> addUsers({
-    required String albumId,
-    required List<String> userIds,
-  }) async {
-    await _albumApiRepository.addUsers(albumId, userIds);
-
-    return _repository.addUsers(albumId, userIds);
-  }
 }

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

@@ -1,11 +1,6 @@
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 
-// Singleton instance of SettingsService, to use in places
-// where reactivity is not required
-// ignore: non_constant_identifier_names
-final AppSetting = SettingsService(storeService: StoreService.I);
-
 class SettingsService {
   final StoreService _storeService;
 

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

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
-import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
@@ -24,65 +23,7 @@ class SyncStreamService {
 
   bool get isCancelled => _cancelChecker?.call() ?? false;
 
-  Future<void> sync() {
-    _logger.info("Remote sync request for userr");
-    DLog.log("Remote sync request for user");
-    // Start the sync stream and handle events
-    return _syncApiRepository.streamChanges(_handleEvents);
-  }
-
-  Future<void> handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) async {
-    if (batchData.isEmpty) return;
-
-    _logger.info(
-      'Processing batch of ${batchData.length} AssetUploadReadyV1 events',
-    );
-
-    final List<SyncAssetV1> 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 = SyncAssetV1.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.updateAssetsV1(
-          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 AssetUploadReadyV1 websocket batch events",
-        error,
-        stackTrace,
-      );
-    }
-  }
+  Future<void> sync() => _syncApiRepository.streamChanges(_handleEvents);
 
   Future<void> _handleEvents(List<SyncEvent> events, Function() abort) async {
     List<SyncEvent> items = [];
@@ -205,41 +146,6 @@ class SyncStreamService {
       // to acknowledge that the client has processed all the backfill events
       case SyncEntityType.syncAckV1:
         return;
-      case SyncEntityType.memoryV1:
-        return _syncStreamRepository.updateMemoriesV1(data.cast());
-      case SyncEntityType.memoryDeleteV1:
-        return _syncStreamRepository.deleteMemoriesV1(data.cast());
-      case SyncEntityType.memoryToAssetV1:
-        return _syncStreamRepository.updateMemoryAssetsV1(data.cast());
-      case SyncEntityType.memoryToAssetDeleteV1:
-        return _syncStreamRepository.deleteMemoryAssetsV1(data.cast());
-      case SyncEntityType.stackV1:
-        return _syncStreamRepository.updateStacksV1(data.cast());
-      case SyncEntityType.stackDeleteV1:
-        return _syncStreamRepository.deleteStacksV1(data.cast());
-      case SyncEntityType.partnerStackV1:
-        return _syncStreamRepository.updateStacksV1(
-          data.cast(),
-          debugLabel: 'partner',
-        );
-      case SyncEntityType.partnerStackBackfillV1:
-        return _syncStreamRepository.updateStacksV1(
-          data.cast(),
-          debugLabel: 'partner backfill',
-        );
-      case SyncEntityType.partnerStackDeleteV1:
-        return _syncStreamRepository.deleteStacksV1(
-          data.cast(),
-          debugLabel: 'partner',
-        );
-      case SyncEntityType.userMetadataV1:
-        return _syncStreamRepository.updateUserMetadatasV1(
-          data.cast(),
-        );
-      case SyncEntityType.userMetadataDeleteV1:
-        return _syncStreamRepository.deleteUserMetadatasV1(
-          data.cast(),
-        );
       default:
         _logger.warning("Unknown sync data type: $type");
     }

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

@@ -7,7 +7,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 
@@ -18,11 +17,6 @@ typedef TimelineAssetSource = Future<List<BaseAsset>> Function(
 
 typedef TimelineBucketSource = Stream<List<Bucket>> Function();
 
-typedef TimelineQuery = ({
-  TimelineAssetSource assetSource,
-  TimelineBucketSource bucketSource,
-});
-
 class TimelineFactory {
   final DriftTimelineRepository _timelineRepository;
   final SettingsService _settingsService;
@@ -36,95 +30,54 @@ class TimelineFactory {
   GroupAssetsBy get groupBy =>
       GroupAssetsBy.values[_settingsService.get(Setting.groupAssetsBy)];
 
-  TimelineService main(List<String> timelineUsers) =>
-      TimelineService(_timelineRepository.main(timelineUsers, groupBy));
+  TimelineService main(List<String> timelineUsers) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getMainBucketAssets(timelineUsers, offset: offset, count: count),
+        bucketSource: () => _timelineRepository.watchMainBucket(
+          timelineUsers,
+          groupBy: groupBy,
+        ),
+      );
 
-  TimelineService localAlbum({required String albumId}) =>
-      TimelineService(_timelineRepository.localAlbum(albumId, groupBy));
+  TimelineService localAlbum({required String albumId}) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getLocalBucketAssets(albumId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchLocalBucket(albumId, groupBy: groupBy),
+      );
 
-  TimelineService remoteAlbum({required String albumId}) =>
-      TimelineService(_timelineRepository.remoteAlbum(albumId, groupBy));
-
-  TimelineService remoteAssets(String userId) =>
-      TimelineService(_timelineRepository.remote(userId, groupBy));
-
-  TimelineService favorite(String userId) =>
-      TimelineService(_timelineRepository.favorite(userId, groupBy));
-
-  TimelineService trash(String userId) =>
-      TimelineService(_timelineRepository.trash(userId, groupBy));
-
-  TimelineService archive(String userId) =>
-      TimelineService(_timelineRepository.archived(userId, groupBy));
-
-  TimelineService lockedFolder(String userId) =>
-      TimelineService(_timelineRepository.locked(userId, groupBy));
-
-  TimelineService video(String userId) =>
-      TimelineService(_timelineRepository.video(userId, groupBy));
-
-  TimelineService place(String place) =>
-      TimelineService(_timelineRepository.place(place, groupBy));
+  TimelineService remoteAlbum({required String albumId}) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getRemoteBucketAssets(albumId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchRemoteBucket(albumId, groupBy: groupBy),
+      );
 }
 
 class TimelineService {
   final TimelineAssetSource _assetSource;
   final TimelineBucketSource _bucketSource;
+
+  TimelineService({
+    required TimelineAssetSource assetSource,
+    required TimelineBucketSource bucketSource,
+  })  : _assetSource = assetSource,
+        _bucketSource = bucketSource {
+    _bucketSubscription =
+        _bucketSource().listen((_) => unawaited(reloadBucket()));
+  }
+
   final AsyncMutex _mutex = AsyncMutex();
   int _bufferOffset = 0;
   List<BaseAsset> _buffer = [];
   StreamSubscription? _bucketSubscription;
 
-  int _totalAssets = 0;
-  int get totalAssets => _totalAssets;
-
-  TimelineService(TimelineQuery query)
-      : this._(
-          assetSource: query.assetSource,
-          bucketSource: query.bucketSource,
-        );
-
-  TimelineService._({
-    required TimelineAssetSource assetSource,
-    required TimelineBucketSource bucketSource,
-  })  : _assetSource = assetSource,
-        _bucketSource = bucketSource {
-    _bucketSubscription = _bucketSource().listen((buckets) {
-      _mutex.run(() async {
-        final totalAssets =
-            buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
-
-        if (totalAssets == 0) {
-          _bufferOffset = 0;
-          _buffer.clear();
-        } else {
-          final int offset;
-          final int count;
-          // When the buffer is empty or the old bufferOffset is greater than the new total assets,
-          // we need to reset the buffer and load the first batch of assets.
-          if (_bufferOffset >= totalAssets || _buffer.isEmpty) {
-            offset = 0;
-            count = kTimelineAssetLoadBatchSize;
-          } else {
-            offset = _bufferOffset;
-            count = math.min(
-              _buffer.length,
-              totalAssets - _bufferOffset,
-            );
-          }
-          _buffer = await _assetSource(offset, count);
-          _bufferOffset = offset;
-        }
-
-        // change the state's total assets count only after the buffer is reloaded
-        _totalAssets = totalAssets;
-        EventStream.shared.emit(const TimelineReloadEvent());
-      });
-    });
-  }
-
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
 
+  Future<void> reloadBucket() => _mutex.run(() async {
+        _buffer = await _assetSource(_bufferOffset, _buffer.length);
+      });
+
   Future<List<BaseAsset>> loadAssets(int index, int count) =>
       _mutex.run(() => _loadAssets(index, count));
 
@@ -153,18 +106,15 @@ class TimelineService {
           : (len > kTimelineAssetLoadBatchSize ? index : index + count - len),
     );
 
-    _buffer = await _assetSource(start, len);
+    final assets = await _assetSource(start, len);
+    _buffer = assets;
     _bufferOffset = start;
 
     return getAssets(index, count);
   }
 
   bool hasRange(int index, int count) =>
-      index >= 0 &&
-      index < _totalAssets &&
-      index >= _bufferOffset &&
-      index + count <= _bufferOffset + _buffer.length &&
-      index + count <= _totalAssets;
+      index >= _bufferOffset && index + count <= _bufferOffset + _buffer.length;
 
   List<BaseAsset> getAssets(int index, int count) {
     if (!hasRange(index, count)) {
@@ -174,22 +124,6 @@ class TimelineService {
     return _buffer.slice(start, start + count);
   }
 
-  // Pre-cache assets around the given index for asset viewer
-  Future<void> preCacheAssets(int index) =>
-      _mutex.run(() => _loadAssets(index, math.min(5, _totalAssets - index)));
-
-  BaseAsset getRandomAsset() =>
-      _buffer.elementAt(math.Random().nextInt(_buffer.length));
-
-  BaseAsset getAsset(int index) {
-    if (!hasRange(index, 1)) {
-      throw RangeError(
-        'TimelineService::getAsset Index $index not in buffer range [$_bufferOffset, ${_bufferOffset + _buffer.length})',
-      );
-    }
-    return _buffer.elementAt(index - _bufferOffset);
-  }
-
   Future<void> dispose() async {
     await _bucketSubscription?.cancel();
     _bucketSubscription = null;

mobile/lib/domain/utils/background_sync.dart

@@ -6,7 +6,6 @@ import 'package:worker_manager/worker_manager.dart';
 
 class BackgroundSyncManager {
   Cancelable<void>? _syncTask;
-  Cancelable<void>? _syncWebsocketTask;
   Cancelable<void>? _deviceAlbumSyncTask;
   Cancelable<void>? _hashTask;
 
@@ -21,12 +20,6 @@ class BackgroundSyncManager {
     _syncTask?.cancel();
     _syncTask = null;
 
-    if (_syncWebsocketTask != null) {
-      futures.add(_syncWebsocketTask!.future);
-    }
-    _syncWebsocketTask?.cancel();
-    _syncWebsocketTask = null;
-
     return Future.wait(futures);
   }
 
@@ -79,19 +72,4 @@ class BackgroundSyncManager {
       _syncTask = null;
     });
   }
-
-  Future<void> syncWebsocketBatch(List<dynamic> batchData) {
-    if (_syncWebsocketTask != null) {
-      return _syncWebsocketTask!.future;
-    }
-
-    _syncWebsocketTask = runInIsolateGentle(
-      computation: (ref) => ref
-          .read(syncStreamServiceProvider)
-          .handleWsAssetUploadReadyV1Batch(batchData),
-    );
-    return _syncWebsocketTask!.whenComplete(() {
-      _syncWebsocketTask = null;
-    });
-  }
 }

mobile/lib/domain/utils/event_stream.dart

@@ -1,52 +0,0 @@
-import 'dart:async';
-
-sealed class Event {
-  const Event();
-}
-
-class TimelineReloadEvent extends Event {
-  const TimelineReloadEvent();
-}
-
-class ViewerOpenBottomSheetEvent extends Event {
-  const ViewerOpenBottomSheetEvent();
-}
-
-class EventStream {
-  EventStream._();
-
-  static final EventStream shared = EventStream._();
-
-  final StreamController<Event> _controller =
-      StreamController<Event>.broadcast();
-
-  void emit(Event event) {
-    _controller.add(event);
-  }
-
-  Stream<T> where<T extends Event>() {
-    if (T == Event) {
-      return _controller.stream as Stream<T>;
-    }
-    return _controller.stream.where((event) => event is T).cast<T>();
-  }
-
-  StreamSubscription<T> listen<T extends Event>(
-    void Function(T event)? onData, {
-    Function? onError,
-    void Function()? onDone,
-    bool? cancelOnError,
-  }) {
-    return where<T>().listen(
-      onData,
-      onError: onError,
-      onDone: onDone,
-      cancelOnError: cancelOnError,
-    );
-  }
-
-  /// Closes the stream controller
-  void dispose() {
-    _controller.close();
-  }
-}

mobile/lib/extensions/datetime_extensions.dart

@@ -1,6 +1,3 @@
-import 'dart:ui';
-import 'package:easy_localization/easy_localization.dart';
-
 extension TimeAgoExtension on DateTime {
   /// Displays the time difference of this [DateTime] object to the current time as a [String]
   String timeAgo({bool numericDates = true}) {
@@ -38,56 +35,3 @@ extension TimeAgoExtension on DateTime {
     return '${(difference.inDays / 365).floor()} years ago';
   }
 }
-
-/// Extension to format date ranges according to UI requirements
-extension DateRangeFormatting on DateTime {
-  /// Formats a date range according to specific rules:
-  /// - Single date of this year: "Aug 28"
-  /// - Single date of other year: "Aug 28, 2023"
-  /// - Date range of this year: "Mar 23-May 31"
-  /// - Date range of other year: "Aug 28 - Sep 30, 2023"
-  /// - Date range over multiple years: "Apr 17, 2021 - Apr 9, 2022"
-  static String formatDateRange(
-    DateTime startDate,
-    DateTime endDate,
-    Locale? locale,
-  ) {
-    final now = DateTime.now();
-    final currentYear = now.year;
-    final localeString = locale?.toString() ?? 'en_US';
-
-    // Check if it's a single date (same day)
-    if (startDate.year == endDate.year &&
-        startDate.month == endDate.month &&
-        startDate.day == endDate.day) {
-      if (startDate.year == currentYear) {
-        // Single date of this year: "Aug 28"
-        return DateFormat.MMMd(localeString).format(startDate);
-      } else {
-        // Single date of other year: "Aug 28, 2023"
-        return DateFormat.yMMMd(localeString).format(startDate);
-      }
-    }
-
-    // It's a date range
-    if (startDate.year == endDate.year) {
-      // Same year
-      if (startDate.year == currentYear) {
-        // Date range of this year: "Mar 23-May 31"
-        final startFormatted = DateFormat.MMMd(localeString).format(startDate);
-        final endFormatted = DateFormat.MMMd(localeString).format(endDate);
-        return '$startFormatted - $endFormatted';
-      } else {
-        // Date range of other year: "Aug 28 - Sep 30, 2023"
-        final startFormatted = DateFormat.MMMd(localeString).format(startDate);
-        final endFormatted = DateFormat.MMMd(localeString).format(endDate);
-        return '$startFormatted - $endFormatted, ${startDate.year}';
-      }
-    } else {
-      // Date range over multiple years: "Apr 17, 2021 - Apr 9, 2022"
-      final startFormatted = DateFormat.yMMMd(localeString).format(startDate);
-      final endFormatted = DateFormat.yMMMd(localeString).format(endDate);
-      return '$startFormatted - $endFormatted';
-    }
-  }
-}

mobile/lib/extensions/duration_extensions.dart

@@ -3,15 +3,3 @@ extension TZOffsetExtension on Duration {
   String formatAsOffset() =>
       "${isNegative ? '-' : '+'}${inHours.abs().toString().padLeft(2, '0')}:${inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";
 }
-
-extension DurationFormatExtension on Duration {
-  String format() {
-    final seconds = inSeconds.remainder(60).toString().padLeft(2, '0');
-    final minutes = inMinutes.remainder(60).toString().padLeft(2, '0');
-    if (inHours == 0) {
-      return "$minutes:$seconds";
-    }
-    final hours = inHours.toString().padLeft(2, '0');
-    return "$hours:$minutes:$seconds";
-  }
-}

mobile/lib/extensions/scroll_extensions.dart

@@ -11,9 +11,9 @@ class FastScrollPhysics extends ScrollPhysics {
 
   @override
   SpringDescription get spring => const SpringDescription(
-        mass: 1,
-        stiffness: 402.49984375,
-        damping: 40,
+        mass: 40,
+        stiffness: 100,
+        damping: 1,
       );
 }
 
@@ -31,8 +31,8 @@ class FastClampingScrollPhysics extends ClampingScrollPhysics {
         // can briefly be seen and cause a flicker effect if the video begins to initialize
         // before the animation finishes - probably a bug in PhotoViewGallery's animation handling
         // Making the animation faster is not just stylistic, but also helps to avoid this flicker
-        mass: 1,
-        stiffness: 1601.2499609375,
-        damping: 80,
+        mass: 80,
+        stiffness: 100,
+        damping: 1,
       );
 }

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

@@ -1,6 +1,5 @@
 import 'package:drift/drift.dart' hide Query;
 import 'package:immich_mobile/domain/models/exif.model.dart' as domain;
-import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
@@ -133,8 +132,6 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get model => text().nullable()();
 
-  TextColumn get lens => text().nullable()();
-
   TextColumn get orientation => text().nullable()();
 
   TextColumn get timeZone => text().nullable()();
@@ -146,27 +143,3 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {
   @override
   Set<Column> get primaryKey => {assetId};
 }
-
-extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
-  domain.ExifInfo toDto() => domain.ExifInfo(
-        fileSize: fileSize,
-        dateTimeOriginal: dateTimeOriginal,
-        timeZone: timeZone,
-        make: make,
-        model: model,
-        iso: iso,
-        city: city,
-        state: state,
-        country: country,
-        description: description,
-        orientation: orientation,
-        latitude: latitude,
-        longitude: longitude,
-        f: fNumber?.toDouble(),
-        mm: focalLength?.toDouble(),
-        lens: lens,
-        width: width?.toDouble(),
-        height: height?.toDouble(),
-        isFlipped: ExifDtoConverter.isOrientationFlipped(orientation),
-      );
-}

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

@@ -27,7 +27,6 @@ typedef $$RemoteExifEntityTableCreateCompanionBuilder
   i0.Value<int?> iso,
   i0.Value<String?> make,
   i0.Value<String?> model,
-  i0.Value<String?> lens,
   i0.Value<String?> orientation,
   i0.Value<String?> timeZone,
   i0.Value<int?> rating,
@@ -52,7 +51,6 @@ typedef $$RemoteExifEntityTableUpdateCompanionBuilder
   i0.Value<int?> iso,
   i0.Value<String?> make,
   i0.Value<String?> model,
-  i0.Value<String?> lens,
   i0.Value<String?> orientation,
   i0.Value<String?> timeZone,
   i0.Value<int?> rating,
@@ -152,9 +150,6 @@ class $$RemoteExifEntityTableFilterComposer
   i0.ColumnFilters<String> get model => $composableBuilder(
       column: $table.model, builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<String> get lens => $composableBuilder(
-      column: $table.lens, builder: (column) => i0.ColumnFilters(column));
-
   i0.ColumnFilters<String> get orientation => $composableBuilder(
       column: $table.orientation,
       builder: (column) => i0.ColumnFilters(column));
@@ -254,9 +249,6 @@ class $$RemoteExifEntityTableOrderingComposer
   i0.ColumnOrderings<String> get model => $composableBuilder(
       column: $table.model, builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<String> get lens => $composableBuilder(
-      column: $table.lens, builder: (column) => i0.ColumnOrderings(column));
-
   i0.ColumnOrderings<String> get orientation => $composableBuilder(
       column: $table.orientation,
       builder: (column) => i0.ColumnOrderings(column));
@@ -353,9 +345,6 @@ class $$RemoteExifEntityTableAnnotationComposer
   i0.GeneratedColumn<String> get model =>
       $composableBuilder(column: $table.model, builder: (column) => column);
 
-  i0.GeneratedColumn<String> get lens =>
-      $composableBuilder(column: $table.lens, builder: (column) => column);
-
   i0.GeneratedColumn<String> get orientation => $composableBuilder(
       column: $table.orientation, builder: (column) => column);
 
@@ -435,7 +424,6 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             i0.Value<int?> iso = const i0.Value.absent(),
             i0.Value<String?> make = const i0.Value.absent(),
             i0.Value<String?> model = const i0.Value.absent(),
-            i0.Value<String?> lens = const i0.Value.absent(),
             i0.Value<String?> orientation = const i0.Value.absent(),
             i0.Value<String?> timeZone = const i0.Value.absent(),
             i0.Value<int?> rating = const i0.Value.absent(),
@@ -459,7 +447,6 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             iso: iso,
             make: make,
             model: model,
-            lens: lens,
             orientation: orientation,
             timeZone: timeZone,
             rating: rating,
@@ -483,7 +470,6 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             i0.Value<int?> iso = const i0.Value.absent(),
             i0.Value<String?> make = const i0.Value.absent(),
             i0.Value<String?> model = const i0.Value.absent(),
-            i0.Value<String?> lens = const i0.Value.absent(),
             i0.Value<String?> orientation = const i0.Value.absent(),
             i0.Value<String?> timeZone = const i0.Value.absent(),
             i0.Value<int?> rating = const i0.Value.absent(),
@@ -507,7 +493,6 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             iso: iso,
             make: make,
             model: model,
-            lens: lens,
             orientation: orientation,
             timeZone: timeZone,
             rating: rating,
@@ -681,12 +666,6 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
   late final i0.GeneratedColumn<String> model = i0.GeneratedColumn<String>(
       'model', aliasedName, true,
       type: i0.DriftSqlType.string, requiredDuringInsert: false);
-  static const i0.VerificationMeta _lensMeta =
-      const i0.VerificationMeta('lens');
-  @override
-  late final i0.GeneratedColumn<String> lens = i0.GeneratedColumn<String>(
-      'lens', aliasedName, true,
-      type: i0.DriftSqlType.string, requiredDuringInsert: false);
   static const i0.VerificationMeta _orientationMeta =
       const i0.VerificationMeta('orientation');
   @override
@@ -730,7 +709,6 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
         iso,
         make,
         model,
-        lens,
         orientation,
         timeZone,
         rating,
@@ -825,10 +803,6 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
       context.handle(
           _modelMeta, model.isAcceptableOrUnknown(data['model']!, _modelMeta));
     }
-    if (data.containsKey('lens')) {
-      context.handle(
-          _lensMeta, lens.isAcceptableOrUnknown(data['lens']!, _lensMeta));
-    }
     if (data.containsKey('orientation')) {
       context.handle(
           _orientationMeta,
@@ -894,8 +868,6 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
           .read(i0.DriftSqlType.string, data['${effectivePrefix}make']),
       model: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.string, data['${effectivePrefix}model']),
-      lens: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}lens']),
       orientation: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.string, data['${effectivePrefix}orientation']),
       timeZone: attachedDatabase.typeMapping
@@ -937,7 +909,6 @@ class RemoteExifEntityData extends i0.DataClass
   final int? iso;
   final String? make;
   final String? model;
-  final String? lens;
   final String? orientation;
   final String? timeZone;
   final int? rating;
@@ -960,7 +931,6 @@ class RemoteExifEntityData extends i0.DataClass
       this.iso,
       this.make,
       this.model,
-      this.lens,
       this.orientation,
       this.timeZone,
       this.rating,
@@ -1017,9 +987,6 @@ class RemoteExifEntityData extends i0.DataClass
     if (!nullToAbsent || model != null) {
       map['model'] = i0.Variable<String>(model);
     }
-    if (!nullToAbsent || lens != null) {
-      map['lens'] = i0.Variable<String>(lens);
-    }
     if (!nullToAbsent || orientation != null) {
       map['orientation'] = i0.Variable<String>(orientation);
     }
@@ -1057,7 +1024,6 @@ class RemoteExifEntityData extends i0.DataClass
       iso: serializer.fromJson<int?>(json['iso']),
       make: serializer.fromJson<String?>(json['make']),
       model: serializer.fromJson<String?>(json['model']),
-      lens: serializer.fromJson<String?>(json['lens']),
       orientation: serializer.fromJson<String?>(json['orientation']),
       timeZone: serializer.fromJson<String?>(json['timeZone']),
       rating: serializer.fromJson<int?>(json['rating']),
@@ -1085,7 +1051,6 @@ class RemoteExifEntityData extends i0.DataClass
       'iso': serializer.toJson<int?>(iso),
       'make': serializer.toJson<String?>(make),
       'model': serializer.toJson<String?>(model),
-      'lens': serializer.toJson<String?>(lens),
       'orientation': serializer.toJson<String?>(orientation),
       'timeZone': serializer.toJson<String?>(timeZone),
       'rating': serializer.toJson<int?>(rating),
@@ -1111,7 +1076,6 @@ class RemoteExifEntityData extends i0.DataClass
           i0.Value<int?> iso = const i0.Value.absent(),
           i0.Value<String?> make = const i0.Value.absent(),
           i0.Value<String?> model = const i0.Value.absent(),
-          i0.Value<String?> lens = const i0.Value.absent(),
           i0.Value<String?> orientation = const i0.Value.absent(),
           i0.Value<String?> timeZone = const i0.Value.absent(),
           i0.Value<int?> rating = const i0.Value.absent(),
@@ -1137,7 +1101,6 @@ class RemoteExifEntityData extends i0.DataClass
         iso: iso.present ? iso.value : this.iso,
         make: make.present ? make.value : this.make,
         model: model.present ? model.value : this.model,
-        lens: lens.present ? lens.value : this.lens,
         orientation: orientation.present ? orientation.value : this.orientation,
         timeZone: timeZone.present ? timeZone.value : this.timeZone,
         rating: rating.present ? rating.value : this.rating,
@@ -1169,7 +1132,6 @@ class RemoteExifEntityData extends i0.DataClass
       iso: data.iso.present ? data.iso.value : this.iso,
       make: data.make.present ? data.make.value : this.make,
       model: data.model.present ? data.model.value : this.model,
-      lens: data.lens.present ? data.lens.value : this.lens,
       orientation:
           data.orientation.present ? data.orientation.value : this.orientation,
       timeZone: data.timeZone.present ? data.timeZone.value : this.timeZone,
@@ -1200,7 +1162,6 @@ class RemoteExifEntityData extends i0.DataClass
           ..write('iso: $iso, ')
           ..write('make: $make, ')
           ..write('model: $model, ')
-          ..write('lens: $lens, ')
           ..write('orientation: $orientation, ')
           ..write('timeZone: $timeZone, ')
           ..write('rating: $rating, ')
@@ -1228,7 +1189,6 @@ class RemoteExifEntityData extends i0.DataClass
         iso,
         make,
         model,
-        lens,
         orientation,
         timeZone,
         rating,
@@ -1255,7 +1215,6 @@ class RemoteExifEntityData extends i0.DataClass
           other.iso == this.iso &&
           other.make == this.make &&
           other.model == this.model &&
-          other.lens == this.lens &&
           other.orientation == this.orientation &&
           other.timeZone == this.timeZone &&
           other.rating == this.rating &&
@@ -1281,7 +1240,6 @@ class RemoteExifEntityCompanion
   final i0.Value<int?> iso;
   final i0.Value<String?> make;
   final i0.Value<String?> model;
-  final i0.Value<String?> lens;
   final i0.Value<String?> orientation;
   final i0.Value<String?> timeZone;
   final i0.Value<int?> rating;
@@ -1304,7 +1262,6 @@ class RemoteExifEntityCompanion
     this.iso = const i0.Value.absent(),
     this.make = const i0.Value.absent(),
     this.model = const i0.Value.absent(),
-    this.lens = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
     this.timeZone = const i0.Value.absent(),
     this.rating = const i0.Value.absent(),
@@ -1328,7 +1285,6 @@ class RemoteExifEntityCompanion
     this.iso = const i0.Value.absent(),
     this.make = const i0.Value.absent(),
     this.model = const i0.Value.absent(),
-    this.lens = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
     this.timeZone = const i0.Value.absent(),
     this.rating = const i0.Value.absent(),
@@ -1352,7 +1308,6 @@ class RemoteExifEntityCompanion
     i0.Expression<int>? iso,
     i0.Expression<String>? make,
     i0.Expression<String>? model,
-    i0.Expression<String>? lens,
     i0.Expression<String>? orientation,
     i0.Expression<String>? timeZone,
     i0.Expression<int>? rating,
@@ -1376,7 +1331,6 @@ class RemoteExifEntityCompanion
       if (iso != null) 'iso': iso,
       if (make != null) 'make': make,
       if (model != null) 'model': model,
-      if (lens != null) 'lens': lens,
       if (orientation != null) 'orientation': orientation,
       if (timeZone != null) 'time_zone': timeZone,
       if (rating != null) 'rating': rating,
@@ -1402,7 +1356,6 @@ class RemoteExifEntityCompanion
       i0.Value<int?>? iso,
       i0.Value<String?>? make,
       i0.Value<String?>? model,
-      i0.Value<String?>? lens,
       i0.Value<String?>? orientation,
       i0.Value<String?>? timeZone,
       i0.Value<int?>? rating,
@@ -1425,7 +1378,6 @@ class RemoteExifEntityCompanion
       iso: iso ?? this.iso,
       make: make ?? this.make,
       model: model ?? this.model,
-      lens: lens ?? this.lens,
       orientation: orientation ?? this.orientation,
       timeZone: timeZone ?? this.timeZone,
       rating: rating ?? this.rating,
@@ -1487,9 +1439,6 @@ class RemoteExifEntityCompanion
     if (model.present) {
       map['model'] = i0.Variable<String>(model.value);
     }
-    if (lens.present) {
-      map['lens'] = i0.Variable<String>(lens.value);
-    }
     if (orientation.present) {
       map['orientation'] = i0.Variable<String>(orientation.value);
     }
@@ -1525,7 +1474,6 @@ class RemoteExifEntityCompanion
           ..write('iso: $iso, ')
           ..write('make: $make, ')
           ..write('model: $model, ')
-          ..write('lens: $lens, ')
           ..write('orientation: $orientation, ')
           ..write('timeZone: $timeZone, ')
           ..write('rating: $rating, ')

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

@@ -14,8 +14,6 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
   // Only used during backup to mirror the favorite status of the asset in the server
   BoolColumn get isFavorite => boolean().withDefault(const Constant(false))();
 
-  IntColumn get orientation => integer().withDefault(const Constant(0))();
-
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -30,9 +28,5 @@ extension LocalAssetEntityDataDomainEx on LocalAssetEntityData {
         updatedAt: updatedAt,
         durationInSeconds: durationInSeconds,
         isFavorite: isFavorite,
-        height: height,
-        width: width,
-        remoteId: null,
-        orientation: orientation,
       );
 }

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

@@ -20,7 +20,6 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder
   required String id,
   i0.Value<String?> checksum,
   i0.Value<bool> isFavorite,
-  i0.Value<int> orientation,
 });
 typedef $$LocalAssetEntityTableUpdateCompanionBuilder
     = i1.LocalAssetEntityCompanion Function({
@@ -34,7 +33,6 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder
   i0.Value<String> id,
   i0.Value<String?> checksum,
   i0.Value<bool> isFavorite,
-  i0.Value<int> orientation,
 });
 
 class $$LocalAssetEntityTableFilterComposer
@@ -78,10 +76,6 @@ class $$LocalAssetEntityTableFilterComposer
 
   i0.ColumnFilters<bool> get isFavorite => $composableBuilder(
       column: $table.isFavorite, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<int> get orientation => $composableBuilder(
-      column: $table.orientation,
-      builder: (column) => i0.ColumnFilters(column));
 }
 
 class $$LocalAssetEntityTableOrderingComposer
@@ -126,10 +120,6 @@ class $$LocalAssetEntityTableOrderingComposer
   i0.ColumnOrderings<bool> get isFavorite => $composableBuilder(
       column: $table.isFavorite,
       builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<int> get orientation => $composableBuilder(
-      column: $table.orientation,
-      builder: (column) => i0.ColumnOrderings(column));
 }
 
 class $$LocalAssetEntityTableAnnotationComposer
@@ -170,9 +160,6 @@ class $$LocalAssetEntityTableAnnotationComposer
 
   i0.GeneratedColumn<bool> get isFavorite => $composableBuilder(
       column: $table.isFavorite, builder: (column) => column);
-
-  i0.GeneratedColumn<int> get orientation => $composableBuilder(
-      column: $table.orientation, builder: (column) => column);
 }
 
 class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
@@ -214,7 +201,6 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             i0.Value<String> id = const i0.Value.absent(),
             i0.Value<String?> checksum = const i0.Value.absent(),
             i0.Value<bool> isFavorite = const i0.Value.absent(),
-            i0.Value<int> orientation = const i0.Value.absent(),
           }) =>
               i1.LocalAssetEntityCompanion(
             name: name,
@@ -227,7 +213,6 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             id: id,
             checksum: checksum,
             isFavorite: isFavorite,
-            orientation: orientation,
           ),
           createCompanionCallback: ({
             required String name,
@@ -240,7 +225,6 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             required String id,
             i0.Value<String?> checksum = const i0.Value.absent(),
             i0.Value<bool> isFavorite = const i0.Value.absent(),
-            i0.Value<int> orientation = const i0.Value.absent(),
           }) =>
               i1.LocalAssetEntityCompanion.insert(
             name: name,
@@ -253,7 +237,6 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             id: id,
             checksum: checksum,
             isFavorite: isFavorite,
-            orientation: orientation,
           ),
           withReferenceMapper: (p0) => p0
               .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -354,14 +337,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
       defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
           'CHECK ("is_favorite" IN (0, 1))'),
       defaultValue: const i4.Constant(false));
-  static const i0.VerificationMeta _orientationMeta =
-      const i0.VerificationMeta('orientation');
-  @override
-  late final i0.GeneratedColumn<int> orientation = i0.GeneratedColumn<int>(
-      'orientation', aliasedName, false,
-      type: i0.DriftSqlType.int,
-      requiredDuringInsert: false,
-      defaultValue: const i4.Constant(0));
   @override
   List<i0.GeneratedColumn> get $columns => [
         name,
@@ -373,8 +348,7 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
         durationInSeconds,
         id,
         checksum,
-        isFavorite,
-        orientation
+        isFavorite
       ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -430,12 +404,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
           isFavorite.isAcceptableOrUnknown(
               data['is_favorite']!, _isFavoriteMeta));
     }
-    if (data.containsKey('orientation')) {
-      context.handle(
-          _orientationMeta,
-          orientation.isAcceptableOrUnknown(
-              data['orientation']!, _orientationMeta));
-    }
     return context;
   }
 
@@ -467,8 +435,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
           .read(i0.DriftSqlType.string, data['${effectivePrefix}checksum']),
       isFavorite: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.bool, data['${effectivePrefix}is_favorite'])!,
-      orientation: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}orientation'])!,
     );
   }
 
@@ -497,7 +463,6 @@ class LocalAssetEntityData extends i0.DataClass
   final String id;
   final String? checksum;
   final bool isFavorite;
-  final int orientation;
   const LocalAssetEntityData(
       {required this.name,
       required this.type,
@@ -508,8 +473,7 @@ class LocalAssetEntityData extends i0.DataClass
       this.durationInSeconds,
       required this.id,
       this.checksum,
-      required this.isFavorite,
-      required this.orientation});
+      required this.isFavorite});
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
     final map = <String, i0.Expression>{};
@@ -534,7 +498,6 @@ class LocalAssetEntityData extends i0.DataClass
       map['checksum'] = i0.Variable<String>(checksum);
     }
     map['is_favorite'] = i0.Variable<bool>(isFavorite);
-    map['orientation'] = i0.Variable<int>(orientation);
     return map;
   }
 
@@ -553,7 +516,6 @@ class LocalAssetEntityData extends i0.DataClass
       id: serializer.fromJson<String>(json['id']),
       checksum: serializer.fromJson<String?>(json['checksum']),
       isFavorite: serializer.fromJson<bool>(json['isFavorite']),
-      orientation: serializer.fromJson<int>(json['orientation']),
     );
   }
   @override
@@ -571,7 +533,6 @@ class LocalAssetEntityData extends i0.DataClass
       'id': serializer.toJson<String>(id),
       'checksum': serializer.toJson<String?>(checksum),
       'isFavorite': serializer.toJson<bool>(isFavorite),
-      'orientation': serializer.toJson<int>(orientation),
     };
   }
 
@@ -585,8 +546,7 @@ class LocalAssetEntityData extends i0.DataClass
           i0.Value<int?> durationInSeconds = const i0.Value.absent(),
           String? id,
           i0.Value<String?> checksum = const i0.Value.absent(),
-          bool? isFavorite,
-          int? orientation}) =>
+          bool? isFavorite}) =>
       i1.LocalAssetEntityData(
         name: name ?? this.name,
         type: type ?? this.type,
@@ -600,7 +560,6 @@ class LocalAssetEntityData extends i0.DataClass
         id: id ?? this.id,
         checksum: checksum.present ? checksum.value : this.checksum,
         isFavorite: isFavorite ?? this.isFavorite,
-        orientation: orientation ?? this.orientation,
       );
   LocalAssetEntityData copyWithCompanion(i1.LocalAssetEntityCompanion data) {
     return LocalAssetEntityData(
@@ -617,8 +576,6 @@ class LocalAssetEntityData extends i0.DataClass
       checksum: data.checksum.present ? data.checksum.value : this.checksum,
       isFavorite:
           data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
-      orientation:
-          data.orientation.present ? data.orientation.value : this.orientation,
     );
   }
 
@@ -634,15 +591,14 @@ class LocalAssetEntityData extends i0.DataClass
           ..write('durationInSeconds: $durationInSeconds, ')
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
-          ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation')
+          ..write('isFavorite: $isFavorite')
           ..write(')'))
         .toString();
   }
 
   @override
   int get hashCode => Object.hash(name, type, createdAt, updatedAt, width,
-      height, durationInSeconds, id, checksum, isFavorite, orientation);
+      height, durationInSeconds, id, checksum, isFavorite);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -656,8 +612,7 @@ class LocalAssetEntityData extends i0.DataClass
           other.durationInSeconds == this.durationInSeconds &&
           other.id == this.id &&
           other.checksum == this.checksum &&
-          other.isFavorite == this.isFavorite &&
-          other.orientation == this.orientation);
+          other.isFavorite == this.isFavorite);
 }
 
 class LocalAssetEntityCompanion
@@ -672,7 +627,6 @@ class LocalAssetEntityCompanion
   final i0.Value<String> id;
   final i0.Value<String?> checksum;
   final i0.Value<bool> isFavorite;
-  final i0.Value<int> orientation;
   const LocalAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -684,7 +638,6 @@ class LocalAssetEntityCompanion
     this.id = const i0.Value.absent(),
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
-    this.orientation = const i0.Value.absent(),
   });
   LocalAssetEntityCompanion.insert({
     required String name,
@@ -697,7 +650,6 @@ class LocalAssetEntityCompanion
     required String id,
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
-    this.orientation = const i0.Value.absent(),
   })  : name = i0.Value(name),
         type = i0.Value(type),
         id = i0.Value(id);
@@ -712,7 +664,6 @@ class LocalAssetEntityCompanion
     i0.Expression<String>? id,
     i0.Expression<String>? checksum,
     i0.Expression<bool>? isFavorite,
-    i0.Expression<int>? orientation,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -725,7 +676,6 @@ class LocalAssetEntityCompanion
       if (id != null) 'id': id,
       if (checksum != null) 'checksum': checksum,
       if (isFavorite != null) 'is_favorite': isFavorite,
-      if (orientation != null) 'orientation': orientation,
     });
   }
 
@@ -739,8 +689,7 @@ class LocalAssetEntityCompanion
       i0.Value<int?>? durationInSeconds,
       i0.Value<String>? id,
       i0.Value<String?>? checksum,
-      i0.Value<bool>? isFavorite,
-      i0.Value<int>? orientation}) {
+      i0.Value<bool>? isFavorite}) {
     return i1.LocalAssetEntityCompanion(
       name: name ?? this.name,
       type: type ?? this.type,
@@ -752,7 +701,6 @@ class LocalAssetEntityCompanion
       id: id ?? this.id,
       checksum: checksum ?? this.checksum,
       isFavorite: isFavorite ?? this.isFavorite,
-      orientation: orientation ?? this.orientation,
     );
   }
 
@@ -790,9 +738,6 @@ class LocalAssetEntityCompanion
     if (isFavorite.present) {
       map['is_favorite'] = i0.Variable<bool>(isFavorite.value);
     }
-    if (orientation.present) {
-      map['orientation'] = i0.Variable<int>(orientation.value);
-    }
     return map;
   }
 
@@ -808,8 +753,7 @@ class LocalAssetEntityCompanion
           ..write('durationInSeconds: $durationInSeconds, ')
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
-          ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation')
+          ..write('isFavorite: $isFavorite')
           ..write(')'))
         .toString();
   }