feat: object storage

.github/workflows/cli.yml

@@ -58,7 +58,7 @@ jobs:
         uses: docker/setup-qemu-action@v3.0.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.1.0
+        uses: docker/setup-buildx-action@v3.0.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3

.github/workflows/docker.yml

@@ -66,7 +66,7 @@ jobs:
         uses: docker/setup-qemu-action@v3.0.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.1.0
+        uses: docker/setup-buildx-action@v3.0.0
         # Workaround to fix error:
         # failed to push: failed to copy: io: read/write on closed pipe
         # See https://github.com/docker/build-push-action/issues/761

.github/workflows/static_analysis.yml

@@ -32,11 +32,7 @@ jobs:
       - name: Run dart analyze
         run: dart analyze --fatal-infos
         working-directory: ./mobile
-
-      - name: Run dart format
-        run: dart format lib/ --set-exit-if-changed
-        working-directory: ./mobile
-
+      
       # Enable after riverpod generator migration is completed
       # - name: Run dart custom lint
       #   run: dart run custom_lint

.github/workflows/test.yml

@@ -12,7 +12,7 @@ concurrency:
 jobs:
   server-e2e-api:
     name: Server (e2e-api)
-    runs-on: ubuntu-latest
+    runs-on: mich
     defaults:
       run:
         working-directory: ./server
@@ -29,7 +29,7 @@ jobs:
 
   server-e2e-jobs:
     name: Server (e2e-jobs)
-    runs-on: ubuntu-latest
+    runs-on: mich
 
     steps:
       - name: Checkout code
@@ -135,6 +135,38 @@ jobs:
         run: npm run test:cov
         if: ${{ !cancelled() }}
 
+  cli-e2e-tests:
+    name: CLI (e2e)
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./cli
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Run setup typescript-sdk
+        run: npm ci && npm run build
+        working-directory: ./open-api/typescript-sdk
+
+      - name: Run npm install (cli)
+        run: npm ci
+
+      - name: Run npm install (server)
+        run: npm ci && npm run build
+        working-directory: ./server
+
+      - name: Run e2e tests
+        run: npm run test:e2e
+
   web-unit-tests:
     name: Web
     runs-on: ubuntu-latest
@@ -173,8 +205,8 @@ jobs:
         run: npm run test:cov
         if: ${{ !cancelled() }}
 
-  e2e-tests:
-    name: End-to-End Tests
+  web-e2e-tests:
+    name: Web (e2e)
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -183,22 +215,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          submodules: "recursive"
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
 
       - name: Run setup typescript-sdk
         run: npm ci && npm run build
         working-directory: ./open-api/typescript-sdk
 
-      - name: Run setup cli
-        run: npm ci && npm run build
-        working-directory: ./cli
-
       - name: Install dependencies
         run: npm ci
 
@@ -206,12 +227,10 @@ jobs:
         run: npx playwright install --with-deps
 
       - name: Docker build
-        run: docker compose build
+        run: docker compose -f docker/docker-compose.e2e.yml build
+        working-directory: ./
 
-      - name: Run e2e tests (api & cli)
-        run: npm run test
-
-      - name: Run e2e tests (web)
+      - name: Run e2e tests
         run: npx playwright test
 
   mobile-unit-tests:
@@ -258,19 +277,6 @@ jobs:
         run: |
           poetry run pytest app --cov=app --cov-report term-missing
 
-  shellcheck:
-    name: ShellCheck
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
-        with:
-          ignore_paths: >-
-            **/open-api/**
-            **/openapi/**
-            **/node_modules/**
-
   generated-api-up-to-date:
     name: OpenAPI Clients
     runs-on: ubuntu-latest

Makefile

@@ -24,7 +24,7 @@ server-e2e-api:
 
 .PHONY: e2e
 e2e:
-	docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+	docker compose -f ./docker/docker-compose.e2e.yml up --build -V --remove-orphans
 
 prod:
 	docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans

README.md

@@ -128,9 +128,3 @@ If you feel like this is the right cause and the app is something you are seeing
 <a href="https://github.com/alextran1502/immich/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=immich-app/immich" width="100%"/>
 </a>
-
-## Star History
-
-<a href="https://star-history.com/#immich-app/immich">
-  <img src="https://api.star-history.com/svg?repos=immich-app/immich&type=Date" alt="Star History Chart" width="100%" />
-</a>

cli/.eslintrc.cjs

@@ -10,6 +10,7 @@ module.exports = {
   root: true,
   env: {
     node: true,
+    jest: true,
   },
   ignorePatterns: ['.eslintrc.js'],
   rules: {
@@ -21,6 +22,11 @@ module.exports = {
     'unicorn/prefer-module': 'off',
     curly: 2,
     'prettier/prettier': 0,
-    'unicorn/prevent-abbreviations': 'error',
+    'unicorn/prevent-abbreviations': [
+      'error',
+      {
+        ignore: ['\\.e2e-spec$', /^ignore/i],
+      },
+    ],
   },
 };

cli/.npmignore

@@ -1,4 +1,5 @@
 **/*.spec.js
+test/**
 upload/**
 .editorconfig
 .eslintignore

cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine3.19@sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c as core
+FROM node:20-alpine3.19 as core
 
 WORKDIR /usr/src/open-api/typescript-sdk
 COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./

cli/package.json

@@ -17,11 +17,10 @@
     "@testcontainers/postgresql": "^10.7.1",
     "@types/byte-size": "^8.1.0",
     "@types/cli-progress": "^3.11.0",
-    "@types/lodash-es": "^4.17.12",
     "@types/mock-fs": "^4.13.1",
     "@types/node": "^20.3.1",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "@vitest/coverage-v8": "^1.2.2",
     "byte-size": "^8.1.1",
     "cli-progress": "^3.12.0",
@@ -31,6 +30,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-unicorn": "^51.0.0",
     "glob": "^10.3.1",
+    "immich": "file:../server",
     "mock-fs": "^5.2.0",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^3.2.4",
@@ -41,14 +41,15 @@
   },
   "scripts": {
     "build": "vite build",
-    "lint": "eslint \"src/**/*.ts\" --max-warnings 0",
+    "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\" --max-warnings 0",
     "lint:fix": "npm run lint -- --fix",
     "prepack": "npm run build",
     "test": "vitest",
     "test:cov": "vitest --coverage",
     "format": "prettier --check .",
     "format:fix": "prettier --write .",
-    "check": "tsc --noEmit"
+    "check": "tsc --noEmit",
+    "test:e2e": "vitest --config test/e2e/vitest.config.ts"
   },
   "repository": {
     "type": "git",
@@ -57,8 +58,5 @@
   },
   "engines": {
     "node": ">=20.0.0"
-  },
-  "dependencies": {
-    "lodash-es": "^4.17.21"
   }
 }

cli/src/commands/upload.command.ts

@@ -1,7 +1,5 @@
-import { AssetBulkUploadCheckResult } from '@immich/sdk';
 import byteSize from 'byte-size';
 import cliProgress from 'cli-progress';
-import { chunk, zip } from 'lodash-es';
 import { createHash } from 'node:crypto';
 import fs, { createReadStream } from 'node:fs';
 import { access, constants, stat, unlink } from 'node:fs/promises';
@@ -11,23 +9,15 @@ import { ImmichApi } from 'src/services/api.service';
 import { CrawlService } from '../services/crawl.service';
 import { BaseCommand } from './base-command';
 
-const zipDefined = zip as <T, U>(a: T[], b: U[]) => [T, U][];
-
-enum CheckResponseStatus {
-  ACCEPT = 'accept',
-  REJECT = 'reject',
-  DUPLICATE = 'duplicate',
-}
-
 class Asset {
   readonly path: string;
+  readonly deviceId!: string;
 
-  id?: string;
   deviceAssetId?: string;
   fileCreatedAt?: Date;
   fileModifiedAt?: Date;
   sidecarPath?: string;
-  fileSize?: number;
+  fileSize!: number;
   albumName?: string;
 
   constructor(path: string) {
@@ -115,141 +105,17 @@ export class UploadOptionsDto {
   album? = false;
   albumName? = '';
   includeHidden? = false;
-  concurrency? = 4;
 }
 
 export class UploadCommand extends BaseCommand {
-  api!: ImmichApi;
+  uploadLength!: number;
 
   public async run(paths: string[], options: UploadOptionsDto): Promise<void> {
-    this.api = await this.connect();
+    const api = await this.connect();
 
-    console.log('Crawling for assets...');
-    const files = await this.getFiles(paths, options);
+    const formatResponse = await api.getSupportedMediaTypes();
+    const crawlService = new CrawlService(formatResponse.image, formatResponse.video);
 
-    if (files.length === 0) {
-      console.log('No assets found, exiting');
-      return;
-    }
-
-    const assetsToCheck = files.map((path) => new Asset(path));
-
-    const { newAssets, duplicateAssets } = await this.checkAssets(assetsToCheck, options.concurrency ?? 4);
-
-    const totalSizeUploaded = await this.upload(newAssets, options);
-    const messageStart = options.dryRun ? 'Would have' : 'Successfully';
-    if (newAssets.length === 0) {
-      console.log('All assets were already uploaded, nothing to do.');
-    } else {
-      console.log(
-        `${messageStart} uploaded ${newAssets.length} asset${newAssets.length === 1 ? '' : 's'} (${byteSize(totalSizeUploaded)})`,
-      );
-    }
-
-    if (options.album || options.albumName) {
-      const { createdAlbumCount, updatedAssetCount } = await this.updateAlbums(
-        [...newAssets, ...duplicateAssets],
-        options,
-      );
-      console.log(`${messageStart} created ${createdAlbumCount} new album${createdAlbumCount === 1 ? '' : 's'}`);
-      console.log(`${messageStart} updated ${updatedAssetCount} asset${updatedAssetCount === 1 ? '' : 's'}`);
-    }
-
-    if (!options.delete) {
-      return;
-    }
-
-    if (options.dryRun) {
-      console.log(`Would now have deleted assets, but skipped due to dry run`);
-      return;
-    }
-
-    console.log('Deleting assets that have been uploaded...');
-
-    await this.deleteAssets(newAssets, options);
-  }
-
-  public async checkAssets(
-    assetsToCheck: Asset[],
-    concurrency: number,
-  ): Promise<{ newAssets: Asset[]; duplicateAssets: Asset[]; rejectedAssets: Asset[] }> {
-    for (const assets of chunk(assetsToCheck, concurrency)) {
-      await Promise.all(assets.map((asset: Asset) => asset.prepare()));
-    }
-
-    const checkProgress = new cliProgress.SingleBar(
-      { format: 'Checking assets | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets' },
-      cliProgress.Presets.shades_classic,
-    );
-    checkProgress.start(assetsToCheck.length, 0);
-
-    const newAssets = [];
-    const duplicateAssets = [];
-    const rejectedAssets = [];
-    try {
-      for (const assets of chunk(assetsToCheck, concurrency)) {
-        const checkedAssets = await this.getStatus(assets);
-        for (const checked of checkedAssets) {
-          if (checked.status === CheckResponseStatus.ACCEPT) {
-            newAssets.push(checked.asset);
-          } else if (checked.status === CheckResponseStatus.DUPLICATE) {
-            duplicateAssets.push(checked.asset);
-          } else {
-            rejectedAssets.push(checked.asset);
-          }
-          checkProgress.increment();
-        }
-      }
-    } finally {
-      checkProgress.stop();
-    }
-
-    return { newAssets, duplicateAssets, rejectedAssets };
-  }
-
-  public async upload(assetsToUpload: Asset[], options: UploadOptionsDto): Promise<number> {
-    let totalSize = 0;
-
-    // Compute total size first
-    for (const asset of assetsToUpload) {
-      totalSize += asset.fileSize ?? 0;
-    }
-
-    if (options.dryRun) {
-      return totalSize;
-    }
-
-    const uploadProgress = new cliProgress.SingleBar(
-      {
-        format: 'Uploading assets | {bar} | {percentage}% | ETA: {eta_formatted} | {value_formatted}/{total_formatted}',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-    uploadProgress.start(totalSize, 0);
-    uploadProgress.update({ value_formatted: 0, total_formatted: byteSize(totalSize) });
-
-    let totalSizeUploaded = 0;
-    try {
-      for (const assets of chunk(assetsToUpload, options.concurrency)) {
-        const ids = await this.uploadAssets(assets);
-        for (const [asset, id] of zipDefined(assets, ids)) {
-          asset.id = id;
-          if (asset.fileSize) {
-            totalSizeUploaded += asset.fileSize ?? 0;
-          } else {
-            console.log(`Could not determine file size for ${asset.path}`);
-          }
-        }
-        uploadProgress.update(totalSizeUploaded, { value_formatted: byteSize(totalSizeUploaded) });
-      }
-    } finally {
-      uploadProgress.stop();
-    }
-
-    return totalSizeUploaded;
-  }
-
-  public async getFiles(paths: string[], options: UploadOptionsDto): Promise<string[]> {
     const inputFiles: string[] = [];
     for (const pathArgument of paths) {
       const fileStat = await fs.promises.lstat(pathArgument);
@@ -258,187 +124,151 @@ export class UploadCommand extends BaseCommand {
       }
     }
 
-    const files: string[] = await this.crawl(paths, options);
-    files.push(...inputFiles);
-    return files;
-  }
-
-  public async getAlbums(): Promise<Map<string, string>> {
-    const existingAlbums = await this.api.getAllAlbums();
-
-    const albumMapping = new Map<string, string>();
-    for (const album of existingAlbums) {
-      albumMapping.set(album.albumName, album.id);
-    }
-
-    return albumMapping;
-  }
-
-  public async updateAlbums(
-    assets: Asset[],
-    options: UploadOptionsDto,
-  ): Promise<{ createdAlbumCount: number; updatedAssetCount: number }> {
-    if (options.albumName) {
-      for (const asset of assets) {
-        asset.albumName = options.albumName;
-      }
-    }
-
-    const existingAlbums = await this.getAlbums();
-    const assetsToUpdate = assets.filter(
-      (asset): asset is Asset & { albumName: string; id: string } => !!(asset.albumName && asset.id),
-    );
-
-    const newAlbumsSet: Set<string> = new Set();
-    for (const asset of assetsToUpdate) {
-      if (!existingAlbums.has(asset.albumName)) {
-        newAlbumsSet.add(asset.albumName);
-      }
-    }
-
-    const newAlbums = [...newAlbumsSet];
-
-    if (options.dryRun) {
-      return { createdAlbumCount: newAlbums.length, updatedAssetCount: assetsToUpdate.length };
-    }
-
-    const albumCreationProgress = new cliProgress.SingleBar(
-      {
-        format: 'Creating albums | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} albums',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-    albumCreationProgress.start(newAlbums.length, 0);
-
-    try {
-      for (const albumNames of chunk(newAlbums, options.concurrency)) {
-        const newAlbumIds = await Promise.all(
-          albumNames.map((albumName: string) => this.api.createAlbum({ albumName }).then((r) => r.id)),
-        );
-
-        for (const [albumName, albumId] of zipDefined(albumNames, newAlbumIds)) {
-          existingAlbums.set(albumName, albumId);
-        }
-
-        albumCreationProgress.increment(albumNames.length);
-      }
-    } finally {
-      albumCreationProgress.stop();
-    }
-
-    const albumToAssets = new Map<string, string[]>();
-    for (const asset of assetsToUpdate) {
-      const albumId = existingAlbums.get(asset.albumName);
-      if (albumId) {
-        if (!albumToAssets.has(albumId)) {
-          albumToAssets.set(albumId, []);
-        }
-        albumToAssets.get(albumId)?.push(asset.id);
-      }
-    }
-
-    const albumUpdateProgress = new cliProgress.SingleBar(
-      {
-        format: 'Adding assets to albums | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-    albumUpdateProgress.start(assetsToUpdate.length, 0);
-
-    try {
-      for (const [albumId, assets] of albumToAssets.entries()) {
-        for (const assetBatch of chunk(assets, Math.min(1000 * (options.concurrency ?? 4), 65_000))) {
-          await this.api.addAssetsToAlbum(albumId, { ids: assetBatch });
-          albumUpdateProgress.increment(assetBatch.length);
-        }
-      }
-    } finally {
-      albumUpdateProgress.stop();
-    }
-
-    return { createdAlbumCount: newAlbums.length, updatedAssetCount: assetsToUpdate.length };
-  }
-
-  public async deleteAssets(assets: Asset[], options: UploadOptionsDto): Promise<void> {
-    const deletionProgress = new cliProgress.SingleBar(
-      {
-        format: 'Deleting local assets | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-    deletionProgress.start(assets.length, 0);
-
-    try {
-      for (const assetBatch of chunk(assets, options.concurrency)) {
-        await Promise.all(assetBatch.map((asset: Asset) => asset.delete()));
-        deletionProgress.update(assetBatch.length);
-      }
-    } finally {
-      deletionProgress.stop();
-    }
-  }
-
-  private async getStatus(assets: Asset[]): Promise<{ asset: Asset; status: CheckResponseStatus }[]> {
-    const checkResponse = await this.checkHashes(assets);
-
-    const responses = [];
-    for (const [check, asset] of zipDefined(checkResponse, assets)) {
-      if (check.assetId) {
-        asset.id = check.assetId;
-      }
-
-      if (check.action === 'accept') {
-        responses.push({ asset, status: CheckResponseStatus.ACCEPT });
-      } else if (check.reason === 'duplicate') {
-        responses.push({ asset, status: CheckResponseStatus.DUPLICATE });
-      } else {
-        responses.push({ asset, status: CheckResponseStatus.REJECT });
-      }
-    }
-
-    return responses;
-  }
-
-  private async checkHashes(assetsToCheck: Asset[]): Promise<AssetBulkUploadCheckResult[]> {
-    const checksums = await Promise.all(assetsToCheck.map((asset) => asset.hash()));
-    const assetBulkUploadCheckDto = {
-      assets: zipDefined(assetsToCheck, checksums).map(([asset, checksum]) => ({ id: asset.path, checksum })),
-    };
-    const checkResponse = await this.api.checkBulkUpload(assetBulkUploadCheckDto);
-    return checkResponse.results;
-  }
-
-  private async uploadAssets(assets: Asset[]): Promise<string[]> {
-    const fileRequests = await Promise.all(assets.map((asset) => asset.getUploadFormData()));
-    return Promise.all(fileRequests.map((request) => this.uploadAsset(request).then((response) => response.id)));
-  }
-
-  private async crawl(paths: string[], options: UploadOptionsDto): Promise<string[]> {
-    const formatResponse = await this.api.getSupportedMediaTypes();
-    const crawlService = new CrawlService(formatResponse.image, formatResponse.video);
-
-    return crawlService.crawl({
+    const files: string[] = await crawlService.crawl({
       pathsToCrawl: paths,
       recursive: options.recursive,
       exclusionPatterns: options.exclusionPatterns,
       includeHidden: options.includeHidden,
     });
+
+    files.push(...inputFiles);
+
+    if (files.length === 0) {
+      console.log('No assets found, exiting');
+      return;
+    }
+
+    const assetsToUpload = files.map((path) => new Asset(path));
+
+    const uploadProgress = new cliProgress.SingleBar(
+      {
+        format: '{bar} | {percentage}% | ETA: {eta_formatted} | {value_formatted}/{total_formatted}: {filename}',
+      },
+      cliProgress.Presets.shades_classic,
+    );
+
+    let totalSize = 0;
+    let sizeSoFar = 0;
+
+    let totalSizeUploaded = 0;
+    let uploadCounter = 0;
+
+    for (const asset of assetsToUpload) {
+      // Compute total size first
+      await asset.prepare();
+      totalSize += asset.fileSize;
+
+      if (options.albumName) {
+        asset.albumName = options.albumName;
+      }
+    }
+
+    const existingAlbums = await api.getAllAlbums();
+
+    uploadProgress.start(totalSize, 0);
+    uploadProgress.update({ value_formatted: 0, total_formatted: byteSize(totalSize) });
+
+    try {
+      for (const asset of assetsToUpload) {
+        uploadProgress.update({
+          filename: asset.path,
+        });
+
+        let skipUpload = false;
+
+        let skipAsset = false;
+        let existingAssetId: string | undefined = undefined;
+
+        if (!options.skipHash) {
+          const assetBulkUploadCheckDto = { assets: [{ id: asset.path, checksum: await asset.hash() }] };
+
+          const checkResponse = await api.checkBulkUpload(assetBulkUploadCheckDto);
+
+          skipUpload = checkResponse.results[0].action === 'reject';
+
+          const isDuplicate = checkResponse.results[0].reason === 'duplicate';
+          if (isDuplicate) {
+            existingAssetId = checkResponse.results[0].assetId;
+          }
+
+          skipAsset = skipUpload && !isDuplicate;
+        }
+
+        if (!skipAsset && !options.dryRun) {
+          if (!skipUpload) {
+            const formData = await asset.getUploadFormData();
+            const response = await this.uploadAsset(api, formData);
+            const json = await response.json();
+            existingAssetId = json.id;
+            uploadCounter++;
+            totalSizeUploaded += asset.fileSize;
+          }
+
+          if ((options.album || options.albumName) && asset.albumName !== undefined) {
+            let album = existingAlbums.find((album) => album.albumName === asset.albumName);
+            if (!album) {
+              const response = await api.createAlbum({ albumName: asset.albumName });
+              album = response;
+              existingAlbums.push(album);
+            }
+
+            if (existingAssetId) {
+              await api.addAssetsToAlbum(album.id, {
+                ids: [existingAssetId],
+              });
+            }
+          }
+        }
+
+        sizeSoFar += asset.fileSize;
+
+        uploadProgress.update(sizeSoFar, { value_formatted: byteSize(sizeSoFar) });
+      }
+    } finally {
+      uploadProgress.stop();
+    }
+
+    const messageStart = options.dryRun ? 'Would have' : 'Successfully';
+
+    if (uploadCounter === 0) {
+      console.log('All assets were already uploaded, nothing to do.');
+    } else {
+      console.log(`${messageStart} uploaded ${uploadCounter} assets (${byteSize(totalSizeUploaded)})`);
+    }
+    if (options.delete) {
+      if (options.dryRun) {
+        console.log(`Would now have deleted assets, but skipped due to dry run`);
+      } else {
+        console.log('Deleting assets that have been uploaded...');
+        const deletionProgress = new cliProgress.SingleBar(cliProgress.Presets.shades_classic);
+        deletionProgress.start(files.length, 0);
+
+        for (const asset of assetsToUpload) {
+          if (!options.dryRun) {
+            await asset.delete();
+          }
+          deletionProgress.increment();
+        }
+        deletionProgress.stop();
+        console.log('Deletion complete');
+      }
+    }
   }
 
-  private async uploadAsset(data: FormData): Promise<{ id: string }> {
-    const url = this.api.instanceUrl + '/asset/upload';
+  private async uploadAsset(api: ImmichApi, data: FormData): Promise<Response> {
+    const url = api.instanceUrl + '/asset/upload';
 
     const response = await fetch(url, {
       method: 'post',
       redirect: 'error',
       headers: {
-        'x-api-key': this.api.apiKey,
+        'x-api-key': api.apiKey,
       },
       body: data,
     });
     if (response.status !== 200 && response.status !== 201) {
       throw new Error(await response.text());
     }
-    return response.json();
+    return response;
   }
 }

cli/src/index.ts

@@ -15,7 +15,7 @@ const program = new Command()
   .version(version)
   .description('Command line interface for Immich')
   .addOption(
-    new Option('-d, --config-directory <directory>', 'Configuration directory where auth.yml will be stored')
+    new Option('-d, --config-directory', 'Configuration directory where auth.yml will be stored')
       .env('IMMICH_CONFIG_DIR')
       .default(defaultConfigDirectory),
   );
@@ -43,11 +43,6 @@ program
       .env('IMMICH_DRY_RUN')
       .default(false),
   )
-  .addOption(
-    new Option('-c, --concurrency', 'Number of assets to upload at the same time')
-      .env('IMMICH_UPLOAD_CONCURRENCY')
-      .default(4),
-  )
   .addOption(new Option('--delete', 'Delete local assets after upload').env('IMMICH_DELETE_ASSETS'))
   .argument('[paths...]', 'One or more paths to assets to be uploaded')
   .action(async (paths, options) => {
@@ -65,10 +60,10 @@ program
 program
   .command('login-key')
   .description('Login using an API key')
-  .argument('url')
-  .argument('key')
-  .action(async (url, key) => {
-    await new LoginCommand(program.opts()).run(url, key);
+  .argument('[instanceUrl]')
+  .argument('[apiKey]')
+  .action(async (paths, options) => {
+    await new LoginCommand(program.opts()).run(paths, options);
   });
 
 program

cli/src/services/session.service.spec.ts

@@ -1,41 +1,17 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import yaml from 'yaml';
+import {
+  TEST_AUTH_FILE,
+  TEST_CONFIG_DIR,
+  TEST_IMMICH_API_KEY,
+  TEST_IMMICH_INSTANCE_URL,
+  createTestAuthFile,
+  deleteAuthFile,
+  readTestAuthFile,
+  spyOnConsole,
+} from '../../test/cli-test-utils';
 import { SessionService } from './session.service';
 
-const TEST_CONFIG_DIR = '/tmp/immich/';
-const TEST_AUTH_FILE = path.join(TEST_CONFIG_DIR, 'auth.yml');
-const TEST_IMMICH_INSTANCE_URL = 'https://test/api';
-const TEST_IMMICH_API_KEY = 'pNussssKSYo5WasdgalvKJ1n9kdvaasdfbluPg';
-
-const spyOnConsole = () => vi.spyOn(console, 'log').mockImplementation(() => {});
-
-const createTestAuthFile = async (contents: string) => {
-  if (!fs.existsSync(TEST_CONFIG_DIR)) {
-    // Create config folder if it doesn't exist
-    const created = await fs.promises.mkdir(TEST_CONFIG_DIR, { recursive: true });
-    if (!created) {
-      throw new Error(`Failed to create config folder ${TEST_CONFIG_DIR}`);
-    }
-  }
-
-  fs.writeFileSync(TEST_AUTH_FILE, contents);
-};
-
-const readTestAuthFile = async (): Promise<string> => {
-  return await fs.promises.readFile(TEST_AUTH_FILE, 'utf8');
-};
-
-const deleteAuthFile = () => {
-  try {
-    fs.unlinkSync(TEST_AUTH_FILE);
-  } catch (error: any) {
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
-  }
-};
-
 const mocks = vi.hoisted(() => {
   return {
     getMyUserInfo: vi.fn(() => Promise.resolve({ email: 'admin@example.com' })),

cli/test/cli-test-utils.ts

@@ -0,0 +1,52 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { ImmichApi } from 'src/services/api.service';
+
+export const TEST_CONFIG_DIR = '/tmp/immich/';
+export const TEST_AUTH_FILE = path.join(TEST_CONFIG_DIR, 'auth.yml');
+export const TEST_IMMICH_INSTANCE_URL = 'https://test/api';
+export const TEST_IMMICH_API_KEY = 'pNussssKSYo5WasdgalvKJ1n9kdvaasdfbluPg';
+
+export const CLI_BASE_OPTIONS = { configDirectory: TEST_CONFIG_DIR };
+
+export const setup = async () => {
+  const api = new ImmichApi(process.env.IMMICH_INSTANCE_URL as string, '');
+  await api.signUpAdmin({ email: 'cli@immich.app', password: 'password', name: 'Administrator' });
+  const admin = await api.login({ email: 'cli@immich.app', password: 'password' });
+  const apiKey = await api.createApiKey(
+    { name: 'CLI Test' },
+    { headers: { Authorization: `Bearer ${admin.accessToken}` } },
+  );
+
+  api.setApiKey(apiKey.secret);
+
+  return api;
+};
+
+export const spyOnConsole = () => vi.spyOn(console, 'log').mockImplementation(() => {});
+
+export const createTestAuthFile = async (contents: string) => {
+  if (!fs.existsSync(TEST_CONFIG_DIR)) {
+    // Create config folder if it doesn't exist
+    const created = await fs.promises.mkdir(TEST_CONFIG_DIR, { recursive: true });
+    if (!created) {
+      throw new Error(`Failed to create config folder ${TEST_CONFIG_DIR}`);
+    }
+  }
+
+  fs.writeFileSync(TEST_AUTH_FILE, contents);
+};
+
+export const readTestAuthFile = async (): Promise<string> => {
+  return await fs.promises.readFile(TEST_AUTH_FILE, 'utf8');
+};
+
+export const deleteAuthFile = () => {
+  try {
+    fs.unlinkSync(TEST_AUTH_FILE);
+  } catch (error: any) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
+  }
+};

cli/test/e2e/login-key.e2e-spec.ts

@@ -0,0 +1,65 @@
+import { restoreTempFolder, testApp } from '@test-utils';
+import { readFile, stat } from 'node:fs/promises';
+import { CLI_BASE_OPTIONS, TEST_AUTH_FILE, deleteAuthFile, setup, spyOnConsole } from 'test/cli-test-utils';
+import yaml from 'yaml';
+import { LoginCommand } from '../../src/commands/login.command';
+
+describe(`login-key (e2e)`, () => {
+  let apiKey: string;
+  let instanceUrl: string;
+
+  spyOnConsole();
+
+  beforeAll(async () => {
+    await testApp.create();
+    if (process.env.IMMICH_INSTANCE_URL) {
+      instanceUrl = process.env.IMMICH_INSTANCE_URL;
+    } else {
+      throw new Error('IMMICH_INSTANCE_URL environment variable not set');
+    }
+  });
+
+  afterAll(async () => {
+    await testApp.teardown();
+    await restoreTempFolder();
+    deleteAuthFile();
+  });
+
+  beforeEach(async () => {
+    await testApp.reset();
+    await restoreTempFolder();
+
+    const api = await setup();
+    apiKey = api.apiKey;
+
+    deleteAuthFile();
+  });
+
+  it('should error when providing an invalid API key', async () => {
+    await expect(new LoginCommand(CLI_BASE_OPTIONS).run(instanceUrl, 'invalid')).rejects.toThrow(
+      `Failed to connect to server ${instanceUrl}: Error: 401`,
+    );
+  });
+
+  it('should log in when providing the correct API key', async () => {
+    await new LoginCommand(CLI_BASE_OPTIONS).run(instanceUrl, apiKey);
+  });
+
+  it('should create an auth file when logging in', async () => {
+    await new LoginCommand(CLI_BASE_OPTIONS).run(instanceUrl, apiKey);
+
+    const data: string = await readFile(TEST_AUTH_FILE, 'utf8');
+    const parsedConfig = yaml.parse(data);
+
+    expect(parsedConfig).toEqual(expect.objectContaining({ instanceUrl, apiKey }));
+  });
+
+  it('should create an auth file with chmod 600', async () => {
+    await new LoginCommand(CLI_BASE_OPTIONS).run(instanceUrl, apiKey);
+
+    const stats = await stat(TEST_AUTH_FILE);
+    const mode = (stats.mode & 0o777).toString(8);
+
+    expect(mode).toEqual('600');
+  });
+});

cli/test/e2e/server-info.e2e-spec.ts

@@ -0,0 +1,34 @@
+import { restoreTempFolder, testApp } from '@test-utils';
+import { CLI_BASE_OPTIONS, setup, spyOnConsole } from 'test/cli-test-utils';
+import { ServerInfoCommand } from '../../src/commands/server-info.command';
+
+describe(`server-info (e2e)`, () => {
+  const consoleSpy = spyOnConsole();
+
+  beforeAll(async () => {
+    await testApp.create();
+  });
+
+  afterAll(async () => {
+    await testApp.teardown();
+    await restoreTempFolder();
+  });
+
+  beforeEach(async () => {
+    await testApp.reset();
+    await restoreTempFolder();
+    const api = await setup();
+    process.env.IMMICH_API_KEY = api.apiKey;
+  });
+
+  it('should show server version', async () => {
+    await new ServerInfoCommand(CLI_BASE_OPTIONS).run();
+
+    expect(consoleSpy.mock.calls).toEqual([
+      [expect.stringMatching(new RegExp('Server Version: \\d+.\\d+.\\d+'))],
+      [expect.stringMatching('Image Types: .*')],
+      [expect.stringMatching('Video Types: .*')],
+      ['Statistics:\n  Images: 0\n  Videos: 0\n  Total: 0'],
+    ]);
+  });
+});

cli/test/e2e/setup.ts

@@ -0,0 +1,42 @@
+import { PostgreSqlContainer } from '@testcontainers/postgresql';
+import { access } from 'node:fs/promises';
+import path from 'node:path';
+
+export const directoryExists = (directory: string) =>
+  access(directory)
+    .then(() => true)
+    .catch(() => false);
+
+export default async () => {
+  let IMMICH_TEST_ASSET_PATH: string = '';
+
+  if (process.env.IMMICH_TEST_ASSET_PATH === undefined) {
+    IMMICH_TEST_ASSET_PATH = path.normalize(`${__dirname}/../../../server/test/assets/`);
+    process.env.IMMICH_TEST_ASSET_PATH = IMMICH_TEST_ASSET_PATH;
+  } else {
+    IMMICH_TEST_ASSET_PATH = process.env.IMMICH_TEST_ASSET_PATH;
+  }
+
+  if (!(await directoryExists(`${IMMICH_TEST_ASSET_PATH}/albums`))) {
+    throw new Error(
+      `Test assets not found. Please checkout https://github.com/immich-app/test-assets into ${IMMICH_TEST_ASSET_PATH} before testing`,
+    );
+  }
+
+  if (process.env.DB_HOSTNAME === undefined) {
+    // DB hostname not set which likely means we're not running e2e through docker compose. Start a local postgres container.
+    const pg = await new PostgreSqlContainer('tensorchord/pgvecto-rs:pg14-v0.2.0')
+      .withExposedPorts(5432)
+      .withDatabase('immich')
+      .withUsername('postgres')
+      .withPassword('postgres')
+      .withReuse()
+      .start();
+
+    process.env.DB_URL = pg.getConnectionUri();
+  }
+
+  process.env.NODE_ENV = 'development';
+  process.env.IMMICH_CONFIG_FILE = path.normalize(`${__dirname}/../../../server/e2e/jobs/immich-e2e-config.json`);
+  process.env.TZ = 'Z';
+};

cli/test/e2e/upload.e2e-spec.ts

@@ -0,0 +1,79 @@
+import { IMMICH_TEST_ASSET_PATH, restoreTempFolder, testApp } from '@test-utils';
+import { ImmichApi } from 'src/services/api.service';
+import { CLI_BASE_OPTIONS, setup, spyOnConsole } from 'test/cli-test-utils';
+import { UploadCommand } from '../../src/commands/upload.command';
+
+describe(`upload (e2e)`, () => {
+  let api: ImmichApi;
+
+  spyOnConsole();
+
+  beforeAll(async () => {
+    await testApp.create();
+  });
+
+  afterAll(async () => {
+    await testApp.teardown();
+    await restoreTempFolder();
+  });
+
+  beforeEach(async () => {
+    await testApp.reset();
+    await restoreTempFolder();
+    api = await setup();
+    process.env.IMMICH_API_KEY = api.apiKey;
+  });
+
+  it('should upload a folder recursively', async () => {
+    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], { recursive: true });
+    const assets = await api.getAllAssets();
+    expect(assets.length).toBeGreaterThan(4);
+  });
+
+  it('should not create a new album', async () => {
+    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], { recursive: true });
+    const albums = await api.getAllAlbums();
+    expect(albums.length).toEqual(0);
+  });
+
+  it('should create album from folder name', async () => {
+    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], {
+      recursive: true,
+      album: true,
+    });
+
+    const albums = await api.getAllAlbums();
+    expect(albums.length).toEqual(1);
+    const natureAlbum = albums[0];
+    expect(natureAlbum.albumName).toEqual('nature');
+  });
+
+  it('should add existing assets to album', async () => {
+    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], {
+      recursive: true,
+    });
+
+    // upload again, but this time add to album
+    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], {
+      recursive: true,
+      album: true,
+    });
+
+    const albums = await api.getAllAlbums();
+    expect(albums.length).toEqual(1);
+    const natureAlbum = albums[0];
+    expect(natureAlbum.albumName).toEqual('nature');
+  });
+
+  it('should upload to the specified album name', async () => {
+    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], {
+      recursive: true,
+      albumName: 'testAlbum',
+    });
+
+    const albums = await api.getAllAlbums();
+    expect(albums.length).toEqual(1);
+    const testAlbum = albums[0];
+    expect(testAlbum.albumName).toEqual('testAlbum');
+  });
+});

cli/test/e2e/vitest.config.ts

@@ -0,0 +1,22 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  resolve: {
+    alias: {
+      '@test-utils': new URL('../../../server/dist/test-utils/utils.js', import.meta.url).pathname,
+    },
+  },
+  test: {
+    include: ['**/*.e2e-spec.ts'],
+    globals: true,
+    globalSetup: 'test/e2e/setup.ts',
+    pool: 'forks',
+    poolOptions: {
+      forks: {
+        maxForks: 1,
+        minForks: 1,
+      },
+    },
+    testTimeout: 10_000,
+  },
+});

cli/test/global-setup.js

@@ -0,0 +1,3 @@
+module.exports = async () => {
+  process.env.TZ = 'UTC';
+};

cli/testSetup.js

@@ -0,0 +1,3 @@
+// add all jest-extended matchers
+import * as matchers from 'jest-extended';
+expect.extend(matchers);

docker/docker-compose.e2e.yml

@@ -13,7 +13,6 @@ x-server-build: &server-common
     - DB_PASSWORD=postgres
     - DB_DATABASE_NAME=immich
     - REDIS_HOSTNAME=redis
-    - IMMICH_MACHINE_LEARNING_ENABLED=false
   volumes:
     - upload:/usr/src/app/upload
   depends_on:
@@ -22,29 +21,28 @@ x-server-build: &server-common
 
 services:
   immich-server:
-    container_name: immich-e2e-server
     command: [ "./start.sh", "immich" ]
     <<: *server-common
     ports:
       - 2283:3001
 
   immich-microservices:
-    container_name: immich-e2e-microservices
     command: [ "./start.sh", "microservices" ]
     <<: *server-common
 
+
   redis:
     image: redis:6.2-alpine@sha256:51d6c56749a4243096327e3fb964a48ed92254357108449cb6e23999c37773c5
+    restart: always
 
   database:
     image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
-    command: -c fsync=off -c shared_preload_libraries=vectors.so
     environment:
       POSTGRES_PASSWORD: postgres
       POSTGRES_USER: postgres
       POSTGRES_DB: immich
     ports:
-      - 5433:5432
+      - 5432:5432
 
 volumes:
   model-cache:

docker/docker-compose.prod.yml

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

docker/hwaccel.transcoding.yml

@@ -38,6 +38,12 @@ services:
       - /dev/dri:/dev/dri
       - /dev/dma_heap:/dev/dma_heap
       - /dev/mpp_service:/dev/mpp_service
+    volumes:
+      - /usr/bin/ffmpeg:/usr/bin/ffmpeg_mpp:ro
+      - /lib/aarch64-linux-gnu:/lib/ffmpeg-mpp:ro
+      - /lib/aarch64-linux-gnu/libblas.so.3:/lib/ffmpeg-mpp/libblas.so.3:ro # symlink is resolved by mounting
+      - /lib/aarch64-linux-gnu/liblapack.so.3:/lib/ffmpeg-mpp/liblapack.so.3:ro # symlink is resolved by mounting
+      - /lib/aarch64-linux-gnu/pulseaudio/libpulsecommon-15.99.so:/lib/ffmpeg-mpp/libpulsecommon-15.99.so:ro
 
   vaapi:
     devices:

docs/docs/administration/reverse-proxy.md

@@ -44,13 +44,22 @@ Below is an example config for Apache2 site configuration.
 
 ```
 <VirtualHost *:80>
-   ServerName <snip>
-   ProxyRequests Off
-   ProxyPass / http://127.0.0.1:2283/ timeout=600 upgrade=websocket
-   ProxyPassReverse / http://127.0.0.1:2283/
-   ProxyPreserveHost On
+    ServerName <snip>
 
+    ProxyRequests off
+    ProxyVia on
+
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI}  ^/api/socket.io            [NC]
+    RewriteCond %{QUERY_STRING} transport=websocket    [NC]
+    RewriteRule /(.*)           ws://localhost:2283/$1 [P,L]
+
+    ProxyPass        /api/socket.io ws://localhost:2283/api/socket.io
+    ProxyPassReverse /api/socket.io ws://localhost:2283/api/socket.io
+
+    <Location />
+        ProxyPass http://localhost:2283/
+        ProxyPassReverse http://localhost:2283/
+    </Location>
 </VirtualHost>
 ```
-
-**timeout:** is measured in seconds, and it is particularly useful when long operations are triggered (i.e. Repair), so the server doesn't return an error.

docs/docs/developer/pr-checklist.md

@@ -7,7 +7,7 @@ When contributing code through a pull request, please check the following:
 - [ ] `npm run lint` (linting via ESLint)
 - [ ] `npm run format` (formatting via Prettier)
 - [ ] `npm run check:svelte` (Type checking via SvelteKit)
-- [ ] `npm test` (unit tests)
+- [ ] `npm test` (Tests via Jest)
 
 :::tip
 Run all web checks with `npm run check:all`
@@ -18,7 +18,7 @@ Run all web checks with `npm run check:all`
 - [ ] `npm run lint` (linting via ESLint)
 - [ ] `npm run format` (formatting via Prettier)
 - [ ] `npm run check` (Type checking via `tsc`)
-- [ ] `npm test` (unit tests)
+- [ ] `npm test` (Tests via Jest)
 
 :::tip
 Run all server checks with `npm run check:all`

docs/docs/features/libraries.md

@@ -42,24 +42,23 @@ Finally, files can be deleted from Immich via the `Remove Offline Files` job. Th
 
 ### Import Paths
 
-External libraries use import paths to determine which files to scan. Each library can have multiple import paths so that files from different locations can be added to the same library. Import paths are scanned recursively, and if a file is in multiple import paths, it will only be added once. Each import file must be a readable directory that exists on the filesystem; the import path dialog will alert you of any paths that are not accessible.
-
-If the import paths are edited in a way that an external file is no longer in any import path, it will be removed from the library in the same way a deleted file would. If the file is moved back to an import path, it will be added again as if it was a new file.
+External libraries use import paths to determine which files to scan. Each library can have multiple import paths so that files from different locations can be added to the same library. Import paths are scanned recursively, and if a file is in multiple import paths, it will only be added once. If the import paths are edited in a way that an external file is no longer in any import path, it will be removed from the library in the same way a deleted file would. If the file is moved back to an import path, it will be added again as if it was a new file.
 
 ### Troubleshooting
 
-Sometimes, an external library will not scan correctly. This can happen if immich_server or immich_microservices can't access the files. Here are some things to check:
+Sometimes, an external library will not scan correctly. This can happen if the immich_server or immich_microservices can't access the files. Here are some things to check:
 
-- Is the external path set correctly? Each import path must be contained in the external path.
-- Make sure the external path does not contain spaces
+- Is the external path set correctly?
 - In the docker-compose file, are the volumes mounted correctly?
 - Are the volumes identical between the `server` and `microservices` container?
 - Are the import paths set correctly, and do they match the path set in docker-compose file?
-- Make sure you don't use symlinks in your import libraries, and that you aren't linking across docker mounts.
+- Are you using symbolic link in your import library?
 - Are the permissions set correctly?
-- Make sure you are using forward slashes (`/`) and not backward slashes.
+- Are you using forward slashes everywhere? (`/`)
+- Are you using symlink across docker mounts?
+- Are you using [spaces in the internal path](/docs/features/libraries#:~:text=can%20be%20accessed.-,NOTE,-Spaces%20in%20the)?
 
-To validate that Immich can reach your external library, start a shell inside the container. Run `docker exec -it immich_microservices /bin/bash` to a bash shell. If your import path is `/data/import/photos`, check it with `ls /data/import/photos`. Do the same check for the `immich_server` container. If you cannot access this directory in both the `microservices` and `server` containers, Immich won't be able to import files.
+If all else fails, you can always start a shell inside the container and check if the path is accessible. For example, `docker exec -it immich_microservices /bin/bash` will start a bash shell. If your import path, for instance, is `/data/import/photos`, you can check if the files are accessible by running `ls /data/import/photos`. Also check the `immich_server` container in the same way.
 
 ### Security Considerations
 

docs/docs/install/environment-variables.md

@@ -60,17 +60,14 @@ These environment variables are used by the `docker-compose.yml` file and do **N
 
 ## Database
 
-| Variable                            | Description                                                   |   Default    | Services              |
-| :---------------------------------- | :------------------------------------------------------------ | :----------: | :-------------------- |
-| `DB_URL`                            | Database URL                                                  |              | server, microservices |
-| `DB_HOSTNAME`                       | Database Host                                                 | `localhost`  | server, microservices |
-| `DB_PORT`                           | Database Port                                                 |    `5432`    | server, microservices |
-| `DB_USERNAME`                       | Database User                                                 |  `postgres`  | server, microservices |
-| `DB_PASSWORD`                       | Database Password                                             |  `postgres`  | 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
+| Variable      | Description       |   Default   | Services              |
+| :------------ | :---------------- | :---------: | :-------------------- |
+| `DB_URL`      | Database URL      |             | server, microservices |
+| `DB_HOSTNAME` | Database Host     | `localhost` | server, microservices |
+| `DB_PORT`     | Database Port     |   `5432`    | server, microservices |
+| `DB_USERNAME` | Database User     | `postgres`  | server, microservices |
+| `DB_PASSWORD` | Database Password | `postgres`  | server, microservices |
+| `DB_DATABASE` | Database Name     |  `immich`   | server, microservices |
 
 :::info
 

docs/package-lock.json

@@ -2964,9 +2964,9 @@
       }
     },
     "node_modules/@mdx-js/react": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.0.1.tgz",
-      "integrity": "sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.0.0.tgz",
+      "integrity": "sha512-nDctevR9KyYFyV+m+/+S4cpzCWHqj+iHDHq3QrsWezcC+B17uZdIWgCguESUkwFhM3n/56KxWVE3V6EokrmONQ==",
       "dependencies": {
         "@types/mdx": "^2.0.0"
       },

e2e/package.json

@@ -5,27 +5,18 @@
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "test": "vitest --config vitest.config.ts",
-    "test:web": "npx playwright test",
-    "start:web": "npx playwright test --ui"
+    "test": "npx playwright test",
+    "build": "tsc"
   },
   "keywords": [],
   "author": "",
   "license": "GNU Affero General Public License version 3",
   "devDependencies": {
-    "@immich/cli": "file:../cli",
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.41.2",
-    "@types/luxon": "^3.4.2",
     "@types/node": "^20.11.17",
     "@types/pg": "^8.11.0",
-    "@types/supertest": "^6.0.2",
-    "@vitest/coverage-v8": "^1.3.0",
-    "luxon": "^3.4.4",
     "pg": "^8.11.3",
-    "socket.io-client": "^4.7.4",
-    "supertest": "^6.3.4",
-    "typescript": "^5.3.3",
-    "vitest": "^1.3.0"
+    "typescript": "^5.3.3"
   }
 }

e2e/playwright.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig, devices } from '@playwright/test';
 
 export default defineConfig({
-  testDir: './src/web/specs',
+  testDir: './specs/',
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
@@ -53,7 +53,8 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'docker compose up --build -V --remove-orphans',
+    command:
+      'docker compose -f ../docker/docker-compose.e2e.yml up --build -V --remove-orphans',
     url: 'http://127.0.0.1:2283',
     reuseExistingServer: true,
   },

e2e/specs/auth.e2e-spec.ts

@@ -1,17 +1,13 @@
 import { test, expect } from '@playwright/test';
-import { apiUtils, dbUtils, webUtils } from 'src/utils';
+import { app } from '../test-utils';
 
 test.describe('Registration', () => {
-  test.beforeAll(() => {
-    apiUtils.setup();
-  });
-
   test.beforeEach(async () => {
-    await dbUtils.reset();
+    await app.reset();
   });
 
   test.afterAll(async () => {
-    await dbUtils.teardown();
+    await app.teardown();
   });
 
   test('admin registration', async ({ page }) => {
@@ -45,8 +41,7 @@ test.describe('Registration', () => {
   });
 
   test('user registration', async ({ context, page }) => {
-    const admin = await apiUtils.adminSetup();
-    await webUtils.setAuthCookies(context, admin.accessToken);
+    await app.adminSetup(context);
 
     // create user
     await page.goto('/admin/user-management');

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

@@ -1,481 +0,0 @@
-import {
-  AssetFileUploadResponseDto,
-  AssetResponseDto,
-  LoginResponseDto,
-  SharedLinkType,
-} from '@immich/sdk';
-import { DateTime } from 'luxon';
-import { Socket } from 'socket.io-client';
-import { createUserDto, uuidDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { apiUtils, app, dbUtils } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-const today = DateTime.fromObject({
-  year: 2023,
-  month: 11,
-  day: 3,
-}) as DateTime<true>;
-const yesterday = today.minus({ days: 1 });
-
-describe('/asset', () => {
-  let admin: LoginResponseDto;
-  let user1: LoginResponseDto;
-  let user2: LoginResponseDto;
-  let userStats: LoginResponseDto;
-  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 });
-    [user1, user2, userStats] = await Promise.all([
-      apiUtils.userSetup(admin.accessToken, createUserDto.user1),
-      apiUtils.userSetup(admin.accessToken, createUserDto.user2),
-      apiUtils.userSetup(admin.accessToken, createUserDto.user3),
-    ]);
-
-    [asset1, asset2, asset3, asset4, asset5, asset6] = await Promise.all([
-      apiUtils.createAsset(user1.accessToken),
-      apiUtils.createAsset(user1.accessToken),
-      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),
-
-      // 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,
-        },
-        { filename: 'example.mp4' },
-      ),
-    ]);
-
-    const person1 = await apiUtils.createPerson(user1.accessToken, {
-      name: 'Test Person',
-    });
-    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}`,
-      );
-      expect(body).toEqual(errorDto.unauthorized);
-      expect(status).toBe(401);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .get(`/asset/${uuidDto.invalid}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
-    it('should require access', async () => {
-      const { status, body } = await request(app)
-        .get(`/asset/${asset4.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.noPermission);
-    });
-
-    it('should get the asset info', async () => {
-      const { status, body } = await request(app)
-        .get(`/asset/${asset1.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-      expect(status).toBe(200);
-      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: [asset1.id],
-      });
-
-      const { status, body } = await request(app).get(
-        `/asset/${asset1.id}?key=${sharedLink.key}`,
-      );
-      expect(status).toBe(200);
-      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/${asset1.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-
-      expect(status).toEqual(200);
-      expect(body).toMatchObject({
-        id: asset1.id,
-        isFavorite: false,
-        people: [
-          {
-            birthDate: null,
-            id: expect.any(String),
-            isHidden: false,
-            name: 'Test Person',
-            thumbnailPath: '/my/awesome/thumbnail.jpg',
-          },
-        ],
-      });
-
-      const sharedLink = await apiUtils.createSharedLink(user1.accessToken, {
-        type: SharedLinkType.Individual,
-        assetIds: [asset1.id],
-      });
-
-      const data = await request(app).get(
-        `/asset/${asset1.id}?key=${sharedLink.key}`,
-      );
-      expect(data.status).toBe(200);
-      expect(data.body).toMatchObject({ people: [] });
-    });
-  });
-
-  describe('GET /asset/statistics', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/asset/statistics');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should return stats of all assets', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/statistics')
-        .set('Authorization', `Bearer ${userStats.accessToken}`);
-
-      expect(body).toEqual({ images: 3, videos: 1, total: 4 });
-      expect(status).toBe(200);
-    });
-
-    it('should return stats of all favored assets', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/statistics')
-        .set('Authorization', `Bearer ${userStats.accessToken}`)
-        .query({ isFavorite: true });
-
-      expect(status).toBe(200);
-      expect(body).toEqual({ images: 1, videos: 1, total: 2 });
-    });
-
-    it('should return stats of all archived assets', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/statistics')
-        .set('Authorization', `Bearer ${userStats.accessToken}`)
-        .query({ isArchived: true });
-
-      expect(status).toBe(200);
-      expect(body).toEqual({ images: 1, videos: 1, total: 2 });
-    });
-
-    it('should return stats of all favored and archived assets', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/statistics')
-        .set('Authorization', `Bearer ${userStats.accessToken}`)
-        .query({ isFavorite: true, isArchived: true });
-
-      expect(status).toBe(200);
-      expect(body).toEqual({ images: 0, videos: 1, total: 1 });
-    });
-
-    it('should return stats of all assets neither favored nor archived', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/statistics')
-        .set('Authorization', `Bearer ${userStats.accessToken}`)
-        .query({ isFavorite: false, isArchived: false });
-
-      expect(status).toBe(200);
-      expect(body).toEqual({ images: 1, videos: 0, total: 1 });
-    });
-  });
-
-  describe('GET /asset/random', () => {
-    beforeAll(async () => {
-      await Promise.all([
-        apiUtils.createAsset(user1.accessToken),
-        apiUtils.createAsset(user1.accessToken),
-        apiUtils.createAsset(user1.accessToken),
-        apiUtils.createAsset(user1.accessToken),
-        apiUtils.createAsset(user1.accessToken),
-        apiUtils.createAsset(user1.accessToken),
-      ]);
-    });
-
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/asset/random');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it.each(Array(10))('should return 1 random assets', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/random')
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-
-      expect(status).toBe(200);
-
-      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(Array(10))('should return 2 random assets', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/random?count=2')
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-
-      expect(status).toBe(200);
-
-      const assets: AssetResponseDto[] = body;
-      expect(assets.length).toBe(2);
-
-      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(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')
-          .set('Authorization', `Bearer ${user2.accessToken}`);
-
-        expect(status).toBe(200);
-        expect(body).toEqual([expect.objectContaining({ id: asset4.id })]);
-      },
-    );
-
-    it('should return error', async () => {
-      const { status } = await request(app)
-        .get('/asset/random?count=ABC')
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-
-      expect(status).toBe(400);
-    });
-  });
-
-  describe('PUT /asset/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(
-        `/asset/:${uuidDto.notFound}`,
-      );
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .put(`/asset/${uuidDto.invalid}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
-    it('should require access', async () => {
-      const { status, body } = await request(app)
-        .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, asset1.id);
-      expect(before.isFavorite).toBe(false);
-
-      const { status, body } = await request(app)
-        .put(`/asset/${asset1.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ 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, asset1.id);
-      expect(before.isArchived).toBe(false);
-
-      const { status, body } = await request(app)
-        .put(`/asset/${asset1.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ 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/${asset1.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ dateTimeOriginal: '2023-11-19T18:11:00.000-07:00' });
-
-      expect(body).toMatchObject({
-        id: asset1.id,
-        exifInfo: expect.objectContaining({
-          dateTimeOriginal: '2023-11-20T01:11:00.000Z',
-        }),
-      });
-      expect(status).toEqual(200);
-    });
-
-    it('should reject invalid gps coordinates', async () => {
-      for (const test of [
-        { latitude: 12 },
-        { longitude: 12 },
-        { latitude: 12, longitude: 'abc' },
-        { latitude: 'abc', longitude: 12 },
-        { latitude: null, longitude: 12 },
-        { latitude: 12, longitude: null },
-        { latitude: 91, longitude: 12 },
-        { latitude: -91, longitude: 12 },
-        { latitude: 12, longitude: -181 },
-        { latitude: 12, longitude: 181 },
-      ]) {
-        const { status, body } = await request(app)
-          .put(`/asset/${asset1.id}`)
-          .send(test)
-          .set('Authorization', `Bearer ${user1.accessToken}`);
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest());
-      }
-    });
-
-    it('should update gps data', async () => {
-      const { status, body } = await request(app)
-        .put(`/asset/${asset1.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ latitude: 12, longitude: 12 });
-
-      expect(body).toMatchObject({
-        id: asset1.id,
-        exifInfo: expect.objectContaining({ latitude: 12, longitude: 12 }),
-      });
-      expect(status).toEqual(200);
-    });
-
-    it('should set the description', async () => {
-      const { status, body } = await request(app)
-        .put(`/asset/${asset1.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ description: 'Test asset description' });
-      expect(body).toMatchObject({
-        id: asset1.id,
-        exifInfo: expect.objectContaining({
-          description: 'Test asset description',
-        }),
-      });
-      expect(status).toEqual(200);
-    });
-
-    it('should return tagged people', async () => {
-      const { status, body } = await request(app)
-        .put(`/asset/${asset1.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ isFavorite: true });
-      expect(status).toEqual(200);
-      expect(body).toMatchObject({
-        id: asset1.id,
-        isFavorite: true,
-        people: [
-          {
-            birthDate: null,
-            id: expect.any(String),
-            isHidden: false,
-            name: 'Test Person',
-            thumbnailPath: '/my/awesome/thumbnail.jpg',
-          },
-        ],
-      });
-    });
-  });
-
-  describe('DELETE /asset', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .delete(`/asset`)
-        .send({ ids: [uuidDto.notFound] });
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid uuid', async () => {
-      const { status, body } = await request(app)
-        .delete(`/asset`)
-        .send({ ids: [uuidDto.invalid] })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(400);
-      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 () => {
-      const { status, body } = await request(app)
-        .delete(`/asset`)
-        .send({ ids: [uuidDto.notFound] })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.badRequest('Not found or no asset.delete access'),
-      );
-    });
-
-    it('should move an asset to the trash', async () => {
-      const { id: assetId } = await apiUtils.createAsset(admin.accessToken);
-
-      const before = await apiUtils.getAssetInfo(admin.accessToken, assetId);
-      expect(before.isTrashed).toBe(false);
-
-      const { status } = await request(app)
-        .delete('/asset')
-        .send({ ids: [assetId] })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(204);
-
-      const after = await apiUtils.getAssetInfo(admin.accessToken, assetId);
-      expect(after.isTrashed).toBe(true);
-    });
-  });
-});

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

@@ -1,51 +0,0 @@
-import {
-  deleteAssets,
-  getAuditFiles,
-  updateAsset,
-  type LoginResponseDto,
-} from '@immich/sdk';
-import { apiUtils, asBearerAuth, dbUtils, fileUtils } from 'src/utils';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-describe('/audit', () => {
-  let admin: LoginResponseDto;
-
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    await fileUtils.reset();
-
-    admin = await apiUtils.adminSetup();
-  });
-
-  describe('GET :/file-report', () => {
-    it('excludes assets without issues from report', async () => {
-      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) }
-        ),
-        updateAsset(
-          {
-            id: archivedAsset.id,
-            updateAssetDto: { isArchived: true },
-          },
-          { headers: asBearerAuth(admin.accessToken) }
-        ),
-      ]);
-
-      const body = await getAuditFiles({
-        headers: asBearerAuth(admin.accessToken),
-      });
-
-      expect(body.orphans).toHaveLength(0);
-      expect(body.extras).toHaveLength(0);
-    });
-  });
-});

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

@@ -1,291 +0,0 @@
-import {
-  LoginResponseDto,
-  getAuthDevices,
-  login,
-  signUpAdmin,
-} from '@immich/sdk';
-import { loginDto, signupDto, uuidDto } from 'src/fixtures';
-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';
-
-const { name, email, password } = signupDto.admin;
-
-describe(`/auth/admin-sign-up`, () => {
-  beforeAll(() => {
-    apiUtils.setup();
-  });
-
-  beforeEach(async () => {
-    await dbUtils.reset();
-  });
-
-  describe('POST /auth/admin-sign-up', () => {
-    const invalid = [
-      {
-        should: 'require an email address',
-        data: { name, password },
-      },
-      {
-        should: 'require a password',
-        data: { name, email },
-      },
-      {
-        should: 'require a name',
-        data: { email, password },
-      },
-      {
-        should: 'require a valid email',
-        data: { name, email: 'immich', password },
-      },
-    ];
-
-    for (const { should, data } of invalid) {
-      it(`should ${should}`, async () => {
-        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);
-      expect(status).toBe(201);
-      expect(body).toEqual(signupResponseDto.admin);
-    });
-
-    it('should sign up the admin with a local domain', async () => {
-      const { status, body } = await request(app)
-        .post('/auth/admin-sign-up')
-        .send({ ...signupDto.admin, email: 'admin@local' });
-      expect(status).toEqual(201);
-      expect(body).toEqual({
-        ...signupResponseDto.admin,
-        email: 'admin@local',
-      });
-    });
-
-    it('should transform email to lower case', async () => {
-      const { status, body } = await request(app)
-        .post('/auth/admin-sign-up')
-        .send({ ...signupDto.admin, email: 'aDmIn@IMMICH.cloud' });
-      expect(status).toEqual(201);
-      expect(body).toEqual(signupResponseDto.admin);
-    });
-
-    it('should not allow a second admin to sign up', async () => {
-      await signUpAdmin({ signUpDto: signupDto.admin });
-
-      const { status, body } = await request(app)
-        .post('/auth/admin-sign-up')
-        .send(signupDto.admin);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.alreadyHasAdmin);
-    });
-  });
-});
-
-describe('/auth/*', () => {
-  let admin: LoginResponseDto;
-
-  beforeEach(async () => {
-    await dbUtils.reset();
-    await signUpAdmin({ signUpDto: signupDto.admin });
-    admin = await login({ loginCredentialDto: loginDto.admin });
-  });
-
-  describe(`POST /auth/login`, () => {
-    it('should reject an incorrect password', async () => {
-      const { status, body } = await request(app)
-        .post('/auth/login')
-        .send({ email, password: 'incorrect' });
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.incorrectLogin);
-    });
-
-    for (const key of Object.keys(loginDto.admin)) {
-      it(`should not allow null ${key}`, async () => {
-        const { status, body } = await request(app)
-          .post('/auth/login')
-          .send({ ...loginDto.admin, [key]: null });
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest());
-      });
-    }
-
-    it('should accept a correct password', async () => {
-      const { status, body, headers } = await request(app)
-        .post('/auth/login')
-        .send({ email, password });
-      expect(status).toBe(201);
-      expect(body).toEqual(loginResponseDto.admin);
-
-      const token = body.accessToken;
-      expect(token).toBeDefined();
-
-      const cookies = headers['set-cookie'];
-      expect(cookies).toHaveLength(3);
-      expect(cookies[0]).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;'
-      );
-    });
-  });
-
-  describe('GET /auth/devices', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/auth/devices');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should get a list of authorized devices', async () => {
-      const { status, body } = await request(app)
-        .get('/auth/devices')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual([deviceDto.current]);
-    });
-  });
-
-  describe('DELETE /auth/devices', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/auth/devices`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should logout all devices (except the current one)', async () => {
-      for (let i = 0; i < 5; i++) {
-        await login({ loginCredentialDto: loginDto.admin });
-      }
-
-      await expect(
-        getAuthDevices({ headers: asBearerAuth(admin.accessToken) })
-      ).resolves.toHaveLength(6);
-
-      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);
-    });
-
-    it('should throw an error for a non-existent device id', async () => {
-      const { status, body } = await request(app)
-        .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')
-      );
-    });
-
-    it('should logout a device', async () => {
-      const [device] = await getAuthDevices({
-        headers: asBearerAuth(admin.accessToken),
-      });
-      const { status } = await request(app)
-        .delete(`/auth/devices/${device.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(204);
-
-      const response = await request(app)
-        .post('/auth/validateToken')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(response.body).toEqual(errorDto.invalidToken);
-      expect(response.status).toBe(401);
-    });
-  });
-
-  describe('POST /auth/validateToken', () => {
-    it('should reject an invalid token', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/validateToken`)
-        .set('Authorization', 'Bearer 123');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.invalidToken);
-    });
-
-    it('should accept a valid token', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/validateToken`)
-        .send({})
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({ authStatus: true });
-    });
-  });
-
-  describe('POST /auth/change-password', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/change-password`)
-        .send({ password, newPassword: 'Password1234' });
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require the current password', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/change-password`)
-        .send({ password: 'wrong-password', newPassword: 'Password1234' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.wrongPassword);
-    });
-
-    it('should change the password', async () => {
-      const { status } = await request(app)
-        .post(`/auth/change-password`)
-        .send({ password, newPassword: 'Password1234' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-
-      await login({
-        loginCredentialDto: {
-          email: 'admin@immich.cloud',
-          password: 'Password1234',
-        },
-      });
-    });
-  });
-
-  describe('POST /auth/logout', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/auth/logout`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should logout the user', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/logout`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        successful: true,
-        redirectUri: '/auth/login?autoLaunch=0',
-      });
-    });
-  });
-});

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

@@ -1,62 +0,0 @@
-import { AssetFileUploadResponseDto, LoginResponseDto } from '@immich/sdk';
-import { errorDto } from 'src/responses';
-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;
-
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    admin = await apiUtils.adminSetup();
-    asset1 = await apiUtils.createAsset(admin.accessToken);
-  });
-
-  describe('POST /download/info', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .post(`/download/info`)
-        .send({ assetIds: [asset1.id] });
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should download info', async () => {
-      const { status, body } = await request(app)
-        .post('/download/info')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ assetIds: [asset1.id] });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          archives: [expect.objectContaining({ assetIds: [asset1.id] })],
-        }),
-      );
-    });
-  });
-
-  describe('POST /download/asset/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(
-        `/download/asset/${asset1.id}`,
-      );
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should download file', async () => {
-      const response = await request(app)
-        .post(`/download/asset/${asset1.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(response.status).toBe(200);
-      expect(response.headers['content-type']).toEqual('image/jpeg');
-    });
-  });
-});

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

@@ -1,30 +0,0 @@
-import { errorDto } from 'src/responses';
-import { apiUtils, app, dbUtils } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
-
-describe(`/oauth`, () => {
-  beforeAll(() => {
-    apiUtils.setup();
-  });
-
-  beforeEach(async () => {
-    await dbUtils.reset();
-    await apiUtils.adminSetup();
-  });
-
-  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({});
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.badRequest([
-          'redirectUri must be a string',
-          'redirectUri should not be empty',
-        ])
-      );
-    });
-  });
-});

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

@@ -1,178 +0,0 @@
-import { LoginResponseDto, PersonResponseDto } from '@immich/sdk';
-import { uuidDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { apiUtils, app, dbUtils } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
-
-describe('/activity', () => {
-  let admin: LoginResponseDto;
-  let visiblePerson: PersonResponseDto;
-  let hiddenPerson: PersonResponseDto;
-
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    admin = await apiUtils.adminSetup();
-  });
-
-  beforeEach(async () => {
-    await dbUtils.reset(['person']);
-
-    [visiblePerson, hiddenPerson] = await Promise.all([
-      apiUtils.createPerson(admin.accessToken, {
-        name: 'visible_person',
-      }),
-      apiUtils.createPerson(admin.accessToken, {
-        name: 'hidden_person',
-        isHidden: true,
-      }),
-    ]);
-
-    const asset = await apiUtils.createAsset(admin.accessToken);
-
-    await Promise.all([
-      dbUtils.createFace({ assetId: asset.id, personId: visiblePerson.id }),
-      dbUtils.createFace({ assetId: asset.id, personId: hiddenPerson.id }),
-    ]);
-  });
-
-  describe('GET /person', () => {
-    beforeEach(async () => {});
-
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/person');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should return all people (including hidden)', async () => {
-      const { status, body } = await request(app)
-        .get('/person')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .query({ withHidden: true });
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        total: 2,
-        hidden: 1,
-        people: [
-          expect.objectContaining({ name: 'visible_person' }),
-          expect.objectContaining({ name: 'hidden_person' }),
-        ],
-      });
-    });
-
-    it('should return only visible people', async () => {
-      const { status, body } = await request(app)
-        .get('/person')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        total: 2,
-        hidden: 1,
-        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}`
-      );
-
-      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}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest());
-    });
-
-    it('should return person information', async () => {
-      const { status, body } = await request(app)
-        .get(`/person/${visiblePerson.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual(expect.objectContaining({ id: visiblePerson.id }));
-    });
-  });
-
-  describe('PUT /person/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(
-        `/person/${uuidDto.notFound}`
-      );
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    for (const { key, type } of [
-      { key: 'name', type: 'string' },
-      { key: 'featureFaceAssetId', type: 'string' },
-      { key: 'isHidden', type: 'boolean value' },
-    ]) {
-      it(`should not allow null ${key}`, async () => {
-        const { status, body } = await request(app)
-          .put(`/person/${visiblePerson.id}`)
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send({ [key]: null });
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest([`${key} must be a ${type}`]));
-      });
-    }
-
-    it('should not accept invalid birth dates', async () => {
-      for (const { birthDate, response } of [
-        { birthDate: false, response: 'Not found or no person.write access' },
-        { birthDate: 'false', response: ['birthDate must be a Date instance'] },
-        {
-          birthDate: '123567',
-          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}`)
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send({ birthDate });
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest(response));
-      }
-    });
-
-    it('should update a date of birth', async () => {
-      const { status, body } = await request(app)
-        .put(`/person/${visiblePerson.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ birthDate: '1990-01-01T05:00:00.000Z' });
-      expect(status).toBe(200);
-      expect(body).toMatchObject({ birthDate: '1990-01-01' });
-    });
-
-    it('should clear a date of birth', async () => {
-      // TODO ironically this uses the update endpoint to create the person
-      const person = await apiUtils.createPerson(admin.accessToken, {
-        birthDate: new Date('1990-01-01').toISOString(),
-      });
-
-      expect(person.birthDate).toBeDefined();
-
-      const { status, body } = await request(app)
-        .put(`/person/${person.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ birthDate: null });
-      expect(status).toBe(200);
-      expect(body).toMatchObject({ birthDate: null });
-    });
-  });
-});

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

@@ -1,107 +0,0 @@
-import { LoginResponseDto, getAllAssets } from '@immich/sdk';
-import { Socket } from 'socket.io-client';
-import { errorDto } from 'src/responses';
-import { apiUtils, app, asBearerAuth, dbUtils, wsUtils } from 'src/utils';
-import request from 'supertest';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-describe('/trash', () => {
-  let admin: LoginResponseDto;
-  let ws: Socket;
-
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    admin = await apiUtils.adminSetup({ onboarding: false });
-    ws = await wsUtils.connect(admin.accessToken);
-  });
-
-  afterAll(() => {
-    wsUtils.disconnect(ws);
-  });
-
-  describe('POST /trash/empty', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/trash/empty');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should empty the trash', async () => {
-      const { id: assetId } = await apiUtils.createAsset(admin.accessToken);
-      await apiUtils.deleteAssets(admin.accessToken, [assetId]);
-
-      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}`);
-      expect(status).toBe(204);
-
-      await wsUtils.once(ws, 'on_asset_delete');
-
-      const after = await getAllAssets(
-        {},
-        { headers: asBearerAuth(admin.accessToken) },
-      );
-      expect(after.length).toBe(0);
-    });
-  });
-
-  describe('POST /trash/restore', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/trash/restore');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should restore all trashed assets', async () => {
-      const { id: assetId } = await apiUtils.createAsset(admin.accessToken);
-      await apiUtils.deleteAssets(admin.accessToken, [assetId]);
-
-      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}`);
-      expect(status).toBe(204);
-
-      const after = await apiUtils.getAssetInfo(admin.accessToken, assetId);
-      expect(after.isTrashed).toBe(false);
-    });
-  });
-
-  describe('POST /trash/restore/assets', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/trash/restore/assets');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should restore a trashed asset by id', async () => {
-      const { id: assetId } = await apiUtils.createAsset(admin.accessToken);
-      await apiUtils.deleteAssets(admin.accessToken, [assetId]);
-
-      const before = await apiUtils.getAssetInfo(admin.accessToken, assetId);
-      expect(before.isTrashed).toBe(true);
-
-      const { status } = await request(app)
-        .post('/trash/restore/assets')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ids: [assetId] });
-      expect(status).toBe(204);
-
-      const after = await apiUtils.getAssetInfo(admin.accessToken, assetId);
-      expect(after.isTrashed).toBe(false);
-    });
-  });
-});

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

@@ -1,308 +0,0 @@
-import { LoginResponseDto, deleteUser, getUserById } from '@immich/sdk';
-import { createUserDto, userDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { apiUtils, app, asBearerAuth, dbUtils } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-describe('/server-info', () => {
-  let admin: LoginResponseDto;
-  let deletedUser: LoginResponseDto;
-  let userToDelete: LoginResponseDto;
-  let nonAdmin: LoginResponseDto;
-
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    admin = await apiUtils.adminSetup({ onboarding: false });
-
-    [deletedUser, nonAdmin, userToDelete] = await Promise.all([
-      apiUtils.userSetup(admin.accessToken, createUserDto.user1),
-      apiUtils.userSetup(admin.accessToken, createUserDto.user2),
-      apiUtils.userSetup(admin.accessToken, createUserDto.user3),
-    ]);
-
-    await deleteUser(
-      { id: deletedUser.userId },
-      { headers: asBearerAuth(admin.accessToken) }
-    );
-  });
-
-  describe('GET /user', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/user');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should get users', async () => {
-      const { status, body } = await request(app)
-        .get('/user')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toEqual(200);
-      expect(body).toHaveLength(4);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ email: 'admin@immich.cloud' }),
-          expect.objectContaining({ email: 'user1@immich.cloud' }),
-          expect.objectContaining({ email: 'user2@immich.cloud' }),
-          expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ])
-      );
-    });
-
-    it('should hide deleted users', async () => {
-      const { status, body } = await request(app)
-        .get(`/user`)
-        .query({ isAll: true })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toHaveLength(3);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ email: 'admin@immich.cloud' }),
-          expect.objectContaining({ email: 'user2@immich.cloud' }),
-          expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ])
-      );
-    });
-
-    it('should include deleted users', async () => {
-      const { status, body } = await request(app)
-        .get(`/user`)
-        .query({ isAll: false })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toHaveLength(4);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ email: 'admin@immich.cloud' }),
-          expect.objectContaining({ email: 'user1@immich.cloud' }),
-          expect.objectContaining({ email: 'user2@immich.cloud' }),
-          expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ])
-      );
-    });
-  });
-
-  describe('GET /user/info/:id', () => {
-    it('should require authentication', async () => {
-      const { status } = await request(app).get(`/user/info/${admin.userId}`);
-      expect(status).toEqual(401);
-    });
-
-    it('should get the user info', async () => {
-      const { status, body } = await request(app)
-        .get(`/user/info/${admin.userId}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: admin.userId,
-        email: 'admin@immich.cloud',
-      });
-    });
-  });
-
-  describe('GET /user/me', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/user/me`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should get my info', async () => {
-      const { status, body } = await request(app)
-        .get(`/user/me`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: admin.userId,
-        email: 'admin@immich.cloud',
-      });
-    });
-  });
-
-  describe('POST /user', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .post(`/user`)
-        .send(createUserDto.user1);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    for (const key of Object.keys(createUserDto.user1)) {
-      it(`should not allow null ${key}`, async () => {
-        const { status, body } = await request(app)
-          .post(`/user`)
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send({ ...createUserDto.user1, [key]: null });
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest());
-      });
-    }
-
-    it('should ignore `isAdmin`', async () => {
-      const { status, body } = await request(app)
-        .post(`/user`)
-        .send({
-          isAdmin: true,
-          email: 'user4@immich.cloud',
-          password: 'password123',
-          name: 'Immich',
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(body).toMatchObject({
-        email: 'user4@immich.cloud',
-        isAdmin: false,
-        shouldChangePassword: true,
-      });
-      expect(status).toBe(201);
-    });
-
-    it('should create a user without memories enabled', async () => {
-      const { status, body } = await request(app)
-        .post(`/user`)
-        .send({
-          email: 'no-memories@immich.cloud',
-          password: 'Password123',
-          name: 'No Memories',
-          memoriesEnabled: false,
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(body).toMatchObject({
-        email: 'no-memories@immich.cloud',
-        memoriesEnabled: false,
-      });
-      expect(status).toBe(201);
-    });
-  });
-
-  describe('DELETE /user/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(
-        `/user/${userToDelete.userId}`
-      );
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should delete user', async () => {
-      const { status, body } = await request(app)
-        .delete(`/user/${userToDelete.userId}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: userToDelete.userId,
-        updatedAt: expect.any(String),
-        deletedAt: expect.any(String),
-      });
-    });
-  });
-
-  describe('PUT /user', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/user`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    for (const key of Object.keys(userDto.admin)) {
-      it(`should not allow null ${key}`, async () => {
-        const { status, body } = await request(app)
-          .put(`/user`)
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send({ ...userDto.admin, [key]: null });
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest());
-      });
-    }
-
-    it('should not allow a non-admin to become an admin', async () => {
-      const { status, body } = await request(app)
-        .put(`/user`)
-        .send({ isAdmin: true, id: nonAdmin.userId })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.alreadyHasAdmin);
-    });
-
-    it('ignores updates to profileImagePath', async () => {
-      const { status, body } = await request(app)
-        .put(`/user`)
-        .send({ id: admin.userId, profileImagePath: 'invalid.jpg' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({ id: admin.userId, profileImagePath: '' });
-    });
-
-    it('should ignore updates to createdAt, updatedAt and deletedAt', async () => {
-      const before = await getUserById(
-        { id: admin.userId },
-        { headers: asBearerAuth(admin.accessToken) }
-      );
-
-      const { status, body } = await request(app)
-        .put(`/user`)
-        .send({
-          id: admin.userId,
-          createdAt: '2023-01-01T00:00:00.000Z',
-          updatedAt: '2023-01-01T00:00:00.000Z',
-          deletedAt: '2023-01-01T00:00:00.000Z',
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toStrictEqual(before);
-    });
-
-    it('should update first and last name', async () => {
-      const before = await getUserById(
-        { id: admin.userId },
-        { headers: asBearerAuth(admin.accessToken) }
-      );
-
-      const { status, body } = await request(app)
-        .put(`/user`)
-        .send({
-          id: admin.userId,
-          name: 'Name',
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        ...before,
-        updatedAt: expect.any(String),
-        name: 'Name',
-      });
-      expect(before.updatedAt).not.toEqual(body.updatedAt);
-    });
-
-    it('should update memories enabled', async () => {
-      const before = await getUserById(
-        { id: admin.userId },
-        { headers: asBearerAuth(admin.accessToken) }
-      );
-      const { status, body } = await request(app)
-        .put(`/user`)
-        .send({
-          id: admin.userId,
-          memoriesEnabled: false,
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        ...before,
-        updatedAt: expect.anything(),
-        memoriesEnabled: false,
-      });
-      expect(before.updatedAt).not.toEqual(body.updatedAt);
-    });
-  });
-});

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

@@ -1,58 +0,0 @@
-import { stat } from 'node:fs/promises';
-import { apiUtils, app, dbUtils, immichCli } from 'src/utils';
-import { beforeEach, beforeAll, describe, expect, it } from 'vitest';
-
-describe(`immich login-key`, () => {
-  beforeAll(() => {
-    apiUtils.setup();
-  });
-
-  beforeEach(async () => {
-    await dbUtils.reset();
-  });
-
-  it('should require a url', async () => {
-    const { stderr, exitCode } = await immichCli(['login-key']);
-    expect(stderr).toBe("error: missing required argument 'url'");
-    expect(exitCode).toBe(1);
-  });
-
-  it('should require a key', async () => {
-    const { stderr, exitCode } = await immichCli(['login-key', app]);
-    expect(stderr).toBe("error: missing required argument 'key'");
-    expect(exitCode).toBe(1);
-  });
-
-  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'
-    );
-    expect(exitCode).toBe(1);
-  });
-
-  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}`,
-    ]);
-    expect(stdout.split('\n')).toEqual([
-      'Logging in...',
-      'Logged in as admin@immich.cloud',
-      'Wrote auth info to /tmp/immich/auth.yml',
-    ]);
-    expect(stderr).toBe('');
-    expect(exitCode).toBe(0);
-
-    const stats = await stat('/tmp/immich/auth.yml');
-    const mode = (stats.mode & 0o777).toString(8);
-    expect(mode).toEqual('600');
-  });
-});

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

@@ -1,25 +0,0 @@
-import { apiUtils, cliUtils, dbUtils, immichCli } from 'src/utils';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-describe(`immich server-info`, () => {
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    await cliUtils.login();
-  });
-
-  it('should return the server info', async () => {
-    const { stderr, stdout, exitCode } = await immichCli(['server-info']);
-    expect(stdout.split('\n')).toEqual([
-      expect.stringContaining('Server Version:'),
-      expect.stringContaining('Image Types:'),
-      expect.stringContaining('Video Types:'),
-      'Statistics:',
-      '  Images: 0',
-      '  Videos: 0',
-      '  Total: 0',
-    ]);
-    expect(stderr).toBe('');
-    expect(exitCode).toBe(0);
-  });
-});

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

@@ -1,179 +0,0 @@
-import { getAllAlbums, getAllAssets } from '@immich/sdk';
-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`, () => {
-  let key: string;
-
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    key = await cliUtils.login();
-  });
-
-  beforeEach(async () => {
-    await dbUtils.reset(['assets', 'albums']);
-  });
-
-  describe('immich upload --recursive', () => {
-    it('should upload a folder recursively', async () => {
-      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(exitCode).toBe(0);
-
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
-    });
-  });
-
-  describe('immich upload --recursive --album', () => {
-    it('should create albums from folder names', async () => {
-      const { stderr, stdout, exitCode } = await immichCli([
-        'upload',
-        `${testAssetDir}/albums/nature/`,
-        '--recursive',
-        '--album',
-      ]);
-      expect(stdout.split('\n')).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining('Successfully uploaded 9 assets'),
-          expect.stringContaining('Successfully created 1 new album'),
-          expect.stringContaining('Successfully updated 9 assets'),
-        ]),
-      );
-      expect(stderr).toBe('');
-      expect(exitCode).toBe(0);
-
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
-
-      const albums = await getAllAlbums({}, { headers: asKeyAuth(key) });
-      expect(albums.length).toBe(1);
-      expect(albums[0].albumName).toBe('nature');
-    });
-
-    it('should add existing assets to albums', async () => {
-      const response1 = await immichCli([
-        'upload',
-        `${testAssetDir}/albums/nature/`,
-        '--recursive',
-      ]);
-      expect(response1.stdout.split('\n')).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining('Successfully uploaded 9 assets'),
-        ]),
-      );
-      expect(response1.stderr).toBe('');
-      expect(response1.exitCode).toBe(0);
-
-      const assets1 = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets1.length).toBe(9);
-
-      const albums1 = await getAllAlbums({}, { headers: asKeyAuth(key) });
-      expect(albums1.length).toBe(0);
-
-      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('Successfully updated 9 assets'),
-        ]),
-      );
-      expect(response2.stderr).toBe('');
-      expect(response2.exitCode).toBe(0);
-
-      const assets2 = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets2.length).toBe(9);
-
-      const albums2 = await getAllAlbums({}, { headers: asKeyAuth(key) });
-      expect(albums2.length).toBe(1);
-      expect(albums2[0].albumName).toBe('nature');
-    });
-  });
-
-  describe('immich upload --recursive --album-name=e2e', () => {
-    it('should create a named album', async () => {
-      const { stderr, stdout, exitCode } = await immichCli([
-        'upload',
-        `${testAssetDir}/albums/nature/`,
-        '--recursive',
-        '--album-name=e2e',
-      ]);
-      expect(stdout.split('\n')).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining('Successfully uploaded 9 assets'),
-          expect.stringContaining('Successfully created 1 new album'),
-          expect.stringContaining('Successfully updated 9 assets'),
-        ]),
-      );
-      expect(stderr).toBe('');
-      expect(exitCode).toBe(0);
-
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
-
-      const albums = await getAllAlbums({}, { headers: asKeyAuth(key) });
-      expect(albums.length).toBe(1);
-      expect(albums[0].albumName).toBe('e2e');
-    });
-  });
-
-  describe('immich upload --delete', () => {
-    it('should delete local files if specified', async () => {
-      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}`,
-        );
-      }
-
-      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 });
-      expect(files).toEqual([]);
-
-      expect(stdout.split('\n')).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining('Successfully uploaded 9 assets'),
-          expect.stringContaining('Deleting assets that have been uploaded'),
-        ]),
-      );
-      expect(stderr).toBe('');
-      expect(exitCode).toBe(0);
-
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
-    });
-  });
-});

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

@@ -1,29 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { apiUtils, immichCli } from 'src/utils';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-const pkg = JSON.parse(readFileSync('../cli/package.json', 'utf8'));
-
-describe(`immich --version`, () => {
-  beforeAll(() => {
-    apiUtils.setup();
-  });
-
-  describe('immich --version', () => {
-    it('should print the cli version', async () => {
-      const { stdout, stderr, exitCode } = await immichCli(['--version']);
-      expect(stdout).toEqual(pkg.version);
-      expect(stderr).toEqual('');
-      expect(exitCode).toBe(0);
-    });
-  });
-
-  describe('immich -V', () => {
-    it('should print the cli version', async () => {
-      const { stdout, stderr, exitCode } = await immichCli(['-V']);
-      expect(stdout).toEqual(pkg.version);
-      expect(stderr).toEqual('');
-      expect(exitCode).toBe(0);
-    });
-  });
-});

e2e/src/fixtures.ts

@@ -1,80 +0,0 @@
-import { UserAvatarColor } from '@immich/sdk';
-
-export const uuidDto = {
-  invalid: 'invalid-uuid',
-  // valid uuid v4
-  notFound: '00000000-0000-4000-a000-000000000000',
-};
-
-const adminLoginDto = {
-  email: 'admin@immich.cloud',
-  password: 'password',
-};
-const adminSignupDto = { ...adminLoginDto, name: 'Immich Admin' };
-
-export const loginDto = {
-  admin: adminLoginDto,
-};
-
-export const signupDto = {
-  admin: adminSignupDto,
-};
-
-export const createUserDto = {
-  user1: {
-    email: 'user1@immich.cloud',
-    name: 'User 1',
-    password: 'password1',
-  },
-  user2: {
-    email: 'user2@immich.cloud',
-    name: 'User 2',
-    password: 'password12',
-  },
-  user3: {
-    email: 'user3@immich.cloud',
-    name: 'User 3',
-    password: 'password123',
-  },
-};
-
-export const userDto = {
-  admin: {
-    name: signupDto.admin.name,
-    email: signupDto.admin.email,
-    password: signupDto.admin.password,
-    storageLabel: 'admin',
-    externalPath: null,
-    oauthId: '',
-    shouldChangePassword: false,
-    profileImagePath: '',
-    createdAt: new Date('2021-01-01'),
-    deletedAt: null,
-    updatedAt: new Date('2021-01-01'),
-    tags: [],
-    assets: [],
-    memoriesEnabled: true,
-    avatarColor: UserAvatarColor.Primary,
-    quotaSizeInBytes: null,
-    quotaUsageInBytes: 0,
-  },
-  user1: {
-    name: createUserDto.user1.name,
-    email: createUserDto.user1.email,
-    password: createUserDto.user1.password,
-    storageLabel: null,
-    externalPath: null,
-    oauthId: '',
-    shouldChangePassword: false,
-    profileImagePath: '',
-    createdAt: new Date('2021-01-01'),
-    deletedAt: null,
-    updatedAt: new Date('2021-01-01'),
-    tags: [],
-    assets: [],
-    memoriesEnabled: true,
-    avatarColor: UserAvatarColor.Primary,
-    quotaSizeInBytes: null,
-    quotaUsageInBytes: 0,
-  },
-};

e2e/src/responses.ts

@@ -1,103 +0,0 @@
-import { expect } from 'vitest';
-
-export const errorDto = {
-  unauthorized: {
-    error: 'Unauthorized',
-    statusCode: 401,
-    message: 'Authentication required',
-  },
-  forbidden: {
-    error: 'Forbidden',
-    statusCode: 403,
-    message: expect.any(String),
-  },
-  wrongPassword: {
-    error: 'Bad Request',
-    statusCode: 400,
-    message: 'Wrong password',
-  },
-  invalidToken: {
-    error: 'Unauthorized',
-    statusCode: 401,
-    message: 'Invalid user token',
-  },
-  invalidShareKey: {
-    error: 'Unauthorized',
-    statusCode: 401,
-    message: 'Invalid share key',
-  },
-  invalidSharePassword: {
-    error: 'Unauthorized',
-    statusCode: 401,
-    message: 'Invalid password',
-  },
-  badRequest: (message: any = null) => ({
-    error: 'Bad Request',
-    statusCode: 400,
-    message: message ?? expect.anything(),
-  }),
-  noPermission: {
-    error: 'Bad Request',
-    statusCode: 400,
-    message: expect.stringContaining('Not found or no'),
-  },
-  incorrectLogin: {
-    error: 'Unauthorized',
-    statusCode: 401,
-    message: 'Incorrect email or password',
-  },
-  alreadyHasAdmin: {
-    error: 'Bad Request',
-    statusCode: 400,
-    message: 'The server already has an admin',
-  },
-  noDeleteUploadLibrary: {
-    error: 'Bad Request',
-    statusCode: 400,
-    message: 'Cannot delete the last upload library',
-  },
-};
-
-export const signupResponseDto = {
-  admin: {
-    avatarColor: expect.any(String),
-    id: expect.any(String),
-    name: 'Immich Admin',
-    email: 'admin@immich.cloud',
-    storageLabel: 'admin',
-    externalPath: null,
-    profileImagePath: '',
-    // why? lol
-    shouldChangePassword: true,
-    isAdmin: true,
-    createdAt: expect.any(String),
-    updatedAt: expect.any(String),
-    deletedAt: null,
-    oauthId: '',
-    memoriesEnabled: true,
-    quotaUsageInBytes: 0,
-    quotaSizeInBytes: null,
-  },
-};
-
-export const loginResponseDto = {
-  admin: {
-    accessToken: expect.any(String),
-    name: 'Immich Admin',
-    isAdmin: true,
-    profileImagePath: '',
-    shouldChangePassword: true,
-    userEmail: 'admin@immich.cloud',
-    userId: expect.any(String),
-  },
-};
-export const deviceDto = {
-  current: {
-    id: expect.any(String),
-    createdAt: expect.any(String),
-    updatedAt: expect.any(String),
-    current: true,
-    deviceOS: '',
-    deviceType: '',
-  },
-};

e2e/src/setup.ts

@@ -1,26 +0,0 @@
-import { spawn, exec } from 'child_process';
-
-export default async () => {
-  let _resolve: () => unknown;
-  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 Server is listening')) {
-      _resolve();
-    }
-  });
-
-  child.stderr.on('data', (data) => console.log(data.toString()));
-
-  await promise;
-
-  return async () => {
-    await new Promise<void>((resolve) =>
-      exec('docker compose down', () => resolve())
-    );
-  };
-};

e2e/src/utils.ts

@@ -1,352 +0,0 @@
-import {
-  AssetFileUploadResponseDto,
-  CreateAlbumDto,
-  CreateAssetDto,
-  CreateUserDto,
-  PersonUpdateDto,
-  SharedLinkCreateDto,
-  createAlbum,
-  createApiKey,
-  createPerson,
-  createSharedLink,
-  createUser,
-  defaults,
-  deleteAssets,
-  getAssetInfo,
-  login,
-  setAdminOnboarding,
-  signUpAdmin,
-  updatePerson,
-} from '@immich/sdk';
-import { BrowserContext } from '@playwright/test';
-import { exec, spawn } from 'child_process';
-import { randomBytes } from 'node:crypto';
-import { access } from 'node:fs/promises';
-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 request from 'supertest';
-
-const execPromise = promisify(exec);
-
-export const app = 'http://127.0.0.1:2283/api';
-
-const directoryExists = (directory: string) =>
-  access(directory)
-    .then(() => true)
-    .catch(() => false);
-
-// TODO move test assets into e2e/assets
-export const testAssetDir = path.resolve(`./../server/test/assets/`);
-
-const serverContainerName = 'immich-e2e-server';
-const mediaDir = '/usr/src/app/upload';
-const dirs = [
-  `"${mediaDir}/thumbs"`,
-  `"${mediaDir}/upload"`,
-  `"${mediaDir}/library"`,
-].join(' ');
-
-if (!(await directoryExists(`${testAssetDir}/albums`))) {
-  throw new Error(
-    `Test assets not found. Please checkout https://github.com/immich-app/test-assets into ${testAssetDir} before testing`,
-  );
-}
-
-export const asBearerAuth = (accessToken: string) => ({
-  Authorization: `Bearer ${accessToken}`,
-});
-
-export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
-
-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}"`,
-    );
-  },
-};
-
-export const dbUtils = {
-  createFace: async ({
-    assetId,
-    personId,
-  }: {
-    assetId: string;
-    personId: string;
-  }) => {
-    if (!client) {
-      return;
-    }
-
-    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],
-    );
-  },
-  setPersonThumbnail: async (personId: string) => {
-    if (!client) {
-      return;
-    }
-
-    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',
-        );
-        await client.connect();
-      }
-
-      tables = tables || [
-        'shared_links',
-        'person',
-        'albums',
-        'assets',
-        'asset_faces',
-        'activity',
-        'api_keys',
-        'user_token',
-        'users',
-        'system_metadata',
-      ];
-
-      for (const table of tables) {
-        await client.query(`DELETE FROM ${table} CASCADE;`);
-      }
-    } catch (error) {
-      console.error('Failed to reset database', error);
-      throw error;
-    }
-  },
-  teardown: async () => {
-    try {
-      if (client) {
-        await client.end();
-        client = null;
-      }
-    } catch (error) {
-      console.error('Failed to teardown database', error);
-      throw error;
-    }
-  },
-};
-export interface CliResponse {
-  stdout: string;
-  stderr: string;
-  exitCode: number | null;
-}
-
-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', '/tmp/immich/', ...args];
-  const child = spawn('node', _args, {
-    stdio: 'pipe',
-  });
-
-  let stdout = '';
-  let stderr = '';
-
-  child.stdout.on('data', (data) => (stdout += data.toString()));
-  child.stderr.on('data', (data) => (stderr += data.toString()));
-  child.on('exit', (exitCode) => {
-    _resolve({
-      stdout: stdout.trim(),
-      stderr: stderr.trim(),
-      exitCode,
-    });
-  });
-
-  return deferred;
-};
-
-export interface AdminSetupOptions {
-  onboarding?: boolean;
-}
-
-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: false,
-      forceNew: true,
-    });
-
-    return new Promise<Socket>((resolve) => {
-      websocket.on('connect', () => resolve(websocket));
-      websocket.connect();
-    });
-  },
-  disconnect: (ws: Socket) => {
-    if (ws?.connected) {
-      ws.disconnect();
-    }
-  },
-  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(data);
-      });
-    });
-  },
-};
-
-export const apiUtils = {
-  setup: () => {
-    defaults.baseUrl = app;
-  },
-
-  adminSetup: async (options?: AdminSetupOptions) => {
-    options = options || { onboarding: true };
-
-    await signUpAdmin({ signUpDto: signupDto.admin });
-    const response = await login({ loginCredentialDto: loginDto.admin });
-    if (options.onboarding) {
-      await setAdminOnboarding({ headers: asBearerAuth(response.accessToken) });
-    }
-    return response;
-  },
-  userSetup: async (accessToken: string, dto: CreateUserDto) => {
-    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) },
-    );
-  },
-  createAlbum: (accessToken: string, dto: CreateAlbumDto) =>
-    createAlbum(
-      { createAlbumDto: dto },
-      { headers: asBearerAuth(accessToken) },
-    ),
-  createAsset: async (
-    accessToken: string,
-    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 || {}),
-    };
-
-    const _assetData = {
-      bytes: randomBytes(32),
-      filename: 'example.jpg',
-      ...(data || {}),
-    };
-
-    const builder = request(app)
-      .post(`/asset/upload`)
-      .attach('assetData', _assetData.bytes, _assetData.filename)
-      .set('Authorization', `Bearer ${accessToken}`);
-
-    for (const [key, value] of Object.entries(_dto)) {
-      builder.field(key, String(value));
-    }
-
-    const { body } = await builder;
-
-    return body as AssetFileUploadResponseDto;
-  },
-  getAssetInfo: (accessToken: string, id: string) =>
-    getAssetInfo({ id }, { headers: asBearerAuth(accessToken) }),
-  deleteAssets: (accessToken: string, ids: string[]) =>
-    deleteAssets(
-      { assetBulkDeleteDto: { ids } },
-      { headers: asBearerAuth(accessToken) },
-    ),
-  createPerson: async (accessToken: string, dto?: PersonUpdateDto) => {
-    // TODO fix createPerson to accept a body
-    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) },
-    );
-  },
-  createSharedLink: (accessToken: string, dto: SharedLinkCreateDto) =>
-    createSharedLink(
-      { sharedLinkCreateDto: dto },
-      { headers: asBearerAuth(accessToken) },
-    ),
-};
-
-export const cliUtils = {
-  login: async () => {
-    const admin = await apiUtils.adminSetup();
-    const key = await apiUtils.createApiKey(admin.accessToken);
-    await immichCli(['login-key', app, `${key.secret}`]);
-    return key.secret;
-  },
-};
-
-export const webUtils = {
-  setAuthCookies: async (context: BrowserContext, accessToken: string) =>
-    await context.addCookies([
-      {
-        name: 'immich_access_token',
-        value: accessToken,
-        domain: '127.0.0.1',
-        path: '/',
-        expires: 1742402728,
-        httpOnly: true,
-        secure: false,
-        sameSite: 'Lax',
-      },
-      {
-        name: 'immich_auth_type',
-        value: 'password',
-        domain: '127.0.0.1',
-        path: '/',
-        expires: 1742402728,
-        httpOnly: true,
-        secure: false,
-        sameSite: 'Lax',
-      },
-      {
-        name: 'immich_is_authenticated',
-        value: 'true',
-        domain: '127.0.0.1',
-        path: '/',
-        expires: 1742402728,
-        httpOnly: false,
-        secure: false,
-        sameSite: 'Lax',
-      },
-    ]),
-};

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

@@ -1,70 +0,0 @@
-import {
-  AlbumResponseDto,
-  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: AssetResponseDto;
-  let album: AlbumResponseDto;
-  let sharedLink: SharedLinkResponseDto;
-  let sharedLinkPassword: SharedLinkResponseDto;
-
-  test.beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    admin = await apiUtils.adminSetup();
-    asset = await apiUtils.createAsset(admin.accessToken);
-    album = await createAlbum(
-      {
-        createAlbumDto: {
-          albumName: 'Test Album',
-          assetIds: [asset.id],
-        },
-      },
-      { headers: asBearerAuth(admin.accessToken) }
-    );
-    sharedLink = await apiUtils.createSharedLink(admin.accessToken, {
-      type: SharedLinkType.Album,
-      albumId: album.id,
-    });
-    sharedLinkPassword = await apiUtils.createSharedLink(admin.accessToken, {
-      type: SharedLinkType.Album,
-      albumId: album.id,
-      password: 'test-password',
-    });
-  });
-
-  test.afterAll(async () => {
-    await dbUtils.teardown();
-  });
-
-  test('download from a shared link', async ({ page }) => {
-    await page.goto(`/share/${sharedLink.key}`);
-    await page.getByRole('heading', { name: 'Test Album' }).waitFor();
-    await page.locator('.group > div').first().hover();
-    await page.waitForSelector('#asset-group-by-date svg');
-    await page.getByRole('checkbox').click();
-    await page.getByRole('button', { name: 'Download' }).click();
-    await page.getByText('DOWNLOADING').waitFor();
-  });
-
-  test('enter password for a shared link', async ({ page }) => {
-    await page.goto(`/share/${sharedLinkPassword.key}`);
-    await page.getByPlaceholder('Password').fill('test-password');
-    await page.getByRole('button', { name: 'Submit' }).click();
-    await page.getByRole('heading', { name: 'Test Album' }).waitFor();
-  });
-
-  test('show error for invalid shared link', async ({ page }) => {
-    await page.goto('/share/invalid');
-    await page.getByRole('heading', { name: 'Invalid share key' }).waitFor();
-  });
-});

e2e/test-utils.ts

@@ -0,0 +1,88 @@
+import pg from 'pg';
+import { defaults, login, setAdminOnboarding, signUpAdmin } from '@immich/sdk';
+import { BrowserContext } from '@playwright/test';
+
+const client = new pg.Client(
+  'postgres://postgres:postgres@localhost:5432/immich'
+);
+let connected = false;
+
+const loginCredentialDto = {
+  email: 'admin@immich.cloud',
+  password: 'password',
+};
+const signUpDto = { ...loginCredentialDto, name: 'Immich Admin' };
+
+const setBaseUrl = () => (defaults.baseUrl = 'http://127.0.0.1:2283/api');
+const asAuthHeader = (accessToken: string) => ({
+  Authorization: `Bearer ${accessToken}`,
+});
+
+export const app = {
+  adminSetup: async (context: BrowserContext) => {
+    setBaseUrl();
+    await signUpAdmin({ signUpDto });
+
+    const response = await login({ loginCredentialDto });
+
+    await context.addCookies([
+      {
+        name: 'immich_access_token',
+        value: response.accessToken,
+        domain: '127.0.0.1',
+        path: '/',
+        expires: 1742402728,
+        httpOnly: true,
+        secure: false,
+        sameSite: 'Lax',
+      },
+      {
+        name: 'immich_auth_type',
+        value: 'password',
+        domain: '127.0.0.1',
+        path: '/',
+        expires: 1742402728,
+        httpOnly: true,
+        secure: false,
+        sameSite: 'Lax',
+      },
+      {
+        name: 'immich_is_authenticated',
+        value: 'true',
+        domain: '127.0.0.1',
+        path: '/',
+        expires: 1742402728,
+        httpOnly: false,
+        secure: false,
+        sameSite: 'Lax',
+      },
+    ]);
+
+    await setAdminOnboarding({ headers: asAuthHeader(response.accessToken) });
+
+    return response;
+  },
+  reset: async () => {
+    try {
+      if (!connected) {
+        await client.connect();
+        connected = true;
+      }
+
+      for (const table of ['user_token', 'users', 'system_metadata']) {
+        await client.query(`DELETE FROM ${table} CASCADE;`);
+      }
+    } catch (error) {
+      console.error('Failed to reset database', error);
+    }
+  },
+  teardown: async () => {
+    try {
+      if (connected) {
+        await client.end();
+      }
+    } catch (error) {
+      console.error('Failed to teardown database', error);
+    }
+  },
+};

e2e/tsconfig.json

@@ -16,7 +16,8 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "rootDirs": ["src"],
-    "baseUrl": "./"
+    "baseUrl": "./",
+    "types": ["vitest/globals"]
   },
   "exclude": ["dist", "node_modules"]
 }

e2e/vitest.config.ts

@@ -1,13 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    include: ['src/{api,cli}/specs/*.e2e-spec.ts'],
-    globalSetup: ['src/setup.ts'],
-    poolOptions: {
-      threads: {
-        singleThread: true,
-      },
-    },
-  },
-});

install.sh

@@ -1,13 +1,15 @@
-#!/usr/bin/env bash
-
 echo "Starting Immich installation..."
 
 ip_address=$(hostname -I | awk '{print $1}')
 
+RED='\033[0;31m'
+GREEN='\032[0;31m'
+NC='\033[0m' # No Color
+
 create_immich_directory() {
   echo "Creating Immich directory..."
   mkdir -p ./immich-app/immich-data
-  cd ./immich-app || exit
+  cd ./immich-app
 }
 
 download_docker_compose_file() {
@@ -32,18 +34,18 @@ replace_env_value() {
 populate_upload_location() {
   echo "Populating default UPLOAD_LOCATION value..."
   upload_location=$(pwd)/immich-data
-  replace_env_value "UPLOAD_LOCATION" "$upload_location"
+  replace_env_value "UPLOAD_LOCATION" $upload_location
 }
 
 start_docker_compose() {
   echo "Starting Immich's docker containers"
 
-  if docker compose >/dev/null 2>&1; then
+  if docker compose > /dev/null 2>&1; then
     docker_bin="docker compose"
-  elif docker-compose >/dev/null 2>&1; then
+  elif docker-compose > /dev/null 2>&1; then
     docker_bin="docker-compose"
   else
-    echo "Cannot find \`docker compose\` or \`docker-compose\`."
+    echo 'Cannot find `docker compose` or `docker-compose`.'
     exit 1
   fi
 

machine-learning/ann/__init__.py

@@ -0,0 +1 @@
+from .ann import Ann, is_available

machine-learning/ann/ann.py

@@ -32,7 +32,8 @@ T = TypeVar("T", covariant=True)
 
 
 class Newable(Protocol[T]):
-    def new(self) -> None: ...
+    def new(self) -> None:
+        ...
 
 
 class _Singleton(type, Newable[T]):

machine-learning/ann/build.sh

@@ -1,3 +1 @@
-#!/usr/bin/env sh
-
-g++ -shared -O3 -o libann.so -fuse-ld=gold -std=c++17 -I"$ARMNN_PATH"/include -larmnn -larmnnDeserializer -larmnnTfLiteParser -larmnnOnnxParser -L"$ARMNN_PATH" ann.cpp
+g++ -shared -O3 -o libann.so -fuse-ld=gold -std=c++17 -I$ARMNN_PATH/include -larmnn -larmnnDeserializer -larmnnTfLiteParser -larmnnOnnxParser -L$ARMNN_PATH ann.cpp

machine-learning/ann/export/build-converter.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
-cd armnn-23.11/ || exit
+cd armnn-23.11/
 g++ -o ../armnnconverter -O1 -DARMNN_ONNX_PARSER -DARMNN_SERIALIZER -DARMNN_TF_LITE_PARSER -fuse-ld=gold -std=c++17 -Iinclude -Isrc/armnnUtils -Ithird-party -larmnn -larmnnDeserializer -larmnnTfLiteParser -larmnnOnnxParser -larmnnSerializer -L../armnn src/armnnConverter/ArmnnConverter.cpp

machine-learning/app/models/base.py

@@ -1,16 +1,18 @@
 from __future__ import annotations
 
-import os
 from abc import ABC, abstractmethod
 from pathlib import Path
 from shutil import rmtree
 from typing import Any
 
+import onnx
 import onnxruntime as ort
 from huggingface_hub import snapshot_download
+from onnx.shape_inference import infer_shapes
+from onnx.tools.update_model_dims import update_inputs_outputs_dims
 
 import ann.ann
-from app.models.constants import SUPPORTED_PROVIDERS
+from app.models.constants import STATIC_INPUT_PROVIDERS, SUPPORTED_PROVIDERS
 
 from ..config import get_cache_dir, get_hf_model_name, log, settings
 from ..schemas import ModelRuntime, ModelType
@@ -111,25 +113,63 @@ class InferenceModel(ABC):
             )
             model_path = onnx_path
 
+        if any(provider in STATIC_INPUT_PROVIDERS for provider in self.providers):
+            static_path = model_path.parent / "static_1" / "model.onnx"
+            static_path.parent.mkdir(parents=True, exist_ok=True)
+            if not static_path.is_file():
+                self._convert_to_static(model_path, static_path)
+            model_path = static_path
+
         match model_path.suffix:
             case ".armnn":
                 session = AnnSession(model_path)
             case ".onnx":
-                cwd = os.getcwd()
-                try:
-                    os.chdir(model_path.parent)
-                    session = ort.InferenceSession(
-                        model_path.as_posix(),
-                        sess_options=self.sess_options,
-                        providers=self.providers,
-                        provider_options=self.provider_options,
-                    )
-                finally:
-                    os.chdir(cwd)
+                session = ort.InferenceSession(
+                    model_path.as_posix(),
+                    sess_options=self.sess_options,
+                    providers=self.providers,
+                    provider_options=self.provider_options,
+                )
             case _:
                 raise ValueError(f"Unsupported model file type: {model_path.suffix}")
         return session
 
+    def _convert_to_static(self, source_path: Path, target_path: Path) -> None:
+        inferred = infer_shapes(onnx.load(source_path))
+        inputs = self._get_static_dims(inferred.graph.input)
+        outputs = self._get_static_dims(inferred.graph.output)
+
+        # check_model gets called in update_inputs_outputs_dims and doesn't work for large models
+        check_model = onnx.checker.check_model
+        try:
+
+            def check_model_stub(*args: Any, **kwargs: Any) -> None:
+                pass
+
+            onnx.checker.check_model = check_model_stub
+            updated_model = update_inputs_outputs_dims(inferred, inputs, outputs)
+        finally:
+            onnx.checker.check_model = check_model
+
+        onnx.save(
+            updated_model,
+            target_path,
+            save_as_external_data=True,
+            all_tensors_to_one_file=False,
+            size_threshold=1048576,
+        )
+
+    def _get_static_dims(self, graph_io: Any, dim_size: int = 1) -> dict[str, list[int]]:
+        return {
+            field.name: [
+                d.dim_value if d.HasField("dim_value") else dim_size
+                for shape in field.type.ListFields()
+                if (dim := shape[1].shape.dim)
+                for d in dim
+            ]
+            for field in graph_io
+        }
+
     @property
     def model_type(self) -> ModelType:
         return self._model_type
@@ -165,14 +205,6 @@ class InferenceModel(ABC):
     def providers_default(self) -> list[str]:
         available_providers = set(ort.get_available_providers())
         log.debug(f"Available ORT providers: {available_providers}")
-        if (openvino := "OpenVINOExecutionProvider") in available_providers:
-            device_ids: list[str] = ort.capi._pybind_state.get_available_openvino_device_ids()
-            log.debug(f"Available OpenVINO devices: {device_ids}")
-
-            gpu_devices = [device_id for device_id in device_ids if device_id.startswith("GPU")]
-            if not gpu_devices:
-                log.warning("No GPU device found in OpenVINO. Falling back to CPU.")
-                available_providers.remove(openvino)
         return [provider for provider in SUPPORTED_PROVIDERS if provider in available_providers]
 
     @property
@@ -192,7 +224,15 @@ class InferenceModel(ABC):
                 case "CPUExecutionProvider" | "CUDAExecutionProvider":
                     option = {"arena_extend_strategy": "kSameAsRequested"}
                 case "OpenVINOExecutionProvider":
-                    option = {"device_type": "GPU_FP32"}
+                    try:
+                        device_ids: list[str] = ort.capi._pybind_state.get_available_openvino_device_ids()
+                        log.debug(f"Available OpenVINO devices: {device_ids}")
+                        gpu_devices = [device_id for device_id in device_ids if device_id.startswith("GPU")]
+                        option = {"device_id": gpu_devices[0]} if gpu_devices else {}
+                    except AttributeError as e:
+                        log.warning("Failed to get OpenVINO device IDs. Using default options.")
+                        log.error(e)
+                        option = {}
                 case _:
                     option = {}
             options.append(option)

machine-learning/app/models/constants.py

@@ -54,6 +54,9 @@ _INSIGHTFACE_MODELS = {
 SUPPORTED_PROVIDERS = ["CUDAExecutionProvider", "OpenVINOExecutionProvider", "CPUExecutionProvider"]
 
 
+STATIC_INPUT_PROVIDERS = ["OpenVINOExecutionProvider"]
+
+
 def is_openclip(model_name: str) -> bool:
     return clean_name(model_name) in _OPENCLIP_MODELS
 

machine-learning/app/test_main.py

@@ -1,5 +1,4 @@
 import json
-import os
 from io import BytesIO
 from pathlib import Path
 from random import randint
@@ -45,23 +44,11 @@ class TestBase:
         assert encoder.providers == self.CUDA_EP
 
     @pytest.mark.providers(OV_EP)
-    def test_sets_openvino_provider_if_available(self, providers: list[str], mocker: MockerFixture) -> None:
-        mocked = mocker.patch("app.models.base.ort.capi._pybind_state")
-        mocked.get_available_openvino_device_ids.return_value = ["GPU.0", "CPU"]
-
+    def test_sets_openvino_provider_if_available(self, providers: list[str]) -> None:
         encoder = OpenCLIPEncoder("ViT-B-32__openai")
 
         assert encoder.providers == self.OV_EP
 
-    @pytest.mark.providers(OV_EP)
-    def test_avoids_openvino_if_gpu_not_available(self, providers: list[str], mocker: MockerFixture) -> None:
-        mocked = mocker.patch("app.models.base.ort.capi._pybind_state")
-        mocked.get_available_openvino_device_ids.return_value = ["CPU"]
-
-        encoder = OpenCLIPEncoder("ViT-B-32__openai")
-
-        assert encoder.providers == self.CPU_EP
-
     @pytest.mark.providers(CUDA_EP_OUT_OF_ORDER)
     def test_sets_providers_in_correct_order(self, providers: list[str]) -> None:
         encoder = OpenCLIPEncoder("ViT-B-32__openai")
@@ -80,14 +67,22 @@ class TestBase:
 
         assert encoder.providers == providers
 
-    def test_sets_default_provider_options(self, mocker: MockerFixture) -> None:
+    def test_sets_default_provider_options(self) -> None:
+        encoder = OpenCLIPEncoder("ViT-B-32__openai", providers=["OpenVINOExecutionProvider", "CPUExecutionProvider"])
+
+        assert encoder.provider_options == [
+            {},
+            {"arena_extend_strategy": "kSameAsRequested"},
+        ]
+
+    def test_sets_openvino_device_id_if_possible(self, mocker: MockerFixture) -> None:
         mocked = mocker.patch("app.models.base.ort.capi._pybind_state")
         mocked.get_available_openvino_device_ids.return_value = ["GPU.0", "CPU"]
 
         encoder = OpenCLIPEncoder("ViT-B-32__openai", providers=["OpenVINOExecutionProvider", "CPUExecutionProvider"])
 
         assert encoder.provider_options == [
-            {"device_type": "GPU_FP32"},
+            {"device_id": "GPU.0"},
             {"arena_extend_strategy": "kSameAsRequested"},
         ]
 
@@ -242,12 +237,12 @@ class TestBase:
         mock_model_path.is_file.return_value = True
         mock_model_path.suffix = ".armnn"
         mock_model_path.with_suffix.return_value = mock_model_path
-        mock_ann = mocker.patch("app.models.base.AnnSession")
+        mock_session = mocker.patch("app.models.base.AnnSession")
 
         encoder = OpenCLIPEncoder("ViT-B-32__openai")
         encoder._make_session(mock_model_path)
 
-        mock_ann.assert_called_once()
+        mock_session.assert_called_once()
 
     def test_make_session_return_ort_if_available_and_ann_is_not(self, mocker: MockerFixture) -> None:
         mock_armnn_path = mocker.Mock()
@@ -261,7 +256,6 @@ class TestBase:
 
         mock_ann = mocker.patch("app.models.base.AnnSession")
         mock_ort = mocker.patch("app.models.base.ort.InferenceSession")
-        mocker.patch("app.models.base.os.chdir")
 
         encoder = OpenCLIPEncoder("ViT-B-32__openai")
         encoder._make_session(mock_armnn_path)
@@ -284,26 +278,6 @@ class TestBase:
         mock_ann.assert_not_called()
         mock_ort.assert_not_called()
 
-    def test_make_session_changes_cwd(self, mocker: MockerFixture) -> None:
-        mock_model_path = mocker.Mock()
-        mock_model_path.is_file.return_value = True
-        mock_model_path.suffix = ".onnx"
-        mock_model_path.parent = "model_parent"
-        mock_model_path.with_suffix.return_value = mock_model_path
-        mock_ort = mocker.patch("app.models.base.ort.InferenceSession")
-        mock_chdir = mocker.patch("app.models.base.os.chdir")
-
-        encoder = OpenCLIPEncoder("ViT-B-32__openai")
-        encoder._make_session(mock_model_path)
-
-        mock_chdir.assert_has_calls(
-            [
-                mock.call(mock_model_path.parent),
-                mock.call(os.getcwd()),
-            ]
-        )
-        mock_ort.assert_called_once()
-
     def test_download(self, mocker: MockerFixture) -> None:
         mock_snapshot_download = mocker.patch("app.models.base.snapshot_download")
 

machine-learning/export/Dockerfile

@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:bookworm-slim@sha256:6038b89363c9181215f3d9e8ce2720c880e224537f4028a854482e43a9b4998a as builder
+FROM mambaorg/micromamba:bookworm-slim@sha256:926cac38640709f90f3fef2a3f730733b5c350be612f0d14706be8833b79ad8c as builder
 
 ENV NODE_ENV=production \
   TRANSFORMERS_CACHE=/cache \

machine-learning/poetry.lock

@@ -64,33 +64,33 @@ trio = ["trio (>=0.23)"]
 
 [[package]]
 name = "black"
-version = "24.2.0"
+version = "24.1.1"
 description = "The uncompromising code formatter."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "black-24.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6981eae48b3b33399c8757036c7f5d48a535b962a7c2310d19361edeef64ce29"},
-    {file = "black-24.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d533d5e3259720fdbc1b37444491b024003e012c5173f7d06825a77508085430"},
-    {file = "black-24.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61a0391772490ddfb8a693c067df1ef5227257e72b0e4108482b8d41b5aee13f"},
-    {file = "black-24.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:992e451b04667116680cb88f63449267c13e1ad134f30087dec8527242e9862a"},
-    {file = "black-24.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:163baf4ef40e6897a2a9b83890e59141cc8c2a98f2dda5080dc15c00ee1e62cd"},
-    {file = "black-24.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e37c99f89929af50ffaf912454b3e3b47fd64109659026b678c091a4cd450fb2"},
-    {file = "black-24.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f9de21bafcba9683853f6c96c2d515e364aee631b178eaa5145fc1c61a3cc92"},
-    {file = "black-24.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:9db528bccb9e8e20c08e716b3b09c6bdd64da0dd129b11e160bf082d4642ac23"},
-    {file = "black-24.2.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d84f29eb3ee44859052073b7636533ec995bd0f64e2fb43aeceefc70090e752b"},
-    {file = "black-24.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e08fb9a15c914b81dd734ddd7fb10513016e5ce7e6704bdd5e1251ceee51ac9"},
-    {file = "black-24.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:810d445ae6069ce64030c78ff6127cd9cd178a9ac3361435708b907d8a04c693"},
-    {file = "black-24.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:ba15742a13de85e9b8f3239c8f807723991fbfae24bad92d34a2b12e81904982"},
-    {file = "black-24.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7e53a8c630f71db01b28cd9602a1ada68c937cbf2c333e6ed041390d6968faf4"},
-    {file = "black-24.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:93601c2deb321b4bad8f95df408e3fb3943d85012dddb6121336b8e24a0d1218"},
-    {file = "black-24.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0057f800de6acc4407fe75bb147b0c2b5cbb7c3ed110d3e5999cd01184d53b0"},
-    {file = "black-24.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:faf2ee02e6612577ba0181f4347bcbcf591eb122f7841ae5ba233d12c39dcb4d"},
-    {file = "black-24.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:057c3dc602eaa6fdc451069bd027a1b2635028b575a6c3acfd63193ced20d9c8"},
-    {file = "black-24.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:08654d0797e65f2423f850fc8e16a0ce50925f9337fb4a4a176a7aa4026e63f8"},
-    {file = "black-24.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca610d29415ee1a30a3f30fab7a8f4144e9d34c89a235d81292a1edb2b55f540"},
-    {file = "black-24.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:4dd76e9468d5536abd40ffbc7a247f83b2324f0c050556d9c371c2b9a9a95e31"},
-    {file = "black-24.2.0-py3-none-any.whl", hash = "sha256:e8a6ae970537e67830776488bca52000eaa37fa63b9988e8c487458d9cd5ace6"},
-    {file = "black-24.2.0.tar.gz", hash = "sha256:bce4f25c27c3435e4dace4815bcb2008b87e167e3bf4ee47ccdc5ce906eb4894"},
+    {file = "black-24.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2588021038bd5ada078de606f2a804cadd0a3cc6a79cb3e9bb3a8bf581325a4c"},
+    {file = "black-24.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1a95915c98d6e32ca43809d46d932e2abc5f1f7d582ffbe65a5b4d1588af7445"},
+    {file = "black-24.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fa6a0e965779c8f2afb286f9ef798df770ba2b6cee063c650b96adec22c056a"},
+    {file = "black-24.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:5242ecd9e990aeb995b6d03dc3b2d112d4a78f2083e5a8e86d566340ae80fec4"},
+    {file = "black-24.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fc1ec9aa6f4d98d022101e015261c056ddebe3da6a8ccfc2c792cbe0349d48b7"},
+    {file = "black-24.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0269dfdea12442022e88043d2910429bed717b2d04523867a85dacce535916b8"},
+    {file = "black-24.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3d64db762eae4a5ce04b6e3dd745dcca0fb9560eb931a5be97472e38652a161"},
+    {file = "black-24.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:5d7b06ea8816cbd4becfe5f70accae953c53c0e53aa98730ceccb0395520ee5d"},
+    {file = "black-24.1.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e2c8dfa14677f90d976f68e0c923947ae68fa3961d61ee30976c388adc0b02c8"},
+    {file = "black-24.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a21725862d0e855ae05da1dd25e3825ed712eaaccef6b03017fe0853a01aa45e"},
+    {file = "black-24.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07204d078e25327aad9ed2c64790d681238686bce254c910de640c7cc4fc3aa6"},
+    {file = "black-24.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:a83fe522d9698d8f9a101b860b1ee154c1d25f8a82ceb807d319f085b2627c5b"},
+    {file = "black-24.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:08b34e85170d368c37ca7bf81cf67ac863c9d1963b2c1780c39102187ec8dd62"},
+    {file = "black-24.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7258c27115c1e3b5de9ac6c4f9957e3ee2c02c0b39222a24dc7aa03ba0e986f5"},
+    {file = "black-24.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40657e1b78212d582a0edecafef133cf1dd02e6677f539b669db4746150d38f6"},
+    {file = "black-24.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e298d588744efda02379521a19639ebcd314fba7a49be22136204d7ed1782717"},
+    {file = "black-24.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:34afe9da5056aa123b8bfda1664bfe6fb4e9c6f311d8e4a6eb089da9a9173bf9"},
+    {file = "black-24.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:854c06fb86fd854140f37fb24dbf10621f5dab9e3b0c29a690ba595e3d543024"},
+    {file = "black-24.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3897ae5a21ca132efa219c029cce5e6bfc9c3d34ed7e892113d199c0b1b444a2"},
+    {file = "black-24.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:ecba2a15dfb2d97105be74bbfe5128bc5e9fa8477d8c46766505c1dda5883aac"},
+    {file = "black-24.1.1-py3-none-any.whl", hash = "sha256:5cdc2e2195212208fbcae579b931407c1fa9997584f0a415421748aeafff1168"},
+    {file = "black-24.1.1.tar.gz", hash = "sha256:48b5760dcbfe5cf97fd4fba23946681f3a81514c6ab8a45b50da67ac8fbc6c7b"},
 ]
 
 [package.dependencies]
@@ -1250,13 +1250,13 @@ test = ["Cython (>=0.29.24,<0.30.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.27.0"
+version = "0.26.0"
 description = "The next generation HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
-    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+    {file = "httpx-0.26.0-py3-none-any.whl", hash = "sha256:8915f5a3627c4d47b73e8202457cb28f1266982d1159bd5779d86a80c0eab1cd"},
+    {file = "httpx-0.26.0.tar.gz", hash = "sha256:451b55c30d5185ea6b23c2c793abf9bb237d2a7dfb901ced6ff69ad37ec1dfaf"},
 ]
 
 [package.dependencies]
@@ -2101,61 +2101,61 @@ numpy = [
 
 [[package]]
 name = "orjson"
-version = "3.9.15"
+version = "3.9.13"
 description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "orjson-3.9.15-cp310-cp310-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:d61f7ce4727a9fa7680cd6f3986b0e2c732639f46a5e0156e550e35258aa313a"},
-    {file = "orjson-3.9.15-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4feeb41882e8aa17634b589533baafdceb387e01e117b1ec65534ec724023d04"},
-    {file = "orjson-3.9.15-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbbeb3c9b2edb5fd044b2a070f127a0ac456ffd079cb82746fc84af01ef021a4"},
-    {file = "orjson-3.9.15-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b66bcc5670e8a6b78f0313bcb74774c8291f6f8aeef10fe70e910b8040f3ab75"},
-    {file = "orjson-3.9.15-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2973474811db7b35c30248d1129c64fd2bdf40d57d84beed2a9a379a6f57d0ab"},
-    {file = "orjson-3.9.15-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9fe41b6f72f52d3da4db524c8653e46243c8c92df826ab5ffaece2dba9cccd58"},
-    {file = "orjson-3.9.15-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:4228aace81781cc9d05a3ec3a6d2673a1ad0d8725b4e915f1089803e9efd2b99"},
-    {file = "orjson-3.9.15-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:6f7b65bfaf69493c73423ce9db66cfe9138b2f9ef62897486417a8fcb0a92bfe"},
-    {file = "orjson-3.9.15-cp310-none-win32.whl", hash = "sha256:2d99e3c4c13a7b0fb3792cc04c2829c9db07838fb6973e578b85c1745e7d0ce7"},
-    {file = "orjson-3.9.15-cp310-none-win_amd64.whl", hash = "sha256:b725da33e6e58e4a5d27958568484aa766e825e93aa20c26c91168be58e08cbb"},
-    {file = "orjson-3.9.15-cp311-cp311-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:c8e8fe01e435005d4421f183038fc70ca85d2c1e490f51fb972db92af6e047c2"},
-    {file = "orjson-3.9.15-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:87f1097acb569dde17f246faa268759a71a2cb8c96dd392cd25c668b104cad2f"},
-    {file = "orjson-3.9.15-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff0f9913d82e1d1fadbd976424c316fbc4d9c525c81d047bbdd16bd27dd98cfc"},
-    {file = "orjson-3.9.15-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8055ec598605b0077e29652ccfe9372247474375e0e3f5775c91d9434e12d6b1"},
-    {file = "orjson-3.9.15-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d6768a327ea1ba44c9114dba5fdda4a214bdb70129065cd0807eb5f010bfcbb5"},
-    {file = "orjson-3.9.15-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:12365576039b1a5a47df01aadb353b68223da413e2e7f98c02403061aad34bde"},
-    {file = "orjson-3.9.15-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:71c6b009d431b3839d7c14c3af86788b3cfac41e969e3e1c22f8a6ea13139404"},
-    {file = "orjson-3.9.15-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e18668f1bd39e69b7fed19fa7cd1cd110a121ec25439328b5c89934e6d30d357"},
-    {file = "orjson-3.9.15-cp311-none-win32.whl", hash = "sha256:62482873e0289cf7313461009bf62ac8b2e54bc6f00c6fabcde785709231a5d7"},
-    {file = "orjson-3.9.15-cp311-none-win_amd64.whl", hash = "sha256:b3d336ed75d17c7b1af233a6561cf421dee41d9204aa3cfcc6c9c65cd5bb69a8"},
-    {file = "orjson-3.9.15-cp312-cp312-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:82425dd5c7bd3adfe4e94c78e27e2fa02971750c2b7ffba648b0f5d5cc016a73"},
-    {file = "orjson-3.9.15-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c51378d4a8255b2e7c1e5cc430644f0939539deddfa77f6fac7b56a9784160a"},
-    {file = "orjson-3.9.15-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6ae4e06be04dc00618247c4ae3f7c3e561d5bc19ab6941427f6d3722a0875ef7"},
-    {file = "orjson-3.9.15-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bcef128f970bb63ecf9a65f7beafd9b55e3aaf0efc271a4154050fc15cdb386e"},
-    {file = "orjson-3.9.15-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b72758f3ffc36ca566ba98a8e7f4f373b6c17c646ff8ad9b21ad10c29186f00d"},
-    {file = "orjson-3.9.15-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c57bc7b946cf2efa67ac55766e41764b66d40cbd9489041e637c1304400494"},
-    {file = "orjson-3.9.15-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:946c3a1ef25338e78107fba746f299f926db408d34553b4754e90a7de1d44068"},
-    {file = "orjson-3.9.15-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2f256d03957075fcb5923410058982aea85455d035607486ccb847f095442bda"},
-    {file = "orjson-3.9.15-cp312-none-win_amd64.whl", hash = "sha256:5bb399e1b49db120653a31463b4a7b27cf2fbfe60469546baf681d1b39f4edf2"},
-    {file = "orjson-3.9.15-cp38-cp38-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:b17f0f14a9c0ba55ff6279a922d1932e24b13fc218a3e968ecdbf791b3682b25"},
-    {file = "orjson-3.9.15-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f6cbd8e6e446fb7e4ed5bac4661a29e43f38aeecbf60c4b900b825a353276a1"},
-    {file = "orjson-3.9.15-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:76bc6356d07c1d9f4b782813094d0caf1703b729d876ab6a676f3aaa9a47e37c"},
-    {file = "orjson-3.9.15-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fdfa97090e2d6f73dced247a2f2d8004ac6449df6568f30e7fa1a045767c69a6"},
-    {file = "orjson-3.9.15-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7413070a3e927e4207d00bd65f42d1b780fb0d32d7b1d951f6dc6ade318e1b5a"},
-    {file = "orjson-3.9.15-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9cf1596680ac1f01839dba32d496136bdd5d8ffb858c280fa82bbfeb173bdd40"},
-    {file = "orjson-3.9.15-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:809d653c155e2cc4fd39ad69c08fdff7f4016c355ae4b88905219d3579e31eb7"},
-    {file = "orjson-3.9.15-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:920fa5a0c5175ab14b9c78f6f820b75804fb4984423ee4c4f1e6d748f8b22bc1"},
-    {file = "orjson-3.9.15-cp38-none-win32.whl", hash = "sha256:2b5c0f532905e60cf22a511120e3719b85d9c25d0e1c2a8abb20c4dede3b05a5"},
-    {file = "orjson-3.9.15-cp38-none-win_amd64.whl", hash = "sha256:67384f588f7f8daf040114337d34a5188346e3fae6c38b6a19a2fe8c663a2f9b"},
-    {file = "orjson-3.9.15-cp39-cp39-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:6fc2fe4647927070df3d93f561d7e588a38865ea0040027662e3e541d592811e"},
-    {file = "orjson-3.9.15-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34cbcd216e7af5270f2ffa63a963346845eb71e174ea530867b7443892d77180"},
-    {file = "orjson-3.9.15-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f541587f5c558abd93cb0de491ce99a9ef8d1ae29dd6ab4dbb5a13281ae04cbd"},
-    {file = "orjson-3.9.15-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:92255879280ef9c3c0bcb327c5a1b8ed694c290d61a6a532458264f887f052cb"},
-    {file = "orjson-3.9.15-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:05a1f57fb601c426635fcae9ddbe90dfc1ed42245eb4c75e4960440cac667262"},
-    {file = "orjson-3.9.15-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ede0bde16cc6e9b96633df1631fbcd66491d1063667f260a4f2386a098393790"},
-    {file = "orjson-3.9.15-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:e88b97ef13910e5f87bcbc4dd7979a7de9ba8702b54d3204ac587e83639c0c2b"},
-    {file = "orjson-3.9.15-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:57d5d8cf9c27f7ef6bc56a5925c7fbc76b61288ab674eb352c26ac780caa5b10"},
-    {file = "orjson-3.9.15-cp39-none-win32.whl", hash = "sha256:001f4eb0ecd8e9ebd295722d0cbedf0748680fb9998d3993abaed2f40587257a"},
-    {file = "orjson-3.9.15-cp39-none-win_amd64.whl", hash = "sha256:ea0b183a5fe6b2b45f3b854b0d19c4e932d6f5934ae1f723b07cf9560edd4ec7"},
-    {file = "orjson-3.9.15.tar.gz", hash = "sha256:95cae920959d772f30ab36d3b25f83bb0f3be671e986c72ce22f8fa700dae061"},
+    {file = "orjson-3.9.13-cp310-cp310-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:fa6b67f8bef277c2a4aadd548d58796854e7d760964126c3209b19bccc6a74f1"},
+    {file = "orjson-3.9.13-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b812417199eeb169c25f67815cfb66fd8de7ff098bf57d065e8c1943a7ba5c8f"},
+    {file = "orjson-3.9.13-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7ccd5bd222e5041069ad9d9868ab59e6dbc53ecde8d8c82b919954fbba43b46b"},
+    {file = "orjson-3.9.13-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eaaf80957c38e9d3f796f355a80fad945e72cd745e6b64c210e635b7043b673e"},
+    {file = "orjson-3.9.13-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:60da7316131185d0110a1848e9ad15311e6c8938ee0b5be8cbd7261e1d80ee8f"},
+    {file = "orjson-3.9.13-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5b98cd948372f0eb219bc309dee4633db1278687161e3280d9e693b6076951d2"},
+    {file = "orjson-3.9.13-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:3869d65561f10071d3e7f35ae58fd377056f67d7aaed5222f318390c3ad30339"},
+    {file = "orjson-3.9.13-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:43fd6036b16bb6742d03dae62f7bdf8214d06dea47e4353cde7e2bd1358d186f"},
+    {file = "orjson-3.9.13-cp310-none-win32.whl", hash = "sha256:0d3ba9d88e20765335260d7b25547d7c571eee2b698200f97afa7d8c7cd668fc"},
+    {file = "orjson-3.9.13-cp310-none-win_amd64.whl", hash = "sha256:6e47153db080f5e87e8ba638f1a8b18995eede6b0abb93964d58cf11bcea362f"},
+    {file = "orjson-3.9.13-cp311-cp311-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:4584e8eb727bc431baaf1bf97e35a1d8a0109c924ec847395673dfd5f4ef6d6f"},
+    {file = "orjson-3.9.13-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f37f0cdd026ef777a4336e599d8194c8357fc14760c2a5ddcfdf1965d45504b"},
+    {file = "orjson-3.9.13-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d714595d81efab11b42bccd119977d94b25d12d3a806851ff6bfd286a4bce960"},
+    {file = "orjson-3.9.13-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9171e8e1a1f221953e38e84ae0abffe8759002fd8968106ee379febbb5358b33"},
+    {file = "orjson-3.9.13-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1ab9dbdec3f13f3ea6f937564ce21651844cfbf2725099f2f490426acf683c23"},
+    {file = "orjson-3.9.13-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:811ac076855e33e931549340288e0761873baf29276ad00f221709933c644330"},
+    {file = "orjson-3.9.13-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:860d0f5b42d0c0afd73fa4177709f6e1b966ba691fcd72175affa902052a81d6"},
+    {file = "orjson-3.9.13-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:838b898e8c1f26eb6b8d81b180981273f6f5110c76c22c384979aca854194f1b"},
+    {file = "orjson-3.9.13-cp311-none-win32.whl", hash = "sha256:d3222db9df629ef3c3673124f2e05fb72bc4a320c117e953fec0d69dde82e36d"},
+    {file = "orjson-3.9.13-cp311-none-win_amd64.whl", hash = "sha256:978117122ca4cc59b28af5322253017f6c5fc03dbdda78c7f4b94ae984c8dd43"},
+    {file = "orjson-3.9.13-cp312-cp312-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:031df1026c7ea8303332d78711f180231e3ae8b564271fb748a03926587c5546"},
+    {file = "orjson-3.9.13-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fd9a2101d04e85086ea6198786a3f016e45475f800712e6833e14bf9ce2832f"},
+    {file = "orjson-3.9.13-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:446d9ad04204e79229ae19502daeea56479e55cbc32634655d886f5a39e91b44"},
+    {file = "orjson-3.9.13-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b57c0954a9fdd2b05b9cec0f5a12a0bdce5bf021a5b3b09323041613972481ab"},
+    {file = "orjson-3.9.13-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:266e55c83f81248f63cc93d11c5e3a53df49a5d2598fa9e9db5f99837a802d5d"},
+    {file = "orjson-3.9.13-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31372ba3a9fe8ad118e7d22fba46bbc18e89039e3bfa89db7bc8c18ee722dca8"},
+    {file = "orjson-3.9.13-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e3b0c4da61f39899561e08e571f54472a09fa71717d9797928af558175ae5243"},
+    {file = "orjson-3.9.13-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2cc03a35bfc71c8ebf96ce49b82c2a7be6af4b3cd3ac34166fdb42ac510bbfff"},
+    {file = "orjson-3.9.13-cp312-none-win_amd64.whl", hash = "sha256:49b7e3fe861cb246361825d1a238f2584ed8ea21e714bf6bb17cebb86772e61c"},
+    {file = "orjson-3.9.13-cp38-cp38-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:62e9a99879c4d5a04926ac2518a992134bfa00d546ea5a4cae4b9be454d35a22"},
+    {file = "orjson-3.9.13-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d92a3e835a5100f1d5b566fff79217eab92223ca31900dba733902a182a35ab0"},
+    {file = "orjson-3.9.13-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:23f21faf072ed3b60b5954686f98157e073f6a8068eaa58dbde83e87212eda84"},
+    {file = "orjson-3.9.13-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:828c502bb261588f7de897e06cb23c4b122997cb039d2014cb78e7dabe92ef0c"},
+    {file = "orjson-3.9.13-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:16946d095212a3dec552572c5d9bca7afa40f3116ad49695a397be07d529f1fa"},
+    {file = "orjson-3.9.13-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3deadd8dc0e9ff844b5b656fa30a48dbee1c3b332d8278302dd9637f6b09f627"},
+    {file = "orjson-3.9.13-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:9b1b5adc5adf596c59dca57156b71ad301d73956f5bab4039b0e34dbf50b9fa0"},
+    {file = "orjson-3.9.13-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:ddc089315d030c54f0f03fb38286e2667c05009a78d659f108a8efcfbdf2e585"},
+    {file = "orjson-3.9.13-cp38-none-win32.whl", hash = "sha256:ae77275a28667d9c82d4522b681504642055efa0368d73108511647c6499b31c"},
+    {file = "orjson-3.9.13-cp38-none-win_amd64.whl", hash = "sha256:730385fdb99a21fce9bb84bb7fcbda72c88626facd74956bda712834b480729d"},
+    {file = "orjson-3.9.13-cp39-cp39-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:7e8e4a571d958910272af8d53a9cbe6599f9f5fd496a1bc51211183bb2072cbd"},
+    {file = "orjson-3.9.13-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cfad553a36548262e7da0f3a7464270e13900b898800fb571a5d4b298c3f8356"},
+    {file = "orjson-3.9.13-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0d691c44604941945b00e0a13b19a7d9c1a19511abadf0080f373e98fdeb6b31"},
+    {file = "orjson-3.9.13-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8c83718346de08d68b3cb1105c5d91e5fc39885d8610fdda16613d4e3941459"},
+    {file = "orjson-3.9.13-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:63ef57a53bfc2091a7cd50a640d9ae866bd7d92a5225a1bab6baa60ef62583f2"},
+    {file = "orjson-3.9.13-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9156b96afa38db71344522f5517077eaedf62fcd2c9148392ff93d801128809c"},
+    {file = "orjson-3.9.13-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:31fb66b41fb2c4c817d9610f0bc7d31345728d7b5295ac78b63603407432a2b2"},
+    {file = "orjson-3.9.13-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:8a730bf07feacb0863974e67b206b7c503a62199de1cece2eb0d4c233ec29c11"},
+    {file = "orjson-3.9.13-cp39-none-win32.whl", hash = "sha256:5ef58869f3399acbbe013518d8b374ee9558659eef14bca0984f67cb1fbd3c37"},
+    {file = "orjson-3.9.13-cp39-none-win_amd64.whl", hash = "sha256:9bcf56efdb83244cde070e82a69c0f03c47c235f0a5cb6c81d9da23af7fbaae4"},
+    {file = "orjson-3.9.13.tar.gz", hash = "sha256:fc6bc65b0cf524ee042e0bc2912b9206ef242edfba7426cf95763e4af01f527a"},
 ]
 
 [[package]]
@@ -2465,13 +2465,13 @@ files = [
 
 [[package]]
 name = "pytest"
-version = "8.0.2"
+version = "8.0.0"
 description = "pytest: simple powerful testing with Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pytest-8.0.2-py3-none-any.whl", hash = "sha256:edfaaef32ce5172d5466b5127b42e0d6d35ebbe4453f0e3505d96afd93f6b096"},
-    {file = "pytest-8.0.2.tar.gz", hash = "sha256:d4051d623a2e0b7e51960ba963193b09ce6daeb9759a451844a21e4ddedfc1bd"},
+    {file = "pytest-8.0.0-py3-none-any.whl", hash = "sha256:50fb9cbe836c3f20f0dfa99c565201fb75dc54c8d76373cd1bde06b06657bdb6"},
+    {file = "pytest-8.0.0.tar.gz", hash = "sha256:249b1b0864530ba251b7438274c4d251c58d868edaaec8762893ad4a0d71c36c"},
 ]
 
 [package.dependencies]
@@ -2836,28 +2836,28 @@ files = [
 
 [[package]]
 name = "ruff"
-version = "0.2.2"
+version = "0.2.1"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "ruff-0.2.2-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:0a9efb032855ffb3c21f6405751d5e147b0c6b631e3ca3f6b20f917572b97eb6"},
-    {file = "ruff-0.2.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:d450b7fbff85913f866a5384d8912710936e2b96da74541c82c1b458472ddb39"},
-    {file = "ruff-0.2.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ecd46e3106850a5c26aee114e562c329f9a1fbe9e4821b008c4404f64ff9ce73"},
-    {file = "ruff-0.2.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5e22676a5b875bd72acd3d11d5fa9075d3a5f53b877fe7b4793e4673499318ba"},
-    {file = "ruff-0.2.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1695700d1e25a99d28f7a1636d85bafcc5030bba9d0578c0781ba1790dbcf51c"},
-    {file = "ruff-0.2.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:b0c232af3d0bd8f521806223723456ffebf8e323bd1e4e82b0befb20ba18388e"},
-    {file = "ruff-0.2.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f63d96494eeec2fc70d909393bcd76c69f35334cdbd9e20d089fb3f0640216ca"},
-    {file = "ruff-0.2.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6a61ea0ff048e06de273b2e45bd72629f470f5da8f71daf09fe481278b175001"},
-    {file = "ruff-0.2.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5e1439c8f407e4f356470e54cdecdca1bd5439a0673792dbe34a2b0a551a2fe3"},
-    {file = "ruff-0.2.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:940de32dc8853eba0f67f7198b3e79bc6ba95c2edbfdfac2144c8235114d6726"},
-    {file = "ruff-0.2.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:0c126da55c38dd917621552ab430213bdb3273bb10ddb67bc4b761989210eb6e"},
-    {file = "ruff-0.2.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:3b65494f7e4bed2e74110dac1f0d17dc8e1f42faaa784e7c58a98e335ec83d7e"},
-    {file = "ruff-0.2.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1ec49be4fe6ddac0503833f3ed8930528e26d1e60ad35c2446da372d16651ce9"},
-    {file = "ruff-0.2.2-py3-none-win32.whl", hash = "sha256:d920499b576f6c68295bc04e7b17b6544d9d05f196bb3aac4358792ef6f34325"},
-    {file = "ruff-0.2.2-py3-none-win_amd64.whl", hash = "sha256:cc9a91ae137d687f43a44c900e5d95e9617cb37d4c989e462980ba27039d239d"},
-    {file = "ruff-0.2.2-py3-none-win_arm64.whl", hash = "sha256:c9d15fc41e6054bfc7200478720570078f0b41c9ae4f010bcc16bd6f4d1aacdd"},
-    {file = "ruff-0.2.2.tar.gz", hash = "sha256:e62ed7f36b3068a30ba39193a14274cd706bc486fad521276458022f7bccb31d"},
+    {file = "ruff-0.2.1-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:dd81b911d28925e7e8b323e8d06951554655021df8dd4ac3045d7212ac4ba080"},
+    {file = "ruff-0.2.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:dc586724a95b7d980aa17f671e173df00f0a2eef23f8babbeee663229a938fec"},
+    {file = "ruff-0.2.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c92db7101ef5bfc18e96777ed7bc7c822d545fa5977e90a585accac43d22f18a"},
+    {file = "ruff-0.2.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:13471684694d41ae0f1e8e3a7497e14cd57ccb7dd72ae08d56a159d6c9c3e30e"},
+    {file = "ruff-0.2.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a11567e20ea39d1f51aebd778685582d4c56ccb082c1161ffc10f79bebe6df35"},
+    {file = "ruff-0.2.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:00a818e2db63659570403e44383ab03c529c2b9678ba4ba6c105af7854008105"},
+    {file = "ruff-0.2.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be60592f9d218b52f03384d1325efa9d3b41e4c4d55ea022cd548547cc42cd2b"},
+    {file = "ruff-0.2.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fbd2288890b88e8aab4499e55148805b58ec711053588cc2f0196a44f6e3d855"},
+    {file = "ruff-0.2.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3ef052283da7dec1987bba8d8733051c2325654641dfe5877a4022108098683"},
+    {file = "ruff-0.2.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:7022d66366d6fded4ba3889f73cd791c2d5621b2ccf34befc752cb0df70f5fad"},
+    {file = "ruff-0.2.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:0a725823cb2a3f08ee743a534cb6935727d9e47409e4ad72c10a3faf042ad5ba"},
+    {file = "ruff-0.2.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:0034d5b6323e6e8fe91b2a1e55b02d92d0b582d2953a2b37a67a2d7dedbb7acc"},
+    {file = "ruff-0.2.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:e5cb5526d69bb9143c2e4d2a115d08ffca3d8e0fddc84925a7b54931c96f5c02"},
+    {file = "ruff-0.2.1-py3-none-win32.whl", hash = "sha256:6b95ac9ce49b4fb390634d46d6ece32ace3acdd52814671ccaf20b7f60adb232"},
+    {file = "ruff-0.2.1-py3-none-win_amd64.whl", hash = "sha256:e3affdcbc2afb6f5bd0eb3130139ceedc5e3f28d206fe49f63073cb9e65988e0"},
+    {file = "ruff-0.2.1-py3-none-win_arm64.whl", hash = "sha256:efababa8e12330aa94a53e90a81eb6e2d55f348bc2e71adbf17d9cad23c03ee6"},
+    {file = "ruff-0.2.1.tar.gz", hash = "sha256:3b42b5d8677cd0c72b99fcaf068ffc62abb5a19e71b4a3b9cfa50658a0af02f1"},
 ]
 
 [[package]]
@@ -3096,121 +3096,121 @@ all = ["defusedxml", "fsspec", "imagecodecs (>=2023.8.12)", "lxml", "matplotlib"
 
 [[package]]
 name = "tokenizers"
-version = "0.15.2"
+version = "0.15.1"
 description = ""
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tokenizers-0.15.2-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:52f6130c9cbf70544287575a985bf44ae1bda2da7e8c24e97716080593638012"},
-    {file = "tokenizers-0.15.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:054c1cc9c6d68f7ffa4e810b3d5131e0ba511b6e4be34157aa08ee54c2f8d9ee"},
-    {file = "tokenizers-0.15.2-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a9b9b070fdad06e347563b88c278995735292ded1132f8657084989a4c84a6d5"},
-    {file = "tokenizers-0.15.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea621a7eef4b70e1f7a4e84dd989ae3f0eeb50fc8690254eacc08acb623e82f1"},
-    {file = "tokenizers-0.15.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cf7fd9a5141634fa3aa8d6b7be362e6ae1b4cda60da81388fa533e0b552c98fd"},
-    {file = "tokenizers-0.15.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:44f2a832cd0825295f7179eaf173381dc45230f9227ec4b44378322d900447c9"},
-    {file = "tokenizers-0.15.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8b9ec69247a23747669ec4b0ca10f8e3dfb3545d550258129bd62291aabe8605"},
-    {file = "tokenizers-0.15.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40b6a4c78da863ff26dbd5ad9a8ecc33d8a8d97b535172601cf00aee9d7ce9ce"},
-    {file = "tokenizers-0.15.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5ab2a4d21dcf76af60e05af8063138849eb1d6553a0d059f6534357bce8ba364"},
-    {file = "tokenizers-0.15.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a47acfac7e511f6bbfcf2d3fb8c26979c780a91e06fb5b9a43831b2c0153d024"},
-    {file = "tokenizers-0.15.2-cp310-none-win32.whl", hash = "sha256:064ff87bb6acdbd693666de9a4b692add41308a2c0ec0770d6385737117215f2"},
-    {file = "tokenizers-0.15.2-cp310-none-win_amd64.whl", hash = "sha256:3b919afe4df7eb6ac7cafd2bd14fb507d3f408db7a68c43117f579c984a73843"},
-    {file = "tokenizers-0.15.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:89cd1cb93e4b12ff39bb2d626ad77e35209de9309a71e4d3d4672667b4b256e7"},
-    {file = "tokenizers-0.15.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:cfed5c64e5be23d7ee0f0e98081a25c2a46b0b77ce99a4f0605b1ec43dd481fa"},
-    {file = "tokenizers-0.15.2-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a907d76dcfda37023ba203ab4ceeb21bc5683436ebefbd895a0841fd52f6f6f2"},
-    {file = "tokenizers-0.15.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20ea60479de6fc7b8ae756b4b097572372d7e4032e2521c1bbf3d90c90a99ff0"},
-    {file = "tokenizers-0.15.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:48e2b9335be2bc0171df9281385c2ed06a15f5cf121c44094338306ab7b33f2c"},
-    {file = "tokenizers-0.15.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:112a1dd436d2cc06e6ffdc0b06d55ac019a35a63afd26475205cb4b1bf0bfbff"},
-    {file = "tokenizers-0.15.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4620cca5c2817177ee8706f860364cc3a8845bc1e291aaf661fb899e5d1c45b0"},
-    {file = "tokenizers-0.15.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ccd73a82751c523b3fc31ff8194702e4af4db21dc20e55b30ecc2079c5d43cb7"},
-    {file = "tokenizers-0.15.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:107089f135b4ae7817affe6264f8c7a5c5b4fd9a90f9439ed495f54fcea56fb4"},
-    {file = "tokenizers-0.15.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0ff110ecc57b7aa4a594396525a3451ad70988e517237fe91c540997c4e50e29"},
-    {file = "tokenizers-0.15.2-cp311-none-win32.whl", hash = "sha256:6d76f00f5c32da36c61f41c58346a4fa7f0a61be02f4301fd30ad59834977cc3"},
-    {file = "tokenizers-0.15.2-cp311-none-win_amd64.whl", hash = "sha256:cc90102ed17271cf0a1262babe5939e0134b3890345d11a19c3145184b706055"},
-    {file = "tokenizers-0.15.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f86593c18d2e6248e72fb91c77d413a815153b8ea4e31f7cd443bdf28e467670"},
-    {file = "tokenizers-0.15.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0774bccc6608eca23eb9d620196687c8b2360624619623cf4ba9dc9bd53e8b51"},
-    {file = "tokenizers-0.15.2-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d0222c5b7c9b26c0b4822a82f6a7011de0a9d3060e1da176f66274b70f846b98"},
-    {file = "tokenizers-0.15.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3835738be1de66624fff2f4f6f6684775da4e9c00bde053be7564cbf3545cc66"},
-    {file = "tokenizers-0.15.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0143e7d9dcd811855c1ce1ab9bf5d96d29bf5e528fd6c7824d0465741e8c10fd"},
-    {file = "tokenizers-0.15.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db35825f6d54215f6b6009a7ff3eedee0848c99a6271c870d2826fbbedf31a38"},
-    {file = "tokenizers-0.15.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3f5e64b0389a2be47091d8cc53c87859783b837ea1a06edd9d8e04004df55a5c"},
-    {file = "tokenizers-0.15.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e0480c452217edd35eca56fafe2029fb4d368b7c0475f8dfa3c5c9c400a7456"},
-    {file = "tokenizers-0.15.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:a33ab881c8fe70474980577e033d0bc9a27b7ab8272896e500708b212995d834"},
-    {file = "tokenizers-0.15.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a308a607ca9de2c64c1b9ba79ec9a403969715a1b8ba5f998a676826f1a7039d"},
-    {file = "tokenizers-0.15.2-cp312-none-win32.whl", hash = "sha256:b8fcfa81bcb9447df582c5bc96a031e6df4da2a774b8080d4f02c0c16b42be0b"},
-    {file = "tokenizers-0.15.2-cp312-none-win_amd64.whl", hash = "sha256:38d7ab43c6825abfc0b661d95f39c7f8af2449364f01d331f3b51c94dcff7221"},
-    {file = "tokenizers-0.15.2-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:38bfb0204ff3246ca4d5e726e8cc8403bfc931090151e6eede54d0e0cf162ef0"},
-    {file = "tokenizers-0.15.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:9c861d35e8286a53e06e9e28d030b5a05bcbf5ac9d7229e561e53c352a85b1fc"},
-    {file = "tokenizers-0.15.2-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:936bf3842db5b2048eaa53dade907b1160f318e7c90c74bfab86f1e47720bdd6"},
-    {file = "tokenizers-0.15.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:620beacc3373277700d0e27718aa8b25f7b383eb8001fba94ee00aeea1459d89"},
-    {file = "tokenizers-0.15.2-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:2735ecbbf37e52db4ea970e539fd2d450d213517b77745114f92867f3fc246eb"},
-    {file = "tokenizers-0.15.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:473c83c5e2359bb81b0b6fde870b41b2764fcdd36d997485e07e72cc3a62264a"},
-    {file = "tokenizers-0.15.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:968fa1fb3c27398b28a4eca1cbd1e19355c4d3a6007f7398d48826bbe3a0f728"},
-    {file = "tokenizers-0.15.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:865c60ae6eaebdde7da66191ee9b7db52e542ed8ee9d2c653b6d190a9351b980"},
-    {file = "tokenizers-0.15.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7c0d8b52664ab2d4a8d6686eb5effc68b78608a9008f086a122a7b2996befbab"},
-    {file = "tokenizers-0.15.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:f33dfbdec3784093a9aebb3680d1f91336c56d86cc70ddf88708251da1fe9064"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-macosx_10_12_x86_64.whl", hash = "sha256:d44ba80988ff9424e33e0a49445072ac7029d8c0e1601ad25a0ca5f41ed0c1d6"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:dce74266919b892f82b1b86025a613956ea0ea62a4843d4c4237be2c5498ed3a"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0ef06b9707baeb98b316577acb04f4852239d856b93e9ec3a299622f6084e4be"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c73e2e74bbb07910da0d37c326869f34113137b23eadad3fc00856e6b3d9930c"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4eeb12daf02a59e29f578a865f55d87cd103ce62bd8a3a5874f8fdeaa82e336b"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9ba9f6895af58487ca4f54e8a664a322f16c26bbb442effd01087eba391a719e"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ccec77aa7150e38eec6878a493bf8c263ff1fa8a62404e16c6203c64c1f16a26"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3f40604f5042ff210ba82743dda2b6aa3e55aa12df4e9f2378ee01a17e2855e"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:5645938a42d78c4885086767c70923abad047163d809c16da75d6b290cb30bbe"},
-    {file = "tokenizers-0.15.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:05a77cbfebe28a61ab5c3891f9939cc24798b63fa236d84e5f29f3a85a200c00"},
-    {file = "tokenizers-0.15.2-cp37-none-win32.whl", hash = "sha256:361abdc068e8afe9c5b818769a48624687fb6aaed49636ee39bec4e95e1a215b"},
-    {file = "tokenizers-0.15.2-cp37-none-win_amd64.whl", hash = "sha256:7ef789f83eb0f9baeb4d09a86cd639c0a5518528f9992f38b28e819df397eb06"},
-    {file = "tokenizers-0.15.2-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:4fe1f74a902bee74a3b25aff180fbfbf4f8b444ab37c4d496af7afd13a784ed2"},
-    {file = "tokenizers-0.15.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c4b89038a684f40a6b15d6b09f49650ac64d951ad0f2a3ea9169687bbf2a8ba"},
-    {file = "tokenizers-0.15.2-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d05a1b06f986d41aed5f2de464c003004b2df8aaf66f2b7628254bcbfb72a438"},
-    {file = "tokenizers-0.15.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:508711a108684111ec8af89d3a9e9e08755247eda27d0ba5e3c50e9da1600f6d"},
-    {file = "tokenizers-0.15.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:daa348f02d15160cb35439098ac96e3a53bacf35885072611cd9e5be7d333daa"},
-    {file = "tokenizers-0.15.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:494fdbe5932d3416de2a85fc2470b797e6f3226c12845cadf054dd906afd0442"},
-    {file = "tokenizers-0.15.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c2d60f5246f4da9373f75ff18d64c69cbf60c3bca597290cea01059c336d2470"},
-    {file = "tokenizers-0.15.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:93268e788825f52de4c7bdcb6ebc1fcd4a5442c02e730faa9b6b08f23ead0e24"},
-    {file = "tokenizers-0.15.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6fc7083ab404019fc9acafe78662c192673c1e696bd598d16dc005bd663a5cf9"},
-    {file = "tokenizers-0.15.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:41e39b41e5531d6b2122a77532dbea60e171ef87a3820b5a3888daa847df4153"},
-    {file = "tokenizers-0.15.2-cp38-none-win32.whl", hash = "sha256:06cd0487b1cbfabefb2cc52fbd6b1f8d4c37799bd6c6e1641281adaa6b2504a7"},
-    {file = "tokenizers-0.15.2-cp38-none-win_amd64.whl", hash = "sha256:5179c271aa5de9c71712e31cb5a79e436ecd0d7532a408fa42a8dbfa4bc23fd9"},
-    {file = "tokenizers-0.15.2-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:82f8652a74cc107052328b87ea8b34291c0f55b96d8fb261b3880216a9f9e48e"},
-    {file = "tokenizers-0.15.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:02458bee6f5f3139f1ebbb6d042b283af712c0981f5bc50edf771d6b762d5e4f"},
-    {file = "tokenizers-0.15.2-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c9a09cd26cca2e1c349f91aa665309ddb48d71636370749414fbf67bc83c5343"},
-    {file = "tokenizers-0.15.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:158be8ea8554e5ed69acc1ce3fbb23a06060bd4bbb09029431ad6b9a466a7121"},
-    {file = "tokenizers-0.15.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1ddba9a2b0c8c81633eca0bb2e1aa5b3a15362b1277f1ae64176d0f6eba78ab1"},
-    {file = "tokenizers-0.15.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3ef5dd1d39797044642dbe53eb2bc56435308432e9c7907728da74c69ee2adca"},
-    {file = "tokenizers-0.15.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:454c203164e07a860dbeb3b1f4a733be52b0edbb4dd2e5bd75023ffa8b49403a"},
-    {file = "tokenizers-0.15.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cf6b7f1d4dc59af960e6ffdc4faffe6460bbfa8dce27a58bf75755ffdb2526d"},
-    {file = "tokenizers-0.15.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2ef09bbc16519f6c25d0c7fc0c6a33a6f62923e263c9d7cca4e58b8c61572afb"},
-    {file = "tokenizers-0.15.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c9a2ebdd2ad4ec7a68e7615086e633857c85e2f18025bd05d2a4399e6c5f7169"},
-    {file = "tokenizers-0.15.2-cp39-none-win32.whl", hash = "sha256:918fbb0eab96fe08e72a8c2b5461e9cce95585d82a58688e7f01c2bd546c79d0"},
-    {file = "tokenizers-0.15.2-cp39-none-win_amd64.whl", hash = "sha256:524e60da0135e106b254bd71f0659be9f89d83f006ea9093ce4d1fab498c6d0d"},
-    {file = "tokenizers-0.15.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:6a9b648a58281c4672212fab04e60648fde574877d0139cd4b4f93fe28ca8944"},
-    {file = "tokenizers-0.15.2-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:7c7d18b733be6bbca8a55084027f7be428c947ddf871c500ee603e375013ffba"},
-    {file = "tokenizers-0.15.2-pp310-pypy310_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:13ca3611de8d9ddfbc4dc39ef54ab1d2d4aaa114ac8727dfdc6a6ec4be017378"},
-    {file = "tokenizers-0.15.2-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:237d1bf3361cf2e6463e6c140628e6406766e8b27274f5fcc62c747ae3c6f094"},
-    {file = "tokenizers-0.15.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67a0fe1e49e60c664915e9fb6b0cb19bac082ab1f309188230e4b2920230edb3"},
-    {file = "tokenizers-0.15.2-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4e022fe65e99230b8fd89ebdfea138c24421f91c1a4f4781a8f5016fd5cdfb4d"},
-    {file = "tokenizers-0.15.2-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:d857be2df69763362ac699f8b251a8cd3fac9d21893de129bc788f8baaef2693"},
-    {file = "tokenizers-0.15.2-pp37-pypy37_pp73-macosx_10_12_x86_64.whl", hash = "sha256:708bb3e4283177236309e698da5fcd0879ce8fd37457d7c266d16b550bcbbd18"},
-    {file = "tokenizers-0.15.2-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:64c35e09e9899b72a76e762f9854e8750213f67567787d45f37ce06daf57ca78"},
-    {file = "tokenizers-0.15.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c1257f4394be0d3b00de8c9e840ca5601d0a4a8438361ce9c2b05c7d25f6057b"},
-    {file = "tokenizers-0.15.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:02272fe48280e0293a04245ca5d919b2c94a48b408b55e858feae9618138aeda"},
-    {file = "tokenizers-0.15.2-pp37-pypy37_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:dc3ad9ebc76eabe8b1d7c04d38be884b8f9d60c0cdc09b0aa4e3bcf746de0388"},
-    {file = "tokenizers-0.15.2-pp37-pypy37_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:32e16bdeffa7c4f46bf2152172ca511808b952701d13e7c18833c0b73cb5c23f"},
-    {file = "tokenizers-0.15.2-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:fb16ba563d59003028b678d2361a27f7e4ae0ab29c7a80690efa20d829c81fdb"},
-    {file = "tokenizers-0.15.2-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:2277c36d2d6cdb7876c274547921a42425b6810d38354327dd65a8009acf870c"},
-    {file = "tokenizers-0.15.2-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1cf75d32e8d250781940d07f7eece253f2fe9ecdb1dc7ba6e3833fa17b82fcbc"},
-    {file = "tokenizers-0.15.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f1b3b31884dc8e9b21508bb76da80ebf7308fdb947a17affce815665d5c4d028"},
-    {file = "tokenizers-0.15.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b10122d8d8e30afb43bb1fe21a3619f62c3e2574bff2699cf8af8b0b6c5dc4a3"},
-    {file = "tokenizers-0.15.2-pp38-pypy38_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d88b96ff0fe8e91f6ef01ba50b0d71db5017fa4e3b1d99681cec89a85faf7bf7"},
-    {file = "tokenizers-0.15.2-pp38-pypy38_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:37aaec5a52e959892870a7c47cef80c53797c0db9149d458460f4f31e2fb250e"},
-    {file = "tokenizers-0.15.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e2ea752f2b0fe96eb6e2f3adbbf4d72aaa1272079b0dfa1145507bd6a5d537e6"},
-    {file = "tokenizers-0.15.2-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:4b19a808d8799fda23504a5cd31d2f58e6f52f140380082b352f877017d6342b"},
-    {file = "tokenizers-0.15.2-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:64c86e5e068ac8b19204419ed8ca90f9d25db20578f5881e337d203b314f4104"},
-    {file = "tokenizers-0.15.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de19c4dc503c612847edf833c82e9f73cd79926a384af9d801dcf93f110cea4e"},
-    {file = "tokenizers-0.15.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ea09acd2fe3324174063d61ad620dec3bcf042b495515f27f638270a7d466e8b"},
-    {file = "tokenizers-0.15.2-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:cf27fd43472e07b57cf420eee1e814549203d56de00b5af8659cb99885472f1f"},
-    {file = "tokenizers-0.15.2-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:7ca22bd897537a0080521445d91a58886c8c04084a6a19e6c78c586e0cfa92a5"},
-    {file = "tokenizers-0.15.2.tar.gz", hash = "sha256:e6e9c6e019dd5484be5beafc775ae6c925f4c69a3487040ed09b45e13df2cb91"},
+    {file = "tokenizers-0.15.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:32c9491dd1bcb33172c26b454dbd607276af959b9e78fa766e2694cafab3103c"},
+    {file = "tokenizers-0.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:29a1b784b870a097e7768f8c20c2dd851e2c75dad3efdae69a79d3e7f1d614d5"},
+    {file = "tokenizers-0.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0049fbe648af04148b08cb211994ce8365ee628ce49724b56aaefd09a3007a78"},
+    {file = "tokenizers-0.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e84b3c235219e75e24de6b71e6073cd2c8d740b14d88e4c6d131b90134e3a338"},
+    {file = "tokenizers-0.15.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8cc575769ea11d074308c6d71cb10b036cdaec941562c07fc7431d956c502f0e"},
+    {file = "tokenizers-0.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:22bf28f299c4158e6d0b5eaebddfd500c4973d947ffeaca8bcbe2e8c137dff0b"},
+    {file = "tokenizers-0.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:506555f98361db9c74e1323a862d77dcd7d64c2058829a368bf4159d986e339f"},
+    {file = "tokenizers-0.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7061b0a28ade15906f5b2ec8c48d3bdd6e24eca6b427979af34954fbe31d5cef"},
+    {file = "tokenizers-0.15.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7ed5e35507b7a0e2aac3285c4f5e37d4ec5cfc0e5825b862b68a0aaf2757af52"},
+    {file = "tokenizers-0.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1c9df9247df0de6509dd751b1c086e5f124b220133b5c883bb691cb6fb3d786f"},
+    {file = "tokenizers-0.15.1-cp310-none-win32.whl", hash = "sha256:dd999af1b4848bef1b11d289f04edaf189c269d5e6afa7a95fa1058644c3f021"},
+    {file = "tokenizers-0.15.1-cp310-none-win_amd64.whl", hash = "sha256:39d06a57f7c06940d602fad98702cf7024c4eee7f6b9fe76b9f2197d5a4cc7e2"},
+    {file = "tokenizers-0.15.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:8ad034eb48bf728af06915e9294871f72fcc5254911eddec81d6df8dba1ce055"},
+    {file = "tokenizers-0.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea9ede7c42f8fa90f31bfc40376fd91a7d83a4aa6ad38e6076de961d48585b26"},
+    {file = "tokenizers-0.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b85d6fe1a20d903877aa0ef32ef6b96e81e0e48b71c206d6046ce16094de6970"},
+    {file = "tokenizers-0.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a7d44f656320137c7d643b9c7dcc1814763385de737fb98fd2643880910f597"},
+    {file = "tokenizers-0.15.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bd244bd0793cdacf27ee65ec3db88c21f5815460e8872bbeb32b040469d6774e"},
+    {file = "tokenizers-0.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0f3f4a36e371b3cb1123adac8aeeeeab207ad32f15ed686d9d71686a093bb140"},
+    {file = "tokenizers-0.15.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c2921a53966afb29444da98d56a6ccbef23feb3b0c0f294b4e502370a0a64f25"},
+    {file = "tokenizers-0.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f49068cf51f49c231067f1a8c9fc075ff960573f6b2a956e8e1b0154fb638ea5"},
+    {file = "tokenizers-0.15.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0ab1a22f20eaaab832ab3b00a0709ca44a0eb04721e580277579411b622c741c"},
+    {file = "tokenizers-0.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:671268f24b607c4adc6fa2b5b580fd4211b9f84b16bd7f46d62f8e5be0aa7ba4"},
+    {file = "tokenizers-0.15.1-cp311-none-win32.whl", hash = "sha256:a4f03e33d2bf7df39c8894032aba599bf90f6f6378e683a19d28871f09bb07fc"},
+    {file = "tokenizers-0.15.1-cp311-none-win_amd64.whl", hash = "sha256:30f689537bcc7576d8bd4daeeaa2cb8f36446ba2f13f421b173e88f2d8289c4e"},
+    {file = "tokenizers-0.15.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:0f3a379dd0898a82ea3125e8f9c481373f73bffce6430d4315f0b6cd5547e409"},
+    {file = "tokenizers-0.15.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7d870ae58bba347d38ac3fc8b1f662f51e9c95272d776dd89f30035c83ee0a4f"},
+    {file = "tokenizers-0.15.1-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d6d28e0143ec2e253a8a39e94bf1d24776dbe73804fa748675dbffff4a5cd6d8"},
+    {file = "tokenizers-0.15.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:61ae9ac9f44e2da128ee35db69489883b522f7abe033733fa54eb2de30dac23d"},
+    {file = "tokenizers-0.15.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d8e322a47e29128300b3f7749a03c0ec2bce0a3dc8539ebff738d3f59e233542"},
+    {file = "tokenizers-0.15.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:760334f475443bc13907b1a8e1cb0aeaf88aae489062546f9704dce6c498bfe2"},
+    {file = "tokenizers-0.15.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1b173753d4aca1e7d0d4cb52b5e3ffecfb0ca014e070e40391b6bb4c1d6af3f2"},
+    {file = "tokenizers-0.15.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82c1f13d457c8f0ab17e32e787d03470067fe8a3b4d012e7cc57cb3264529f4a"},
+    {file = "tokenizers-0.15.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:425b46ceff4505f20191df54b50ac818055d9d55023d58ae32a5d895b6f15bb0"},
+    {file = "tokenizers-0.15.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:681ac6ba3b4fdaf868ead8971221a061f580961c386e9732ea54d46c7b72f286"},
+    {file = "tokenizers-0.15.1-cp312-none-win32.whl", hash = "sha256:f2272656063ccfba2044df2115095223960d80525d208e7a32f6c01c351a6f4a"},
+    {file = "tokenizers-0.15.1-cp312-none-win_amd64.whl", hash = "sha256:9abe103203b1c6a2435d248d5ff4cceebcf46771bfbc4957a98a74da6ed37674"},
+    {file = "tokenizers-0.15.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:2ce9ed5c8ef26b026a66110e3c7b73d93ec2d26a0b1d0ea55ddce61c0e5f446f"},
+    {file = "tokenizers-0.15.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:89b24d366137986c3647baac29ef902d2d5445003d11c30df52f1bd304689aeb"},
+    {file = "tokenizers-0.15.1-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0faebedd01b413ab777ca0ee85914ed8b031ea5762ab0ea60b707ce8b9be6842"},
+    {file = "tokenizers-0.15.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cdbd9dfcdad4f3b95d801f768e143165165055c18e44ca79a8a26de889cd8e85"},
+    {file = "tokenizers-0.15.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:97194324c12565b07e9993ca9aa813b939541185682e859fb45bb8d7d99b3193"},
+    {file = "tokenizers-0.15.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:485e43e2cc159580e0d83fc919ec3a45ae279097f634b1ffe371869ffda5802c"},
+    {file = "tokenizers-0.15.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:191d084d60e3589d6420caeb3f9966168269315f8ec7fbc3883122dc9d99759d"},
+    {file = "tokenizers-0.15.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01c28cc8d7220634a75b14c53f4fc9d1b485f99a5a29306a999c115921de2897"},
+    {file = "tokenizers-0.15.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:325212027745d3f8d5d5006bb9e5409d674eb80a184f19873f4f83494e1fdd26"},
+    {file = "tokenizers-0.15.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:3c5573603c36ce12dbe318bcfb490a94cad2d250f34deb2f06cb6937957bbb71"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-macosx_10_12_x86_64.whl", hash = "sha256:1441161adb6d71a15a630d5c1d8659d5ebe41b6b209586fbeea64738e58fcbb2"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:382a8d0c31afcfb86571afbfefa37186df90865ce3f5b731842dab4460e53a38"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:e76959783e3f4ec73b3f3d24d4eec5aa9225f0bee565c48e77f806ed1e048f12"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:401df223e5eb927c5961a0fc6b171818a2bba01fb36ef18c3e1b69b8cd80e591"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c52606c233c759561a16e81b2290a7738c3affac7a0b1f0a16fe58dc22e04c7d"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b72c658bbe5a05ed8bc2ac5ad782385bfd743ffa4bc87d9b5026341e709c6f44"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:25f5643a2f005c42f0737a326c6c6bdfedfdc9a994b10a1923d9c3e792e4d6a6"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c5b6f633999d6b42466bbfe21be2e26ad1760b6f106967a591a41d8cbca980e"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ceb5c9ad11a015150b545c1a11210966a45b8c3d68a942e57cf8938c578a77ca"},
+    {file = "tokenizers-0.15.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bedd4ce0c4872db193444c395b11c7697260ce86a635ab6d48102d76be07d324"},
+    {file = "tokenizers-0.15.1-cp37-none-win32.whl", hash = "sha256:cd6caef6c14f5ed6d35f0ddb78eab8ca6306d0cd9870330bccff72ad014a6f42"},
+    {file = "tokenizers-0.15.1-cp37-none-win_amd64.whl", hash = "sha256:d2bd7af78f58d75a55e5df61efae164ab9200c04b76025f9cc6eeb7aff3219c2"},
+    {file = "tokenizers-0.15.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:59b3ca6c02e0bd5704caee274978bd055de2dff2e2f39dadf536c21032dfd432"},
+    {file = "tokenizers-0.15.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:48fe21b67c22583bed71933a025fd66b1f5cfae1baefa423c3d40379b5a6e74e"},
+    {file = "tokenizers-0.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:3d190254c66a20fb1efbdf035e6333c5e1f1c73b1f7bfad88f9c31908ac2c2c4"},
+    {file = "tokenizers-0.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fef90c8f5abf17d48d6635f5fd92ad258acd1d0c2d920935c8bf261782cfe7c8"},
+    {file = "tokenizers-0.15.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fac011ef7da3357aa7eb19efeecf3d201ede9618f37ddedddc5eb809ea0963ca"},
+    {file = "tokenizers-0.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:574ec5b3e71d1feda6b0ecac0e0445875729b4899806efbe2b329909ec75cb50"},
+    {file = "tokenizers-0.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:aca16c3c0637c051a59ea99c4253f16fbb43034fac849076a7e7913b2b9afd2d"},
+    {file = "tokenizers-0.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a6f238fc2bbfd3e12e8529980ec1624c7e5b69d4e959edb3d902f36974f725a"},
+    {file = "tokenizers-0.15.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:587e11a26835b73c31867a728f32ca8a93c9ded4a6cd746516e68b9d51418431"},
+    {file = "tokenizers-0.15.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6456e7ad397352775e2efdf68a9ec5d6524bbc4543e926eef428d36de627aed4"},
+    {file = "tokenizers-0.15.1-cp38-none-win32.whl", hash = "sha256:614f0da7dd73293214bd143e6221cafd3f7790d06b799f33a987e29d057ca658"},
+    {file = "tokenizers-0.15.1-cp38-none-win_amd64.whl", hash = "sha256:a4fa0a20d9f69cc2bf1cfce41aa40588598e77ec1d6f56bf0eb99769969d1ede"},
+    {file = "tokenizers-0.15.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:8d3f18a45e0cf03ce193d5900460dc2430eec4e14c786e5d79bddba7ea19034f"},
+    {file = "tokenizers-0.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:38dbd6c38f88ad7d5dc5d70c764415d38fe3bcd99dc81638b572d093abc54170"},
+    {file = "tokenizers-0.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:777286b1f7e52de92aa4af49fe31046cfd32885d1bbaae918fab3bba52794c33"},
+    {file = "tokenizers-0.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:58d4d550a3862a47dd249892d03a025e32286eb73cbd6bc887fb8fb64bc97165"},
+    {file = "tokenizers-0.15.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4eda68ce0344f35042ae89220b40a0007f721776b727806b5c95497b35714bb7"},
+    {file = "tokenizers-0.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0cd33d15f7a3a784c3b665cfe807b8de3c6779e060349bd5005bb4ae5bdcb437"},
+    {file = "tokenizers-0.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0a1aa370f978ac0bfb50374c3a40daa93fd56d47c0c70f0c79607fdac2ccbb42"},
+    {file = "tokenizers-0.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:241482b940340fff26a2708cb9ba383a5bb8a2996d67a0ff2c4367bf4b86cc3a"},
+    {file = "tokenizers-0.15.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:68f30b05f46a4d9aba88489eadd021904afe90e10a7950e28370d6e71b9db021"},
+    {file = "tokenizers-0.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5a3c5d8025529670462b881b7b2527aacb6257398c9ec8e170070432c3ae3a82"},
+    {file = "tokenizers-0.15.1-cp39-none-win32.whl", hash = "sha256:74d1827830f60a9d78da8f6d49a1fbea5422ce0eea42e2617877d23380a7efbc"},
+    {file = "tokenizers-0.15.1-cp39-none-win_amd64.whl", hash = "sha256:9ff499923e4d6876d6b6a63ea84a56805eb35e91dd89b933a7aee0c56a3838c6"},
+    {file = "tokenizers-0.15.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:b3aa007a0f4408f62a8471bdaa3faccad644cbf2622639f2906b4f9b5339e8b8"},
+    {file = "tokenizers-0.15.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:f3d4176fa93d8b2070db8f3c70dc21106ae6624fcaaa334be6bdd3a0251e729e"},
+    {file = "tokenizers-0.15.1-pp310-pypy310_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1d0e463655ef8b2064df07bd4a445ed7f76f6da3b286b4590812587d42f80e89"},
+    {file = "tokenizers-0.15.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:089138fd0351b62215c462a501bd68b8df0e213edcf99ab9efd5dba7b4cb733e"},
+    {file = "tokenizers-0.15.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e563ac628f5175ed08e950430e2580e544b3e4b606a0995bb6b52b3a3165728"},
+    {file = "tokenizers-0.15.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:244dcc28c5fde221cb4373961b20da30097669005b122384d7f9f22752487a46"},
+    {file = "tokenizers-0.15.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:d82951d46052dddae1369e68ff799a0e6e29befa9a0b46e387ae710fd4daefb0"},
+    {file = "tokenizers-0.15.1-pp37-pypy37_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7b14296bc9059849246ceb256ffbe97f8806a9b5d707e0095c22db312f4fc014"},
+    {file = "tokenizers-0.15.1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0309357bb9b6c8d86cdf456053479d7112074b470651a997a058cd7ad1c4ea57"},
+    {file = "tokenizers-0.15.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:083f06e9d8d01b70b67bcbcb7751b38b6005512cce95808be6bf34803534a7e7"},
+    {file = "tokenizers-0.15.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85288aea86ada579789447f0dcec108ebef8da4b450037eb4813d83e4da9371e"},
+    {file = "tokenizers-0.15.1-pp37-pypy37_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:385e6fcb01e8de90c1d157ae2a5338b23368d0b1c4cc25088cdca90147e35d17"},
+    {file = "tokenizers-0.15.1-pp37-pypy37_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:60067edfcbf7d6cd448ac47af41ec6e84377efbef7be0c06f15a7c1dd069e044"},
+    {file = "tokenizers-0.15.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5f7e37f89acfe237d4eaf93c3b69b0f01f407a7a5d0b5a8f06ba91943ea3cf10"},
+    {file = "tokenizers-0.15.1-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:6a63a15b523d42ebc1f4028e5a568013388c2aefa4053a263e511cb10aaa02f1"},
+    {file = "tokenizers-0.15.1-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2417d9e4958a6c2fbecc34c27269e74561c55d8823bf914b422e261a11fdd5fd"},
+    {file = "tokenizers-0.15.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8550974bace6210e41ab04231e06408cf99ea4279e0862c02b8d47e7c2b2828"},
+    {file = "tokenizers-0.15.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:194ba82129b171bcd29235a969e5859a93e491e9b0f8b2581f500f200c85cfdd"},
+    {file = "tokenizers-0.15.1-pp38-pypy38_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:1bfd95eef8b01e6c0805dbccc8eaf41d8c5a84f0cce72c0ab149fe76aae0bce6"},
+    {file = "tokenizers-0.15.1-pp38-pypy38_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:b87a15dd72f8216b03c151e3dace00c75c3fe7b0ee9643c25943f31e582f1a34"},
+    {file = "tokenizers-0.15.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:6ac22f358a0c2a6c685be49136ce7ea7054108986ad444f567712cf274b34cd8"},
+    {file = "tokenizers-0.15.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:1e9d1f046a9b9d9a95faa103f07db5921d2c1c50f0329ebba4359350ee02b18b"},
+    {file = "tokenizers-0.15.1-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a0fd30a4b74485f6a7af89fffb5fb84d6d5f649b3e74f8d37f624cc9e9e97cf"},
+    {file = "tokenizers-0.15.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:80e45dc206b9447fa48795a1247c69a1732d890b53e2cc51ba42bc2fefa22407"},
+    {file = "tokenizers-0.15.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4eaff56ef3e218017fa1d72007184401f04cb3a289990d2b6a0a76ce71c95f96"},
+    {file = "tokenizers-0.15.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:b41dc107e4a4e9c95934e79b025228bbdda37d9b153d8b084160e88d5e48ad6f"},
+    {file = "tokenizers-0.15.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:1922b8582d0c33488764bcf32e80ef6054f515369e70092729c928aae2284bc2"},
+    {file = "tokenizers-0.15.1.tar.gz", hash = "sha256:c0a331d6d5a3d6e97b7f99f562cee8d56797180797bc55f12070e495e717c980"},
 ]
 
 [package.dependencies]
@@ -3281,13 +3281,13 @@ zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "uvicorn"
-version = "0.27.1"
+version = "0.27.0.post1"
 description = "The lightning-fast ASGI server."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "uvicorn-0.27.1-py3-none-any.whl", hash = "sha256:5c89da2f3895767472a35556e539fd59f7edbe9b1e9c0e1c99eebeadc61838e4"},
-    {file = "uvicorn-0.27.1.tar.gz", hash = "sha256:3d9a267296243532db80c83a959a3400502165ade2c1338dea4e67915fd4745a"},
+    {file = "uvicorn-0.27.0.post1-py3-none-any.whl", hash = "sha256:4b85ba02b8a20429b9b205d015cbeb788a12da527f731811b643fd739ef90d5f"},
+    {file = "uvicorn-0.27.0.post1.tar.gz", hash = "sha256:54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907"},
 ]
 
 [package.dependencies]

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.96.0"
+version = "1.94.1"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"
@@ -82,10 +82,10 @@ warn_untyped_fields = true
 [tool.ruff]
 line-length = 120
 target-version = "py311"
-
-[tool.ruff.lint]
 select = ["E", "F", "I"]
-per-file-ignores = { "test_main.py" = ["F403"] }
+
+[tool.ruff.per-file-ignores]
+"test_main.py" = ["F403"]
 
 [tool.black]
 line-length = 120

machine-learning/start.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
 
-lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
-export LD_PRELOAD="$lib_path"
+export LD_PRELOAD="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
 export LD_BIND_NOW=1
 
 : "${MACHINE_LEARNING_HOST:=0.0.0.0}"
@@ -11,8 +10,8 @@ export LD_BIND_NOW=1
 
 gunicorn app.main:app \
 	-k app.config.CustomUvicornWorker \
-	-w "$MACHINE_LEARNING_WORKERS" \
-	-b "$MACHINE_LEARNING_HOST":"$MACHINE_LEARNING_PORT" \
-	-t "$MACHINE_LEARNING_WORKER_TIMEOUT" \
+	-w $MACHINE_LEARNING_WORKERS \
+	-b $MACHINE_LEARNING_HOST:$MACHINE_LEARNING_PORT \
+	-t $MACHINE_LEARNING_WORKER_TIMEOUT \
 	--log-config-json log_conf.json \
 	--graceful-timeout 0

misc/release/pump-version.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#/bin/bash
 
 #
 # Pump one or both of the server/mobile versions in appropriate files
@@ -25,10 +25,10 @@ while getopts 's:m:' flag; do
   esac
 done
 
-CURRENT_SERVER=$(jq -r '.version' server/package.json)
-MAJOR=$(echo "$CURRENT_SERVER" | cut -d '.' -f1)
-MINOR=$(echo "$CURRENT_SERVER" | cut -d '.' -f2)
-PATCH=$(echo "$CURRENT_SERVER" | cut -d '.' -f3)
+CURRENT_SERVER=$(cat server/package.json | jq -r '.version')
+MAJOR=$(echo $CURRENT_SERVER | cut -d '.' -f1)
+MINOR=$(echo $CURRENT_SERVER | cut -d '.' -f2)
+PATCH=$(echo $CURRENT_SERVER | cut -d '.' -f3)
 
 if [[ $SERVER_PUMP == "major" ]]; then
   MAJOR=$((MAJOR + 1))
@@ -48,7 +48,7 @@ fi
 
 NEXT_SERVER=$MAJOR.$MINOR.$PATCH
 
-CURRENT_MOBILE=$(grep "^version: .*+[0-9]\+$" mobile/pubspec.yaml | cut -d "+" -f2)
+CURRENT_MOBILE=$(cat mobile/pubspec.yaml | grep "^version: .*+[0-9]\+$" | cut -d "+" -f2)
 NEXT_MOBILE=$CURRENT_MOBILE
 if [[ $MOBILE_PUMP == "true" ]]; then
   set $((NEXT_MOBILE++))
@@ -61,10 +61,9 @@ fi
 
 if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then
   echo "Pumping Server: $CURRENT_SERVER => $NEXT_SERVER"
-  npm --prefix server version "$SERVER_PUMP"
-  npm --prefix web version "$SERVER_PUMP"
+  npm --prefix server version $SERVER_PUMP
   make open-api
-  poetry --directory machine-learning version "$SERVER_PUMP"
+  poetry --directory machine-learning version $SERVER_PUMP
 fi
 
 if [ "$CURRENT_MOBILE" != "$NEXT_MOBILE" ]; then
@@ -76,4 +75,4 @@ sed -i "s/version_number: \"$CURRENT_SERVER\"$/version_number: \"$NEXT_SERVER\"/
 sed -i "s/\"android\.injected\.version\.code\" => $CURRENT_MOBILE,/\"android\.injected\.version\.code\" => $NEXT_MOBILE,/" mobile/android/fastlane/Fastfile
 sed -i "s/^version: $CURRENT_SERVER+$CURRENT_MOBILE$/version: $NEXT_SERVER+$NEXT_MOBILE/" mobile/pubspec.yaml
 
-echo "IMMICH_VERSION=v$NEXT_SERVER" >>"$GITHUB_ENV"
+echo "IMMICH_VERSION=v$NEXT_SERVER" >>$GITHUB_ENV

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 124,
-        "android.injected.version.name" => "1.96.0",
+        "android.injected.version.code" => 121,
+        "android.injected.version.name" => "1.94.1",
       }
     )
     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.000232">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000276">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="78.881681">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="22.651725">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="32.080999">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="31.263395">
         
       </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 = 139;
+				CURRENT_PROJECT_VERSION = 137;
 				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 = 139;
+				CURRENT_PROJECT_VERSION = 137;
 				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 = 139;
+				CURRENT_PROJECT_VERSION = 137;
 				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.95.0</string>
+    <string>1.94.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>139</string>
+    <string>137</string>
     <key>FLTEnableImpeller</key>
     <true />
     <key>ITSAppUsesNonExemptEncryption</key>

mobile/ios/ci_scripts/ci_post_clone.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 
 # The default execution directory of this script is the ci_scripts directory.
-cd "$CI_WORKSPACE"/mobile || exit
+cd $CI_WORKSPACE/mobile
 
 # Install Flutter using git.
-git clone https://github.com/flutter/flutter.git --depth 1 -b stable "$HOME"/flutter
+git clone https://github.com/flutter/flutter.git --depth 1 -b stable $HOME/flutter
 export PATH="$PATH:$HOME/flutter/bin"
 
 # Install Flutter artifacts for iOS (--ios), or macOS (--macos) platforms.
@@ -14,7 +14,7 @@ flutter precache --ios
 flutter pub get
 
 # Install CocoaPods using Homebrew.
-export HOMEBREW_NO_AUTO_UPDATE=1 # disable homebrew's automatic updates.
+HOMEBREW_NO_AUTO_UPDATE=1 # disable homebrew's automatic updates.
 brew install cocoapods
 
 # Install CocoaPods dependencies.

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-      version_number: "1.96.0"
+      version_number: "1.94.1"
     )
     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.000255">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000247">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.157832">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.238661">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="4.825919">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="2.965603">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.18815">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.228067">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: build_app" time="110.912709">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="108.628243">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="78.396901">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="71.752027">
         
       </testcase>
     

mobile/lib/extensions/asyncvalue_extensions.dart

@@ -30,7 +30,7 @@ extension LogOnError<T> on AsyncValue<T> {
     }
 
     if (hasError && !hasValue) {
-      _asyncErrorLogger.severe('Could not load value', error, stackTrace);
+      _asyncErrorLogger.severe("$error", error, stackTrace);
       return onError?.call(error, stackTrace) ??
           ScaffoldErrorBody(errorMsg: error?.toString());
     }

mobile/lib/extensions/response_extensions.dart

@@ -1,5 +0,0 @@
-import 'package:http/http.dart';
-
-extension LoggerExtension on Response {
-  String toLoggerString() => "Status: $statusCode $reasonPhrase\n\n$body";
-}

mobile/lib/main.dart

@@ -73,14 +73,15 @@ Future<void> initApp() async {
   FlutterError.onError = (details) {
     FlutterError.presentError(details);
     log.severe(
-      'FlutterError - Catch all',
-      "${details.toString()}\nException: ${details.exception}\nLibrary: ${details.library}\nContext: ${details.context}",
+      'FlutterError - Catch all error: ${details.toString()} - ${details.exception} - ${details.library} - ${details.context} - ${details.stack}',
+      details,
       details.stack,
     );
   };
 
   PlatformDispatcher.instance.onError = (error, stack) {
-    log.severe('PlatformDispatcher - Catch all', error, stack);
+    log.severe('PlatformDispatcher - Catch all error: $error', error, stack);
+    debugPrint("PlatformDispatcher - Catch all error: $error $stack");
     return true;
   };
 

mobile/lib/mixins/error_logger.mixin.dart

@@ -10,14 +10,13 @@ mixin ErrorLoggerMixin {
   /// Else, logs the error to the overrided logger and returns an AsyncError<>
   AsyncFuture<T> guardError<T>(
     Future<T> Function() fn, {
-    required String errorMessage,
     Level logLevel = Level.SEVERE,
   }) async {
     try {
       final result = await fn();
       return AsyncData(result);
     } catch (error, stackTrace) {
-      logger.log(logLevel, errorMessage, error, stackTrace);
+      logger.log(logLevel, "$error", error, stackTrace);
       return AsyncError(error, stackTrace);
     }
   }
@@ -27,13 +26,12 @@ mixin ErrorLoggerMixin {
   Future<T> logError<T>(
     Future<T> Function() fn, {
     required T defaultValue,
-    required String errorMessage,
     Level logLevel = Level.SEVERE,
   }) async {
     try {
       return await fn();
     } catch (error, stackTrace) {
-      logger.log(logLevel, errorMessage, error, stackTrace);
+      logger.log(logLevel, "$error", error, stackTrace);
     }
     return defaultValue;
   }

mobile/lib/modules/activities/services/activity.service.dart

@@ -24,7 +24,6 @@ class ActivityService with ErrorLoggerMixin {
         return list != null ? list.map(Activity.fromDto).toList() : [];
       },
       defaultValue: [],
-      errorMessage: "Failed to get all activities for album $albumId",
     );
   }
 
@@ -36,7 +35,6 @@ class ActivityService with ErrorLoggerMixin {
         return dto?.comments ?? 0;
       },
       defaultValue: 0,
-      errorMessage: "Failed to statistics for album $albumId",
     );
   }
 
@@ -47,7 +45,6 @@ class ActivityService with ErrorLoggerMixin {
         return true;
       },
       defaultValue: false,
-      errorMessage: "Failed to delete activity",
     );
   }
 
@@ -57,24 +54,21 @@ class ActivityService with ErrorLoggerMixin {
     String? assetId,
     String? comment,
   }) async {
-    return guardError(
-      () async {
-        final dto = await _apiService.activityApi.createActivity(
-          ActivityCreateDto(
-            albumId: albumId,
-            type: type == ActivityType.comment
-                ? ReactionType.comment
-                : ReactionType.like,
-            assetId: assetId,
-            comment: comment,
-          ),
-        );
-        if (dto != null) {
-          return Activity.fromDto(dto);
-        }
-        throw NoResponseDtoError();
-      },
-      errorMessage: "Failed to create $type for album $albumId",
-    );
+    return guardError(() async {
+      final dto = await _apiService.activityApi.createActivity(
+        ActivityCreateDto(
+          albumId: albumId,
+          type: type == ActivityType.comment
+              ? ReactionType.comment
+              : ReactionType.like,
+          assetId: assetId,
+          comment: comment,
+        ),
+      );
+      if (dto != null) {
+        return Activity.fromDto(dto);
+      }
+      throw NoResponseDtoError();
+    });
   }
 }

mobile/lib/modules/album/ui/album_thumbnail_card.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/store.dart';
-import 'package:immich_mobile/shared/ui/immich_thumbnail.dart';
+import 'package:immich_mobile/shared/ui/immich_image.dart';
 
 class AlbumThumbnailCard extends StatelessWidget {
   final Function()? onTap;
@@ -45,8 +45,8 @@ class AlbumThumbnailCard extends StatelessWidget {
           );
         }
 
-        buildAlbumThumbnail() => ImmichThumbnail(
-              asset: album.thumbnail.value,
+        buildAlbumThumbnail() => ImmichImage.thumbnail(
+              album.thumbnail.value,
               width: cardSize,
               height: cardSize,
             );

mobile/lib/modules/album/ui/shared_album_thumbnail_image.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:immich_mobile/shared/ui/immich_thumbnail.dart';
+import 'package:immich_mobile/shared/ui/immich_image.dart';
 
 class SharedAlbumThumbnailImage extends HookConsumerWidget {
   final Asset asset;
@@ -16,8 +16,8 @@ class SharedAlbumThumbnailImage extends HookConsumerWidget {
       },
       child: Stack(
         children: [
-          ImmichThumbnail(
-            asset: asset,
+          ImmichImage.thumbnail(
+            asset,
             width: 500,
             height: 500,
           ),

mobile/lib/modules/album/views/sharing_page.dart

@@ -12,7 +12,7 @@ import 'package:immich_mobile/modules/partner/ui/partner_list.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/providers/user.provider.dart';
 import 'package:immich_mobile/shared/ui/immich_app_bar.dart';
-import 'package:immich_mobile/shared/ui/immich_thumbnail.dart';
+import 'package:immich_mobile/shared/ui/immich_image.dart';
 
 @RoutePage()
 class SharingPage extends HookConsumerWidget {
@@ -72,8 +72,8 @@ class SharingPage extends HookConsumerWidget {
               contentPadding: const EdgeInsets.symmetric(horizontal: 12),
               leading: ClipRRect(
                 borderRadius: const BorderRadius.all(Radius.circular(8)),
-                child: ImmichThumbnail(
-                  asset: album.thumbnail.value,
+                child: ImmichImage.thumbnail(
+                  album.thumbnail.value,
                   width: 60,
                   height: 60,
                 ),

mobile/lib/modules/asset_viewer/hooks/chewiew_controller_hook.dart

@@ -1,179 +0,0 @@
-import 'dart:async';
-
-import 'package:chewie/chewie.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:immich_mobile/shared/models/store.dart';
-import 'package:video_player/video_player.dart';
-import 'package:immich_mobile/shared/models/store.dart' as store;
-import 'package:wakelock_plus/wakelock_plus.dart';
-
-/// Provides the initialized video player controller
-/// If the asset is local, use the local file
-/// Otherwise, use a video player with a URL
-ChewieController? useChewieController(
-  Asset asset, {
-  EdgeInsets controlsSafeAreaMinimum = const EdgeInsets.only(
-    bottom: 100,
-  ),
-  bool showOptions = true,
-  bool showControlsOnInitialize = false,
-  bool autoPlay = true,
-  bool autoInitialize = true,
-  bool allowFullScreen = false,
-  bool allowedScreenSleep = false,
-  bool showControls = true,
-  Widget? customControls,
-  Widget? placeholder,
-  Duration hideControlsTimer = const Duration(seconds: 1),
-  VoidCallback? onPlaying,
-  VoidCallback? onPaused,
-  VoidCallback? onVideoEnded,
-}) {
-  return use(
-    _ChewieControllerHook(
-      asset: asset,
-      placeholder: placeholder,
-      showOptions: showOptions,
-      controlsSafeAreaMinimum: controlsSafeAreaMinimum,
-      autoPlay: autoPlay,
-      allowFullScreen: allowFullScreen,
-      customControls: customControls,
-      hideControlsTimer: hideControlsTimer,
-      showControlsOnInitialize: showControlsOnInitialize,
-      showControls: showControls,
-      autoInitialize: autoInitialize,
-      allowedScreenSleep: allowedScreenSleep,
-      onPlaying: onPlaying,
-      onPaused: onPaused,
-      onVideoEnded: onVideoEnded,
-    ),
-  );
-}
-
-class _ChewieControllerHook extends Hook<ChewieController?> {
-  final Asset asset;
-  final EdgeInsets controlsSafeAreaMinimum;
-  final bool showOptions;
-  final bool showControlsOnInitialize;
-  final bool autoPlay;
-  final bool autoInitialize;
-  final bool allowFullScreen;
-  final bool allowedScreenSleep;
-  final bool showControls;
-  final Widget? customControls;
-  final Widget? placeholder;
-  final Duration hideControlsTimer;
-  final VoidCallback? onPlaying;
-  final VoidCallback? onPaused;
-  final VoidCallback? onVideoEnded;
-
-  const _ChewieControllerHook({
-    required this.asset,
-    this.controlsSafeAreaMinimum = const EdgeInsets.only(
-      bottom: 100,
-    ),
-    this.showOptions = true,
-    this.showControlsOnInitialize = false,
-    this.autoPlay = true,
-    this.autoInitialize = true,
-    this.allowFullScreen = false,
-    this.allowedScreenSleep = false,
-    this.showControls = true,
-    this.customControls,
-    this.placeholder,
-    this.hideControlsTimer = const Duration(seconds: 3),
-    this.onPlaying,
-    this.onPaused,
-    this.onVideoEnded,
-  });
-
-  @override
-  createState() => _ChewieControllerHookState();
-}
-
-class _ChewieControllerHookState
-    extends HookState<ChewieController?, _ChewieControllerHook> {
-  ChewieController? chewieController;
-  VideoPlayerController? videoPlayerController;
-
-  @override
-  void initHook() async {
-    super.initHook();
-    unawaited(_initialize());
-  }
-
-  @override
-  void dispose() {
-    chewieController?.dispose();
-    videoPlayerController?.dispose();
-    super.dispose();
-  }
-
-  @override
-  ChewieController? build(BuildContext context) {
-    return chewieController;
-  }
-
-  /// Initializes the chewie controller and video player controller
-  Future<void> _initialize() async {
-    if (hook.asset.isLocal && hook.asset.livePhotoVideoId == null) {
-      // Use a local file for the video player controller
-      final file = await hook.asset.local!.file;
-      if (file == null) {
-        throw Exception('No file found for the video');
-      }
-      videoPlayerController = VideoPlayerController.file(file);
-    } else {
-      // Use a network URL for the video player controller
-      final serverEndpoint = store.Store.get(store.StoreKey.serverEndpoint);
-      final String videoUrl = hook.asset.livePhotoVideoId != null
-          ? '$serverEndpoint/asset/file/${hook.asset.livePhotoVideoId}'
-          : '$serverEndpoint/asset/file/${hook.asset.remoteId}';
-
-      final url = Uri.parse(videoUrl);
-      final accessToken = store.Store.get(StoreKey.accessToken);
-
-      videoPlayerController = VideoPlayerController.networkUrl(
-        url,
-        httpHeaders: {"x-immich-user-token": accessToken},
-      );
-    }
-
-    videoPlayerController!.addListener(() {
-      final value = videoPlayerController!.value;
-      if (value.isPlaying) {
-        WakelockPlus.enable();
-        hook.onPlaying?.call();
-      } else if (!value.isPlaying) {
-        WakelockPlus.disable();
-        hook.onPaused?.call();
-      }
-
-      if (value.position == value.duration) {
-        WakelockPlus.disable();
-        hook.onVideoEnded?.call();
-      }
-    });
-
-    await videoPlayerController!.initialize();
-
-    setState(() {
-      chewieController = ChewieController(
-        videoPlayerController: videoPlayerController!,
-        controlsSafeAreaMinimum: hook.controlsSafeAreaMinimum,
-        showOptions: hook.showOptions,
-        showControlsOnInitialize: hook.showControlsOnInitialize,
-        autoPlay: hook.autoPlay,
-        autoInitialize: hook.autoInitialize,
-        allowFullScreen: hook.allowFullScreen,
-        allowedScreenSleep: hook.allowedScreenSleep,
-        showControls: hook.showControls,
-        customControls: hook.customControls,
-        placeholder: hook.placeholder,
-        hideControlsTimer: hook.hideControlsTimer,
-      );
-    });
-  }
-}

mobile/lib/modules/asset_viewer/image_providers/immich_local_image_provider.dart

@@ -11,7 +11,7 @@ import 'package:photo_manager/photo_manager.dart';
 
 /// The local image provider for an asset
 /// Only viable
-class ImmichLocalImageProvider extends ImageProvider<ImmichLocalImageProvider> {
+class ImmichLocalImageProvider extends ImageProvider<Asset> {
   final Asset asset;
 
   ImmichLocalImageProvider({
@@ -21,18 +21,15 @@ class ImmichLocalImageProvider extends ImageProvider<ImmichLocalImageProvider> {
   /// Converts an [ImageProvider]'s settings plus an [ImageConfiguration] to a key
   /// that describes the precise image to load.
   @override
-  Future<ImmichLocalImageProvider> obtainKey(ImageConfiguration configuration) {
-    return SynchronousFuture(this);
+  Future<Asset> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(asset);
   }
 
   @override
-  ImageStreamCompleter loadImage(
-    ImmichLocalImageProvider key,
-    ImageDecoderCallback decode,
-  ) {
+  ImageStreamCompleter loadImage(Asset key, ImageDecoderCallback decode) {
     final chunkEvents = StreamController<ImageChunkEvent>();
     return MultiImageStreamCompleter(
-      codec: _codec(key.asset, decode, chunkEvents),
+      codec: _codec(key, decode, chunkEvents),
       scale: 1.0,
       chunkEvents: chunkEvents.stream,
       informationCollector: () sync* {
@@ -85,6 +82,11 @@ class ImmichLocalImageProvider extends ImageProvider<ImmichLocalImageProvider> {
           yield codec;
         } catch (error) {
           throw StateError("Loading asset ${asset.fileName} failed");
+        } finally {
+          if (Platform.isIOS) {
+            // Clean up this file
+            await file.delete();
+          }
         }
       }
     }

mobile/lib/modules/asset_viewer/image_providers/immich_local_thumbnail_provider.dart

@@ -1,86 +0,0 @@
-import 'dart:async';
-import 'dart:ui' as ui;
-
-import 'package:cached_network_image/cached_network_image.dart';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/painting.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:photo_manager/photo_manager.dart';
-
-/// The local image provider for an asset
-/// Only viable
-class ImmichLocalThumbnailProvider extends ImageProvider<Asset> {
-  final Asset asset;
-  final int height;
-  final int width;
-
-  ImmichLocalThumbnailProvider({
-    required this.asset,
-    this.height = 256,
-    this.width = 256,
-  }) : assert(asset.local != null, 'Only usable when asset.local is set');
-
-  /// Converts an [ImageProvider]'s settings plus an [ImageConfiguration] to a key
-  /// that describes the precise image to load.
-  @override
-  Future<Asset> obtainKey(ImageConfiguration configuration) {
-    return SynchronousFuture(asset);
-  }
-
-  @override
-  ImageStreamCompleter loadImage(Asset key, ImageDecoderCallback decode) {
-    final chunkEvents = StreamController<ImageChunkEvent>();
-    return MultiImageStreamCompleter(
-      codec: _codec(key, decode, chunkEvents),
-      scale: 1.0,
-      chunkEvents: chunkEvents.stream,
-      informationCollector: () sync* {
-        yield ErrorDescription(asset.fileName);
-      },
-    );
-  }
-
-  // Streams in each stage of the image as we ask for it
-  Stream<ui.Codec> _codec(
-    Asset key,
-    ImageDecoderCallback decode,
-    StreamController<ImageChunkEvent> chunkEvents,
-  ) async* {
-    // Load a small thumbnail
-    final thumbBytes = await asset.local?.thumbnailDataWithSize(
-      const ThumbnailSize.square(32),
-      quality: 75,
-    );
-    if (thumbBytes != null) {
-      final buffer = await ui.ImmutableBuffer.fromUint8List(thumbBytes);
-      final codec = await decode(buffer);
-      yield codec;
-    } else {
-      debugPrint("Loading thumb for ${asset.fileName} failed");
-    }
-
-    final normalThumbBytes =
-        await asset.local?.thumbnailDataWithSize(ThumbnailSize(width, height));
-    if (normalThumbBytes == null) {
-      throw StateError(
-        "Loading thumb for local photo ${asset.fileName} failed",
-      );
-    }
-    final buffer = await ui.ImmutableBuffer.fromUint8List(normalThumbBytes);
-    final codec = await decode(buffer);
-    yield codec;
-
-    chunkEvents.close();
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! ImmichLocalThumbnailProvider) return false;
-    if (identical(this, other)) return true;
-    return asset == other.asset;
-  }
-
-  @override
-  int get hashCode => asset.hashCode;
-}

mobile/lib/modules/asset_viewer/image_providers/immich_remote_image_provider.dart

@@ -13,13 +13,10 @@ import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 
 /// Our Image Provider HTTP client to make the request
-final _httpClient = HttpClient()
-  ..autoUncompress = false
-  ..maxConnectionsPerHost = 10;
+final _httpClient = HttpClient()..autoUncompress = false;
 
 /// The remote image provider
-class ImmichRemoteImageProvider
-    extends ImageProvider<ImmichRemoteImageProvider> {
+class ImmichRemoteImageProvider extends ImageProvider<String> {
   /// The [Asset.remoteId] of the asset to fetch
   final String assetId;
 
@@ -35,20 +32,16 @@ class ImmichRemoteImageProvider
   /// Converts an [ImageProvider]'s settings plus an [ImageConfiguration] to a key
   /// that describes the precise image to load.
   @override
-  Future<ImmichRemoteImageProvider> obtainKey(
-    ImageConfiguration configuration,
-  ) {
-    return SynchronousFuture(this);
+  Future<String> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture('$assetId,$isThumbnail');
   }
 
   @override
-  ImageStreamCompleter loadImage(
-    ImmichRemoteImageProvider key,
-    ImageDecoderCallback decode,
-  ) {
+  ImageStreamCompleter loadImage(String key, ImageDecoderCallback decode) {
+    final id = key.split(',').first;
     final chunkEvents = StreamController<ImageChunkEvent>();
     return MultiImageStreamCompleter(
-      codec: _codec(key, decode, chunkEvents),
+      codec: _codec(id, decode, chunkEvents),
       scale: 1.0,
       chunkEvents: chunkEvents.stream,
     );
@@ -68,14 +61,14 @@ class ImmichRemoteImageProvider
 
   // Streams in each stage of the image as we ask for it
   Stream<ui.Codec> _codec(
-    ImmichRemoteImageProvider key,
+    String key,
     ImageDecoderCallback decode,
     StreamController<ImageChunkEvent> chunkEvents,
   ) async* {
     // Load a preview to the chunk events
-    if (_loadPreview || key.isThumbnail) {
+    if (_loadPreview || isThumbnail) {
       final preview = getThumbnailUrlForRemoteId(
-        key.assetId,
+        assetId,
         type: api.ThumbnailFormat.WEBP,
       );
 
@@ -87,14 +80,14 @@ class ImmichRemoteImageProvider
     }
 
     // Guard thumnbail rendering
-    if (key.isThumbnail) {
+    if (isThumbnail) {
       await chunkEvents.close();
       return;
     }
 
     // Load the higher resolution version of the image
     final url = getThumbnailUrlForRemoteId(
-      key.assetId,
+      assetId,
       type: api.ThumbnailFormat.JPEG,
     );
     final codec = await _loadFromUri(Uri.parse(url), decode, chunkEvents);
@@ -103,7 +96,7 @@ class ImmichRemoteImageProvider
     // Load the final remote image
     if (_useOriginal) {
       // Load the original image
-      final url = getImageUrlFromId(key.assetId);
+      final url = getImageUrlFromId(assetId);
       final codec = await _loadFromUri(Uri.parse(url), decode, chunkEvents);
       yield codec;
     }
@@ -144,7 +137,7 @@ class ImmichRemoteImageProvider
   bool operator ==(Object other) {
     if (other is! ImmichRemoteImageProvider) return false;
     if (identical(this, other)) return true;
-    return assetId == other.assetId && isThumbnail == other.isThumbnail;
+    return assetId == other.assetId;
   }
 
   @override

mobile/lib/modules/asset_viewer/image_providers/immich_remote_thumbnail_provider.dart

@@ -12,17 +12,14 @@ import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 
-/// Our HTTP client to make the request
-final _httpClient = HttpClient()
-  ..autoUncompress = false
-  ..maxConnectionsPerHost = 100;
-
 /// The remote image provider
-class ImmichRemoteThumbnailProvider
-    extends ImageProvider<ImmichRemoteThumbnailProvider> {
+class ImmichRemoteThumbnailProvider extends ImageProvider<String> {
   /// The [Asset.remoteId] of the asset to fetch
   final String assetId;
 
+  /// Our HTTP client to make the request
+  final _httpClient = HttpClient()..autoUncompress = false;
+
   ImmichRemoteThumbnailProvider({
     required this.assetId,
   });
@@ -30,17 +27,12 @@ class ImmichRemoteThumbnailProvider
   /// Converts an [ImageProvider]'s settings plus an [ImageConfiguration] to a key
   /// that describes the precise image to load.
   @override
-  Future<ImmichRemoteThumbnailProvider> obtainKey(
-    ImageConfiguration configuration,
-  ) {
-    return SynchronousFuture(this);
+  Future<String> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(assetId);
   }
 
   @override
-  ImageStreamCompleter loadImage(
-    ImmichRemoteThumbnailProvider key,
-    ImageDecoderCallback decode,
-  ) {
+  ImageStreamCompleter loadImage(String key, ImageDecoderCallback decode) {
     final chunkEvents = StreamController<ImageChunkEvent>();
     return MultiImageStreamCompleter(
       codec: _codec(key, decode, chunkEvents),
@@ -51,13 +43,13 @@ class ImmichRemoteThumbnailProvider
 
   // Streams in each stage of the image as we ask for it
   Stream<ui.Codec> _codec(
-    ImmichRemoteThumbnailProvider key,
+    String key,
     ImageDecoderCallback decode,
     StreamController<ImageChunkEvent> chunkEvents,
   ) async* {
     // Load a preview to the chunk events
     final preview = getThumbnailUrlForRemoteId(
-      key.assetId,
+      assetId,
       type: api.ThumbnailFormat.WEBP,
     );
 

mobile/lib/modules/asset_viewer/services/image_viewer.service.dart

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/response_extensions.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
 import 'package:immich_mobile/shared/services/api.service.dart';
@@ -40,8 +39,7 @@ class ImageViewerService {
           final failedResponse =
               imageResponse.statusCode != 200 ? imageResponse : motionReponse;
           _log.severe(
-            "Motion asset download failed",
-            failedResponse.toLoggerString(),
+            "Motion asset download failed with status - ${failedResponse.statusCode} and response - ${failedResponse.body}",
           );
           return false;
         }
@@ -77,7 +75,9 @@ class ImageViewerService {
             .downloadFileWithHttpInfo(asset.remoteId!);
 
         if (res.statusCode != 200) {
-          _log.severe("Asset download failed", res.toLoggerString());
+          _log.severe(
+            "Asset download failed with status - ${res.statusCode} and response - ${res.body}",
+          );
           return false;
         }
 
@@ -98,7 +98,7 @@ class ImageViewerService {
         return entity != null;
       }
     } catch (error, stack) {
-      _log.severe("Error saving downloaded asset", error, stack);
+      _log.severe("Error saving file ${error.toString()}", error, stack);
       return false;
     } finally {
       // Clear temp files

mobile/lib/modules/asset_viewer/ui/description_input.dart

@@ -48,7 +48,7 @@ class DescriptionInput extends HookConsumerWidget {
         );
       } catch (error, stack) {
         hasError.value = true;
-        _log.severe("Error updating description", error, stack);
+        _log.severe("Error updating description $error", error, stack);
         ImmichToast.show(
           context: context,
           msg: "description_input_submit_error".tr(),

mobile/lib/modules/asset_viewer/ui/video_player_controls.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/modules/asset_viewer/providers/show_controls.provi
 import 'package:immich_mobile/modules/asset_viewer/providers/video_player_controls_provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/video_player_value_provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/center_play_button.dart';
-import 'package:immich_mobile/shared/ui/delayed_loading_indicator.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:video_player/video_player.dart';
 
 class VideoPlayerControls extends ConsumerStatefulWidget {
@@ -66,9 +66,7 @@ class VideoPlayerControlsState extends ConsumerState<VideoPlayerControls>
           children: [
             if (_displayBufferingIndicator)
               const Center(
-                child: DelayedLoadingIndicator(
-                  fadeInDuration: Duration(milliseconds: 400),
-                ),
+                child: ImmichLoadingIndicator(),
               )
             else
               _buildHitArea(),
@@ -81,7 +79,6 @@ class VideoPlayerControlsState extends ConsumerState<VideoPlayerControls>
   @override
   void dispose() {
     _dispose();
-
     super.dispose();
   }
 
@@ -95,7 +92,6 @@ class VideoPlayerControlsState extends ConsumerState<VideoPlayerControls>
     final oldController = _chewieController;
     _chewieController = ChewieController.of(context);
     controller = chewieController.videoPlayerController;
-    _latestValue = controller.value;
 
     if (oldController != chewieController) {
       _dispose();
@@ -110,10 +106,12 @@ class VideoPlayerControlsState extends ConsumerState<VideoPlayerControls>
 
     return GestureDetector(
       onTap: () {
-        if (!_latestValue.isPlaying) {
+        if (_latestValue.isPlaying) {
+          ref.read(showControlsProvider.notifier).show = false;
+        } else {
           _playPause();
+          ref.read(showControlsProvider.notifier).show = false;
         }
-        ref.read(showControlsProvider.notifier).show = false;
       },
       child: CenterPlayButton(
         backgroundColor: Colors.black54,
@@ -133,11 +131,10 @@ class VideoPlayerControlsState extends ConsumerState<VideoPlayerControls>
   }
 
   Future<void> _initialize() async {
-    ref.read(showControlsProvider.notifier).show = false;
     _mute(ref.read(videoPlayerControlsProvider.select((value) => value.mute)));
 
-    _latestValue = controller.value;
     controller.addListener(_updateState);
+    _latestValue = controller.value;
 
     if (controller.value.isPlaying || chewieController.autoPlay) {
       _startHideTimer();
@@ -170,8 +167,9 @@ class VideoPlayerControlsState extends ConsumerState<VideoPlayerControls>
   }
 
   void _startHideTimer() {
-    final hideControlsTimer = chewieController.hideControlsTimer;
-    _hideTimer?.cancel();
+    final hideControlsTimer = chewieController.hideControlsTimer.isNegative
+        ? ChewieController.defaultHideControlsTimer
+        : chewieController.hideControlsTimer;
     _hideTimer = Timer(hideControlsTimer, () {
       ref.read(showControlsProvider.notifier).show = false;
     });

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

@@ -1,8 +1,8 @@
 import 'dart:io';
 import 'dart:math';
-import 'dart:ui' as ui;
 import 'package:easy_localization/easy_localization.dart';
 import 'package:auto_route/auto_route.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
@@ -10,7 +10,6 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/current_album.provider.dart';
-import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_image_provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/asset_stack.provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/current_asset.provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/show_controls.provider.dart';
@@ -27,13 +26,13 @@ import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.da
 import 'package:immich_mobile/modules/home/ui/upload_dialog.dart';
 import 'package:immich_mobile/modules/partner/providers/partner.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/modules/home/ui/delete_dialog.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 import 'package:immich_mobile/shared/providers/user.provider.dart';
 import 'package:immich_mobile/shared/ui/immich_image.dart';
-import 'package:immich_mobile/shared/ui/immich_thumbnail.dart';
 import 'package:immich_mobile/shared/ui/immich_toast.dart';
 import 'package:immich_mobile/shared/ui/photo_view/photo_view_gallery.dart';
 import 'package:immich_mobile/shared/ui/photo_view/src/photo_view_computed_scale.dart';
@@ -482,9 +481,15 @@ class GalleryViewerPage extends HookConsumerWidget {
                 ),
                 child: ClipRRect(
                   borderRadius: BorderRadius.circular(4),
-                  child: Image(
+                  child: CachedNetworkImage(
                     fit: BoxFit.cover,
-                    image: ImmichRemoteImageProvider(assetId: assetId!),
+                    imageUrl:
+                        '${Store.get(StoreKey.serverEndpoint)}/asset/thumbnail/$assetId',
+                    httpHeaders: {
+                      "x-immich-user-token": Store.get(StoreKey.accessToken),
+                    },
+                    errorWidget: (context, url, error) =>
+                        const Icon(Icons.image_not_supported_outlined),
                   ),
                 ),
               ),
@@ -699,18 +704,6 @@ class GalleryViewerPage extends HookConsumerWidget {
       );
     }
 
-    useEffect(
-      () {
-        if (ref.read(showControlsProvider)) {
-          SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-        } else {
-          SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-        }
-        return null;
-      },
-      [],
-    );
-
     ref.listen(showControlsProvider, (_, show) {
       if (show) {
         SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
@@ -735,15 +728,9 @@ class GalleryViewerPage extends HookConsumerWidget {
                 isZoomed.value = state != PhotoViewScaleState.initial;
                 ref.read(showControlsProvider.notifier).show = !isZoomed.value;
               },
-              loadingBuilder: (context, event, index) => ImageFiltered(
-                imageFilter: ui.ImageFilter.blur(
-                  sigmaX: 1,
-                  sigmaY: 1,
-                ),
-                child: ImmichThumbnail(
-                  asset: asset(),
-                  fit: BoxFit.contain,
-                ),
+              loadingBuilder: (context, event, index) => ImmichImage.thumbnail(
+                asset(),
+                fit: BoxFit.contain,
               ),
               pageController: controller,
               scrollPhysics: isZoomed.value
@@ -807,9 +794,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                     minScale: 1.0,
                     basePosition: Alignment.center,
                     child: VideoViewerPage(
-                      onPlaying: () {
-                        isPlayingVideo.value = true;
-                      },
+                      onPlaying: () => isPlayingVideo.value = true,
                       onPaused: () =>
                           WidgetsBinding.instance.addPostFrameCallback(
                         (_) => isPlayingVideo.value = false,

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

@@ -1,15 +1,23 @@
+import 'dart:io';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:chewie/chewie.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/modules/asset_viewer/hooks/chewiew_controller_hook.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart';
+import 'package:immich_mobile/modules/asset_viewer/providers/image_viewer_page_state.provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/video_player_controls.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:immich_mobile/shared/ui/delayed_loading_indicator.dart';
+import 'package:immich_mobile/shared/models/store.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
+import 'package:photo_manager/photo_manager.dart';
+import 'package:video_player/video_player.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 @RoutePage()
 // ignore: must_be_immutable
-class VideoViewerPage extends HookWidget {
+class VideoViewerPage extends HookConsumerWidget {
   final Asset asset;
   final bool isMotionVideo;
   final Widget? placeholder;
@@ -34,49 +42,211 @@ class VideoViewerPage extends HookWidget {
   });
 
   @override
-  Widget build(BuildContext context) {
-    final controller = useChewieController(
-      asset,
-      controlsSafeAreaMinimum: const EdgeInsets.only(
-        bottom: 100,
-      ),
-      placeholder: SizedBox.expand(child: placeholder),
-      showControls: showControls && !isMotionVideo,
-      hideControlsTimer: hideControlsTimer,
-      customControls: const VideoPlayerControls(),
-      onPlaying: onPlaying,
-      onPaused: onPaused,
-      onVideoEnded: onVideoEnded,
-    );
-
-    // Loading
-    return PopScope(
-      child: AnimatedSwitcher(
-        duration: const Duration(milliseconds: 400),
-        child: Builder(
-          builder: (context) {
-            if (controller == null) {
-              return Stack(
-                children: [
-                  if (placeholder != null) SizedBox.expand(child: placeholder!),
-                  const DelayedLoadingIndicator(
-                    fadeInDuration: Duration(milliseconds: 500),
-                  ),
-                ],
-              );
-            }
-
-            final size = MediaQuery.of(context).size;
-            return SizedBox(
-              height: size.height,
-              width: size.width,
-              child: Chewie(
-                controller: controller,
-              ),
-            );
-          },
+  Widget build(BuildContext context, WidgetRef ref) {
+    if (asset.isLocal && asset.livePhotoVideoId == null) {
+      final AsyncValue<File> videoFile = ref.watch(_fileFamily(asset.local!));
+      return AnimatedSwitcher(
+        duration: const Duration(milliseconds: 200),
+        child: videoFile.when(
+          data: (data) => VideoPlayer(
+            file: data,
+            isMotionVideo: false,
+            onVideoEnded: () {},
+          ),
+          error: (error, stackTrace) => Icon(
+            Icons.image_not_supported_outlined,
+            color: context.primaryColor,
+          ),
+          loading: () => showDownloadingIndicator
+              ? const Center(child: ImmichLoadingIndicator())
+              : Container(),
         ),
-      ),
+      );
+    }
+    final downloadAssetStatus =
+        ref.watch(imageViewerStateProvider).downloadAssetStatus;
+    final String videoUrl = isMotionVideo
+        ? '${Store.get(StoreKey.serverEndpoint)}/asset/file/${asset.livePhotoVideoId}'
+        : '${Store.get(StoreKey.serverEndpoint)}/asset/file/${asset.remoteId}';
+
+    return Stack(
+      children: [
+        VideoPlayer(
+          url: videoUrl,
+          accessToken: Store.get(StoreKey.accessToken),
+          isMotionVideo: isMotionVideo,
+          onVideoEnded: onVideoEnded,
+          onPaused: onPaused,
+          onPlaying: onPlaying,
+          placeholder: placeholder,
+          hideControlsTimer: hideControlsTimer,
+          showControls: showControls,
+          showDownloadingIndicator: showDownloadingIndicator,
+        ),
+        AnimatedOpacity(
+          duration: const Duration(milliseconds: 400),
+          opacity: (downloadAssetStatus == DownloadAssetStatus.loading &&
+                  showDownloadingIndicator)
+              ? 1.0
+              : 0.0,
+          child: SizedBox(
+            height: context.height,
+            width: context.width,
+            child: const Center(
+              child: ImmichLoadingIndicator(),
+            ),
+          ),
+        ),
+      ],
     );
   }
 }
+
+final _fileFamily =
+    FutureProvider.family<File, AssetEntity>((ref, entity) async {
+  final file = await entity.file;
+  if (file == null) {
+    throw Exception();
+  }
+  return file;
+});
+
+class VideoPlayer extends StatefulWidget {
+  final String? url;
+  final String? accessToken;
+  final File? file;
+  final bool isMotionVideo;
+  final VoidCallback? onVideoEnded;
+  final Duration hideControlsTimer;
+  final bool showControls;
+
+  final Function()? onPlaying;
+  final Function()? onPaused;
+
+  /// The placeholder to show while the video is loading
+  /// usually, a thumbnail of the video
+  final Widget? placeholder;
+
+  final bool showDownloadingIndicator;
+
+  const VideoPlayer({
+    super.key,
+    this.url,
+    this.accessToken,
+    this.file,
+    this.onVideoEnded,
+    required this.isMotionVideo,
+    this.onPlaying,
+    this.onPaused,
+    this.placeholder,
+    this.hideControlsTimer = const Duration(
+      seconds: 5,
+    ),
+    this.showControls = true,
+    this.showDownloadingIndicator = true,
+  });
+
+  @override
+  State<VideoPlayer> createState() => _VideoPlayerState();
+}
+
+class _VideoPlayerState extends State<VideoPlayer> {
+  late VideoPlayerController videoPlayerController;
+  ChewieController? chewieController;
+
+  @override
+  void initState() {
+    super.initState();
+    initializePlayer();
+
+    videoPlayerController.addListener(() {
+      if (videoPlayerController.value.isInitialized) {
+        if (videoPlayerController.value.isPlaying) {
+          WakelockPlus.enable();
+          widget.onPlaying?.call();
+        } else if (!videoPlayerController.value.isPlaying) {
+          WakelockPlus.disable();
+          widget.onPaused?.call();
+        }
+
+        if (videoPlayerController.value.position ==
+            videoPlayerController.value.duration) {
+          WakelockPlus.disable();
+          widget.onVideoEnded?.call();
+        }
+      }
+    });
+  }
+
+  Future<void> initializePlayer() async {
+    try {
+      videoPlayerController = widget.file == null
+          ? VideoPlayerController.networkUrl(
+              Uri.parse(widget.url!),
+              httpHeaders: {"x-immich-user-token": widget.accessToken ?? ""},
+            )
+          : VideoPlayerController.file(widget.file!);
+
+      await videoPlayerController.initialize();
+      _createChewieController();
+      setState(() {});
+    } catch (e) {
+      debugPrint("ERROR initialize video player $e");
+    }
+  }
+
+  _createChewieController() {
+    chewieController = ChewieController(
+      controlsSafeAreaMinimum: const EdgeInsets.only(
+        bottom: 100,
+      ),
+      showOptions: true,
+      showControlsOnInitialize: false,
+      videoPlayerController: videoPlayerController,
+      autoPlay: true,
+      autoInitialize: true,
+      allowFullScreen: false,
+      allowedScreenSleep: false,
+      showControls: widget.showControls && !widget.isMotionVideo,
+      customControls: const VideoPlayerControls(),
+      hideControlsTimer: widget.hideControlsTimer,
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    videoPlayerController.pause();
+    videoPlayerController.dispose();
+    chewieController?.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (chewieController?.videoPlayerController.value.isInitialized == true) {
+      return SizedBox(
+        height: context.height,
+        width: context.width,
+        child: Chewie(
+          controller: chewieController!,
+        ),
+      );
+    } else {
+      return SizedBox(
+        height: context.height,
+        width: context.width,
+        child: Center(
+          child: Stack(
+            children: [
+              if (widget.placeholder != null) widget.placeholder!,
+              if (widget.showDownloadingIndicator)
+                const Center(
+                  child: ImmichLoadingIndicator(),
+                ),
+            ],
+          ),
+        ),
+      );
+    }
+  }
+}

mobile/lib/modules/backup/providers/backup.provider.dart

@@ -245,7 +245,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
         } catch (e, stack) {
           log.severe(
             "Failed to get thumbnail for album ${album.name}",
-            e,
+            e.toString(),
             stack,
           );
         }

mobile/lib/modules/home/ui/asset_grid/immich_asset_grid_view.dart

@@ -290,7 +290,7 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
         final now = Timeline.now;
         if (now > (_hapticFeedbackTS + feedbackInterval)) {
           _hapticFeedbackTS = now;
-          HapticFeedback.mediumImpact();
+          HapticFeedback.heavyImpact();
         }
       }
     }

mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart

@@ -4,7 +4,7 @@ import 'package:flutter/services.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:immich_mobile/shared/ui/immich_thumbnail.dart';
+import 'package:immich_mobile/shared/ui/immich_image.dart';
 import 'package:immich_mobile/utils/storage_indicator.dart';
 import 'package:isar/isar.dart';
 
@@ -134,10 +134,10 @@ class ThumbnailImage extends StatelessWidget {
           tag: isFromDto
               ? '${asset.remoteId}-$heroOffset'
               : asset.id + heroOffset,
-          child: ImmichThumbnail(
-            asset: asset,
-            height: 250,
-            width: 250,
+          child: ImmichImage.thumbnail(
+            asset,
+            height: 300,
+            width: 300,
           ),
         ),
       );

mobile/lib/modules/login/providers/authentication.provider.dart

@@ -108,7 +108,7 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
           .then((_) => log.info("Logout was successful for $userEmail"))
           .onError(
             (error, stackTrace) =>
-                log.severe("Logout failed for $userEmail", error, stackTrace),
+                log.severe("Error logging out $userEmail", error, stackTrace),
           );
 
       await Future.wait([
@@ -129,8 +129,8 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
         shouldChangePassword: false,
         isAuthenticated: false,
       );
-    } catch (e, stack) {
-      log.severe('Logout failed', e, stack);
+    } catch (e) {
+      log.severe("Error logging out $e");
     }
   }
 

mobile/lib/modules/login/services/oauth.service.dart

@@ -36,7 +36,7 @@ class OAuthService {
         ),
       );
     } catch (e, stack) {
-      log.severe("OAuth login failed", e, stack);
+      log.severe("Error performing oAuthLogin: ${e.toString()}", e, stack);
       return null;
     }
   }

mobile/lib/modules/map/providers/map_state.provider.dart

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/response_extensions.dart';
 import 'package:immich_mobile/modules/map/models/map_state.model.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
@@ -52,8 +51,7 @@ class MapStateNotifier extends _$MapStateNotifier {
         lightStyleFetched: AsyncError(lightResponse.body, StackTrace.current),
       );
       _log.severe(
-        "Cannot fetch map light style",
-        lightResponse.toLoggerString(),
+        "Cannot fetch map light style with status - ${lightResponse.statusCode} and response - ${lightResponse.body}",
       );
       return;
     }
@@ -79,7 +77,9 @@ class MapStateNotifier extends _$MapStateNotifier {
       state = state.copyWith(
         darkStyleFetched: AsyncError(darkResponse.body, StackTrace.current),
       );
-      _log.severe("Cannot fetch map dark style", darkResponse.toLoggerString());
+      _log.severe(
+        "Cannot fetch map dark style with status - ${darkResponse.statusCode} and response - ${darkResponse.body}",
+      );
       return;
     }
 

mobile/lib/modules/map/services/map.service.dart

@@ -28,7 +28,6 @@ class MapSerivce with ErrorLoggerMixin {
         return markers?.map(MapMarker.fromDto) ?? [];
       },
       defaultValue: [],
-      errorMessage: "Failed to get map markers",
     );
   }
 }

mobile/lib/modules/map/utils/map_utils.dart

@@ -105,8 +105,10 @@ class MapUtils {
         timeLimit: const Duration(seconds: 5),
       );
       return (currentUserLocation, null);
-    } catch (error, stack) {
-      _log.severe("Cannot get user's current location", error, stack);
+    } catch (error) {
+      _log.severe(
+        "Cannot get user's current location due to ${error.toString()}",
+      );
       return (null, LocationPermission.unableToDetermine);
     }
   }