set limits

.dockerignore

@@ -1,31 +1,30 @@
 .vscode/
-.github/
-.git/
 
 design/
 docker/
 docs/
-e2e/
 fastlane/
 machine-learning/
 misc/
 mobile/
 
-cli/coverage/
-cli/dist/
-cli/node_modules/
-
-open-api/typescript-sdk/build/
-open-api/typescript-sdk/node_modules/
-
-server/coverage/
 server/node_modules/
+server/coverage/
+server/.reverse-geocoding-dump/
 server/upload/
 server/dist/
-server/www/
-server/test/assets/
 
 web/node_modules/
 web/coverage/
 web/.svelte-kit
 web/build/
+
+cli/node_modules/
+cli/.reverse-geocoding-dump/
+cli/upload/
+cli/dist/
+
+e2e/
+
+open-api/typescript-sdk/node_modules/
+open-api/typescript-sdk/build/

.editorconfig

@@ -16,4 +16,4 @@ max_line_length = off
 trim_trailing_whitespace = false
 
 [*.{yml,yaml}]
-quote_type = single
+quote_type = double

.gitattributes

@@ -8,6 +8,8 @@ mobile/openapi/.openapi-generator/FILES linguist-generated=true
 mobile/lib/**/*.g.dart -diff -merge
 mobile/lib/**/*.g.dart linguist-generated=true
 
+open-api/typescript-sdk/axios-client/**/* -diff -merge
+open-api/typescript-sdk/axios-client/**/* linguist-generated=true
 open-api/typescript-sdk/fetch-client.ts -diff -merge
 open-api/typescript-sdk/fetch-client.ts linguist-generated=true
 

.github/workflows/test.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: Run e2e tests
         run: make server-e2e-jobs
@@ -184,7 +184,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -194,40 +194,25 @@ jobs:
       - name: Run setup typescript-sdk
         run: npm ci && npm run build
         working-directory: ./open-api/typescript-sdk
-        if: ${{ !cancelled() }}
 
       - name: Run setup cli
         run: npm ci && npm run build
         working-directory: ./cli
-        if: ${{ !cancelled() }}
 
       - name: Install dependencies
         run: npm ci
-        if: ${{ !cancelled() }}
-
-      - name: Run linter
-        run: npm run lint
-        if: ${{ !cancelled() }}
-
-      - name: Run formatter
-        run: npm run format
-        if: ${{ !cancelled() }}
 
       - name: Install Playwright Browsers
-        run: npx playwright install --with-deps chromium
-        if: ${{ !cancelled() }}
+        run: npx playwright install --with-deps
 
       - name: Docker build
         run: docker compose build
-        if: ${{ !cancelled() }}
 
       - name: Run e2e tests (api & cli)
         run: npm run test
-        if: ${{ !cancelled() }}
 
       - name: Run e2e tests (web)
         run: npx playwright test
-        if: ${{ !cancelled() }}
 
   mobile-unit-tests:
     name: Mobile
@@ -237,8 +222,8 @@ jobs:
       - name: Setup Flutter SDK
         uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
-          flutter-version: '3.16.9'
+          channel: "stable"
+          flutter-version: "3.16.9"
       - name: Run tests
         working-directory: ./mobile
         run: flutter test -j 1
@@ -256,7 +241,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.11
-          cache: 'poetry'
+          cache: "poetry"
       - name: Install dependencies
         run: |
           poetry install --with dev --with cpu
@@ -294,7 +279,7 @@ jobs:
       - name: Run API generation
         run: make open-api
       - name: Find file changes
-        uses: tj-actions/verify-changed-files@v19
+        uses: tj-actions/verify-changed-files@v18
         id: verify-changed-files
         with:
           files: |
@@ -349,7 +334,7 @@ jobs:
         run: npm run typeorm:migrations:generate ./src/infra/migrations/TestMigration
 
       - name: Find file changes
-        uses: tj-actions/verify-changed-files@v19
+        uses: tj-actions/verify-changed-files@v18
         id: verify-changed-files
         with:
           files: |
@@ -367,7 +352,7 @@ jobs:
           DB_URL: postgres://postgres:postgres@localhost:5432/immich
 
       - name: Find file changes
-        uses: tj-actions/verify-changed-files@v19
+        uses: tj-actions/verify-changed-files@v18
         id: verify-changed-sql-files
         with:
           files: |

cli/package.json

@@ -14,6 +14,7 @@
   ],
   "devDependencies": {
     "@immich/sdk": "file:../open-api/typescript-sdk",
+    "@testcontainers/postgresql": "^10.7.1",
     "@types/byte-size": "^8.1.0",
     "@types/cli-progress": "^3.11.0",
     "@types/lodash-es": "^4.17.12",

cli/src/services/session.service.ts

@@ -3,7 +3,6 @@ import { access, constants, mkdir, readFile, unlink, writeFile } from 'node:fs/p
 import path from 'node:path';
 import yaml from 'yaml';
 import { ImmichApi } from './api.service';
-
 class LoginError extends Error {
   constructor(message: string) {
     super(message);
@@ -15,11 +14,13 @@ class LoginError extends Error {
 }
 
 export class SessionService {
-  private get authPath() {
-    return path.join(this.configDirectory, '/auth.yml');
-  }
+  readonly configDirectory!: string;
+  readonly authPath!: string;
 
-  constructor(private configDirectory: string) {}
+  constructor(configDirectory: string) {
+    this.configDirectory = configDirectory;
+    this.authPath = path.join(configDirectory, '/auth.yml');
+  }
 
   async connect(): Promise<ImmichApi> {
     let instanceUrl = process.env.IMMICH_INSTANCE_URL;
@@ -47,8 +48,6 @@ export class SessionService {
       }
     }
 
-    instanceUrl = await this.resolveApiEndpoint(instanceUrl);
-
     const api = new ImmichApi(instanceUrl, apiKey);
 
     const pingResponse = await api.pingServer().catch((error) => {
@@ -63,9 +62,7 @@ export class SessionService {
   }
 
   async login(instanceUrl: string, apiKey: string): Promise<ImmichApi> {
-    console.log(`Logging in to ${instanceUrl}`);
-
-    instanceUrl = await this.resolveApiEndpoint(instanceUrl);
+    console.log('Logging in...');
 
     const api = new ImmichApi(instanceUrl, apiKey);
 
@@ -86,7 +83,7 @@ export class SessionService {
 
     await writeFile(this.authPath, yaml.stringify({ instanceUrl, apiKey }), { mode: 0o600 });
 
-    console.log(`Wrote auth info to ${this.authPath}`);
+    console.log('Wrote auth info to ' + this.authPath);
 
     return api;
   }
@@ -101,18 +98,4 @@ export class SessionService {
 
     console.log('Successfully logged out');
   }
-
-  private async resolveApiEndpoint(instanceUrl: string): Promise<string> {
-    const wellKnownUrl = new URL('.well-known/immich', instanceUrl);
-    try {
-      const wellKnown = await fetch(wellKnownUrl).then((response) => response.json());
-      const endpoint = new URL(wellKnown.api.endpoint, instanceUrl).toString();
-      if (endpoint !== instanceUrl) {
-        console.debug(`Discovered API at ${endpoint}`);
-      }
-      return endpoint;
-    } catch {
-      return instanceUrl;
-    }
-  }
 }

docker/docker-compose.dev.yml

@@ -2,7 +2,7 @@
 # - https://immich.app/docs/developer/setup
 # - https://immich.app/docs/developer/troubleshooting
 
-version: '3.8'
+version: "3.8"
 
 name: immich-dev
 
@@ -30,7 +30,7 @@ x-server-build: &server-common
 services:
   immich-server:
     container_name: immich_server
-    command: ['/usr/src/app/bin/immich-dev', 'immich']
+    command: [ "/usr/src/app/bin/immich-dev", "immich" ]
     <<: *server-common
     ports:
       - 3001:3001
@@ -41,7 +41,7 @@ services:
 
   immich-microservices:
     container_name: immich_microservices
-    command: ['/usr/src/app/bin/immich-dev', 'microservices']
+    command: [ "/usr/src/app/bin/immich-dev", "microservices" ]
     <<: *server-common
     # extends:
     #   file: hwaccel.transcoding.yml
@@ -57,7 +57,7 @@ services:
     image: immich-web-dev:latest
     build:
       context: ../web
-    command: ['/usr/src/app/bin/immich-web']
+    command: [ "/usr/src/app/bin/immich-web" ]
     env_file:
       - .env
     ports:

docker/docker-compose.prod.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 name: immich-prod
 
@@ -17,7 +17,7 @@ x-server-build: &server-common
 services:
   immich-server:
     container_name: immich_server
-    command: ['start.sh', 'immich']
+    command: [ "start.sh", "immich" ]
     <<: *server-common
     ports:
       - 2283:3001
@@ -27,7 +27,7 @@ services:
 
   immich-microservices:
     container_name: immich_microservices
-    command: ['start.sh', 'microservices']
+    command: [ "start.sh", "microservices" ]
     <<: *server-common
     # extends:
     #   file: hwaccel.transcoding.yml

docker/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 #
 # WARNING: Make sure to use the docker-compose.yml of the current release:
@@ -14,7 +14,7 @@ services:
   immich-server:
     container_name: immich_server
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
-    command: ['start.sh', 'immich']
+    command: [ "start.sh", "immich" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
@@ -33,7 +33,7 @@ services:
     # extends: # uncomment this section for hardware acceleration - see https://immich.app/docs/features/hardware-transcoding
     #   file: hwaccel.transcoding.yml
     #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
-    command: ['start.sh', 'microservices']
+    command: [ "start.sh", "microservices" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
@@ -60,12 +60,12 @@ services:
 
   redis:
     container_name: immich_redis
-    image: registry.hub.docker.com/library/redis:6.2-alpine@sha256:51d6c56749a4243096327e3fb964a48ed92254357108449cb6e23999c37773c5
+    image: redis:6.2-alpine@sha256:51d6c56749a4243096327e3fb964a48ed92254357108449cb6e23999c37773c5
     restart: always
 
   database:
     container_name: immich_postgres
-    image: registry.hub.docker.com/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
+    image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USERNAME}

docs/docs/administration/oauth.md

@@ -67,11 +67,9 @@ Once you have a new OAuth client application configured, Immich can be configure
 | Client Secret                                        | string  | (required)           | Required. Client Secret (previous step)                                             |
 | 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                                          |
-| 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                                                |
 | Auto Register                                        | boolean | true                 | When true, will automatically register a user the first time they sign in           |
+| Storage Claim                                        | string  | preferred_username   | Claim mapping for the user's storage label                                          |
 | [Auto Launch](#auto-launch)                          | boolean | false                | When true, will skip the login page and automatically start the OAuth login process |
 | [Mobile Redirect URI Override](#mobile-redirect-uri) | URL     | (empty)              | Http(s) alternative mobile redirect URI                                             |
 

docs/docs/features/libraries.md

@@ -88,7 +88,10 @@ Some basic examples:
 
 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. Deleted assets are, as always, marked as offline and can be removed with the "Remove offline files" button.
 
-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.
+If your photos are on a network drive you will likely have to enable filesystem polling. The performance hit for polling large libraries is currently unknown, feel free to test this feature and report back. In addition to the boolean feature flag, the configuration file allows customization of the following parameters, please see the [chokidar documentation](https://github.com/paulmillr/chokidar?tab=readme-ov-file#performance) for reference.
+
+- `usePolling` (default: `false`).
+- `interval`. (default: 10000). When using polling, this is how often (in milliseconds) the filesystem is polled.
 
 ### Nightly job
 

docs/docs/install/config-file.md

@@ -95,16 +95,13 @@ The default configuration looks like this:
     "issuerUrl": "",
     "clientId": "",
     "clientSecret": "",
+    "mobileOverrideEnabled": false,
+    "mobileRedirectUri": "",
     "scope": "openid email profile",
-    "signingAlgorithm": "RS256",
     "storageLabelClaim": "preferred_username",
-    "storageQuotaClaim": "immich_quota",
-    "defaultStorageQuota": 0,
     "buttonText": "Login with OAuth",
     "autoRegister": true,
-    "autoLaunch": false,
-    "mobileOverrideEnabled": false,
-    "mobileRedirectUri": ""
+    "autoLaunch": false
   },
   "passwordLogin": {
     "enabled": true

docs/docs/install/environment-variables.md

@@ -67,7 +67,7 @@ These environment variables are used by the `docker-compose.yml` file and do **N
 | `DB_PORT`                           | Database Port                                                 |    `5432`    | server, microservices |
 | `DB_USERNAME`                       | Database User                                                 |  `postgres`  | server, microservices |
 | `DB_PASSWORD`                       | Database Password                                             |  `postgres`  | server, microservices |
-| `DB_DATABASE_NAME`                  | Database Name                                                 |   `immich`   | server, microservices |
+| `DB_DATABASE`                       | Database Name                                                 |   `immich`   | server, microservices |
 | `DB_VECTOR_EXTENSION`<sup>\*1</sup> | Database Vector Extension (one of [`pgvector`, `pgvecto.rs`]) | `pgvecto.rs` | server, microservices |
 
 \*1: This setting cannot be changed after the server has successfully started up
@@ -124,18 +124,16 @@ Redis (Sentinel) URL example JSON before encoding:
 
 ## Machine Learning
 
-| Variable                                         | Description                                                          |       Default       | Services         |
-| :----------------------------------------------- | :------------------------------------------------------------------- | :-----------------: | :--------------- |
-| `MACHINE_LEARNING_MODEL_TTL`                     | Inactivity time (s) before a model is unloaded (disabled if \<= 0)   |        `300`        | machine learning |
-| `MACHINE_LEARNING_MODEL_TTL_POLL_S`              | Interval (s) between checks for the model TTL (disabled if \<= 0)    |        `10`         | machine learning |
-| `MACHINE_LEARNING_CACHE_FOLDER`                  | Directory where models are downloaded                                |      `/cache`       | machine learning |
-| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup> | Thread count of the request thread pool (disabled if \<= 0)          | number of CPU cores | machine learning |
-| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`        | Number of parallel model operations                                  |         `1`         | machine learning |
-| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`        | Number of threads for each model operation                           |         `2`         | machine learning |
-| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>         | Number of worker processes to spawn                                  |         `1`         | machine learning |
-| `MACHINE_LEARNING_WORKER_TIMEOUT`                | Maximum time (s) of unresponsiveness before a worker is killed       |        `120`        | machine learning |
-| `MACHINE_LEARNING_PRELOAD__CLIP`                 | Name of a CLIP model to be preloaded and kept in cache               |                     | machine learning |
-| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION`   | Name of a facial recognition model to be preloaded and kept in cache |                     | machine learning |
+| Variable                                         | Description                                                        |       Default       | Services         |
+| :----------------------------------------------- | :----------------------------------------------------------------- | :-----------------: | :--------------- |
+| `MACHINE_LEARNING_MODEL_TTL`                     | Inactivity time (s) before a model is unloaded (disabled if \<= 0) |        `300`        | machine learning |
+| `MACHINE_LEARNING_MODEL_TTL_POLL_S`              | Interval (s) between checks for the model TTL (disabled if \<= 0)  |        `10`         | machine learning |
+| `MACHINE_LEARNING_CACHE_FOLDER`                  | Directory where models are downloaded                              |      `/cache`       | machine learning |
+| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup> | Thread count of the request thread pool (disabled if \<= 0)        | number of CPU cores | machine learning |
+| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`        | Number of parallel model operations                                |         `1`         | machine learning |
+| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`        | Number of threads for each model operation                         |         `2`         | machine learning |
+| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>         | Number of worker processes to spawn                                |         `1`         | machine learning |
+| `MACHINE_LEARNING_WORKER_TIMEOUT`                | Maximum time (s) of unresponsiveness before a worker is killed     |        `120`        | machine learning |
 
 \*1: It is recommended to begin with this parameter when changing the concurrency levels of the machine learning service and then tune the other ones.
 

docs/docs/install/truenas.md

@@ -28,10 +28,6 @@ Or before beginning app installation, [create the datasets](https://www.truenas.
 Immich requires seven datasets: **library**, **pgBackup**, **pgData**, **profile**, **thumbs**, **uploads**, and **video**.
 You can organize these as one parent with seven child datasets, for example `mnt/tank/immich/library`, `mnt/tank/immich/pgBackup`, and so on.
 
-:::info Permissions
-The **pgData** dataset must be owned by the user `netdata` (UID 999) for postgres to start. The other datasets must be owned by the user `root` (UID 0) or a group that includes the user `root` (UID 0) for immich to have the necessary permissions.
-:::
-
 ## Installing the Immich Application
 
 To install the **Immich** application, go to **Apps**, click **Discover Apps**, either begin typing Immich into the search field or scroll down to locate the **Immich** application widget.

docs/package-lock.json

@@ -12231,7 +12231,7 @@
         "mime-format": "2.0.0",
         "mime-types": "2.1.27",
         "postman-url-encoder": "2.1.3",
-        "sanitize-html": "^2.12.1",
+        "sanitize-html": "^2.11.0",
         "semver": "^7.5.4",
         "uuid": "3.4.0"
       }
@@ -14762,9 +14762,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sanitize-html": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.12.1.tgz",
-      "integrity": "sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.11.0.tgz",
+      "integrity": "sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA==",
       "dependencies": {
         "deepmerge": "^4.2.2",
         "escape-string-regexp": "^4.0.0",

e2e/.eslintrc.cjs

@@ -1,31 +0,0 @@
-module.exports = {
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: 'tsconfig.json',
-    sourceType: 'module',
-    tsconfigRootDir: __dirname,
-  },
-  plugins: ['@typescript-eslint/eslint-plugin'],
-  extends: ['plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended', 'plugin:unicorn/recommended'],
-  root: true,
-  env: {
-    node: true,
-  },
-  ignorePatterns: ['.eslintrc.js'],
-  rules: {
-    '@typescript-eslint/interface-name-prefix': 'off',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-floating-promises': 'error',
-    'unicorn/prefer-module': 'off',
-    curly: 2,
-    'prettier/prettier': 0,
-    'unicorn/prevent-abbreviations': 'off',
-    'unicorn/filename-case': 'off',
-    'unicorn/no-null': 'off',
-    'unicorn/prefer-top-level-await': 'off',
-    'unicorn/prefer-event-target': 'off',
-    'unicorn/no-thenable': 'off',
-  },
-};

e2e/.prettierignore

@@ -1,16 +0,0 @@
-.DS_Store
-node_modules
-/build
-/package
-.env
-.env.*
-!.env.example
-*.md
-*.json
-coverage
-dist
-
-# Ignore files for PNPM, NPM and YARN
-pnpm-lock.yaml
-package-lock.json
-yarn.lock

e2e/.prettierrc

@@ -1,8 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 120,
-  "semi": true,
-  "organizeImportsSkipDestructiveCodeActions": true,
-  "plugins": ["prettier-plugin-organize-imports"]
-}

e2e/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 name: immich-e2e
 
@@ -16,7 +16,6 @@ x-server-build: &server-common
     - IMMICH_MACHINE_LEARNING_ENABLED=false
   volumes:
     - upload:/usr/src/app/upload
-    - ../server/test/assets:/data/assets
   depends_on:
     - redis
     - database
@@ -24,14 +23,14 @@ x-server-build: &server-common
 services:
   immich-server:
     container_name: immich-e2e-server
-    command: ['./start.sh', 'immich']
+    command: [ "./start.sh", "immich" ]
     <<: *server-common
     ports:
       - 2283:3001
 
   immich-microservices:
     container_name: immich-e2e-microservices
-    command: ['./start.sh', 'microservices']
+    command: [ "./start.sh", "microservices" ]
     <<: *server-common
 
   redis:

e2e/package.json

@@ -7,11 +7,7 @@
   "scripts": {
     "test": "vitest --config vitest.config.ts",
     "test:web": "npx playwright test",
-    "start:web": "npx playwright test --ui",
-    "format": "prettier --check .",
-    "format:fix": "prettier --write .",
-    "lint": "eslint \"src/**/*.ts\" --max-warnings 0",
-    "lint:fix": "npm run lint -- --fix"
+    "start:web": "npx playwright test --ui"
   },
   "keywords": [],
   "author": "",
@@ -23,21 +19,10 @@
     "@types/luxon": "^3.4.2",
     "@types/node": "^20.11.17",
     "@types/pg": "^8.11.0",
-    "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
     "@vitest/coverage-v8": "^1.3.0",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^51.0.1",
-    "exiftool-vendored": "^24.5.0",
     "luxon": "^3.4.4",
     "pg": "^8.11.3",
-    "pngjs": "^7.0.0",
-    "prettier": "^3.2.5",
-    "prettier-plugin-organize-imports": "^3.2.4",
     "socket.io-client": "^4.7.4",
     "supertest": "^6.3.4",
     "typescript": "^5.3.3",

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

@@ -20,7 +20,10 @@ describe('/activity', () => {
   let album: AlbumResponseDto;
 
   const createActivity = (dto: ActivityCreateDto, accessToken?: string) =>
-    create({ activityCreateDto: dto }, { headers: asBearerAuth(accessToken || admin.accessToken) });
+    create(
+      { activityCreateDto: dto },
+      { headers: asBearerAuth(accessToken || admin.accessToken) },
+    );
 
   beforeAll(async () => {
     apiUtils.setup();
@@ -53,9 +56,13 @@ describe('/activity', () => {
     });
 
     it('should require an albumId', async () => {
-      const { status, body } = await request(app).get('/activity').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/activity')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(400);
-      expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])));
+      expect(body).toEqual(
+        errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])),
+      );
     });
 
     it('should reject an invalid albumId', async () => {
@@ -64,7 +71,9 @@ describe('/activity', () => {
         .query({ albumId: uuidDto.invalid })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(400);
-      expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])));
+      expect(body).toEqual(
+        errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])),
+      );
     });
 
     it('should reject an invalid assetId', async () => {
@@ -73,7 +82,9 @@ describe('/activity', () => {
         .query({ albumId: uuidDto.notFound, assetId: uuidDto.invalid })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(400);
-      expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['assetId must be a UUID'])));
+      expect(body).toEqual(
+        errorDto.badRequest(expect.arrayContaining(['assetId must be a UUID'])),
+      );
     });
 
     it('should start off empty', async () => {
@@ -149,7 +160,9 @@ describe('/activity', () => {
     });
 
     it('should filter by userId', async () => {
-      const [reaction] = await Promise.all([createActivity({ albumId: album.id, type: ReactionType.Like })]);
+      const [reaction] = await Promise.all([
+        createActivity({ albumId: album.id, type: ReactionType.Like }),
+      ]);
 
       const response1 = await request(app)
         .get('/activity')
@@ -202,7 +215,9 @@ describe('/activity', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: uuidDto.invalid });
       expect(status).toEqual(400);
-      expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])));
+      expect(body).toEqual(
+        errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])),
+      );
     });
 
     it('should require a comment when type is comment', async () => {
@@ -211,7 +226,12 @@ describe('/activity', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: uuidDto.notFound, type: 'comment', comment: null });
       expect(status).toEqual(400);
-      expect(body).toEqual(errorDto.badRequest(['comment must be a string', 'comment should not be empty']));
+      expect(body).toEqual(
+        errorDto.badRequest([
+          'comment must be a string',
+          'comment should not be empty',
+        ]),
+      );
     });
 
     it('should add a comment to an album', async () => {
@@ -251,7 +271,9 @@ describe('/activity', () => {
     });
 
     it('should return a 200 for a duplicate like on the album', async () => {
-      const [reaction] = await Promise.all([createActivity({ albumId: album.id, type: ReactionType.Like })]);
+      const [reaction] = await Promise.all([
+        createActivity({ albumId: album.id, type: ReactionType.Like }),
+      ]);
 
       const { status, body } = await request(app)
         .post('/activity')
@@ -334,7 +356,9 @@ describe('/activity', () => {
 
   describe('DELETE /activity/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/activity/${uuidDto.notFound}`);
+      const { status, body } = await request(app).delete(
+        `/activity/${uuidDto.notFound}`,
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -396,7 +420,9 @@ describe('/activity', () => {
         .set('Authorization', `Bearer ${nonOwner.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no activity.delete access'));
+      expect(body).toEqual(
+        errorDto.badRequest('Not found or no activity.delete access'),
+      );
     });
 
     it('should let a non-owner remove their own comment', async () => {

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

@@ -41,7 +41,7 @@ describe('/album', () => {
     ]);
 
     [user1Asset1, user1Asset2] = await Promise.all([
-      apiUtils.createAsset(user1.accessToken, { isFavorite: true }),
+      apiUtils.createAsset(user1.accessToken),
       apiUtils.createAsset(user1.accessToken),
     ]);
 
@@ -93,7 +93,10 @@ describe('/album', () => {
       }),
     ]);
 
-    await deleteUser({ id: user3.userId }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUser(
+      { id: user3.userId },
+      { headers: asBearerAuth(admin.accessToken) },
+    );
   });
 
   describe('GET /album', () => {
@@ -108,7 +111,9 @@ describe('/album', () => {
         .get('/album?shared=invalid')
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toEqual(400);
-      expect(body).toEqual(errorDto.badRequest(['shared must be a boolean value']));
+      expect(body).toEqual(
+        errorDto.badRequest(['shared must be a boolean value']),
+      );
     });
 
     it('should reject an invalid assetId param', async () => {
@@ -119,17 +124,6 @@ describe('/album', () => {
       expect(body).toEqual(errorDto.badRequest(['assetId must be a UUID']));
     });
 
-    it("should not show other users' favorites", async () => {
-      const { status, body } = await request(app)
-        .get(`/album/${user1Albums[0].id}?withoutAssets=false`)
-        .set('Authorization', `Bearer ${user2.accessToken}`);
-      expect(status).toEqual(200);
-      expect(body).toEqual({
-        ...user1Albums[0],
-        assets: [expect.objectContaining({ isFavorite: false })],
-      });
-    });
-
     it('should not return shared albums with a deleted owner', async () => {
       const { status, body } = await request(app)
         .get('/album?shared=true')
@@ -159,7 +153,9 @@ describe('/album', () => {
     });
 
     it('should return the album collection including owned and shared', async () => {
-      const { status, body } = await request(app).get('/album').set('Authorization', `Bearer ${user1.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/album')
+        .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
       expect(body).toHaveLength(3);
       expect(body).toEqual(
@@ -254,7 +250,9 @@ describe('/album', () => {
 
   describe('GET /album/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/album/${user1Albums[0].id}`);
+      const { status, body } = await request(app).get(
+        `/album/${user1Albums[0].id}`,
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -267,7 +265,7 @@ describe('/album', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         ...user1Albums[0],
-        assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
+        assets: [expect.objectContaining(user1Albums[0].assets[0])],
       });
     });
 
@@ -279,7 +277,7 @@ describe('/album', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         ...user2Albums[0],
-        assets: [expect.objectContaining({ id: user2Albums[0].assets[0].id })],
+        assets: [expect.objectContaining(user2Albums[0].assets[0])],
       });
     });
 
@@ -291,7 +289,7 @@ describe('/album', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         ...user1Albums[0],
-        assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
+        assets: [expect.objectContaining(user1Albums[0].assets[0])],
       });
     });
 
@@ -328,7 +326,9 @@ describe('/album', () => {
 
   describe('POST /album', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/album').send({ albumName: 'New album' });
+      const { status, body } = await request(app)
+        .post('/album')
+        .send({ albumName: 'New album' });
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -360,7 +360,9 @@ describe('/album', () => {
 
   describe('PUT /album/:id/assets', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/album/${user1Albums[0].id}/assets`);
+      const { status, body } = await request(app).put(
+        `/album/${user1Albums[0].id}/assets`,
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -373,7 +375,9 @@ describe('/album', () => {
         .send({ ids: [asset.id] });
 
       expect(status).toBe(200);
-      expect(body).toEqual([expect.objectContaining({ id: asset.id, success: true })]);
+      expect(body).toEqual([
+        expect.objectContaining({ id: asset.id, success: true }),
+      ]);
     });
 
     it('should be able to add own asset to shared album', async () => {
@@ -384,7 +388,9 @@ describe('/album', () => {
         .send({ ids: [asset.id] });
 
       expect(status).toBe(200);
-      expect(body).toEqual([expect.objectContaining({ id: asset.id, success: true })]);
+      expect(body).toEqual([
+        expect.objectContaining({ id: asset.id, success: true }),
+      ]);
     });
   });
 
@@ -467,7 +473,9 @@ describe('/album', () => {
         .send({ ids: [user1Asset1.id] });
 
       expect(status).toBe(200);
-      expect(body).toEqual([expect.objectContaining({ id: user1Asset1.id, success: true })]);
+      expect(body).toEqual([
+        expect.objectContaining({ id: user1Asset1.id, success: true }),
+      ]);
     });
 
     it('should be able to remove own asset from shared album', async () => {
@@ -477,7 +485,9 @@ describe('/album', () => {
         .send({ ids: [user1Asset1.id] });
 
       expect(status).toBe(200);
-      expect(body).toEqual([expect.objectContaining({ id: user1Asset1.id, success: true })]);
+      expect(body).toEqual([
+        expect.objectContaining({ id: user1Asset1.id, success: true }),
+      ]);
     });
   });
 
@@ -491,7 +501,9 @@ describe('/album', () => {
     });
 
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/album/${user1Albums[0].id}/users`).send({ sharedUserIds: [] });
+      const { status, body } = await request(app)
+        .put(`/album/${user1Albums[0].id}/users`)
+        .send({ sharedUserIds: [] });
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);

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

@@ -1,30 +1,16 @@
 import {
   AssetFileUploadResponseDto,
   AssetResponseDto,
-  AssetTypeEnum,
   LoginResponseDto,
   SharedLinkType,
 } from '@immich/sdk';
-import { exiftool } from 'exiftool-vendored';
 import { DateTime } from 'luxon';
-import { readFile, writeFile } from 'node:fs/promises';
-import { basename, join } from 'node:path';
 import { Socket } from 'socket.io-client';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
-import { apiUtils, app, dbUtils, fileUtils, tempDir, testAssetDir, wsUtils } from 'src/utils';
+import { apiUtils, app, dbUtils } from 'src/utils';
 import request from 'supertest';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-
-const locationAssetFilepath = `${testAssetDir}/metadata/gps-position/thompson-springs.jpg`;
-
-const readTags = async (bytes: Buffer, filename: string) => {
-  const filepath = join(tempDir, filename);
-  await writeFile(filepath, bytes);
-  return exiftool.read(filepath);
-};
+import { beforeAll, describe, expect, it } from 'vitest';
 
 const today = DateTime.fromObject({
   year: 2023,
@@ -38,81 +24,67 @@ describe('/asset', () => {
   let user1: LoginResponseDto;
   let user2: LoginResponseDto;
   let userStats: LoginResponseDto;
-  let user1Assets: AssetFileUploadResponseDto[];
-  let user2Assets: AssetFileUploadResponseDto[];
-  let assetLocation: AssetFileUploadResponseDto;
+  let asset1: AssetFileUploadResponseDto;
+  let asset2: AssetFileUploadResponseDto;
+  let asset3: AssetFileUploadResponseDto;
+  let asset4: AssetFileUploadResponseDto; // user2 asset
+  let asset5: AssetFileUploadResponseDto;
+  let asset6: AssetFileUploadResponseDto;
   let ws: Socket;
 
   beforeAll(async () => {
     apiUtils.setup();
     await dbUtils.reset();
     admin = await apiUtils.adminSetup({ onboarding: false });
-
-    [ws, user1, user2, userStats] = await Promise.all([
-      wsUtils.connect(admin.accessToken),
+    [user1, user2, userStats] = await Promise.all([
       apiUtils.userSetup(admin.accessToken, createUserDto.user1),
       apiUtils.userSetup(admin.accessToken, createUserDto.user2),
       apiUtils.userSetup(admin.accessToken, createUserDto.user3),
     ]);
 
-    // asset location
-    assetLocation = await apiUtils.createAsset(admin.accessToken, {
-      assetData: {
-        filename: 'thompson-springs.jpg',
-        bytes: await readFile(locationAssetFilepath),
-      },
-    });
-
-    await wsUtils.waitForEvent({ event: 'upload', assetId: assetLocation.id });
-
-    user1Assets = await Promise.all([
+    [asset1, asset2, asset3, asset4, asset5, asset6] = await Promise.all([
       apiUtils.createAsset(user1.accessToken),
       apiUtils.createAsset(user1.accessToken),
-      apiUtils.createAsset(user1.accessToken, {
-        isFavorite: true,
-        isReadOnly: true,
-        fileCreatedAt: yesterday.toISO(),
-        fileModifiedAt: yesterday.toISO(),
-        assetData: { filename: 'example.mp4' },
-      }),
+      apiUtils.createAsset(
+        user1.accessToken,
+        {
+          isFavorite: true,
+          isExternal: true,
+          isReadOnly: true,
+          fileCreatedAt: yesterday.toISO(),
+          fileModifiedAt: yesterday.toISO(),
+        },
+        { filename: 'example.mp4' },
+      ),
+      apiUtils.createAsset(user2.accessToken),
       apiUtils.createAsset(user1.accessToken),
       apiUtils.createAsset(user1.accessToken),
-    ]);
 
-    user2Assets = await Promise.all([apiUtils.createAsset(user2.accessToken)]);
-
-    for (const asset of [...user1Assets, ...user2Assets]) {
-      expect(asset.duplicate).toBe(false);
-    }
-
-    await Promise.all([
       // stats
       apiUtils.createAsset(userStats.accessToken),
       apiUtils.createAsset(userStats.accessToken, { isFavorite: true }),
       apiUtils.createAsset(userStats.accessToken, { isArchived: true }),
-      apiUtils.createAsset(userStats.accessToken, {
-        isArchived: true,
-        isFavorite: true,
-        assetData: { filename: 'example.mp4' },
-      }),
+      apiUtils.createAsset(
+        userStats.accessToken,
+        {
+          isArchived: true,
+          isFavorite: true,
+        },
+        { filename: 'example.mp4' },
+      ),
     ]);
 
     const person1 = await apiUtils.createPerson(user1.accessToken, {
       name: 'Test Person',
     });
-    await dbUtils.createFace({
-      assetId: user1Assets[0].id,
-      personId: person1.id,
-    });
-  }, 30_000);
-
-  afterAll(() => {
-    wsUtils.disconnect(ws);
+    await dbUtils.createFace({ assetId: asset1.id, personId: person1.id });
   });
 
   describe('GET /asset/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/asset/${uuidDto.notFound}`);
+      const { status, body } = await request(app).get(
+        `/asset/${uuidDto.notFound}`,
+      );
       expect(body).toEqual(errorDto.unauthorized);
       expect(status).toBe(401);
     });
@@ -127,7 +99,7 @@ describe('/asset', () => {
 
     it('should require access', async () => {
       const { status, body } = await request(app)
-        .get(`/asset/${user2Assets[0].id}`)
+        .get(`/asset/${asset4.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(400);
       expect(body).toEqual(errorDto.noPermission);
@@ -135,31 +107,33 @@ describe('/asset', () => {
 
     it('should get the asset info', async () => {
       const { status, body } = await request(app)
-        .get(`/asset/${user1Assets[0].id}`)
+        .get(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
-      expect(body).toMatchObject({ id: user1Assets[0].id });
+      expect(body).toMatchObject({ id: asset1.id });
     });
 
     it('should work with a shared link', async () => {
       const sharedLink = await apiUtils.createSharedLink(user1.accessToken, {
         type: SharedLinkType.Individual,
-        assetIds: [user1Assets[0].id],
+        assetIds: [asset1.id],
       });
 
-      const { status, body } = await request(app).get(`/asset/${user1Assets[0].id}?key=${sharedLink.key}`);
+      const { status, body } = await request(app).get(
+        `/asset/${asset1.id}?key=${sharedLink.key}`,
+      );
       expect(status).toBe(200);
-      expect(body).toMatchObject({ id: user1Assets[0].id });
+      expect(body).toMatchObject({ id: asset1.id });
     });
 
     it('should not send people data for shared links for un-authenticated users', async () => {
       const { status, body } = await request(app)
-        .get(`/asset/${user1Assets[0].id}`)
+        .get(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toEqual(200);
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         isFavorite: false,
         people: [
           {
@@ -174,10 +148,12 @@ describe('/asset', () => {
 
       const sharedLink = await apiUtils.createSharedLink(user1.accessToken, {
         type: SharedLinkType.Individual,
-        assetIds: [user1Assets[0].id],
+        assetIds: [asset1.id],
       });
 
-      const data = await request(app).get(`/asset/${user1Assets[0].id}?key=${sharedLink.key}`);
+      const data = await request(app).get(
+        `/asset/${asset1.id}?key=${sharedLink.key}`,
+      );
       expect(data.status).toBe(200);
       expect(data.body).toMatchObject({ people: [] });
     });
@@ -260,7 +236,7 @@ describe('/asset', () => {
       expect(body).toEqual(errorDto.unauthorized);
     });
 
-    it.each(TEN_TIMES)('should return 1 random assets', async () => {
+    it.each(Array(10))('should return 1 random assets', async () => {
       const { status, body } = await request(app)
         .get('/asset/random')
         .set('Authorization', `Bearer ${user1.accessToken}`);
@@ -270,9 +246,14 @@ describe('/asset', () => {
       const assets: AssetResponseDto[] = body;
       expect(assets.length).toBe(1);
       expect(assets[0].ownerId).toBe(user1.userId);
+      //
+      // assets owned by user2
+      expect(assets[0].id).not.toBe(asset4.id);
+      // assets owned by user1
+      expect([asset1.id, asset2.id, asset3.id]).toContain(assets[0].id);
     });
 
-    it.each(TEN_TIMES)('should return 2 random assets', async () => {
+    it.each(Array(10))('should return 2 random assets', async () => {
       const { status, body } = await request(app)
         .get('/asset/random?count=2')
         .set('Authorization', `Bearer ${user1.accessToken}`);
@@ -284,18 +265,22 @@ describe('/asset', () => {
 
       for (const asset of assets) {
         expect(asset.ownerId).toBe(user1.userId);
+        // assets owned by user1
+        expect([asset1.id, asset2.id, asset3.id]).toContain(asset.id);
+        // assets owned by user2
+        expect(asset.id).not.toBe(asset4.id);
       }
     });
 
-    it.each(TEN_TIMES)(
+    it.each(Array(10))(
       'should return 1 asset if there are 10 assets in the database but user 2 only has 1',
       async () => {
         const { status, body } = await request(app)
-          .get('/asset/random')
+          .get('/[]asset/random')
           .set('Authorization', `Bearer ${user2.accessToken}`);
 
         expect(status).toBe(200);
-        expect(body).toEqual([expect.objectContaining({ id: user2Assets[0].id })]);
+        expect(body).toEqual([expect.objectContaining({ id: asset4.id })]);
       },
     );
 
@@ -310,7 +295,9 @@ describe('/asset', () => {
 
   describe('PUT /asset/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/asset/:${uuidDto.notFound}`);
+      const { status, body } = await request(app).put(
+        `/asset/:${uuidDto.notFound}`,
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -325,44 +312,44 @@ describe('/asset', () => {
 
     it('should require access', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user2Assets[0].id}`)
+        .put(`/asset/${asset4.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(400);
       expect(body).toEqual(errorDto.noPermission);
     });
 
     it('should favorite an asset', async () => {
-      const before = await apiUtils.getAssetInfo(user1.accessToken, user1Assets[0].id);
+      const before = await apiUtils.getAssetInfo(user1.accessToken, asset1.id);
       expect(before.isFavorite).toBe(false);
 
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ isFavorite: true });
-      expect(body).toMatchObject({ id: user1Assets[0].id, isFavorite: true });
+      expect(body).toMatchObject({ id: asset1.id, isFavorite: true });
       expect(status).toEqual(200);
     });
 
     it('should archive an asset', async () => {
-      const before = await apiUtils.getAssetInfo(user1.accessToken, user1Assets[0].id);
+      const before = await apiUtils.getAssetInfo(user1.accessToken, asset1.id);
       expect(before.isArchived).toBe(false);
 
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ isArchived: true });
-      expect(body).toMatchObject({ id: user1Assets[0].id, isArchived: true });
+      expect(body).toMatchObject({ id: asset1.id, isArchived: true });
       expect(status).toEqual(200);
     });
 
     it('should update date time original', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ dateTimeOriginal: '2023-11-19T18:11:00.000-07:00' });
 
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         exifInfo: expect.objectContaining({
           dateTimeOriginal: '2023-11-20T01:11:00.000Z',
         }),
@@ -384,7 +371,7 @@ describe('/asset', () => {
         { latitude: 12, longitude: 181 },
       ]) {
         const { status, body } = await request(app)
-          .put(`/asset/${user1Assets[0].id}`)
+          .put(`/asset/${asset1.id}`)
           .send(test)
           .set('Authorization', `Bearer ${user1.accessToken}`);
         expect(status).toBe(400);
@@ -394,12 +381,12 @@ describe('/asset', () => {
 
     it('should update gps data', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ latitude: 12, longitude: 12 });
 
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         exifInfo: expect.objectContaining({ latitude: 12, longitude: 12 }),
       });
       expect(status).toEqual(200);
@@ -407,11 +394,11 @@ describe('/asset', () => {
 
     it('should set the description', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ description: 'Test asset description' });
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         exifInfo: expect.objectContaining({
           description: 'Test asset description',
         }),
@@ -421,12 +408,12 @@ describe('/asset', () => {
 
     it('should return tagged people', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ isFavorite: true });
       expect(status).toEqual(200);
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         isFavorite: true,
         people: [
           {
@@ -458,7 +445,9 @@ describe('/asset', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID']));
+      expect(body).toEqual(
+        errorDto.badRequest(['each value in ids must be a UUID']),
+      );
     });
 
     it('should throw an error when the id is not found', async () => {
@@ -468,7 +457,9 @@ describe('/asset', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no asset.delete access'));
+      expect(body).toEqual(
+        errorDto.badRequest('Not found or no asset.delete access'),
+      );
     });
 
     it('should move an asset to the trash', async () => {
@@ -487,260 +478,4 @@ describe('/asset', () => {
       expect(after.isTrashed).toBe(true);
     });
   });
-
-  describe('POST /asset/upload', () => {
-    const tests = [
-      {
-        input: 'formats/jpg/el_torcal_rocks.jpg',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'el_torcal_rocks',
-          resized: true,
-          exifInfo: {
-            dateTimeOriginal: '2012-08-05T11:39:59.000Z',
-            exifImageWidth: 512,
-            exifImageHeight: 341,
-            latitude: null,
-            longitude: null,
-            focalLength: 75,
-            iso: 200,
-            fNumber: 11,
-            exposureTime: '1/160',
-            fileSizeInByte: 53_493,
-            make: 'SONY',
-            model: 'DSLR-A550',
-            orientation: null,
-            description: 'SONY DSC',
-          },
-        },
-      },
-      {
-        input: 'formats/heic/IMG_2682.heic',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'IMG_2682',
-          resized: true,
-          fileCreatedAt: '2019-03-21T16:04:22.348Z',
-          exifInfo: {
-            dateTimeOriginal: '2019-03-21T16:04:22.348Z',
-            exifImageWidth: 4032,
-            exifImageHeight: 3024,
-            latitude: 41.2203,
-            longitude: -96.071_625,
-            make: 'Apple',
-            model: 'iPhone 7',
-            lensModel: 'iPhone 7 back camera 3.99mm f/1.8',
-            fileSizeInByte: 880_703,
-            exposureTime: '1/887',
-            iso: 20,
-            focalLength: 3.99,
-            fNumber: 1.8,
-            timeZone: 'America/Chicago',
-          },
-        },
-      },
-      {
-        input: 'formats/png/density_plot.png',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'density_plot',
-          resized: true,
-          exifInfo: {
-            exifImageWidth: 800,
-            exifImageHeight: 800,
-            latitude: null,
-            longitude: null,
-            fileSizeInByte: 25_408,
-          },
-        },
-      },
-      {
-        input: 'formats/raw/Nikon/D80/glarus.nef',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'glarus',
-          resized: true,
-          fileCreatedAt: '2010-07-20T17:27:12.000Z',
-          exifInfo: {
-            make: 'NIKON CORPORATION',
-            model: 'NIKON D80',
-            exposureTime: '1/200',
-            fNumber: 10,
-            focalLength: 18,
-            iso: 100,
-            fileSizeInByte: 9_057_784,
-            dateTimeOriginal: '2010-07-20T17:27:12.000Z',
-            latitude: null,
-            longitude: null,
-            orientation: '1',
-          },
-        },
-      },
-      {
-        input: 'formats/raw/Nikon/D700/philadelphia.nef',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'philadelphia',
-          resized: true,
-          fileCreatedAt: '2016-09-22T22:10:29.060Z',
-          exifInfo: {
-            make: 'NIKON CORPORATION',
-            model: 'NIKON D700',
-            exposureTime: '1/400',
-            fNumber: 11,
-            focalLength: 85,
-            iso: 200,
-            fileSizeInByte: 15_856_335,
-            dateTimeOriginal: '2016-09-22T22:10:29.060Z',
-            latitude: null,
-            longitude: null,
-            orientation: '1',
-            timeZone: 'UTC-5',
-          },
-        },
-      },
-    ];
-
-    for (const { input, expected } of tests) {
-      it(`should generate a thumbnail for ${input}`, async () => {
-        const filepath = join(testAssetDir, input);
-        const { id, duplicate } = await apiUtils.createAsset(admin.accessToken, {
-          assetData: { bytes: await readFile(filepath), filename: basename(filepath) },
-        });
-
-        expect(duplicate).toBe(false);
-
-        await wsUtils.waitForEvent({ event: 'upload', assetId: id });
-
-        const asset = await apiUtils.getAssetInfo(admin.accessToken, id);
-
-        expect(asset.exifInfo).toBeDefined();
-        expect(asset.exifInfo).toMatchObject(expected.exifInfo);
-        expect(asset).toMatchObject(expected);
-      });
-    }
-
-    it('should handle a duplicate', async () => {
-      const filepath = 'formats/jpeg/el_torcal_rocks.jpeg';
-      const { duplicate } = await apiUtils.createAsset(admin.accessToken, {
-        assetData: {
-          bytes: await readFile(join(testAssetDir, filepath)),
-          filename: basename(filepath),
-        },
-      });
-
-      expect(duplicate).toBe(true);
-    });
-
-    // These hashes were created by copying the image files to a Samsung phone,
-    // exporting the video from Samsung's stock Gallery app, and hashing them locally.
-    // This ensures that immich+exiftool are extracting the videos the same way Samsung does.
-    // DO NOT assume immich+exiftool are doing things correctly and just copy whatever hash it gives
-    // into the test here.
-    const motionTests = [
-      {
-        filepath: 'formats/motionphoto/Samsung One UI 5.jpg',
-        checksum: 'fr14niqCq6N20HB8rJYEvpsUVtI=',
-      },
-      {
-        filepath: 'formats/motionphoto/Samsung One UI 6.jpg',
-        checksum: 'lT9Uviw/FFJYCjfIxAGPTjzAmmw=',
-      },
-      {
-        filepath: 'formats/motionphoto/Samsung One UI 6.heic',
-        checksum: '/ejgzywvgvzvVhUYVfvkLzFBAF0=',
-      },
-    ];
-
-    for (const { filepath, checksum } of motionTests) {
-      it(`should extract motionphoto video from ${filepath}`, async () => {
-        const response = await apiUtils.createAsset(admin.accessToken, {
-          assetData: {
-            bytes: await readFile(join(testAssetDir, filepath)),
-            filename: basename(filepath),
-          },
-        });
-
-        await wsUtils.waitForEvent({ event: 'upload', assetId: response.id });
-
-        expect(response.duplicate).toBe(false);
-
-        const asset = await apiUtils.getAssetInfo(admin.accessToken, response.id);
-        expect(asset.livePhotoVideoId).toBeDefined();
-
-        const video = await apiUtils.getAssetInfo(admin.accessToken, asset.livePhotoVideoId as string);
-        expect(video.checksum).toStrictEqual(checksum);
-      });
-    }
-  });
-
-  describe('GET /asset/thumbnail/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/asset/thumbnail/${assetLocation.id}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should not include gps data for webp thumbnails', async () => {
-      const { status, body, type } = await request(app)
-        .get(`/asset/thumbnail/${assetLocation.id}?format=WEBP`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      await wsUtils.waitForEvent({
-        event: 'upload',
-        assetId: assetLocation.id,
-      });
-
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/webp');
-
-      const exifData = await readTags(body, 'thumbnail.webp');
-      expect(exifData).not.toHaveProperty('GPSLongitude');
-      expect(exifData).not.toHaveProperty('GPSLatitude');
-    });
-
-    it('should not include gps data for jpeg thumbnails', async () => {
-      const { status, body, type } = await request(app)
-        .get(`/asset/thumbnail/${assetLocation.id}?format=JPEG`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/jpeg');
-
-      const exifData = await readTags(body, 'thumbnail.jpg');
-      expect(exifData).not.toHaveProperty('GPSLongitude');
-      expect(exifData).not.toHaveProperty('GPSLatitude');
-    });
-  });
-
-  describe('GET /asset/file/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/asset/thumbnail/${assetLocation.id}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should download the original', async () => {
-      const { status, body, type } = await request(app)
-        .get(`/asset/file/${assetLocation.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/jpeg');
-
-      const asset = await apiUtils.getAssetInfo(admin.accessToken, assetLocation.id);
-
-      const original = await readFile(locationAssetFilepath);
-      const originalChecksum = fileUtils.sha1(original);
-      const downloadChecksum = fileUtils.sha1(body);
-
-      expect(originalChecksum).toBe(downloadChecksum);
-      expect(downloadChecksum).toBe(asset.checksum);
-    });
-  });
 });

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

@@ -1,4 +1,9 @@
-import { deleteAssets, getAuditFiles, updateAsset, type LoginResponseDto } from '@immich/sdk';
+import {
+  deleteAssets,
+  getAuditFiles,
+  updateAsset,
+  type LoginResponseDto,
+} from '@immich/sdk';
 import { apiUtils, asBearerAuth, dbUtils, fileUtils } from 'src/utils';
 import { beforeAll, describe, expect, it } from 'vitest';
 
@@ -15,20 +20,23 @@ describe('/audit', () => {
 
   describe('GET :/file-report', () => {
     it('excludes assets without issues from report', async () => {
-      const [trashedAsset, archivedAsset] = await Promise.all([
+      const [trashedAsset, archivedAsset, _] = await Promise.all([
         apiUtils.createAsset(admin.accessToken),
         apiUtils.createAsset(admin.accessToken),
         apiUtils.createAsset(admin.accessToken),
       ]);
 
       await Promise.all([
-        deleteAssets({ assetBulkDeleteDto: { ids: [trashedAsset.id] } }, { headers: asBearerAuth(admin.accessToken) }),
+        deleteAssets(
+          { assetBulkDeleteDto: { ids: [trashedAsset.id] } },
+          { headers: asBearerAuth(admin.accessToken) }
+        ),
         updateAsset(
           {
             id: archivedAsset.id,
             updateAssetDto: { isArchived: true },
           },
-          { headers: asBearerAuth(admin.accessToken) },
+          { headers: asBearerAuth(admin.accessToken) }
         ),
       ]);
 

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

@@ -1,6 +1,16 @@
-import { LoginResponseDto, getAuthDevices, login, signUpAdmin } from '@immich/sdk';
+import {
+  LoginResponseDto,
+  getAuthDevices,
+  login,
+  signUpAdmin,
+} from '@immich/sdk';
 import { loginDto, signupDto, uuidDto } from 'src/fixtures';
-import { deviceDto, errorDto, loginResponseDto, signupResponseDto } from 'src/responses';
+import {
+  deviceDto,
+  errorDto,
+  loginResponseDto,
+  signupResponseDto,
+} from 'src/responses';
 import { apiUtils, app, asBearerAuth, dbUtils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
@@ -38,14 +48,18 @@ describe(`/auth/admin-sign-up`, () => {
 
     for (const { should, data } of invalid) {
       it(`should ${should}`, async () => {
-        const { status, body } = await request(app).post('/auth/admin-sign-up').send(data);
+        const { status, body } = await request(app)
+          .post('/auth/admin-sign-up')
+          .send(data);
         expect(status).toEqual(400);
         expect(body).toEqual(errorDto.badRequest());
       });
     }
 
     it(`should sign up the admin`, async () => {
-      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
+      const { status, body } = await request(app)
+        .post('/auth/admin-sign-up')
+        .send(signupDto.admin);
       expect(status).toBe(201);
       expect(body).toEqual(signupResponseDto.admin);
     });
@@ -72,7 +86,9 @@ describe(`/auth/admin-sign-up`, () => {
     it('should not allow a second admin to sign up', async () => {
       await signUpAdmin({ signUpDto: signupDto.admin });
 
-      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
+      const { status, body } = await request(app)
+        .post('/auth/admin-sign-up')
+        .send(signupDto.admin);
 
       expect(status).toBe(400);
       expect(body).toEqual(errorDto.alreadyHasAdmin);
@@ -91,7 +107,9 @@ describe('/auth/*', () => {
 
   describe(`POST /auth/login`, () => {
     it('should reject an incorrect password', async () => {
-      const { status, body } = await request(app).post('/auth/login').send({ email, password: 'incorrect' });
+      const { status, body } = await request(app)
+        .post('/auth/login')
+        .send({ email, password: 'incorrect' });
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.incorrectLogin);
     });
@@ -107,7 +125,9 @@ describe('/auth/*', () => {
     }
 
     it('should accept a correct password', async () => {
-      const { status, body, headers } = await request(app).post('/auth/login').send({ email, password });
+      const { status, body, headers } = await request(app)
+        .post('/auth/login')
+        .send({ email, password });
       expect(status).toBe(201);
       expect(body).toEqual(loginResponseDto.admin);
 
@@ -116,9 +136,15 @@ describe('/auth/*', () => {
 
       const cookies = headers['set-cookie'];
       expect(cookies).toHaveLength(3);
-      expect(cookies[0]).toEqual(`immich_access_token=${token}; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;`);
-      expect(cookies[1]).toEqual('immich_auth_type=password; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;');
-      expect(cookies[2]).toEqual('immich_is_authenticated=true; Path=/; Max-Age=34560000; SameSite=Lax;');
+      expect(cookies[0]).toEqual(
+        `immich_access_token=${token}; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;`
+      );
+      expect(cookies[1]).toEqual(
+        'immich_auth_type=password; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;'
+      );
+      expect(cookies[2]).toEqual(
+        'immich_is_authenticated=true; Path=/; Max-Age=34560000; SameSite=Lax;'
+      );
     });
   });
 
@@ -150,12 +176,18 @@ describe('/auth/*', () => {
         await login({ loginCredentialDto: loginDto.admin });
       }
 
-      await expect(getAuthDevices({ headers: asBearerAuth(admin.accessToken) })).resolves.toHaveLength(6);
+      await expect(
+        getAuthDevices({ headers: asBearerAuth(admin.accessToken) })
+      ).resolves.toHaveLength(6);
 
-      const { status } = await request(app).delete(`/auth/devices`).set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status } = await request(app)
+        .delete(`/auth/devices`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
-      await expect(getAuthDevices({ headers: asBearerAuth(admin.accessToken) })).resolves.toHaveLength(1);
+      await expect(
+        getAuthDevices({ headers: asBearerAuth(admin.accessToken) })
+      ).resolves.toHaveLength(1);
     });
 
     it('should throw an error for a non-existent device id', async () => {
@@ -163,7 +195,9 @@ describe('/auth/*', () => {
         .delete(`/auth/devices/${uuidDto.notFound}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no authDevice.delete access'));
+      expect(body).toEqual(
+        errorDto.badRequest('Not found or no authDevice.delete access')
+      );
     });
 
     it('should logout a device', async () => {
@@ -185,7 +219,9 @@ describe('/auth/*', () => {
 
   describe('POST /auth/validateToken', () => {
     it('should reject an invalid token', async () => {
-      const { status, body } = await request(app).post(`/auth/validateToken`).set('Authorization', 'Bearer 123');
+      const { status, body } = await request(app)
+        .post(`/auth/validateToken`)
+        .set('Authorization', 'Bearer 123');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.invalidToken);
     });

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

@@ -1,23 +1,18 @@
 import { AssetFileUploadResponseDto, LoginResponseDto } from '@immich/sdk';
-import { readFile, writeFile } from 'node:fs/promises';
 import { errorDto } from 'src/responses';
-import { apiUtils, app, dbUtils, fileUtils, tempDir } from 'src/utils';
+import { apiUtils, app, dbUtils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, describe, expect, it } from 'vitest';
 
 describe('/download', () => {
   let admin: LoginResponseDto;
   let asset1: AssetFileUploadResponseDto;
-  let asset2: AssetFileUploadResponseDto;
 
   beforeAll(async () => {
     apiUtils.setup();
     await dbUtils.reset();
     admin = await apiUtils.adminSetup();
-    [asset1, asset2] = await Promise.all([
-      apiUtils.createAsset(admin.accessToken),
-      apiUtils.createAsset(admin.accessToken),
-    ]);
+    asset1 = await apiUtils.createAsset(admin.accessToken);
   });
 
   describe('POST /download/info', () => {
@@ -45,42 +40,11 @@ describe('/download', () => {
     });
   });
 
-  describe('POST /download/archive', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .post(`/download/archive`)
-        .send({ assetIds: [asset1.id, asset2.id] });
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should download an archive', async () => {
-      const { status, body } = await request(app)
-        .post('/download/archive')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ assetIds: [asset1.id, asset2.id] });
-
-      expect(status).toBe(200);
-      expect(body instanceof Buffer).toBe(true);
-
-      await writeFile(`${tempDir}/archive.zip`, body);
-      await fileUtils.unzip(`${tempDir}/archive.zip`, `${tempDir}/archive`);
-      const files = [
-        { filename: 'example.png', id: asset1.id },
-        { filename: 'example+1.png', id: asset2.id },
-      ];
-      for (const { id, filename } of files) {
-        const bytes = await readFile(`${tempDir}/archive/${filename}`);
-        const asset = await apiUtils.getAssetInfo(admin.accessToken, id);
-        expect(fileUtils.sha1(bytes)).toBe(asset.checksum);
-      }
-    });
-  });
-
   describe('POST /download/asset/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/download/asset/${asset1.id}`);
+      const { status, body } = await request(app).post(
+        `/download/asset/${asset1.id}`,
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -92,7 +56,7 @@ describe('/download', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(response.status).toBe(200);
-      expect(response.headers['content-type']).toEqual('image/png');
+      expect(response.headers['content-type']).toEqual('image/jpeg');
     });
   });
 });

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

@@ -1,456 +0,0 @@
-import { LibraryResponseDto, LibraryType, LoginResponseDto, getAllLibraries } from '@immich/sdk';
-import { userDto, uuidDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { apiUtils, app, asBearerAuth, dbUtils, testAssetDirInternal } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-describe('/library', () => {
-  let admin: LoginResponseDto;
-  let user: LoginResponseDto;
-  let library: LibraryResponseDto;
-
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    admin = await apiUtils.adminSetup();
-    user = await apiUtils.userSetup(admin.accessToken, userDto.user1);
-    library = await apiUtils.createLibrary(admin.accessToken, { type: LibraryType.External });
-  });
-
-  describe('GET /library', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/library');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should start with a default upload library', async () => {
-      const { status, body } = await request(app).get('/library').set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            ownerId: admin.userId,
-            type: LibraryType.Upload,
-            name: 'Default Library',
-            refreshedAt: null,
-            assetCount: 0,
-            importPaths: [],
-            exclusionPatterns: [],
-          }),
-        ]),
-      );
-    });
-  });
-
-  describe('POST /library', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/library').send({});
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require admin authentication', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({ type: LibraryType.External });
-
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    it('should create an external library with defaults', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.External });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          ownerId: admin.userId,
-          type: LibraryType.External,
-          name: 'New External Library',
-          refreshedAt: null,
-          assetCount: 0,
-          importPaths: [],
-          exclusionPatterns: [],
-        }),
-      );
-    });
-
-    it('should create an external library with options', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          type: LibraryType.External,
-          name: 'My Awesome Library',
-          importPaths: ['/path/to/import'],
-          exclusionPatterns: ['**/Raw/**'],
-        });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          name: 'My Awesome Library',
-          importPaths: ['/path/to/import'],
-        }),
-      );
-    });
-
-    it('should not create an external library with duplicate import paths', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          type: LibraryType.External,
-          name: 'My Awesome Library',
-          importPaths: ['/path', '/path'],
-          exclusionPatterns: ['**/Raw/**'],
-        });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(["All importPaths's elements must be unique"]));
-    });
-
-    it('should not create an external library with duplicate exclusion patterns', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          type: LibraryType.External,
-          name: 'My Awesome Library',
-          importPaths: ['/path/to/import'],
-          exclusionPatterns: ['**/Raw/**', '**/Raw/**'],
-        });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(["All exclusionPatterns's elements must be unique"]));
-    });
-
-    it('should create an upload library with defaults', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.Upload });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          ownerId: admin.userId,
-          type: LibraryType.Upload,
-          name: 'New Upload Library',
-          refreshedAt: null,
-          assetCount: 0,
-          importPaths: [],
-          exclusionPatterns: [],
-        }),
-      );
-    });
-
-    it('should create an upload library with options', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.Upload, name: 'My Awesome Library' });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          name: 'My Awesome Library',
-        }),
-      );
-    });
-
-    it('should not allow upload libraries to have import paths', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.Upload, importPaths: ['/path/to/import'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Upload libraries cannot have import paths'));
-    });
-
-    it('should not allow upload libraries to have exclusion patterns', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.Upload, exclusionPatterns: ['**/Raw/**'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Upload libraries cannot have exclusion patterns'));
-    });
-  });
-
-  describe('PUT /library/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/library/${uuidDto.notFound}`).send({});
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should change the library name', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ name: 'New Library Name' });
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          name: 'New Library Name',
-        }),
-      );
-    });
-
-    it('should not set an empty name', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ name: '' });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['name should not be empty']));
-    });
-
-    it('should change the import paths', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ importPaths: [testAssetDirInternal] });
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          importPaths: [testAssetDirInternal],
-        }),
-      );
-    });
-
-    it('should reject an empty import path', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ importPaths: [''] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in importPaths should not be empty']));
-    });
-
-    it('should reject duplicate import paths', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ importPaths: ['/path', '/path'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(["All importPaths's elements must be unique"]));
-    });
-
-    it('should change the exclusion pattern', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ exclusionPatterns: ['**/Raw/**'] });
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          exclusionPatterns: ['**/Raw/**'],
-        }),
-      );
-    });
-
-    it('should reject duplicate exclusion patterns', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ exclusionPatterns: ['**/*.jpg', '**/*.jpg'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(["All exclusionPatterns's elements must be unique"]));
-    });
-
-    it('should reject an empty exclusion pattern', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ exclusionPatterns: [''] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in exclusionPatterns should not be empty']));
-    });
-  });
-
-  describe('GET /library/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/library/${uuidDto.notFound}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require admin access', async () => {
-      const { status, body } = await request(app)
-        .get(`/library/${uuidDto.notFound}`)
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    it('should get library by id', async () => {
-      const library = await apiUtils.createLibrary(admin.accessToken, { type: LibraryType.External });
-
-      const { status, body } = await request(app)
-        .get(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          ownerId: admin.userId,
-          type: LibraryType.External,
-          name: 'New External Library',
-          refreshedAt: null,
-          assetCount: 0,
-          importPaths: [],
-          exclusionPatterns: [],
-        }),
-      );
-    });
-  });
-
-  describe('DELETE /library/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/library/${uuidDto.notFound}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should not delete the last upload library', async () => {
-      const libraries = await getAllLibraries(
-        { $type: LibraryType.Upload },
-        { headers: asBearerAuth(admin.accessToken) },
-      );
-
-      const adminLibraries = libraries.filter((library) => library.ownerId === admin.userId);
-      expect(adminLibraries.length).toBeGreaterThanOrEqual(1);
-      const lastLibrary = adminLibraries.pop() as LibraryResponseDto;
-
-      // delete all but the last upload library
-      for (const library of adminLibraries) {
-        const { status } = await request(app)
-          .delete(`/library/${library.id}`)
-          .set('Authorization', `Bearer ${admin.accessToken}`);
-        expect(status).toBe(204);
-      }
-
-      const { status, body } = await request(app)
-        .delete(`/library/${lastLibrary.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(body).toEqual(errorDto.noDeleteUploadLibrary);
-      expect(status).toBe(400);
-    });
-
-    it('should delete an external library', async () => {
-      const library = await apiUtils.createLibrary(admin.accessToken, { type: LibraryType.External });
-
-      const { status, body } = await request(app)
-        .delete(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(204);
-      expect(body).toEqual({});
-
-      const libraries = await getAllLibraries({}, { headers: asBearerAuth(admin.accessToken) });
-      expect(libraries).not.toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            id: library.id,
-          }),
-        ]),
-      );
-    });
-  });
-
-  describe('GET /library/:id/statistics', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/library/${uuidDto.notFound}/statistics`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-  });
-
-  describe('POST /library/:id/scan', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/scan`).send({});
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-  });
-
-  describe('POST /library/:id/removeOffline', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/removeOffline`).send({});
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-  });
-
-  describe('POST /library/:id/validate', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/validate`).send({});
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should pass with no import paths', async () => {
-      const response = await apiUtils.validateLibrary(admin.accessToken, library.id, { importPaths: [] });
-      expect(response.importPaths).toEqual([]);
-    });
-
-    it('should fail if path does not exist', async () => {
-      const pathToTest = `${testAssetDirInternal}/does/not/exist`;
-
-      const response = await apiUtils.validateLibrary(admin.accessToken, library.id, {
-        importPaths: [pathToTest],
-      });
-
-      expect(response.importPaths?.length).toEqual(1);
-      const pathResponse = response?.importPaths?.at(0);
-
-      expect(pathResponse).toEqual({
-        importPath: pathToTest,
-        isValid: false,
-        message: `Path does not exist (ENOENT)`,
-      });
-    });
-
-    it('should fail if path is a file', async () => {
-      const pathToTest = `${testAssetDirInternal}/albums/nature/el_torcal_rocks.jpg`;
-
-      const response = await apiUtils.validateLibrary(admin.accessToken, library.id, {
-        importPaths: [pathToTest],
-      });
-
-      expect(response.importPaths?.length).toEqual(1);
-      const pathResponse = response?.importPaths?.at(0);
-
-      expect(pathResponse).toEqual({
-        importPath: pathToTest,
-        isValid: false,
-        message: `Not a directory`,
-      });
-    });
-  });
-});

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

@@ -15,9 +15,16 @@ describe(`/oauth`, () => {
 
   describe('POST /oauth/authorize', () => {
     it(`should throw an error if a redirect uri is not provided`, async () => {
-      const { status, body } = await request(app).post('/oauth/authorize').send({});
+      const { status, body } = await request(app)
+        .post('/oauth/authorize')
+        .send({});
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['redirectUri must be a string', 'redirectUri should not be empty']));
+      expect(body).toEqual(
+        errorDto.badRequest([
+          'redirectUri must be a string',
+          'redirectUri should not be empty',
+        ])
+      );
     });
   });
 });

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

@@ -24,8 +24,14 @@ describe('/partner', () => {
     ]);
 
     await Promise.all([
-      createPartner({ id: user2.userId }, { headers: asBearerAuth(user1.accessToken) }),
-      createPartner({ id: user1.userId }, { headers: asBearerAuth(user2.accessToken) }),
+      createPartner(
+        { id: user2.userId },
+        { headers: asBearerAuth(user1.accessToken) }
+      ),
+      createPartner(
+        { id: user1.userId },
+        { headers: asBearerAuth(user2.accessToken) }
+      ),
     ]);
   });
 
@@ -60,7 +66,9 @@ describe('/partner', () => {
 
   describe('POST /partner/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/partner/${user3.userId}`);
+      const { status, body } = await request(app).post(
+        `/partner/${user3.userId}`
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -81,13 +89,17 @@ describe('/partner', () => {
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Partner already exists' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Partner already exists' })
+      );
     });
   });
 
   describe('PUT /partner/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/partner/${user2.userId}`);
+      const { status, body } = await request(app).put(
+        `/partner/${user2.userId}`
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -100,13 +112,17 @@ describe('/partner', () => {
         .send({ inTimeline: false });
 
       expect(status).toBe(200);
-      expect(body).toEqual(expect.objectContaining({ id: user2.userId, inTimeline: false }));
+      expect(body).toEqual(
+        expect.objectContaining({ id: user2.userId, inTimeline: false })
+      );
     });
   });
 
   describe('DELETE /partner/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/partner/${user3.userId}`);
+      const { status, body } = await request(app).delete(
+        `/partner/${user3.userId}`
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -126,7 +142,9 @@ describe('/partner', () => {
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Partner not found' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Partner not found' })
+      );
     });
   });
 });

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

@@ -9,7 +9,6 @@ describe('/activity', () => {
   let admin: LoginResponseDto;
   let visiblePerson: PersonResponseDto;
   let hiddenPerson: PersonResponseDto;
-  let multipleAssetsPerson: PersonResponseDto;
 
   beforeAll(async () => {
     apiUtils.setup();
@@ -20,7 +19,7 @@ describe('/activity', () => {
   beforeEach(async () => {
     await dbUtils.reset(['person']);
 
-    [visiblePerson, hiddenPerson, multipleAssetsPerson] = await Promise.all([
+    [visiblePerson, hiddenPerson] = await Promise.all([
       apiUtils.createPerson(admin.accessToken, {
         name: 'visible_person',
       }),
@@ -28,20 +27,13 @@ describe('/activity', () => {
         name: 'hidden_person',
         isHidden: true,
       }),
-      apiUtils.createPerson(admin.accessToken, {
-        name: 'multiple_assets_person',
-      }),
     ]);
 
-    const asset1 = await apiUtils.createAsset(admin.accessToken);
-    const asset2 = await apiUtils.createAsset(admin.accessToken);
+    const asset = await apiUtils.createAsset(admin.accessToken);
 
     await Promise.all([
-      dbUtils.createFace({ assetId: asset1.id, personId: visiblePerson.id }),
-      dbUtils.createFace({ assetId: asset1.id, personId: hiddenPerson.id }),
-      dbUtils.createFace({ assetId: asset1.id, personId: multipleAssetsPerson.id }),
-      dbUtils.createFace({ assetId: asset1.id, personId: multipleAssetsPerson.id }),
-      dbUtils.createFace({ assetId: asset2.id, personId: multipleAssetsPerson.id }),
+      dbUtils.createFace({ assetId: asset.id, personId: visiblePerson.id }),
+      dbUtils.createFace({ assetId: asset.id, personId: hiddenPerson.id }),
     ]);
   });
 
@@ -63,10 +55,9 @@ describe('/activity', () => {
 
       expect(status).toBe(200);
       expect(body).toEqual({
-        total: 3,
+        total: 2,
         hidden: 1,
         people: [
-          expect.objectContaining({ name: 'multiple_assets_person' }),
           expect.objectContaining({ name: 'visible_person' }),
           expect.objectContaining({ name: 'hidden_person' }),
         ],
@@ -74,23 +65,24 @@ describe('/activity', () => {
     });
 
     it('should return only visible people', async () => {
-      const { status, body } = await request(app).get('/person').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/person')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
       expect(body).toEqual({
-        total: 3,
+        total: 2,
         hidden: 1,
-        people: [
-          expect.objectContaining({ name: 'multiple_assets_person' }),
-          expect.objectContaining({ name: 'visible_person' }),
-        ],
+        people: [expect.objectContaining({ name: 'visible_person' })],
       });
     });
   });
 
   describe('GET /person/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/person/${uuidDto.notFound}`);
+      const { status, body } = await request(app).get(
+        `/person/${uuidDto.notFound}`
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -115,36 +107,11 @@ describe('/activity', () => {
     });
   });
 
-  describe('GET /person/:id/statistics', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/person/${multipleAssetsPerson.id}/statistics`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should throw error if person with id does not exist', async () => {
-      const { status, body } = await request(app)
-        .get(`/person/${uuidDto.notFound}/statistics`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest());
-    });
-
-    it('should return the correct number of assets', async () => {
-      const { status, body } = await request(app)
-        .get(`/person/${multipleAssetsPerson.id}/statistics`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual(expect.objectContaining({ assets: 2 }));
-    });
-  });
-
   describe('PUT /person/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/person/${uuidDto.notFound}`);
+      const { status, body } = await request(app).put(
+        `/person/${uuidDto.notFound}`
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -172,7 +139,7 @@ describe('/activity', () => {
           birthDate: '123567',
           response: 'Not found or no person.write access',
         },
-        { birthDate: 123_567, response: 'Not found or no person.write access' },
+        { birthDate: 123567, response: 'Not found or no person.write access' },
       ]) {
         const { status, body } = await request(app)
           .put(`/person/${uuidDto.notFound}`)

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

@@ -97,7 +97,9 @@ describe('/server-info', () => {
 
   describe('GET /server-info/statistics', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/server-info/statistics');
+      const { status, body } = await request(app).get(
+        '/server-info/statistics'
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -143,7 +145,9 @@ describe('/server-info', () => {
 
   describe('GET /server-info/media-types', () => {
     it('should return accepted media types', async () => {
-      const { status, body } = await request(app).get('/server-info/media-types');
+      const { status, body } = await request(app).get(
+        '/server-info/media-types'
+      );
       expect(status).toBe(200);
       expect(body).toEqual({
         sidecar: ['.xmp'],

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

@@ -46,8 +46,14 @@ describe('/shared-link', () => {
     ]);
 
     [album, deletedAlbum, metadataAlbum] = await Promise.all([
-      createAlbum({ createAlbumDto: { albumName: 'album' } }, { headers: asBearerAuth(user1.accessToken) }),
-      createAlbum({ createAlbumDto: { albumName: 'deleted album' } }, { headers: asBearerAuth(user2.accessToken) }),
+      createAlbum(
+        { createAlbumDto: { albumName: 'album' } },
+        { headers: asBearerAuth(user1.accessToken) },
+      ),
+      createAlbum(
+        { createAlbumDto: { albumName: 'deleted album' } },
+        { headers: asBearerAuth(user2.accessToken) },
+      ),
       createAlbum(
         {
           createAlbumDto: {
@@ -59,38 +65,47 @@ describe('/shared-link', () => {
       ),
     ]);
 
-    [linkWithDeletedAlbum, linkWithAlbum, linkWithAssets, linkWithPassword, linkWithMetadata, linkWithoutMetadata] =
-      await Promise.all([
-        apiUtils.createSharedLink(user2.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: deletedAlbum.id,
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: album.id,
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Individual,
-          assetIds: [asset1.id],
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: album.id,
-          password: 'foo',
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: metadataAlbum.id,
-          showMetadata: true,
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: metadataAlbum.id,
-          showMetadata: false,
-        }),
-      ]);
+    [
+      linkWithDeletedAlbum,
+      linkWithAlbum,
+      linkWithAssets,
+      linkWithPassword,
+      linkWithMetadata,
+      linkWithoutMetadata,
+    ] = await Promise.all([
+      apiUtils.createSharedLink(user2.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: deletedAlbum.id,
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: album.id,
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Individual,
+        assetIds: [asset1.id],
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: album.id,
+        password: 'foo',
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: metadataAlbum.id,
+        showMetadata: true,
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: metadataAlbum.id,
+        showMetadata: false,
+      }),
+    ]);
 
-    await deleteUser({ id: user2.userId }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUser(
+      { id: user2.userId },
+      { headers: asBearerAuth(admin.accessToken) },
+    );
   });
 
   describe('GET /shared-link', () => {
@@ -131,13 +146,17 @@ describe('/shared-link', () => {
 
   describe('GET /shared-link/me', () => {
     it('should not require admin authentication', async () => {
-      const { status } = await request(app).get('/shared-link/me').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status } = await request(app)
+        .get('/shared-link/me')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(403);
     });
 
     it('should get data for correct shared link', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithAlbum.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithAlbum.key });
 
       expect(status).toBe(200);
       expect(body).toEqual(
@@ -159,14 +178,18 @@ describe('/shared-link', () => {
     });
 
     it('should return unauthorized if target has been soft deleted', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithDeletedAlbum.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithDeletedAlbum.key });
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.invalidShareKey);
     });
 
     it('should return unauthorized for password protected link', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithPassword.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithPassword.key });
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.invalidSharePassword);
@@ -188,7 +211,9 @@ describe('/shared-link', () => {
     });
 
     it('should return metadata for album shared link', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithMetadata.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithMetadata.key });
 
       expect(status).toBe(200);
       expect(body.assets).toHaveLength(1);
@@ -204,7 +229,9 @@ describe('/shared-link', () => {
     });
 
     it('should not return metadata for album shared link without metadata', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithoutMetadata.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithoutMetadata.key });
 
       expect(status).toBe(200);
       expect(body.assets).toHaveLength(1);
@@ -220,7 +247,9 @@ describe('/shared-link', () => {
 
   describe('GET /shared-link/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/shared-link/${linkWithAlbum.id}`);
+      const { status, body } = await request(app).get(
+        `/shared-link/${linkWithAlbum.id}`,
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -247,7 +276,9 @@ describe('/shared-link', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Shared link not found' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Shared link not found' }),
+      );
     });
   });
 
@@ -277,7 +308,9 @@ describe('/shared-link', () => {
         .send({ type: SharedLinkType.Album });
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Invalid albumId' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Invalid albumId' }),
+      );
     });
 
     it('should require a valid asset id', async () => {
@@ -287,7 +320,9 @@ describe('/shared-link', () => {
         .send({ type: SharedLinkType.Individual, assetId: uuidDto.notFound });
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Invalid assetIds' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Invalid assetIds' }),
+      );
     });
 
     it('should create a shared link', async () => {
@@ -389,7 +424,9 @@ describe('/shared-link', () => {
 
   describe('DELETE /shared-link/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/shared-link/${linkWithAlbum.id}`);
+      const { status, body } = await request(app).delete(
+        `/shared-link/${linkWithAlbum.id}`,
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);

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

@@ -18,7 +18,9 @@ describe('/system-config', () => {
 
   describe('GET /system-config/map/style.json', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/system-config/map/style.json');
+      const { status, body } = await request(app).get(
+        '/system-config/map/style.json'
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -30,7 +32,11 @@ describe('/system-config', () => {
           .query({ theme })
           .set('Authorization', `Bearer ${admin.accessToken}`);
         expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest(['theme must be one of the following values: light, dark']));
+        expect(body).toEqual(
+          errorDto.badRequest([
+            'theme must be one of the following values: light, dark',
+          ])
+        );
       }
     });
 

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

@@ -32,16 +32,24 @@ describe('/trash', () => {
       const { id: assetId } = await apiUtils.createAsset(admin.accessToken);
       await apiUtils.deleteAssets(admin.accessToken, [assetId]);
 
-      const before = await getAllAssets({}, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getAllAssets(
+        {},
+        { headers: asBearerAuth(admin.accessToken) },
+      );
 
       expect(before.length).toBeGreaterThanOrEqual(1);
 
-      const { status } = await request(app).post('/trash/empty').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status } = await request(app)
+        .post('/trash/empty')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
-      await wsUtils.waitForEvent({ event: 'delete', assetId });
+      await wsUtils.once(ws, 'on_asset_delete');
 
-      const after = await getAllAssets({}, { headers: asBearerAuth(admin.accessToken) });
+      const after = await getAllAssets(
+        {},
+        { headers: asBearerAuth(admin.accessToken) },
+      );
       expect(after.length).toBe(0);
     });
   });
@@ -61,7 +69,9 @@ describe('/trash', () => {
       const before = await apiUtils.getAssetInfo(admin.accessToken, assetId);
       expect(before.isTrashed).toBe(true);
 
-      const { status } = await request(app).post('/trash/restore').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status } = await request(app)
+        .post('/trash/restore')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
       const after = await apiUtils.getAssetInfo(admin.accessToken, assetId);

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

@@ -22,7 +22,10 @@ describe('/server-info', () => {
       apiUtils.userSetup(admin.accessToken, createUserDto.user3),
     ]);
 
-    await deleteUser({ id: deletedUser.userId }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUser(
+      { id: deletedUser.userId },
+      { headers: asBearerAuth(admin.accessToken) }
+    );
   });
 
   describe('GET /user', () => {
@@ -33,7 +36,9 @@ describe('/server-info', () => {
     });
 
     it('should get users', async () => {
-      const { status, body } = await request(app).get('/user').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/user')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
       expect(body).toHaveLength(4);
       expect(body).toEqual(
@@ -42,7 +47,7 @@ describe('/server-info', () => {
           expect.objectContaining({ email: 'user1@immich.cloud' }),
           expect.objectContaining({ email: 'user2@immich.cloud' }),
           expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ]),
+        ])
       );
     });
 
@@ -58,7 +63,7 @@ describe('/server-info', () => {
           expect.objectContaining({ email: 'admin@immich.cloud' }),
           expect.objectContaining({ email: 'user2@immich.cloud' }),
           expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ]),
+        ])
       );
     });
 
@@ -76,7 +81,7 @@ describe('/server-info', () => {
           expect.objectContaining({ email: 'user1@immich.cloud' }),
           expect.objectContaining({ email: 'user2@immich.cloud' }),
           expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ]),
+        ])
       );
     });
   });
@@ -107,7 +112,9 @@ describe('/server-info', () => {
     });
 
     it('should get my info', async () => {
-      const { status, body } = await request(app).get(`/user/me`).set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get(`/user/me`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(200);
       expect(body).toMatchObject({
         id: admin.userId,
@@ -118,7 +125,9 @@ describe('/server-info', () => {
 
   describe('POST /user', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/user`).send(createUserDto.user1);
+      const { status, body } = await request(app)
+        .post(`/user`)
+        .send(createUserDto.user1);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -172,7 +181,9 @@ describe('/server-info', () => {
 
   describe('DELETE /user/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/user/${userToDelete.userId}`);
+      const { status, body } = await request(app).delete(
+        `/user/${userToDelete.userId}`
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -230,7 +241,10 @@ describe('/server-info', () => {
     });
 
     it('should ignore updates to createdAt, updatedAt and deletedAt', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getUserById(
+        { id: admin.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
 
       const { status, body } = await request(app)
         .put(`/user`)
@@ -247,7 +261,10 @@ describe('/server-info', () => {
     });
 
     it('should update first and last name', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getUserById(
+        { id: admin.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
 
       const { status, body } = await request(app)
         .put(`/user`)
@@ -267,7 +284,10 @@ describe('/server-info', () => {
     });
 
     it('should update memories enabled', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getUserById(
+        { id: admin.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
       const { status, body } = await request(app)
         .put(`/user`)
         .send({

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

@@ -1,6 +1,6 @@
 import { stat } from 'node:fs/promises';
 import { apiUtils, app, dbUtils, immichCli } from 'src/utils';
-import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe(`immich login-key`, () => {
   beforeAll(() => {
@@ -24,17 +24,27 @@ describe(`immich login-key`, () => {
   });
 
   it('should require a valid key', async () => {
-    const { stderr, exitCode } = await immichCli(['login-key', app, 'immich-is-so-cool']);
-    expect(stderr).toContain('Failed to connect to server http://127.0.0.1:2283/api: Error: 401');
+    const { stderr, exitCode } = await immichCli([
+      'login-key',
+      app,
+      'immich-is-so-cool',
+    ]);
+    expect(stderr).toContain(
+      'Failed to connect to server http://127.0.0.1:2283/api: Error: 401'
+    );
     expect(exitCode).toBe(1);
   });
 
-  it('should login and save auth.yml with 600', async () => {
+  it('should login', async () => {
     const admin = await apiUtils.adminSetup();
     const key = await apiUtils.createApiKey(admin.accessToken);
-    const { stdout, stderr, exitCode } = await immichCli(['login-key', app, `${key.secret}`]);
+    const { stdout, stderr, exitCode } = await immichCli([
+      'login-key',
+      app,
+      `${key.secret}`,
+    ]);
     expect(stdout.split('\n')).toEqual([
-      'Logging in to http://127.0.0.1:2283/api',
+      'Logging in...',
       'Logged in as admin@immich.cloud',
       'Wrote auth info to /tmp/immich/auth.yml',
     ]);
@@ -45,18 +55,4 @@ describe(`immich login-key`, () => {
     const mode = (stats.mode & 0o777).toString(8);
     expect(mode).toEqual('600');
   });
-
-  it('should login without /api in the url', async () => {
-    const admin = await apiUtils.adminSetup();
-    const key = await apiUtils.createApiKey(admin.accessToken);
-    const { stdout, stderr, exitCode } = await immichCli(['login-key', app.replaceAll('/api', ''), `${key.secret}`]);
-    expect(stdout.split('\n')).toEqual([
-      'Logging in to http://127.0.0.1:2283',
-      'Discovered API at http://127.0.0.1:2283/api',
-      'Logged in as admin@immich.cloud',
-      'Wrote auth info to /tmp/immich/auth.yml',
-    ]);
-    expect(stderr).toBe('');
-    expect(exitCode).toBe(0);
-  });
 });

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

@@ -1,6 +1,13 @@
 import { getAllAlbums, getAllAssets } from '@immich/sdk';
-import { mkdir, readdir, rm, symlink } from 'node:fs/promises';
-import { apiUtils, asKeyAuth, cliUtils, dbUtils, immichCli, testAssetDir } from 'src/utils';
+import { mkdir, readdir, rm, symlink } from 'fs/promises';
+import {
+  apiUtils,
+  asKeyAuth,
+  cliUtils,
+  dbUtils,
+  immichCli,
+  testAssetDir,
+} from 'src/utils';
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
 describe(`immich upload`, () => {
@@ -18,10 +25,16 @@ describe(`immich upload`, () => {
 
   describe('immich upload --recursive', () => {
     it('should upload a folder recursively', async () => {
-      const { stderr, stdout, exitCode } = await immichCli(['upload', `${testAssetDir}/albums/nature/`, '--recursive']);
+      const { stderr, stdout, exitCode } = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+      ]);
       expect(stderr).toBe('');
       expect(stdout.split('\n')).toEqual(
-        expect.arrayContaining([expect.stringContaining('Successfully uploaded 9 assets')]),
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+        ]),
       );
       expect(exitCode).toBe(0);
 
@@ -57,9 +70,15 @@ describe(`immich upload`, () => {
     });
 
     it('should add existing assets to albums', async () => {
-      const response1 = await immichCli(['upload', `${testAssetDir}/albums/nature/`, '--recursive']);
+      const response1 = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+      ]);
       expect(response1.stdout.split('\n')).toEqual(
-        expect.arrayContaining([expect.stringContaining('Successfully uploaded 9 assets')]),
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+        ]),
       );
       expect(response1.stderr).toBe('');
       expect(response1.exitCode).toBe(0);
@@ -70,10 +89,17 @@ describe(`immich upload`, () => {
       const albums1 = await getAllAlbums({}, { headers: asKeyAuth(key) });
       expect(albums1.length).toBe(0);
 
-      const response2 = await immichCli(['upload', `${testAssetDir}/albums/nature/`, '--recursive', '--album']);
+      const response2 = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+        '--album',
+      ]);
       expect(response2.stdout.split('\n')).toEqual(
         expect.arrayContaining([
-          expect.stringContaining('All assets were already uploaded, nothing to do.'),
+          expect.stringContaining(
+            'All assets were already uploaded, nothing to do.',
+          ),
           expect.stringContaining('Successfully updated 9 assets'),
         ]),
       );
@@ -121,10 +147,17 @@ describe(`immich upload`, () => {
       await mkdir(`/tmp/albums/nature`, { recursive: true });
       const filesToLink = await readdir(`${testAssetDir}/albums/nature`);
       for (const file of filesToLink) {
-        await symlink(`${testAssetDir}/albums/nature/${file}`, `/tmp/albums/nature/${file}`);
+        await symlink(
+          `${testAssetDir}/albums/nature/${file}`,
+          `/tmp/albums/nature/${file}`,
+        );
       }
 
-      const { stderr, stdout, exitCode } = await immichCli(['upload', `/tmp/albums/nature`, '--delete']);
+      const { stderr, stdout, exitCode } = await immichCli([
+        'upload',
+        `/tmp/albums/nature`,
+        '--delete',
+      ]);
 
       const files = await readdir(`/tmp/albums/nature`);
       await rm(`/tmp/albums/nature`, { recursive: true });

e2e/src/fixtures.ts

@@ -44,6 +44,7 @@ export const userDto = {
     email: signupDto.admin.email,
     password: signupDto.admin.password,
     storageLabel: 'admin',
+    externalPath: null,
     oauthId: '',
     shouldChangePassword: false,
     profileImagePath: '',
@@ -62,6 +63,7 @@ export const userDto = {
     email: createUserDto.user1.email,
     password: createUserDto.user1.password,
     storageLabel: null,
+    externalPath: null,
     oauthId: '',
     shouldChangePassword: false,
     profileImagePath: '',

e2e/src/generators.ts

@@ -1,31 +0,0 @@
-import { PNG } from 'pngjs';
-
-const createPNG = (r: number, g: number, b: number) => {
-  const image = new PNG({ width: 1, height: 1 });
-  image.data[0] = r;
-  image.data[1] = g;
-  image.data[2] = b;
-  image.data[3] = 255;
-  return PNG.sync.write(image);
-};
-
-function* newPngFactory() {
-  for (let r = 0; r < 255; r++) {
-    for (let g = 0; g < 255; g++) {
-      for (let b = 0; b < 255; b++) {
-        yield createPNG(r, g, b);
-      }
-    }
-  }
-}
-
-const pngFactory = newPngFactory();
-
-export const makeRandomImage = () => {
-  const { value } = pngFactory.next();
-  if (!value) {
-    throw new Error('Ran out of random asset data');
-  }
-
-  return value;
-};

e2e/src/responses.ts

@@ -65,6 +65,7 @@ export const signupResponseDto = {
     name: 'Immich Admin',
     email: 'admin@immich.cloud',
     storageLabel: 'admin',
+    externalPath: null,
     profileImagePath: '',
     // why? lol
     shouldChangePassword: true,

e2e/src/setup.ts

@@ -1,24 +1,26 @@
-import { exec, spawn } from 'node:child_process';
+import { spawn, exec } from 'child_process';
 
 export default async () => {
   let _resolve: () => unknown;
-  const ready = new Promise<void>((resolve) => (_resolve = resolve));
+  const promise = new Promise<void>((resolve) => (_resolve = resolve));
 
   const child = spawn('docker', ['compose', 'up'], { stdio: 'pipe' });
 
   child.stdout.on('data', (data) => {
     const input = data.toString();
     console.log(input);
-    if (input.includes('Immich Microservices is listening')) {
+    if (input.includes('Immich Server is listening')) {
       _resolve();
     }
   });
 
   child.stderr.on('data', (data) => console.log(data.toString()));
 
-  await ready;
+  await promise;
 
   return async () => {
-    await new Promise<void>((resolve) => exec('docker compose down', () => resolve()));
+    await new Promise<void>((resolve) =>
+      exec('docker compose down', () => resolve())
+    );
   };
 };

e2e/src/utils.ts

@@ -1,16 +1,12 @@
 import {
   AssetFileUploadResponseDto,
-  AssetResponseDto,
   CreateAlbumDto,
   CreateAssetDto,
-  CreateLibraryDto,
   CreateUserDto,
   PersonUpdateDto,
   SharedLinkCreateDto,
-  ValidateLibraryDto,
   createAlbum,
   createApiKey,
-  createLibrary,
   createPerson,
   createSharedLink,
   createUser,
@@ -21,19 +17,16 @@ import {
   setAdminOnboarding,
   signUpAdmin,
   updatePerson,
-  validate,
 } from '@immich/sdk';
 import { BrowserContext } from '@playwright/test';
-import { exec, spawn } from 'node:child_process';
-import { createHash } from 'node:crypto';
+import { exec, spawn } from 'child_process';
+import { randomBytes } from 'node:crypto';
 import { access } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import pg from 'pg';
 import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
-import { makeRandomImage } from 'src/generators';
 import request from 'supertest';
 
 const execPromise = promisify(exec);
@@ -47,8 +40,6 @@ const directoryExists = (directory: string) =>
 
 // TODO move test assets into e2e/assets
 export const testAssetDir = path.resolve(`./../server/test/assets/`);
-export const testAssetDirInternal = '/data/assets';
-export const tempDir = tmpdir();
 
 const serverContainerName = 'immich-e2e-server';
 const mediaDir = '/usr/src/app/upload';
@@ -56,7 +47,6 @@ const dirs = [
   `"${mediaDir}/thumbs"`,
   `"${mediaDir}/upload"`,
   `"${mediaDir}/library"`,
-  `"${mediaDir}/encoded-video"`,
 ].join(' ');
 
 if (!(await directoryExists(`${testAssetDir}/albums`))) {
@@ -75,16 +65,20 @@ let client: pg.Client | null = null;
 
 export const fileUtils = {
   reset: async () => {
-    await execPromise(`docker exec -i "${serverContainerName}" /bin/bash -c "rm -rf ${dirs} && mkdir ${dirs}"`);
+    await execPromise(
+      `docker exec -i "${serverContainerName}" /bin/bash -c "rm -rf ${dirs} && mkdir ${dirs}"`,
+    );
   },
-  unzip: async (input: string, output: string) => {
-    await execPromise(`unzip -o -d "${output}" "${input}"`);
-  },
-  sha1: (bytes: Buffer) => createHash('sha1').update(bytes).digest('base64'),
 };
 
 export const dbUtils = {
-  createFace: async ({ assetId, personId }: { assetId: string; personId: string }) => {
+  createFace: async ({
+    assetId,
+    personId,
+  }: {
+    assetId: string;
+    personId: string;
+  }) => {
     if (!client) {
       return;
     }
@@ -92,28 +86,31 @@ export const dbUtils = {
     const vector = Array.from({ length: 512 }, Math.random);
     const embedding = `[${vector.join(',')}]`;
 
-    await client.query('INSERT INTO asset_faces ("assetId", "personId", "embedding") VALUES ($1, $2, $3)', [
-      assetId,
-      personId,
-      embedding,
-    ]);
+    await client.query(
+      'INSERT INTO asset_faces ("assetId", "personId", "embedding") VALUES ($1, $2, $3)',
+      [assetId, personId, embedding],
+    );
   },
   setPersonThumbnail: async (personId: string) => {
     if (!client) {
       return;
     }
 
-    await client.query(`UPDATE "person" set "thumbnailPath" = '/my/awesome/thumbnail.jpg' where "id" = $1`, [personId]);
+    await client.query(
+      `UPDATE "person" set "thumbnailPath" = '/my/awesome/thumbnail.jpg' where "id" = $1`,
+      [personId],
+    );
   },
   reset: async (tables?: string[]) => {
     try {
       if (!client) {
-        client = new pg.Client('postgres://postgres:postgres@127.0.0.1:5433/immich');
+        client = new pg.Client(
+          'postgres://postgres:postgres@127.0.0.1:5433/immich',
+        );
         await client.connect();
       }
 
       tables = tables || [
-        'libraries',
         'shared_links',
         'person',
         'albums',
@@ -155,7 +152,7 @@ export interface CliResponse {
 export const immichCli = async (args: string[]) => {
   let _resolve: (value: CliResponse) => void;
   const deferred = new Promise<CliResponse>((resolve) => (_resolve = resolve));
-  const _args = ['node_modules/.bin/immich', '-d', `/${tempDir}/immich/`, ...args];
+  const _args = ['node_modules/.bin/immich', '-d', '/tmp/immich/', ...args];
   const child = spawn('node', _args, {
     stdio: 'pipe',
   });
@@ -180,80 +177,37 @@ export interface AdminSetupOptions {
   onboarding?: boolean;
 }
 
-export enum SocketEvent {
-  UPLOAD = 'upload',
-  DELETE = 'delete',
-}
-
-export type EventType = 'upload' | 'delete';
-export interface WaitOptions {
-  event: EventType;
-  assetId: string;
-  timeout?: number;
-}
-
-const events: Record<EventType, Set<string>> = {
-  upload: new Set<string>(),
-  delete: new Set<string>(),
-};
-
-const callbacks: Record<string, () => void> = {};
-
-const onEvent = ({ event, assetId }: { event: EventType; assetId: string }) => {
-  events[event].add(assetId);
-  const callback = callbacks[assetId];
-  if (callback) {
-    callback();
-    delete callbacks[assetId];
-  }
-};
-
 export const wsUtils = {
   connect: async (accessToken: string) => {
     const websocket = io('http://127.0.0.1:2283', {
       path: '/api/socket.io',
       transports: ['websocket'],
       extraHeaders: { Authorization: `Bearer ${accessToken}` },
-      autoConnect: true,
+      autoConnect: false,
       forceNew: true,
     });
 
     return new Promise<Socket>((resolve) => {
-      websocket
-        .on('connect', () => resolve(websocket))
-        .on('on_upload_success', (data: AssetResponseDto) => onEvent({ event: 'upload', assetId: data.id }))
-        .on('on_asset_delete', (assetId: string) => onEvent({ event: 'delete', assetId }))
-        .connect();
+      websocket.on('connect', () => resolve(websocket));
+      websocket.connect();
     });
   },
   disconnect: (ws: Socket) => {
     if (ws?.connected) {
       ws.disconnect();
     }
-
-    for (const set of Object.values(events)) {
-      set.clear();
-    }
   },
-  waitForEvent: async ({ event, assetId, timeout: ms }: WaitOptions): Promise<void> => {
-    const set = events[event];
-    if (set.has(assetId)) {
-      return;
-    }
-
-    return new Promise<void>((resolve, reject) => {
-      const timeout = setTimeout(() => reject(new Error(`Timed out waiting for ${event} event`)), ms || 5000);
-
-      callbacks[assetId] = () => {
+  once: <T = any>(ws: Socket, event: string): Promise<T> => {
+    return new Promise<T>((resolve, reject) => {
+      const timeout = setTimeout(() => reject(new Error('Timeout')), 4000);
+      ws.once(event, (data: T) => {
         clearTimeout(timeout);
-        resolve();
-      };
+        resolve(data);
+      });
     });
   },
 };
 
-type AssetData = { bytes?: Buffer; filename: string };
-
 export const apiUtils = {
   setup: () => {
     defaults.baseUrl = app;
@@ -270,64 +224,86 @@ export const apiUtils = {
     return response;
   },
   userSetup: async (accessToken: string, dto: CreateUserDto) => {
-    await createUser({ createUserDto: dto }, { headers: asBearerAuth(accessToken) });
+    await createUser(
+      { createUserDto: dto },
+      { headers: asBearerAuth(accessToken) },
+    );
     return login({
       loginCredentialDto: { email: dto.email, password: dto.password },
     });
   },
   createApiKey: (accessToken: string) => {
-    return createApiKey({ apiKeyCreateDto: { name: 'e2e' } }, { headers: asBearerAuth(accessToken) });
+    return createApiKey(
+      { apiKeyCreateDto: { name: 'e2e' } },
+      { headers: asBearerAuth(accessToken) },
+    );
   },
   createAlbum: (accessToken: string, dto: CreateAlbumDto) =>
-    createAlbum({ createAlbumDto: dto }, { headers: asBearerAuth(accessToken) }),
+    createAlbum(
+      { createAlbumDto: dto },
+      { headers: asBearerAuth(accessToken) },
+    ),
   createAsset: async (
     accessToken: string,
-    dto?: Partial<Omit<CreateAssetDto, 'assetData'>> & { assetData?: AssetData },
+    dto?: Partial<Omit<CreateAssetDto, 'assetData'>>,
+    data?: {
+      bytes?: Buffer;
+      filename?: string;
+    },
   ) => {
     const _dto = {
       deviceAssetId: 'test-1',
       deviceId: 'test',
       fileCreatedAt: new Date().toISOString(),
       fileModifiedAt: new Date().toISOString(),
-      ...dto,
+      ...(dto || {}),
     };
 
-    const assetData = dto?.assetData?.bytes || makeRandomImage();
-    const filename = dto?.assetData?.filename || 'example.png';
+    const _assetData = {
+      bytes: randomBytes(32),
+      filename: 'example.jpg',
+      ...(data || {}),
+    };
 
     const builder = request(app)
       .post(`/asset/upload`)
-      .attach('assetData', assetData, filename)
+      .attach('assetData', _assetData.bytes, _assetData.filename)
       .set('Authorization', `Bearer ${accessToken}`);
 
     for (const [key, value] of Object.entries(_dto)) {
-      void builder.field(key, String(value));
+      builder.field(key, String(value));
     }
 
     const { body } = await builder;
 
     return body as AssetFileUploadResponseDto;
   },
-  getAssetInfo: (accessToken: string, id: string) => getAssetInfo({ id }, { headers: asBearerAuth(accessToken) }),
+  getAssetInfo: (accessToken: string, id: string) =>
+    getAssetInfo({ id }, { headers: asBearerAuth(accessToken) }),
   deleteAssets: (accessToken: string, ids: string[]) =>
-    deleteAssets({ assetBulkDeleteDto: { ids } }, { headers: asBearerAuth(accessToken) }),
+    deleteAssets(
+      { assetBulkDeleteDto: { ids } },
+      { headers: asBearerAuth(accessToken) },
+    ),
   createPerson: async (accessToken: string, dto?: PersonUpdateDto) => {
     // TODO fix createPerson to accept a body
-    const person = await createPerson({ headers: asBearerAuth(accessToken) });
+    let person = await createPerson({ headers: asBearerAuth(accessToken) });
     await dbUtils.setPersonThumbnail(person.id);
 
     if (!dto) {
       return person;
     }
 
-    return updatePerson({ id: person.id, personUpdateDto: dto }, { headers: asBearerAuth(accessToken) });
+    return updatePerson(
+      { id: person.id, personUpdateDto: dto },
+      { headers: asBearerAuth(accessToken) },
+    );
   },
   createSharedLink: (accessToken: string, dto: SharedLinkCreateDto) =>
-    createSharedLink({ sharedLinkCreateDto: dto }, { headers: asBearerAuth(accessToken) }),
-  createLibrary: (accessToken: string, dto: CreateLibraryDto) =>
-    createLibrary({ createLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
-  validateLibrary: (accessToken: string, id: string, dto: ValidateLibraryDto) =>
-    validate({ id, validateLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
+    createSharedLink(
+      { sharedLinkCreateDto: dto },
+      { headers: asBearerAuth(accessToken) },
+    ),
 };
 
 export const cliUtils = {
@@ -347,7 +323,7 @@ export const webUtils = {
         value: accessToken,
         domain: '127.0.0.1',
         path: '/',
-        expires: 1_742_402_728,
+        expires: 1742402728,
         httpOnly: true,
         secure: false,
         sameSite: 'Lax',
@@ -357,7 +333,7 @@ export const webUtils = {
         value: 'password',
         domain: '127.0.0.1',
         path: '/',
-        expires: 1_742_402_728,
+        expires: 1742402728,
         httpOnly: true,
         secure: false,
         sameSite: 'Lax',
@@ -367,7 +343,7 @@ export const webUtils = {
         value: 'true',
         domain: '127.0.0.1',
         path: '/',
-        expires: 1_742_402_728,
+        expires: 1742402728,
         httpOnly: false,
         secure: false,
         sameSite: 'Lax',

e2e/src/web/specs/auth.e2e-spec.ts

@@ -1,4 +1,4 @@
-import { expect, test } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 import { apiUtils, dbUtils, webUtils } from 'src/utils';
 
 test.describe('Registration', () => {
@@ -68,7 +68,7 @@ test.describe('Registration', () => {
     await page.getByRole('button', { name: 'Login' }).click();
 
     // change password
-    await expect(page.getByRole('heading')).toHaveText('Change Password');
+    expect(page.getByRole('heading')).toHaveText('Change Password');
     await expect(page).toHaveURL('/auth/change-password');
     await page.getByLabel('New Password').fill('new-password');
     await page.getByLabel('Confirm Password').fill('new-password');

e2e/src/web/specs/shared-link.e2e-spec.ts

@@ -1,17 +1,18 @@
 import {
   AlbumResponseDto,
-  AssetFileUploadResponseDto,
+  AssetResponseDto,
   LoginResponseDto,
   SharedLinkResponseDto,
   SharedLinkType,
   createAlbum,
+  createSharedLink,
 } from '@immich/sdk';
 import { test } from '@playwright/test';
 import { apiUtils, asBearerAuth, dbUtils } from 'src/utils';
 
 test.describe('Shared Links', () => {
   let admin: LoginResponseDto;
-  let asset: AssetFileUploadResponseDto;
+  let asset: AssetResponseDto;
   let album: AlbumResponseDto;
   let sharedLink: SharedLinkResponseDto;
   let sharedLinkPassword: SharedLinkResponseDto;
@@ -28,7 +29,7 @@ test.describe('Shared Links', () => {
           assetIds: [asset.id],
         },
       },
-      { headers: asBearerAuth(admin.accessToken) },
+      { headers: asBearerAuth(admin.accessToken) }
     );
     sharedLink = await apiUtils.createSharedLink(admin.accessToken, {
       type: SharedLinkType.Album,
@@ -52,7 +53,7 @@ test.describe('Shared Links', () => {
     await page.waitForSelector('#asset-group-by-date svg');
     await page.getByRole('checkbox').click();
     await page.getByRole('button', { name: 'Download' }).click();
-    await page.getByText('DOWNLOADING', { exact: true }).waitFor();
+    await page.getByText('DOWNLOADING').waitFor();
   });
 
   test('enter password for a shared link', async ({ page }) => {

e2e/tsconfig.json

@@ -18,6 +18,5 @@
     "rootDirs": ["src"],
     "baseUrl": "./"
   },
-  "include": ["src/**/*.ts"],
   "exclude": ["dist", "node_modules"]
 }

e2e/vitest.config.ts

@@ -1,17 +1,9 @@
 import { defineConfig } from 'vitest/config';
 
-// skip `docker compose up` if `make e2e` was already run
-const globalSetup: string[] = [];
-try {
-  await fetch('http://127.0.0.1:2283/api/server-info/ping');
-} catch {
-  globalSetup.push('src/setup.ts');
-}
-
 export default defineConfig({
   test: {
     include: ['src/{api,cli}/specs/*.e2e-spec.ts'],
-    globalSetup,
+    globalSetup: ['src/setup.ts'],
     poolOptions: {
       threads: {
         singleThread: true,

machine-learning/.gitignore

@@ -167,8 +167,6 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 
-# VS Code
-.vscode
 
 *.onnx
 *.zip

machine-learning/Dockerfile

@@ -39,7 +39,7 @@ FROM python:3.11-slim-bookworm@sha256:ce81dc539f0aedc9114cae640f8352fad83d37461c
 FROM openvino/ubuntu22_runtime:2023.1.0@sha256:002842a9005ba01543b7169ff6f14ecbec82287f09c4d1dd37717f0a8e8754a7 as prod-openvino
 USER root
 
-FROM nvidia/cuda:12.2.2-cudnn8-runtime-ubuntu22.04@sha256:8b51b1fe922964d73c482a267b5b519e990d90bf744ec7a40419923737caff6d as prod-cuda
+FROM nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu22.04@sha256:85fb7ac694079fff1061a0140fd5b5a641997880e12112d92589c3bbb1e8b7ca as prod-cuda
 
 COPY --from=builder-cuda /usr/local/bin/python3 /usr/local/bin/python3
 COPY --from=builder-cuda /usr/local/lib/python3.11 /usr/local/lib/python3.11

machine-learning/app/config.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from socket import socket
 
 from gunicorn.arbiter import Arbiter
-from pydantic import BaseModel, BaseSettings
+from pydantic import BaseSettings
 from rich.console import Console
 from rich.logging import RichHandler
 from uvicorn import Server
@@ -15,11 +15,6 @@ from uvicorn.workers import UvicornWorker
 from .schemas import ModelType
 
 
-class PreloadModelData(BaseModel):
-    clip: str | None
-    facial_recognition: str | None
-
-
 class Settings(BaseSettings):
     cache_folder: str = "/cache"
     model_ttl: int = 300
@@ -32,12 +27,10 @@ class Settings(BaseSettings):
     model_inter_op_threads: int = 0
     model_intra_op_threads: int = 0
     ann: bool = True
-    preload: PreloadModelData | None = None
 
     class Config:
         env_prefix = "MACHINE_LEARNING_"
         case_sensitive = False
-        env_nested_delimiter = "__"
 
 
 class LogSettings(BaseSettings):

machine-learning/app/main.py

@@ -17,7 +17,7 @@ from starlette.formparsers import MultiPartParser
 
 from app.models.base import InferenceModel
 
-from .config import PreloadModelData, log, settings
+from .config import log, settings
 from .models.cache import ModelCache
 from .schemas import (
     MessageResponse,
@@ -27,7 +27,7 @@ from .schemas import (
 
 MultiPartParser.max_file_size = 2**26  # spools to disk if payload is 64 MiB or larger
 
-model_cache = ModelCache(revalidate=settings.model_ttl > 0)
+model_cache = ModelCache(ttl=settings.model_ttl, revalidate=settings.model_ttl > 0)
 thread_pool: ThreadPoolExecutor | None = None
 lock = threading.Lock()
 active_requests = 0
@@ -51,8 +51,6 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
             log.info(f"Initialized request thread pool with {settings.request_threads} threads.")
         if settings.model_ttl > 0 and settings.model_ttl_poll_s > 0:
             asyncio.ensure_future(idle_shutdown_task())
-        if settings.preload is not None:
-            await preload_models(settings.preload)
         yield
     finally:
         log.handlers.clear()
@@ -63,14 +61,6 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
         gc.collect()
 
 
-async def preload_models(preload_models: PreloadModelData) -> None:
-    log.info(f"Preloading models: {preload_models}")
-    if preload_models.clip is not None:
-        await load(await model_cache.get(preload_models.clip, ModelType.CLIP))
-    if preload_models.facial_recognition is not None:
-        await load(await model_cache.get(preload_models.facial_recognition, ModelType.FACIAL_RECOGNITION))
-
-
 def update_state() -> Iterator[None]:
     global active_requests, last_called
     active_requests += 1
@@ -113,7 +103,7 @@ async def predict(
     except orjson.JSONDecodeError:
         raise HTTPException(400, f"Invalid options JSON: {options}")
 
-    model = await load(await model_cache.get(model_name, model_type, ttl=settings.model_ttl, **kwargs))
+    model = await load(await model_cache.get(model_name, model_type, **kwargs))
     model.configure(**kwargs)
     outputs = await run(model.predict, inputs)
     return ORJSONResponse(outputs)

machine-learning/app/models/cache.py

@@ -2,7 +2,7 @@ from typing import Any
 
 from aiocache.backends.memory import SimpleMemoryCache
 from aiocache.lock import OptimisticLock
-from aiocache.plugins import TimingPlugin
+from aiocache.plugins import BasePlugin, TimingPlugin
 
 from app.models import from_model_type
 
@@ -15,25 +15,28 @@ class ModelCache:
 
     def __init__(
         self,
+        ttl: float | None = None,
         revalidate: bool = False,
         timeout: int | None = None,
         profiling: bool = False,
     ) -> None:
         """
         Args:
+            ttl: Unloads model after this duration. Disabled if None. Defaults to None.
             revalidate: Resets TTL on cache hit. Useful to keep models in memory while active. Defaults to False.
             timeout: Maximum allowed time for model to load. Disabled if None. Defaults to None.
             profiling: Collects metrics for cache operations, adding slight overhead. Defaults to False.
         """
 
+        self.ttl = ttl
         plugins = []
 
+        if revalidate:
+            plugins.append(RevalidationPlugin())
         if profiling:
             plugins.append(TimingPlugin())
 
-        self.revalidate_enable = revalidate
-
-        self.cache = SimpleMemoryCache(timeout=timeout, plugins=plugins, namespace=None)
+        self.cache = SimpleMemoryCache(ttl=ttl, timeout=timeout, plugins=plugins, namespace=None)
 
     async def get(self, model_name: str, model_type: ModelType, **model_kwargs: Any) -> InferenceModel:
         """
@@ -46,14 +49,11 @@ class ModelCache:
         """
 
         key = f"{model_name}{model_type.value}{model_kwargs.get('mode', '')}"
-
         async with OptimisticLock(self.cache, key) as lock:
             model: InferenceModel | None = await self.cache.get(key)
             if model is None:
                 model = from_model_type(model_type, model_name, **model_kwargs)
-                await lock.cas(model, ttl=model_kwargs.get("ttl", None))
-            elif self.revalidate_enable:
-                await self.revalidate(key, model_kwargs.get("ttl", None))
+                await lock.cas(model, ttl=self.ttl)
         return model
 
     async def get_profiling(self) -> dict[str, float] | None:
@@ -62,6 +62,21 @@ class ModelCache:
 
         return self.cache.profiling
 
-    async def revalidate(self, key: str, ttl: int | None) -> None:
-        if ttl is not None and key in self.cache._handlers:
-            await self.cache.expire(key, ttl)
+
+class RevalidationPlugin(BasePlugin):  # type: ignore[misc]
+    """Revalidates cache item's TTL after cache hit."""
+
+    async def post_get(
+        self,
+        client: SimpleMemoryCache,
+        key: str,
+        ret: Any | None = None,
+        namespace: str | None = None,
+        **kwargs: Any,
+    ) -> None:
+        if ret is None:
+            return
+        if namespace is not None:
+            key = client.build_key(key, namespace)
+        if key in client._handlers:
+            await client.expire(key, client.ttl)

machine-learning/app/test_main.py

@@ -13,12 +13,11 @@ import onnxruntime as ort
 import pytest
 from fastapi.testclient import TestClient
 from PIL import Image
-from pytest import MonkeyPatch
 from pytest_mock import MockerFixture
 
-from app.main import load, preload_models
+from app.main import load
 
-from .config import Settings, log, settings
+from .config import log, settings
 from .models.base import InferenceModel
 from .models.cache import ModelCache
 from .models.clip import MCLIPEncoder, OpenCLIPEncoder
@@ -510,20 +509,20 @@ class TestCache:
 
     @mock.patch("app.models.cache.OptimisticLock", autospec=True)
     async def test_model_ttl(self, mock_lock_cls: mock.Mock, mock_get_model: mock.Mock) -> None:
-        model_cache = ModelCache()
-        await model_cache.get("test_model_name", ModelType.FACIAL_RECOGNITION, ttl=100)
+        model_cache = ModelCache(ttl=100)
+        await model_cache.get("test_model_name", ModelType.FACIAL_RECOGNITION)
         mock_lock_cls.return_value.__aenter__.return_value.cas.assert_called_with(mock.ANY, ttl=100)
 
     @mock.patch("app.models.cache.SimpleMemoryCache.expire")
     async def test_revalidate_get(self, mock_cache_expire: mock.Mock, mock_get_model: mock.Mock) -> None:
-        model_cache = ModelCache(revalidate=True)
-        await model_cache.get("test_model_name", ModelType.FACIAL_RECOGNITION, ttl=100)
-        await model_cache.get("test_model_name", ModelType.FACIAL_RECOGNITION, ttl=100)
+        model_cache = ModelCache(ttl=100, revalidate=True)
+        await model_cache.get("test_model_name", ModelType.FACIAL_RECOGNITION)
+        await model_cache.get("test_model_name", ModelType.FACIAL_RECOGNITION)
         mock_cache_expire.assert_called_once_with(mock.ANY, 100)
 
     async def test_profiling(self, mock_get_model: mock.Mock) -> None:
-        model_cache = ModelCache(profiling=True)
-        await model_cache.get("test_model_name", ModelType.FACIAL_RECOGNITION, ttl=100)
+        model_cache = ModelCache(ttl=100, profiling=True)
+        await model_cache.get("test_model_name", ModelType.FACIAL_RECOGNITION)
         profiling = await model_cache.get_profiling()
         assert isinstance(profiling, dict)
         assert profiling == model_cache.cache.profiling
@@ -549,25 +548,6 @@ class TestCache:
         with pytest.raises(ValueError):
             await model_cache.get("test_model_name", ModelType.CLIP, mode="text")
 
-    async def test_preloads_models(self, monkeypatch: MonkeyPatch, mock_get_model: mock.Mock) -> None:
-        os.environ["MACHINE_LEARNING_PRELOAD__CLIP"] = "ViT-B-32__openai"
-        os.environ["MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION"] = "buffalo_s"
-
-        settings = Settings()
-        assert settings.preload is not None
-        assert settings.preload.clip == "ViT-B-32__openai"
-        assert settings.preload.facial_recognition == "buffalo_s"
-
-        model_cache = ModelCache()
-        monkeypatch.setattr("app.main.model_cache", model_cache)
-
-        await preload_models(settings.preload)
-        assert len(model_cache.cache._cache) == 2
-        assert mock_get_model.call_count == 2
-        await model_cache.get("ViT-B-32__openai", ModelType.CLIP, ttl=100)
-        await model_cache.get("buffalo_s", ModelType.FACIAL_RECOGNITION, ttl=100)
-        assert mock_get_model.call_count == 2
-
 
 @pytest.mark.asyncio
 class TestLoad:

machine-learning/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
 
 [[package]]
 name = "aiocache"
@@ -2030,21 +2030,21 @@ sympy = "*"
 
 [[package]]
 name = "onnxruntime-gpu"
-version = "1.17.1"
+version = "1.17.0"
 description = "ONNX Runtime is a runtime accelerator for Machine Learning models"
 optional = false
 python-versions = "*"
 files = [
-    {file = "onnxruntime_gpu-1.17.1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:e34ecb2b527ee1265135ae74cd99ea198ff344b8221929a920596a1e461e2bbb"},
-    {file = "onnxruntime_gpu-1.17.1-cp310-cp310-win_amd64.whl", hash = "sha256:37786c0f225be90da0a66ca413fe125a925a0900263301cc4dbcad4ff0404673"},
-    {file = "onnxruntime_gpu-1.17.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:3bde190a683ec84ecf61bd390f3c275d388efe72404633df374c52c557ce6d4d"},
-    {file = "onnxruntime_gpu-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:5206c84caa770efcc2ca819f71ec007a244ed748ca04e7ff76b86df1a096d2c8"},
-    {file = "onnxruntime_gpu-1.17.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:0396ec73de565a64509d96dff154f531f8da8023c191f771ceba47a3f4efc266"},
-    {file = "onnxruntime_gpu-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:8531d4a833c8e978c5ff1de7b3bcc4126bbe58ea71fae54ddce58fe8777cb136"},
-    {file = "onnxruntime_gpu-1.17.1-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:7b831f9eafd626f3d44955420a4b1b84f9ffcb987712a0ab6a37d1ee9f2f7a45"},
-    {file = "onnxruntime_gpu-1.17.1-cp38-cp38-win_amd64.whl", hash = "sha256:a389334d3797519d4b12077db32b8764f1ce54374d0f89235edc04efe8bc192c"},
-    {file = "onnxruntime_gpu-1.17.1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:27aeaa36385e459b3867577ed7f68c1756de79aa68f57141d4ae2a31c84f6a33"},
-    {file = "onnxruntime_gpu-1.17.1-cp39-cp39-win_amd64.whl", hash = "sha256:8b46094ea348aff6c6494402ac4260e2d2aba0522ae13e1ae29d98a29384ed70"},
+    {file = "onnxruntime_gpu-1.17.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:1f2a4e0468ac0bd8246996c3d5dbba92cbbaca874bcd7f9cee4e99ce6eb27f5b"},
+    {file = "onnxruntime_gpu-1.17.0-cp310-cp310-win_amd64.whl", hash = "sha256:0721b7930d7abed3730b2335e639e60d94ec411bb4d35a0347cc9c8b52c34540"},
+    {file = "onnxruntime_gpu-1.17.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:be0314afe399943904de7c1ca797cbcc63e6fad60eb85d3df6422f81dd94e79e"},
+    {file = "onnxruntime_gpu-1.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:52125c24b21406d1431e43de1c98cea29c21e0cceba80db530b7e4c9216d86ea"},
+    {file = "onnxruntime_gpu-1.17.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:bb802d8033885c412269f8bc8877d8779b0dc874df6fb9df8b796cba7276ad66"},
+    {file = "onnxruntime_gpu-1.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:8c43533e3e5335eaa78059fb86b849a4faded513a00c1feaaa205ca5af51c40f"},
+    {file = "onnxruntime_gpu-1.17.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:1d461455bba160836d6c11c648c8fd4e4500d5c17096a13e6c2c9d22a4abd436"},
+    {file = "onnxruntime_gpu-1.17.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4398f2175a92f4b35d95279a6294a89c462f24de058a2736ee1d498bab5a16"},
+    {file = "onnxruntime_gpu-1.17.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:1d0e3805cd1c024aba7f4ae576fd08545fc27530a2aaad2b3c8ac0ee889fbd05"},
+    {file = "onnxruntime_gpu-1.17.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc1da5b93363ee600b5b220b04eeec51ad2c2b3e96f0b7615b16b8a173c88001"},
 ]
 
 [package.dependencies]
@@ -2055,11 +2055,6 @@ packaging = "*"
 protobuf = "*"
 sympy = "*"
 
-[package.source]
-type = "legacy"
-url = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple"
-reference = "cuda12"
-
 [[package]]
 name = "onnxruntime-openvino"
 version = "1.15.0"
@@ -2633,6 +2628,7 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
     {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
     {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
     {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
@@ -3623,4 +3619,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.10,<3.12"
-content-hash = "c947090d326e81179054b7ce4dded311df8b7ca5a56680d5e9459cf8ca18df1a"
+content-hash = "c982d5c5fee76ca102d823010a538f287ac98583f330ebee3c0775c5f42f117d"

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.97.0"
+version = "1.96.0"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"
@@ -45,7 +45,7 @@ onnxruntime = "^1.15.0"
 optional = true
 
 [tool.poetry.group.cuda.dependencies]
-onnxruntime-gpu = {version = "^1.17.0", source = "cuda12"}
+onnxruntime-gpu = "^1.15.0"
 
 [tool.poetry.group.openvino]
 optional = true
@@ -59,11 +59,6 @@ optional = true
 [tool.poetry.group.armnn.dependencies]
 onnxruntime = "^1.15.0"
 
-[[tool.poetry.source]]
-name = "cuda12"
-url = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/"
-priority = "explicit"
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

misc/release/pump-version.sh

@@ -62,12 +62,8 @@ fi
 if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then
   echo "Pumping Server: $CURRENT_SERVER => $NEXT_SERVER"
   npm --prefix server version "$SERVER_PUMP"
-  make open-api
-  npm --prefix open-api/typescript-sdk version "$SERVER_PUMP"
   npm --prefix web version "$SERVER_PUMP"
-  npm --prefix web i --package-lock-only
-  npm --prefix cli i --package-lock-only
-  npm --prefix e2e i --package-lock-only
+  make open-api
   poetry --directory machine-learning version "$SERVER_PUMP"
 fi
 

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 125,
-        "android.injected.version.name" => "1.97.0",
+        "android.injected.version.code" => 124,
+        "android.injected.version.name" => "1.96.0",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/android/fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000266">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000271">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="81.342186">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="74.334294">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="48.746195">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="29.507669">
         
       </testcase>
     

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -379,7 +379,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 141;
+				CURRENT_PROJECT_VERSION = 140;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -515,7 +515,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 141;
+				CURRENT_PROJECT_VERSION = 140;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -543,7 +543,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 141;
+				CURRENT_PROJECT_VERSION = 140;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

mobile/ios/Runner/Info.plist

@@ -55,11 +55,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.97.0</string>
+    <string>1.96.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>141</string>
+    <string>140</string>
     <key>FLTEnableImpeller</key>
     <true />
     <key>ITSAppUsesNonExemptEncryption</key>

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-      version_number: "1.97.0"
+      version_number: "1.96.0"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/ios/fastlane/report.xml

@@ -5,32 +5,32 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000304">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000316">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.272646">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.190055">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="3.560896">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="4.109364">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.235745">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.15926">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: build_app" time="114.820395">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="80.90681">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="68.950812">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="71.634559">
         
       </testcase>
     

mobile/lib/modules/asset_viewer/views/gallery_viewer.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 import 'dart:ui' as ui;
@@ -133,7 +132,7 @@ class GalleryViewerPage extends HookConsumerWidget {
     void toggleFavorite(Asset asset) =>
         ref.read(assetProvider.notifier).toggleFavorite([asset]);
 
-    Future<void> precacheNextImage(int index) async {
+    void precacheNextImage(int index) {
       void onError(Object exception, StackTrace? stackTrace) {
         // swallow error silently
         debugPrint('Error precaching next image: $exception, $stackTrace');
@@ -141,7 +140,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
       if (index < totalAssets && index >= 0) {
         final asset = loadAsset(index);
-        await precacheImage(
+        precacheImage(
           ImmichImage.imageProvider(asset: asset),
           context,
           onError: onError,
@@ -712,21 +711,6 @@ class GalleryViewerPage extends HookConsumerWidget {
       [],
     );
 
-    useEffect(
-      () {
-        // No need to await this
-        unawaited(
-          // Delay this a bit so we can finish loading the page
-          Future.delayed(const Duration(milliseconds: 400)).then(
-            // Precache the next image
-            (_) => precacheNextImage(currentIndex.value + 1),
-          ),
-        );
-        return null;
-      },
-      [],
-    );
-
     ref.listen(showControlsProvider, (_, show) {
       if (show) {
         SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
@@ -751,21 +735,14 @@ class GalleryViewerPage extends HookConsumerWidget {
                 isZoomed.value = state != PhotoViewScaleState.initial;
                 ref.read(showControlsProvider.notifier).show = !isZoomed.value;
               },
-              loadingBuilder: (context, event, index) => ClipRect(
-                child: Stack(
-                  fit: StackFit.expand,
-                  children: [
-                    BackdropFilter(
-                      filter: ui.ImageFilter.blur(
-                        sigmaX: 10,
-                        sigmaY: 10,
-                      ),
-                    ),
-                    ImmichThumbnail(
-                      asset: asset(),
-                      fit: BoxFit.contain,
-                    ),
-                  ],
+              loadingBuilder: (context, event, index) => ImageFiltered(
+                imageFilter: ui.ImageFilter.blur(
+                  sigmaX: 1,
+                  sigmaY: 1,
+                ),
+                child: ImmichThumbnail(
+                  asset: asset(),
+                  fit: BoxFit.contain,
                 ),
               ),
               pageController: controller,
@@ -777,16 +754,12 @@ class GalleryViewerPage extends HookConsumerWidget {
                   ),
               itemCount: totalAssets,
               scrollDirection: Axis.horizontal,
-              onPageChanged: (value) async {
+              onPageChanged: (value) {
                 final next = currentIndex.value < value ? value + 1 : value - 1;
-                HapticFeedback.selectionClick();
+                precacheNextImage(next);
                 currentIndex.value = value;
                 stackIndex.value = -1;
-
-                // Wait for page change animation to finish
-                await Future.delayed(const Duration(milliseconds: 400));
-                // Then precache the next image
-                unawaited(precacheNextImage(next));
+                HapticFeedback.selectionClick();
               },
               builder: (context, index) {
                 final a =
@@ -845,7 +818,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                       isMotionVideo: isPlayingMotionVideo.value,
                       placeholder: Image(
                         image: provider,
-                        fit: BoxFit.contain,
+                        fit: BoxFit.fitWidth,
                         height: context.height,
                         width: context.width,
                         alignment: Alignment.center,

mobile/lib/modules/asset_viewer/views/video_viewer_page.dart

@@ -40,7 +40,7 @@ class VideoViewerPage extends HookWidget {
       controlsSafeAreaMinimum: const EdgeInsets.only(
         bottom: 100,
       ),
-      placeholder: placeholder,
+      placeholder: SizedBox.expand(child: placeholder),
       showControls: showControls && !isMotionVideo,
       hideControlsTimer: hideControlsTimer,
       customControls: const VideoPlayerControls(),
@@ -58,13 +58,9 @@ class VideoViewerPage extends HookWidget {
             if (controller == null) {
               return Stack(
                 children: [
-                  if (placeholder != null) placeholder!,
-                  const Positioned.fill(
-                    child: Center(
-                      child: DelayedLoadingIndicator(
-                        fadeInDuration: Duration(milliseconds: 500),
-                      ),
-                    ),
+                  if (placeholder != null) SizedBox.expand(child: placeholder!),
+                  const DelayedLoadingIndicator(
+                    fadeInDuration: Duration(milliseconds: 500),
                   ),
                 ],
               );

mobile/lib/modules/home/ui/control_bottom_app_bar.dart

@@ -226,7 +226,7 @@ class ControlBottomAppBar extends ConsumerWidget {
         if (selectionAssetState.hasLocal)
           ControlBoxButton(
             iconData: Icons.backup_outlined,
-            label: "control_bottom_app_bar_upload".tr(),
+            label: "Upload",
             onPressed: enabled
                 ? () => showDialog(
                       context: context,

mobile/lib/modules/memories/views/memory_page.dart

@@ -124,14 +124,11 @@ class MemoryPage extends HookConsumerWidget {
           .then((_) => precacheAsset(1));
     }
 
-    Future<void> onAssetChanged(int otherIndex) async {
+    onAssetChanged(int otherIndex) {
       HapticFeedback.selectionClick();
       currentAssetPage.value = otherIndex;
+      precacheAsset(otherIndex + 1);
       updateProgressText();
-      // Wait for page change animation to finish
-      await Future.delayed(const Duration(milliseconds: 400));
-      // And then precache the next asset
-      await precacheAsset(otherIndex + 1);
     }
 
     /* Notification listener is used instead of OnPageChanged callback since OnPageChanged is called

mobile/lib/shared/ui/delayed_loading_indicator.dart

@@ -20,24 +20,21 @@ class DelayedLoadingIndicator extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder(
-      future: Future.delayed(delay),
-      builder: (context, snapshot) {
-        late Widget c;
-        if (snapshot.connectionState == ConnectionState.done) {
-          c = child ??
-              const ImmichLoadingIndicator(
-                key: ValueKey('loading'),
-              );
-        } else {
-          c = Container(key: const ValueKey('hiding'));
-        }
+    return AnimatedSwitcher(
+      duration: fadeInDuration ?? Duration.zero,
+      child: FutureBuilder(
+        future: Future.delayed(delay),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            return child ??
+                const ImmichLoadingIndicator(
+                  key: ValueKey('loading'),
+                );
+          }
 
-        return AnimatedSwitcher(
-          duration: fadeInDuration ?? Duration.zero,
-          child: c,
-        );
-      },
+          return Container(key: const ValueKey('hiding'));
+        },
+      ),
     );
   }
 }

mobile/lib/shared/ui/immich_image.dart

@@ -58,11 +58,9 @@ class ImmichImage extends StatelessWidget {
     }
   }
 
-  // Whether to use the local asset image provider or a remote one
   static bool useLocal(Asset asset) =>
       !asset.isRemote ||
       asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false);
-
   @override
   Widget build(BuildContext context) {
     if (asset == null) {

mobile/lib/shared/ui/immich_thumbnail.dart

@@ -6,7 +6,6 @@ import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_local_
 import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_image_provider.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/ui/hooks/blurhash_hook.dart';
-import 'package:immich_mobile/shared/ui/immich_image.dart';
 import 'package:immich_mobile/shared/ui/thumbhash_placeholder.dart';
 import 'package:octo_image/octo_image.dart';
 
@@ -44,7 +43,7 @@ class ImmichThumbnail extends HookWidget {
       );
     }
 
-    if (ImmichImage.useLocal(asset)) {
+    if (useLocal(asset)) {
       return ImmichLocalThumbnailProvider(
         asset: asset,
         height: thumbnailSize,
@@ -58,6 +57,8 @@ class ImmichThumbnail extends HookWidget {
     }
   }
 
+  static bool useLocal(Asset asset) => !asset.isRemote || asset.isLocal;
+
   @override
   Widget build(BuildContext context) {
     Uint8List? blurhash = useBlurHashRef(asset).value;

mobile/openapi/README.md

@@ -3,7 +3,7 @@ Immich API
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.97.0
+- API version: 1.96.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
 ## Requirements
@@ -135,8 +135,8 @@ Class | Method | HTTP request | Description
 *JobApi* | [**sendJobCommand**](doc//JobApi.md#sendjobcommand) | **PUT** /jobs/{id} | 
 *LibraryApi* | [**createLibrary**](doc//LibraryApi.md#createlibrary) | **POST** /library | 
 *LibraryApi* | [**deleteLibrary**](doc//LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | 
-*LibraryApi* | [**getAllLibraries**](doc//LibraryApi.md#getalllibraries) | **GET** /library | 
-*LibraryApi* | [**getLibrary**](doc//LibraryApi.md#getlibrary) | **GET** /library/{id} | 
+*LibraryApi* | [**getLibraries**](doc//LibraryApi.md#getlibraries) | **GET** /library | 
+*LibraryApi* | [**getLibraryInfo**](doc//LibraryApi.md#getlibraryinfo) | **GET** /library/{id} | 
 *LibraryApi* | [**getLibraryStatistics**](doc//LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | 
 *LibraryApi* | [**removeOfflineFiles**](doc//LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | 
 *LibraryApi* | [**scanLibrary**](doc//LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | 

mobile/openapi/doc/AssetApi.md

@@ -1401,7 +1401,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **uploadFile**
-> AssetFileUploadResponseDto uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData)
+> AssetFileUploadResponseDto uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isExternal, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData)
 
 
 
@@ -1432,6 +1432,7 @@ final fileModifiedAt = 2013-10-20T19:20:30+01:00; // DateTime |
 final key = key_example; // String | 
 final duration = duration_example; // String | 
 final isArchived = true; // bool | 
+final isExternal = true; // bool | 
 final isFavorite = true; // bool | 
 final isOffline = true; // bool | 
 final isReadOnly = true; // bool | 
@@ -1441,7 +1442,7 @@ final livePhotoData = BINARY_DATA_HERE; // MultipartFile |
 final sidecarData = BINARY_DATA_HERE; // MultipartFile | 
 
 try {
-    final result = api_instance.uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData);
+    final result = api_instance.uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isExternal, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData);
     print(result);
 } catch (e) {
     print('Exception when calling AssetApi->uploadFile: $e\n');
@@ -1460,6 +1461,7 @@ Name | Type | Description  | Notes
  **key** | **String**|  | [optional] 
  **duration** | **String**|  | [optional] 
  **isArchived** | **bool**|  | [optional] 
+ **isExternal** | **bool**|  | [optional] 
  **isFavorite** | **bool**|  | [optional] 
  **isOffline** | **bool**|  | [optional] 
  **isReadOnly** | **bool**|  | [optional] 

mobile/openapi/doc/CreateLibraryDto.md

@@ -13,7 +13,6 @@ Name | Type | Description | Notes
 **isVisible** | **bool** |  | [optional] 
 **isWatched** | **bool** |  | [optional] 
 **name** | **String** |  | [optional] 
-**ownerId** | **String** |  | [optional] 
 **type** | [**LibraryType**](LibraryType.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

mobile/openapi/doc/CreateUserDto.md

@@ -9,11 +9,11 @@ import 'package:openapi/api.dart';
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **email** | **String** |  | 
+**externalPath** | **String** |  | [optional] 
 **memoriesEnabled** | **bool** |  | [optional] 
 **name** | **String** |  | 
 **password** | **String** |  | 
 **quotaSizeInBytes** | **int** |  | [optional] 
-**shouldChangePassword** | **bool** |  | [optional] 
 **storageLabel** | **String** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

mobile/openapi/doc/LibraryApi.md

@@ -11,8 +11,8 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**createLibrary**](LibraryApi.md#createlibrary) | **POST** /library | 
 [**deleteLibrary**](LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | 
-[**getAllLibraries**](LibraryApi.md#getalllibraries) | **GET** /library | 
-[**getLibrary**](LibraryApi.md#getlibrary) | **GET** /library/{id} | 
+[**getLibraries**](LibraryApi.md#getlibraries) | **GET** /library | 
+[**getLibraryInfo**](LibraryApi.md#getlibraryinfo) | **GET** /library/{id} | 
 [**getLibraryStatistics**](LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | 
 [**removeOfflineFiles**](LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | 
 [**scanLibrary**](LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | 
@@ -129,8 +129,8 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **getAllLibraries**
-> List<LibraryResponseDto> getAllLibraries(type)
+# **getLibraries**
+> List<LibraryResponseDto> getLibraries()
 
 
 
@@ -153,21 +153,17 @@ import 'package:openapi/api.dart';
 //defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
 
 final api_instance = LibraryApi();
-final type = ; // LibraryType | 
 
 try {
-    final result = api_instance.getAllLibraries(type);
+    final result = api_instance.getLibraries();
     print(result);
 } catch (e) {
-    print('Exception when calling LibraryApi->getAllLibraries: $e\n');
+    print('Exception when calling LibraryApi->getLibraries: $e\n');
 }
 ```
 
 ### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **type** | [**LibraryType**](.md)|  | [optional] 
+This endpoint does not need any parameter.
 
 ### Return type
 
@@ -184,8 +180,8 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **getLibrary**
-> LibraryResponseDto getLibrary(id)
+# **getLibraryInfo**
+> LibraryResponseDto getLibraryInfo(id)
 
 
 
@@ -211,10 +207,10 @@ final api_instance = LibraryApi();
 final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
 
 try {
-    final result = api_instance.getLibrary(id);
+    final result = api_instance.getLibraryInfo(id);
     print(result);
 } catch (e) {
-    print('Exception when calling LibraryApi->getLibrary: $e\n');
+    print('Exception when calling LibraryApi->getLibraryInfo: $e\n');
 }
 ```
 

mobile/openapi/doc/MapMarkerResponseDto.md

@@ -8,12 +8,9 @@ import 'package:openapi/api.dart';
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**city** | **String** |  | 
-**country** | **String** |  | 
 **id** | **String** |  | 
 **lat** | **double** |  | 
 **lon** | **double** |  | 
-**state** | **String** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

mobile/openapi/doc/PartnerResponseDto.md

@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **createdAt** | [**DateTime**](DateTime.md) |  | 
 **deletedAt** | [**DateTime**](DateTime.md) |  | 
 **email** | **String** |  | 
+**externalPath** | **String** |  | 
 **id** | **String** |  | 
 **inTimeline** | **bool** |  | [optional] 
 **isAdmin** | **bool** |  | 

mobile/openapi/doc/SmartSearchDto.md

@@ -27,7 +27,6 @@ Name | Type | Description | Notes
 **make** | **String** |  | [optional] 
 **model** | **String** |  | [optional] 
 **page** | **num** |  | [optional] 
-**personIds** | **List<String>** |  | [optional] [default to const []]
 **query** | **String** |  | 
 **size** | **num** |  | [optional] 
 **state** | **String** |  | [optional] 

mobile/openapi/doc/SystemConfigLibraryWatchDto.md

@@ -9,6 +9,8 @@ import 'package:openapi/api.dart';
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enabled** | **bool** |  | 
+**interval** | **int** |  | 
+**usePolling** | **bool** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

mobile/openapi/doc/SystemConfigOAuthDto.md

@@ -13,7 +13,6 @@ Name | Type | Description | Notes
 **buttonText** | **String** |  | 
 **clientId** | **String** |  | 
 **clientSecret** | **String** |  | 
-**defaultStorageQuota** | **num** |  | 
 **enabled** | **bool** |  | 
 **issuerUrl** | **String** |  | 
 **mobileOverrideEnabled** | **bool** |  | 
@@ -21,7 +20,6 @@ Name | Type | Description | Notes
 **scope** | **String** |  | 
 **signingAlgorithm** | **String** |  | 
 **storageLabelClaim** | **String** |  | 
-**storageQuotaClaim** | **String** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

mobile/openapi/doc/UpdateUserDto.md

@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **avatarColor** | [**UserAvatarColor**](UserAvatarColor.md) |  | [optional] 
 **email** | **String** |  | [optional] 
+**externalPath** | **String** |  | [optional] 
 **id** | **String** |  | 
 **isAdmin** | **bool** |  | [optional] 
 **memoriesEnabled** | **bool** |  | [optional] 

mobile/openapi/doc/UserResponseDto.md

@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **createdAt** | [**DateTime**](DateTime.md) |  | 
 **deletedAt** | [**DateTime**](DateTime.md) |  | 
 **email** | **String** |  | 
+**externalPath** | **String** |  | 
 **id** | **String** |  | 
 **isAdmin** | **bool** |  | 
 **memoriesEnabled** | **bool** |  | [optional] 

mobile/openapi/lib/api/asset_api.dart

@@ -1676,6 +1676,8 @@ class AssetApi {
   ///
   /// * [bool] isArchived:
   ///
+  /// * [bool] isExternal:
+  ///
   /// * [bool] isFavorite:
   ///
   /// * [bool] isOffline:
@@ -1689,7 +1691,7 @@ class AssetApi {
   /// * [MultipartFile] livePhotoData:
   ///
   /// * [MultipartFile] sidecarData:
-  Future<Response> uploadFileWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
+  Future<Response> uploadFileWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isExternal, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
     // ignore: prefer_const_declarations
     final path = r'/asset/upload';
 
@@ -1737,6 +1739,10 @@ class AssetApi {
       hasFields = true;
       mp.fields[r'isArchived'] = parameterToString(isArchived);
     }
+    if (isExternal != null) {
+      hasFields = true;
+      mp.fields[r'isExternal'] = parameterToString(isExternal);
+    }
     if (isFavorite != null) {
       hasFields = true;
       mp.fields[r'isFavorite'] = parameterToString(isFavorite);
@@ -1800,6 +1806,8 @@ class AssetApi {
   ///
   /// * [bool] isArchived:
   ///
+  /// * [bool] isExternal:
+  ///
   /// * [bool] isFavorite:
   ///
   /// * [bool] isOffline:
@@ -1813,8 +1821,8 @@ class AssetApi {
   /// * [MultipartFile] livePhotoData:
   ///
   /// * [MultipartFile] sidecarData:
-  Future<AssetFileUploadResponseDto?> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
-    final response = await uploadFileWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, duration: duration, isArchived: isArchived, isFavorite: isFavorite, isOffline: isOffline, isReadOnly: isReadOnly, isVisible: isVisible, libraryId: libraryId, livePhotoData: livePhotoData, sidecarData: sidecarData, );
+  Future<AssetFileUploadResponseDto?> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isExternal, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
+    final response = await uploadFileWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, duration: duration, isArchived: isArchived, isExternal: isExternal, isFavorite: isFavorite, isOffline: isOffline, isReadOnly: isReadOnly, isVisible: isVisible, libraryId: libraryId, livePhotoData: livePhotoData, sidecarData: sidecarData, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api/library_api.dart

@@ -104,10 +104,7 @@ class LibraryApi {
   }
 
   /// Performs an HTTP 'GET /library' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [LibraryType] type:
-  Future<Response> getAllLibrariesWithHttpInfo({ LibraryType? type, }) async {
+  Future<Response> getLibrariesWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/library';
 
@@ -118,10 +115,6 @@ class LibraryApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (type != null) {
-      queryParams.addAll(_queryParams('', 'type', type));
-    }
-
     const contentTypes = <String>[];
 
 
@@ -136,11 +129,8 @@ class LibraryApi {
     );
   }
 
-  /// Parameters:
-  ///
-  /// * [LibraryType] type:
-  Future<List<LibraryResponseDto>?> getAllLibraries({ LibraryType? type, }) async {
-    final response = await getAllLibrariesWithHttpInfo( type: type, );
+  Future<List<LibraryResponseDto>?> getLibraries() async {
+    final response = await getLibrariesWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -161,7 +151,7 @@ class LibraryApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<Response> getLibraryWithHttpInfo(String id,) async {
+  Future<Response> getLibraryInfoWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
     final path = r'/library/{id}'
       .replaceAll('{id}', id);
@@ -190,8 +180,8 @@ class LibraryApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<LibraryResponseDto?> getLibrary(String id,) async {
-    final response = await getLibraryWithHttpInfo(id,);
+  Future<LibraryResponseDto?> getLibraryInfo(String id,) async {
+    final response = await getLibraryInfoWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/model/create_library_dto.dart

@@ -18,7 +18,6 @@ class CreateLibraryDto {
     this.isVisible,
     this.isWatched,
     this.name,
-    this.ownerId,
     required this.type,
   });
 
@@ -50,14 +49,6 @@ class CreateLibraryDto {
   ///
   String? name;
 
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? ownerId;
-
   LibraryType type;
 
   @override
@@ -67,7 +58,6 @@ class CreateLibraryDto {
     other.isVisible == isVisible &&
     other.isWatched == isWatched &&
     other.name == name &&
-    other.ownerId == ownerId &&
     other.type == type;
 
   @override
@@ -78,11 +68,10 @@ class CreateLibraryDto {
     (isVisible == null ? 0 : isVisible!.hashCode) +
     (isWatched == null ? 0 : isWatched!.hashCode) +
     (name == null ? 0 : name!.hashCode) +
-    (ownerId == null ? 0 : ownerId!.hashCode) +
     (type.hashCode);
 
   @override
-  String toString() => 'CreateLibraryDto[exclusionPatterns=$exclusionPatterns, importPaths=$importPaths, isVisible=$isVisible, isWatched=$isWatched, name=$name, ownerId=$ownerId, type=$type]';
+  String toString() => 'CreateLibraryDto[exclusionPatterns=$exclusionPatterns, importPaths=$importPaths, isVisible=$isVisible, isWatched=$isWatched, name=$name, type=$type]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -102,11 +91,6 @@ class CreateLibraryDto {
       json[r'name'] = this.name;
     } else {
     //  json[r'name'] = null;
-    }
-    if (this.ownerId != null) {
-      json[r'ownerId'] = this.ownerId;
-    } else {
-    //  json[r'ownerId'] = null;
     }
       json[r'type'] = this.type;
     return json;
@@ -129,7 +113,6 @@ class CreateLibraryDto {
         isVisible: mapValueOfType<bool>(json, r'isVisible'),
         isWatched: mapValueOfType<bool>(json, r'isWatched'),
         name: mapValueOfType<String>(json, r'name'),
-        ownerId: mapValueOfType<String>(json, r'ownerId'),
         type: LibraryType.fromJson(json[r'type'])!,
       );
     }

mobile/openapi/lib/model/create_user_dto.dart

@@ -14,16 +14,18 @@ class CreateUserDto {
   /// Returns a new [CreateUserDto] instance.
   CreateUserDto({
     required this.email,
+    this.externalPath,
     this.memoriesEnabled,
     required this.name,
     required this.password,
     this.quotaSizeInBytes,
-    this.shouldChangePassword,
     this.storageLabel,
   });
 
   String email;
 
+  String? externalPath;
+
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
@@ -38,43 +40,40 @@ class CreateUserDto {
 
   int? quotaSizeInBytes;
 
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  bool? shouldChangePassword;
-
   String? storageLabel;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is CreateUserDto &&
     other.email == email &&
+    other.externalPath == externalPath &&
     other.memoriesEnabled == memoriesEnabled &&
     other.name == name &&
     other.password == password &&
     other.quotaSizeInBytes == quotaSizeInBytes &&
-    other.shouldChangePassword == shouldChangePassword &&
     other.storageLabel == storageLabel;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (email.hashCode) +
+    (externalPath == null ? 0 : externalPath!.hashCode) +
     (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
     (name.hashCode) +
     (password.hashCode) +
     (quotaSizeInBytes == null ? 0 : quotaSizeInBytes!.hashCode) +
-    (shouldChangePassword == null ? 0 : shouldChangePassword!.hashCode) +
     (storageLabel == null ? 0 : storageLabel!.hashCode);
 
   @override
-  String toString() => 'CreateUserDto[email=$email, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
+  String toString() => 'CreateUserDto[email=$email, externalPath=$externalPath, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, storageLabel=$storageLabel]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'email'] = this.email;
+    if (this.externalPath != null) {
+      json[r'externalPath'] = this.externalPath;
+    } else {
+    //  json[r'externalPath'] = null;
+    }
     if (this.memoriesEnabled != null) {
       json[r'memoriesEnabled'] = this.memoriesEnabled;
     } else {
@@ -87,11 +86,6 @@ class CreateUserDto {
     } else {
     //  json[r'quotaSizeInBytes'] = null;
     }
-    if (this.shouldChangePassword != null) {
-      json[r'shouldChangePassword'] = this.shouldChangePassword;
-    } else {
-    //  json[r'shouldChangePassword'] = null;
-    }
     if (this.storageLabel != null) {
       json[r'storageLabel'] = this.storageLabel;
     } else {
@@ -109,11 +103,11 @@ class CreateUserDto {
 
       return CreateUserDto(
         email: mapValueOfType<String>(json, r'email')!,
+        externalPath: mapValueOfType<String>(json, r'externalPath'),
         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
         name: mapValueOfType<String>(json, r'name')!,
         password: mapValueOfType<String>(json, r'password')!,
         quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
-        shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword'),
         storageLabel: mapValueOfType<String>(json, r'storageLabel'),
       );
     }

mobile/openapi/lib/model/map_marker_response_dto.dart

@@ -13,68 +13,38 @@ part of openapi.api;
 class MapMarkerResponseDto {
   /// Returns a new [MapMarkerResponseDto] instance.
   MapMarkerResponseDto({
-    required this.city,
-    required this.country,
     required this.id,
     required this.lat,
     required this.lon,
-    required this.state,
   });
 
-  String? city;
-
-  String? country;
-
   String id;
 
   double lat;
 
   double lon;
 
-  String? state;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is MapMarkerResponseDto &&
-    other.city == city &&
-    other.country == country &&
     other.id == id &&
     other.lat == lat &&
-    other.lon == lon &&
-    other.state == state;
+    other.lon == lon;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (city == null ? 0 : city!.hashCode) +
-    (country == null ? 0 : country!.hashCode) +
     (id.hashCode) +
     (lat.hashCode) +
-    (lon.hashCode) +
-    (state == null ? 0 : state!.hashCode);
+    (lon.hashCode);
 
   @override
-  String toString() => 'MapMarkerResponseDto[city=$city, country=$country, id=$id, lat=$lat, lon=$lon, state=$state]';
+  String toString() => 'MapMarkerResponseDto[id=$id, lat=$lat, lon=$lon]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.city != null) {
-      json[r'city'] = this.city;
-    } else {
-    //  json[r'city'] = null;
-    }
-    if (this.country != null) {
-      json[r'country'] = this.country;
-    } else {
-    //  json[r'country'] = null;
-    }
       json[r'id'] = this.id;
       json[r'lat'] = this.lat;
       json[r'lon'] = this.lon;
-    if (this.state != null) {
-      json[r'state'] = this.state;
-    } else {
-    //  json[r'state'] = null;
-    }
     return json;
   }
 
@@ -86,12 +56,9 @@ class MapMarkerResponseDto {
       final json = value.cast<String, dynamic>();
 
       return MapMarkerResponseDto(
-        city: mapValueOfType<String>(json, r'city'),
-        country: mapValueOfType<String>(json, r'country'),
         id: mapValueOfType<String>(json, r'id')!,
         lat: (mapValueOfType<num>(json, r'lat')!).toDouble(),
         lon: (mapValueOfType<num>(json, r'lon')!).toDouble(),
-        state: mapValueOfType<String>(json, r'state'),
       );
     }
     return null;
@@ -139,12 +106,9 @@ class MapMarkerResponseDto {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
-    'city',
-    'country',
     'id',
     'lat',
     'lon',
-    'state',
   };
 }
 

mobile/openapi/lib/model/partner_response_dto.dart

@@ -17,6 +17,7 @@ class PartnerResponseDto {
     required this.createdAt,
     required this.deletedAt,
     required this.email,
+    required this.externalPath,
     required this.id,
     this.inTimeline,
     required this.isAdmin,
@@ -39,6 +40,8 @@ class PartnerResponseDto {
 
   String email;
 
+  String? externalPath;
+
   String id;
 
   ///
@@ -81,6 +84,7 @@ class PartnerResponseDto {
     other.createdAt == createdAt &&
     other.deletedAt == deletedAt &&
     other.email == email &&
+    other.externalPath == externalPath &&
     other.id == id &&
     other.inTimeline == inTimeline &&
     other.isAdmin == isAdmin &&
@@ -101,6 +105,7 @@ class PartnerResponseDto {
     (createdAt.hashCode) +
     (deletedAt == null ? 0 : deletedAt!.hashCode) +
     (email.hashCode) +
+    (externalPath == null ? 0 : externalPath!.hashCode) +
     (id.hashCode) +
     (inTimeline == null ? 0 : inTimeline!.hashCode) +
     (isAdmin.hashCode) +
@@ -115,7 +120,7 @@ class PartnerResponseDto {
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'PartnerResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, inTimeline=$inTimeline, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
+  String toString() => 'PartnerResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, externalPath=$externalPath, id=$id, inTimeline=$inTimeline, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -127,6 +132,11 @@ class PartnerResponseDto {
     //  json[r'deletedAt'] = null;
     }
       json[r'email'] = this.email;
+    if (this.externalPath != null) {
+      json[r'externalPath'] = this.externalPath;
+    } else {
+    //  json[r'externalPath'] = null;
+    }
       json[r'id'] = this.id;
     if (this.inTimeline != null) {
       json[r'inTimeline'] = this.inTimeline;
@@ -174,6 +184,7 @@ class PartnerResponseDto {
         createdAt: mapDateTime(json, r'createdAt', r'')!,
         deletedAt: mapDateTime(json, r'deletedAt', r''),
         email: mapValueOfType<String>(json, r'email')!,
+        externalPath: mapValueOfType<String>(json, r'externalPath'),
         id: mapValueOfType<String>(json, r'id')!,
         inTimeline: mapValueOfType<bool>(json, r'inTimeline'),
         isAdmin: mapValueOfType<bool>(json, r'isAdmin')!,
@@ -237,6 +248,7 @@ class PartnerResponseDto {
     'createdAt',
     'deletedAt',
     'email',
+    'externalPath',
     'id',
     'isAdmin',
     'name',

mobile/openapi/lib/model/smart_search_dto.dart

@@ -32,7 +32,6 @@ class SmartSearchDto {
     this.make,
     this.model,
     this.page,
-    this.personIds = const [],
     required this.query,
     this.size,
     this.state,
@@ -200,8 +199,6 @@ class SmartSearchDto {
   ///
   num? page;
 
-  List<String> personIds;
-
   String query;
 
   ///
@@ -315,7 +312,6 @@ class SmartSearchDto {
     other.make == make &&
     other.model == model &&
     other.page == page &&
-    _deepEquality.equals(other.personIds, personIds) &&
     other.query == query &&
     other.size == size &&
     other.state == state &&
@@ -352,7 +348,6 @@ class SmartSearchDto {
     (make == null ? 0 : make!.hashCode) +
     (model == null ? 0 : model!.hashCode) +
     (page == null ? 0 : page!.hashCode) +
-    (personIds.hashCode) +
     (query.hashCode) +
     (size == null ? 0 : size!.hashCode) +
     (state == null ? 0 : state!.hashCode) +
@@ -368,7 +363,7 @@ class SmartSearchDto {
     (withExif == null ? 0 : withExif!.hashCode);
 
   @override
-  String toString() => 'SmartSearchDto[city=$city, country=$country, createdAfter=$createdAfter, createdBefore=$createdBefore, deviceId=$deviceId, isArchived=$isArchived, isEncoded=$isEncoded, isExternal=$isExternal, isFavorite=$isFavorite, isMotion=$isMotion, isNotInAlbum=$isNotInAlbum, isOffline=$isOffline, isReadOnly=$isReadOnly, isVisible=$isVisible, lensModel=$lensModel, libraryId=$libraryId, make=$make, model=$model, page=$page, personIds=$personIds, query=$query, size=$size, state=$state, takenAfter=$takenAfter, takenBefore=$takenBefore, trashedAfter=$trashedAfter, trashedBefore=$trashedBefore, type=$type, updatedAfter=$updatedAfter, updatedBefore=$updatedBefore, withArchived=$withArchived, withDeleted=$withDeleted, withExif=$withExif]';
+  String toString() => 'SmartSearchDto[city=$city, country=$country, createdAfter=$createdAfter, createdBefore=$createdBefore, deviceId=$deviceId, isArchived=$isArchived, isEncoded=$isEncoded, isExternal=$isExternal, isFavorite=$isFavorite, isMotion=$isMotion, isNotInAlbum=$isNotInAlbum, isOffline=$isOffline, isReadOnly=$isReadOnly, isVisible=$isVisible, lensModel=$lensModel, libraryId=$libraryId, make=$make, model=$model, page=$page, query=$query, size=$size, state=$state, takenAfter=$takenAfter, takenBefore=$takenBefore, trashedAfter=$trashedAfter, trashedBefore=$trashedBefore, type=$type, updatedAfter=$updatedAfter, updatedBefore=$updatedBefore, withArchived=$withArchived, withDeleted=$withDeleted, withExif=$withExif]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -467,7 +462,6 @@ class SmartSearchDto {
     } else {
     //  json[r'page'] = null;
     }
-      json[r'personIds'] = this.personIds;
       json[r'query'] = this.query;
     if (this.size != null) {
       json[r'size'] = this.size;
@@ -555,9 +549,6 @@ class SmartSearchDto {
         make: mapValueOfType<String>(json, r'make'),
         model: mapValueOfType<String>(json, r'model'),
         page: num.parse('${json[r'page']}'),
-        personIds: json[r'personIds'] is Iterable
-            ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
-            : const [],
         query: mapValueOfType<String>(json, r'query')!,
         size: num.parse('${json[r'size']}'),
         state: mapValueOfType<String>(json, r'state'),

mobile/openapi/lib/model/system_config_library_watch_dto.dart

@@ -14,25 +14,37 @@ class SystemConfigLibraryWatchDto {
   /// Returns a new [SystemConfigLibraryWatchDto] instance.
   SystemConfigLibraryWatchDto({
     required this.enabled,
+    required this.interval,
+    required this.usePolling,
   });
 
   bool enabled;
 
+  int interval;
+
+  bool usePolling;
+
   @override
   bool operator ==(Object other) => identical(this, other) || other is SystemConfigLibraryWatchDto &&
-    other.enabled == enabled;
+    other.enabled == enabled &&
+    other.interval == interval &&
+    other.usePolling == usePolling;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (enabled.hashCode);
+    (enabled.hashCode) +
+    (interval.hashCode) +
+    (usePolling.hashCode);
 
   @override
-  String toString() => 'SystemConfigLibraryWatchDto[enabled=$enabled]';
+  String toString() => 'SystemConfigLibraryWatchDto[enabled=$enabled, interval=$interval, usePolling=$usePolling]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'enabled'] = this.enabled;
+      json[r'interval'] = this.interval;
+      json[r'usePolling'] = this.usePolling;
     return json;
   }
 
@@ -45,6 +57,8 @@ class SystemConfigLibraryWatchDto {
 
       return SystemConfigLibraryWatchDto(
         enabled: mapValueOfType<bool>(json, r'enabled')!,
+        interval: mapValueOfType<int>(json, r'interval')!,
+        usePolling: mapValueOfType<bool>(json, r'usePolling')!,
       );
     }
     return null;
@@ -93,6 +107,8 @@ class SystemConfigLibraryWatchDto {
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
     'enabled',
+    'interval',
+    'usePolling',
   };
 }
 

mobile/openapi/lib/model/system_config_o_auth_dto.dart

@@ -18,7 +18,6 @@ class SystemConfigOAuthDto {
     required this.buttonText,
     required this.clientId,
     required this.clientSecret,
-    required this.defaultStorageQuota,
     required this.enabled,
     required this.issuerUrl,
     required this.mobileOverrideEnabled,
@@ -26,7 +25,6 @@ class SystemConfigOAuthDto {
     required this.scope,
     required this.signingAlgorithm,
     required this.storageLabelClaim,
-    required this.storageQuotaClaim,
   });
 
   bool autoLaunch;
@@ -39,8 +37,6 @@ class SystemConfigOAuthDto {
 
   String clientSecret;
 
-  num defaultStorageQuota;
-
   bool enabled;
 
   String issuerUrl;
@@ -55,8 +51,6 @@ class SystemConfigOAuthDto {
 
   String storageLabelClaim;
 
-  String storageQuotaClaim;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is SystemConfigOAuthDto &&
     other.autoLaunch == autoLaunch &&
@@ -64,15 +58,13 @@ class SystemConfigOAuthDto {
     other.buttonText == buttonText &&
     other.clientId == clientId &&
     other.clientSecret == clientSecret &&
-    other.defaultStorageQuota == defaultStorageQuota &&
     other.enabled == enabled &&
     other.issuerUrl == issuerUrl &&
     other.mobileOverrideEnabled == mobileOverrideEnabled &&
     other.mobileRedirectUri == mobileRedirectUri &&
     other.scope == scope &&
     other.signingAlgorithm == signingAlgorithm &&
-    other.storageLabelClaim == storageLabelClaim &&
-    other.storageQuotaClaim == storageQuotaClaim;
+    other.storageLabelClaim == storageLabelClaim;
 
   @override
   int get hashCode =>
@@ -82,18 +74,16 @@ class SystemConfigOAuthDto {
     (buttonText.hashCode) +
     (clientId.hashCode) +
     (clientSecret.hashCode) +
-    (defaultStorageQuota.hashCode) +
     (enabled.hashCode) +
     (issuerUrl.hashCode) +
     (mobileOverrideEnabled.hashCode) +
     (mobileRedirectUri.hashCode) +
     (scope.hashCode) +
     (signingAlgorithm.hashCode) +
-    (storageLabelClaim.hashCode) +
-    (storageQuotaClaim.hashCode);
+    (storageLabelClaim.hashCode);
 
   @override
-  String toString() => 'SystemConfigOAuthDto[autoLaunch=$autoLaunch, autoRegister=$autoRegister, buttonText=$buttonText, clientId=$clientId, clientSecret=$clientSecret, defaultStorageQuota=$defaultStorageQuota, enabled=$enabled, issuerUrl=$issuerUrl, mobileOverrideEnabled=$mobileOverrideEnabled, mobileRedirectUri=$mobileRedirectUri, scope=$scope, signingAlgorithm=$signingAlgorithm, storageLabelClaim=$storageLabelClaim, storageQuotaClaim=$storageQuotaClaim]';
+  String toString() => 'SystemConfigOAuthDto[autoLaunch=$autoLaunch, autoRegister=$autoRegister, buttonText=$buttonText, clientId=$clientId, clientSecret=$clientSecret, enabled=$enabled, issuerUrl=$issuerUrl, mobileOverrideEnabled=$mobileOverrideEnabled, mobileRedirectUri=$mobileRedirectUri, scope=$scope, signingAlgorithm=$signingAlgorithm, storageLabelClaim=$storageLabelClaim]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -102,7 +92,6 @@ class SystemConfigOAuthDto {
       json[r'buttonText'] = this.buttonText;
       json[r'clientId'] = this.clientId;
       json[r'clientSecret'] = this.clientSecret;
-      json[r'defaultStorageQuota'] = this.defaultStorageQuota;
       json[r'enabled'] = this.enabled;
       json[r'issuerUrl'] = this.issuerUrl;
       json[r'mobileOverrideEnabled'] = this.mobileOverrideEnabled;
@@ -110,7 +99,6 @@ class SystemConfigOAuthDto {
       json[r'scope'] = this.scope;
       json[r'signingAlgorithm'] = this.signingAlgorithm;
       json[r'storageLabelClaim'] = this.storageLabelClaim;
-      json[r'storageQuotaClaim'] = this.storageQuotaClaim;
     return json;
   }
 
@@ -127,7 +115,6 @@ class SystemConfigOAuthDto {
         buttonText: mapValueOfType<String>(json, r'buttonText')!,
         clientId: mapValueOfType<String>(json, r'clientId')!,
         clientSecret: mapValueOfType<String>(json, r'clientSecret')!,
-        defaultStorageQuota: num.parse('${json[r'defaultStorageQuota']}'),
         enabled: mapValueOfType<bool>(json, r'enabled')!,
         issuerUrl: mapValueOfType<String>(json, r'issuerUrl')!,
         mobileOverrideEnabled: mapValueOfType<bool>(json, r'mobileOverrideEnabled')!,
@@ -135,7 +122,6 @@ class SystemConfigOAuthDto {
         scope: mapValueOfType<String>(json, r'scope')!,
         signingAlgorithm: mapValueOfType<String>(json, r'signingAlgorithm')!,
         storageLabelClaim: mapValueOfType<String>(json, r'storageLabelClaim')!,
-        storageQuotaClaim: mapValueOfType<String>(json, r'storageQuotaClaim')!,
       );
     }
     return null;
@@ -188,7 +174,6 @@ class SystemConfigOAuthDto {
     'buttonText',
     'clientId',
     'clientSecret',
-    'defaultStorageQuota',
     'enabled',
     'issuerUrl',
     'mobileOverrideEnabled',
@@ -196,7 +181,6 @@ class SystemConfigOAuthDto {
     'scope',
     'signingAlgorithm',
     'storageLabelClaim',
-    'storageQuotaClaim',
   };
 }
 

mobile/openapi/lib/model/update_user_dto.dart

@@ -15,6 +15,7 @@ class UpdateUserDto {
   UpdateUserDto({
     this.avatarColor,
     this.email,
+    this.externalPath,
     required this.id,
     this.isAdmin,
     this.memoriesEnabled,
@@ -41,6 +42,14 @@ class UpdateUserDto {
   ///
   String? email;
 
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  String? externalPath;
+
   String id;
 
   ///
@@ -97,6 +106,7 @@ class UpdateUserDto {
   bool operator ==(Object other) => identical(this, other) || other is UpdateUserDto &&
     other.avatarColor == avatarColor &&
     other.email == email &&
+    other.externalPath == externalPath &&
     other.id == id &&
     other.isAdmin == isAdmin &&
     other.memoriesEnabled == memoriesEnabled &&
@@ -111,6 +121,7 @@ class UpdateUserDto {
     // ignore: unnecessary_parenthesis
     (avatarColor == null ? 0 : avatarColor!.hashCode) +
     (email == null ? 0 : email!.hashCode) +
+    (externalPath == null ? 0 : externalPath!.hashCode) +
     (id.hashCode) +
     (isAdmin == null ? 0 : isAdmin!.hashCode) +
     (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
@@ -121,7 +132,7 @@ class UpdateUserDto {
     (storageLabel == null ? 0 : storageLabel!.hashCode);
 
   @override
-  String toString() => 'UpdateUserDto[avatarColor=$avatarColor, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
+  String toString() => 'UpdateUserDto[avatarColor=$avatarColor, email=$email, externalPath=$externalPath, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -134,6 +145,11 @@ class UpdateUserDto {
       json[r'email'] = this.email;
     } else {
     //  json[r'email'] = null;
+    }
+    if (this.externalPath != null) {
+      json[r'externalPath'] = this.externalPath;
+    } else {
+    //  json[r'externalPath'] = null;
     }
       json[r'id'] = this.id;
     if (this.isAdmin != null) {
@@ -184,6 +200,7 @@ class UpdateUserDto {
       return UpdateUserDto(
         avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
         email: mapValueOfType<String>(json, r'email'),
+        externalPath: mapValueOfType<String>(json, r'externalPath'),
         id: mapValueOfType<String>(json, r'id')!,
         isAdmin: mapValueOfType<bool>(json, r'isAdmin'),
         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),

mobile/openapi/lib/model/user_response_dto.dart

@@ -17,6 +17,7 @@ class UserResponseDto {
     required this.createdAt,
     required this.deletedAt,
     required this.email,
+    required this.externalPath,
     required this.id,
     required this.isAdmin,
     this.memoriesEnabled,
@@ -38,6 +39,8 @@ class UserResponseDto {
 
   String email;
 
+  String? externalPath;
+
   String id;
 
   bool isAdmin;
@@ -72,6 +75,7 @@ class UserResponseDto {
     other.createdAt == createdAt &&
     other.deletedAt == deletedAt &&
     other.email == email &&
+    other.externalPath == externalPath &&
     other.id == id &&
     other.isAdmin == isAdmin &&
     other.memoriesEnabled == memoriesEnabled &&
@@ -91,6 +95,7 @@ class UserResponseDto {
     (createdAt.hashCode) +
     (deletedAt == null ? 0 : deletedAt!.hashCode) +
     (email.hashCode) +
+    (externalPath == null ? 0 : externalPath!.hashCode) +
     (id.hashCode) +
     (isAdmin.hashCode) +
     (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
@@ -104,7 +109,7 @@ class UserResponseDto {
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'UserResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
+  String toString() => 'UserResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, externalPath=$externalPath, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -116,6 +121,11 @@ class UserResponseDto {
     //  json[r'deletedAt'] = null;
     }
       json[r'email'] = this.email;
+    if (this.externalPath != null) {
+      json[r'externalPath'] = this.externalPath;
+    } else {
+    //  json[r'externalPath'] = null;
+    }
       json[r'id'] = this.id;
       json[r'isAdmin'] = this.isAdmin;
     if (this.memoriesEnabled != null) {
@@ -158,6 +168,7 @@ class UserResponseDto {
         createdAt: mapDateTime(json, r'createdAt', r'')!,
         deletedAt: mapDateTime(json, r'deletedAt', r''),
         email: mapValueOfType<String>(json, r'email')!,
+        externalPath: mapValueOfType<String>(json, r'externalPath'),
         id: mapValueOfType<String>(json, r'id')!,
         isAdmin: mapValueOfType<bool>(json, r'isAdmin')!,
         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
@@ -220,6 +231,7 @@ class UserResponseDto {
     'createdAt',
     'deletedAt',
     'email',
+    'externalPath',
     'id',
     'isAdmin',
     'name',

mobile/openapi/test/asset_api_test.dart

@@ -135,7 +135,7 @@ void main() {
       // TODO
     });
 
-    //Future<AssetFileUploadResponseDto> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String key, String duration, bool isArchived, bool isFavorite, bool isOffline, bool isReadOnly, bool isVisible, String libraryId, MultipartFile livePhotoData, MultipartFile sidecarData }) async
+    //Future<AssetFileUploadResponseDto> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String key, String duration, bool isArchived, bool isExternal, bool isFavorite, bool isOffline, bool isReadOnly, bool isVisible, String libraryId, MultipartFile livePhotoData, MultipartFile sidecarData }) async
     test('test uploadFile', () async {
       // TODO
     });

mobile/openapi/test/create_library_dto_test.dart

@@ -41,11 +41,6 @@ void main() {
       // TODO
     });
 
-    // String ownerId
-    test('to test the property `ownerId`', () async {
-      // TODO
-    });
-
     // LibraryType type
     test('to test the property `type`', () async {
       // TODO

mobile/openapi/test/create_user_dto_test.dart

@@ -21,6 +21,11 @@ void main() {
       // TODO
     });
 
+    // String externalPath
+    test('to test the property `externalPath`', () async {
+      // TODO
+    });
+
     // bool memoriesEnabled
     test('to test the property `memoriesEnabled`', () async {
       // TODO
@@ -41,11 +46,6 @@ void main() {
       // TODO
     });
 
-    // bool shouldChangePassword
-    test('to test the property `shouldChangePassword`', () async {
-      // TODO
-    });
-
     // String storageLabel
     test('to test the property `storageLabel`', () async {
       // TODO

mobile/openapi/test/library_api_test.dart

@@ -27,13 +27,13 @@ void main() {
       // TODO
     });
 
-    //Future<List<LibraryResponseDto>> getAllLibraries({ LibraryType type }) async
-    test('test getAllLibraries', () async {
+    //Future<List<LibraryResponseDto>> getLibraries() async
+    test('test getLibraries', () async {
       // TODO
     });
 
-    //Future<LibraryResponseDto> getLibrary(String id) async
-    test('test getLibrary', () async {
+    //Future<LibraryResponseDto> getLibraryInfo(String id) async
+    test('test getLibraryInfo', () async {
       // TODO
     });
 

mobile/openapi/test/map_marker_response_dto_test.dart

@@ -16,16 +16,6 @@ void main() {
   // final instance = MapMarkerResponseDto();
 
   group('test MapMarkerResponseDto', () {
-    // String city
-    test('to test the property `city`', () async {
-      // TODO
-    });
-
-    // String country
-    test('to test the property `country`', () async {
-      // TODO
-    });
-
     // String id
     test('to test the property `id`', () async {
       // TODO
@@ -41,11 +31,6 @@ void main() {
       // TODO
     });
 
-    // String state
-    test('to test the property `state`', () async {
-      // TODO
-    });
-
 
   });
 

mobile/openapi/test/partner_response_dto_test.dart

@@ -36,6 +36,11 @@ void main() {
       // TODO
     });
 
+    // String externalPath
+    test('to test the property `externalPath`', () async {
+      // TODO
+    });
+
     // String id
     test('to test the property `id`', () async {
       // TODO

mobile/openapi/test/smart_search_dto_test.dart

@@ -111,11 +111,6 @@ void main() {
       // TODO
     });
 
-    // List<String> personIds (default value: const [])
-    test('to test the property `personIds`', () async {
-      // TODO
-    });
-
     // String query
     test('to test the property `query`', () async {
       // TODO