refactor!: remove replace asset

cli/src/utils.ts

@@ -81,7 +81,7 @@ export const connect = async (url: string, key: string) => {
 
   const [error] = await withError(getMyUser());
   if (isHttpError(error)) {
-    logError(error, 'Failed to connect to server');
+    logError(error, `Failed to connect to server ${url}`);
     process.exit(1);
   }
 

e2e/src/specs/web/photo-viewer.e2e-spec.ts

@@ -77,18 +77,4 @@ test.describe('Photo Viewer', () => {
     });
     expect(tagAtCenter).toBe('IMG');
   });
-
-  test('reloads photo when checksum changes', async ({ page }) => {
-    await page.goto(`/photos/${asset.id}`);
-
-    const preview = page.getByTestId('preview').filter({ visible: true });
-    await expect(preview).toHaveAttribute('src', /.+/);
-    const initialSrc = await preview.getAttribute('src');
-
-    const websocketEvent = utils.waitForWebsocketEvent({ event: 'assetUpdate', id: asset.id });
-    await utils.replaceAsset(admin.accessToken, asset.id);
-    await websocketEvent;
-
-    await expect(preview).not.toHaveAttribute('src', initialSrc!);
-  });
 });

e2e/src/utils.ts

@@ -375,40 +375,6 @@ export const utils = {
     return body as AssetMediaResponseDto;
   },
 
-  replaceAsset: async (
-    accessToken: string,
-    assetId: string,
-    dto?: Partial<Omit<AssetMediaCreateDto, 'assetData'>> & { assetData?: FileData },
-  ) => {
-    const _dto = {
-      deviceAssetId: 'test-1',
-      deviceId: 'test',
-      fileCreatedAt: new Date().toISOString(),
-      fileModifiedAt: new Date().toISOString(),
-      ...dto,
-    };
-
-    const assetData = dto?.assetData?.bytes || makeRandomImage();
-    const filename = dto?.assetData?.filename || 'example.png';
-
-    if (dto?.assetData?.bytes) {
-      console.log(`Uploading ${filename}`);
-    }
-
-    const builder = request(app)
-      .put(`/assets/${assetId}/original`)
-      .attach('assetData', assetData, filename)
-      .set('Authorization', `Bearer ${accessToken}`);
-
-    for (const [key, value] of Object.entries(_dto)) {
-      void builder.field(key, String(value));
-    }
-
-    const { body } = await builder;
-
-    return body as AssetMediaResponseDto;
-  },
-
   createImageFile: (path: string) => {
     if (!existsSync(dirname(path))) {
       mkdirSync(dirname(path), { recursive: true });

mobile/openapi/README.md

@@ -113,7 +113,6 @@ Class | Method | HTTP request | Description
 *AssetsApi* | [**getRandom**](doc//AssetsApi.md#getrandom) | **GET** /assets/random | Get random assets
 *AssetsApi* | [**playAssetVideo**](doc//AssetsApi.md#playassetvideo) | **GET** /assets/{id}/video/playback | Play asset video
 *AssetsApi* | [**removeAssetEdits**](doc//AssetsApi.md#removeassetedits) | **DELETE** /assets/{id}/edits | Remove edits from an existing asset
-*AssetsApi* | [**replaceAsset**](doc//AssetsApi.md#replaceasset) | **PUT** /assets/{id}/original | Replace asset
 *AssetsApi* | [**runAssetJobs**](doc//AssetsApi.md#runassetjobs) | **POST** /assets/jobs | Run an asset job
 *AssetsApi* | [**updateAsset**](doc//AssetsApi.md#updateasset) | **PUT** /assets/{id} | Update an asset
 *AssetsApi* | [**updateAssetMetadata**](doc//AssetsApi.md#updateassetmetadata) | **PUT** /assets/{id}/metadata | Update asset metadata
@@ -149,7 +148,6 @@ Class | Method | HTTP request | Description
 *DeprecatedApi* | [**getFullSyncForUser**](doc//DeprecatedApi.md#getfullsyncforuser) | **POST** /sync/full-sync | Get full sync for user
 *DeprecatedApi* | [**getQueuesLegacy**](doc//DeprecatedApi.md#getqueueslegacy) | **GET** /jobs | Retrieve queue counts and status
 *DeprecatedApi* | [**getRandom**](doc//DeprecatedApi.md#getrandom) | **GET** /assets/random | Get random assets
-*DeprecatedApi* | [**replaceAsset**](doc//DeprecatedApi.md#replaceasset) | **PUT** /assets/{id}/original | Replace asset
 *DeprecatedApi* | [**runQueueCommandLegacy**](doc//DeprecatedApi.md#runqueuecommandlegacy) | **PUT** /jobs/{name} | Run jobs
 *DownloadApi* | [**downloadArchive**](doc//DownloadApi.md#downloadarchive) | **POST** /download/archive | Download asset archive
 *DownloadApi* | [**getDownloadInfo**](doc//DownloadApi.md#getdownloadinfo) | **POST** /download/info | Retrieve download information

mobile/openapi/lib/api/assets_api.dart

@@ -1115,154 +1115,6 @@ class AssetsApi {
     }
   }
 
-  /// Replace asset
-  ///
-  /// Replace the asset with new file, without changing its id.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [MultipartFile] assetData (required):
-  ///   Asset file data
-  ///
-  /// * [String] deviceAssetId (required):
-  ///   Device asset ID
-  ///
-  /// * [String] deviceId (required):
-  ///   Device ID
-  ///
-  /// * [DateTime] fileCreatedAt (required):
-  ///   File creation date
-  ///
-  /// * [DateTime] fileModifiedAt (required):
-  ///   File modification date
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  ///
-  /// * [String] duration:
-  ///   Duration (for videos)
-  ///
-  /// * [String] filename:
-  ///   Filename
-  Future<Response> replaceAssetWithHttpInfo(String id, MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? duration, String? filename, }) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/assets/{id}/original'
-      .replaceAll('{id}', id);
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    if (key != null) {
-      queryParams.addAll(_queryParams('', 'key', key));
-    }
-    if (slug != null) {
-      queryParams.addAll(_queryParams('', 'slug', slug));
-    }
-
-    const contentTypes = <String>['multipart/form-data'];
-
-    bool hasFields = false;
-    final mp = MultipartRequest('PUT', Uri.parse(apiPath));
-    if (assetData != null) {
-      hasFields = true;
-      mp.fields[r'assetData'] = assetData.field;
-      mp.files.add(assetData);
-    }
-    if (deviceAssetId != null) {
-      hasFields = true;
-      mp.fields[r'deviceAssetId'] = parameterToString(deviceAssetId);
-    }
-    if (deviceId != null) {
-      hasFields = true;
-      mp.fields[r'deviceId'] = parameterToString(deviceId);
-    }
-    if (duration != null) {
-      hasFields = true;
-      mp.fields[r'duration'] = parameterToString(duration);
-    }
-    if (fileCreatedAt != null) {
-      hasFields = true;
-      mp.fields[r'fileCreatedAt'] = parameterToString(fileCreatedAt);
-    }
-    if (fileModifiedAt != null) {
-      hasFields = true;
-      mp.fields[r'fileModifiedAt'] = parameterToString(fileModifiedAt);
-    }
-    if (filename != null) {
-      hasFields = true;
-      mp.fields[r'filename'] = parameterToString(filename);
-    }
-    if (hasFields) {
-      postBody = mp;
-    }
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'PUT',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Replace asset
-  ///
-  /// Replace the asset with new file, without changing its id.
-  ///
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [MultipartFile] assetData (required):
-  ///   Asset file data
-  ///
-  /// * [String] deviceAssetId (required):
-  ///   Device asset ID
-  ///
-  /// * [String] deviceId (required):
-  ///   Device ID
-  ///
-  /// * [DateTime] fileCreatedAt (required):
-  ///   File creation date
-  ///
-  /// * [DateTime] fileModifiedAt (required):
-  ///   File modification date
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  ///
-  /// * [String] duration:
-  ///   Duration (for videos)
-  ///
-  /// * [String] filename:
-  ///   Filename
-  Future<AssetMediaResponseDto?> replaceAsset(String id, MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? duration, String? filename, }) async {
-    final response = await replaceAssetWithHttpInfo(id, assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, slug: slug, duration: duration, filename: filename, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetMediaResponseDto',) as AssetMediaResponseDto;
-    
-    }
-    return null;
-  }
-
   /// Run an asset job
   ///
   /// Run a specific job on a set of assets.

mobile/openapi/lib/api/deprecated_api.dart

@@ -363,154 +363,6 @@ class DeprecatedApi {
     return null;
   }
 
-  /// Replace asset
-  ///
-  /// Replace the asset with new file, without changing its id.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [MultipartFile] assetData (required):
-  ///   Asset file data
-  ///
-  /// * [String] deviceAssetId (required):
-  ///   Device asset ID
-  ///
-  /// * [String] deviceId (required):
-  ///   Device ID
-  ///
-  /// * [DateTime] fileCreatedAt (required):
-  ///   File creation date
-  ///
-  /// * [DateTime] fileModifiedAt (required):
-  ///   File modification date
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  ///
-  /// * [String] duration:
-  ///   Duration (for videos)
-  ///
-  /// * [String] filename:
-  ///   Filename
-  Future<Response> replaceAssetWithHttpInfo(String id, MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? duration, String? filename, }) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/assets/{id}/original'
-      .replaceAll('{id}', id);
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    if (key != null) {
-      queryParams.addAll(_queryParams('', 'key', key));
-    }
-    if (slug != null) {
-      queryParams.addAll(_queryParams('', 'slug', slug));
-    }
-
-    const contentTypes = <String>['multipart/form-data'];
-
-    bool hasFields = false;
-    final mp = MultipartRequest('PUT', Uri.parse(apiPath));
-    if (assetData != null) {
-      hasFields = true;
-      mp.fields[r'assetData'] = assetData.field;
-      mp.files.add(assetData);
-    }
-    if (deviceAssetId != null) {
-      hasFields = true;
-      mp.fields[r'deviceAssetId'] = parameterToString(deviceAssetId);
-    }
-    if (deviceId != null) {
-      hasFields = true;
-      mp.fields[r'deviceId'] = parameterToString(deviceId);
-    }
-    if (duration != null) {
-      hasFields = true;
-      mp.fields[r'duration'] = parameterToString(duration);
-    }
-    if (fileCreatedAt != null) {
-      hasFields = true;
-      mp.fields[r'fileCreatedAt'] = parameterToString(fileCreatedAt);
-    }
-    if (fileModifiedAt != null) {
-      hasFields = true;
-      mp.fields[r'fileModifiedAt'] = parameterToString(fileModifiedAt);
-    }
-    if (filename != null) {
-      hasFields = true;
-      mp.fields[r'filename'] = parameterToString(filename);
-    }
-    if (hasFields) {
-      postBody = mp;
-    }
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'PUT',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Replace asset
-  ///
-  /// Replace the asset with new file, without changing its id.
-  ///
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [MultipartFile] assetData (required):
-  ///   Asset file data
-  ///
-  /// * [String] deviceAssetId (required):
-  ///   Device asset ID
-  ///
-  /// * [String] deviceId (required):
-  ///   Device ID
-  ///
-  /// * [DateTime] fileCreatedAt (required):
-  ///   File creation date
-  ///
-  /// * [DateTime] fileModifiedAt (required):
-  ///   File modification date
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  ///
-  /// * [String] duration:
-  ///   Duration (for videos)
-  ///
-  /// * [String] filename:
-  ///   Filename
-  Future<AssetMediaResponseDto?> replaceAsset(String id, MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? duration, String? filename, }) async {
-    final response = await replaceAssetWithHttpInfo(id, assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, slug: slug, duration: duration, filename: filename, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetMediaResponseDto',) as AssetMediaResponseDto;
-    
-    }
-    return null;
-  }
-
   /// Run jobs
   ///
   /// Queue all assets for a specific job type. Defaults to only queueing assets that have not yet been processed, but the force command can be used to re-process all assets.

mobile/openapi/lib/model/permission.dart

@@ -41,7 +41,6 @@ class Permission {
   static const assetPeriodView = Permission._(r'asset.view');
   static const assetPeriodDownload = Permission._(r'asset.download');
   static const assetPeriodUpload = Permission._(r'asset.upload');
-  static const assetPeriodReplace = Permission._(r'asset.replace');
   static const assetPeriodCopy = Permission._(r'asset.copy');
   static const assetPeriodDerive = Permission._(r'asset.derive');
   static const assetPeriodEditPeriodGet = Permission._(r'asset.edit.get');
@@ -200,7 +199,6 @@ class Permission {
     assetPeriodView,
     assetPeriodDownload,
     assetPeriodUpload,
-    assetPeriodReplace,
     assetPeriodCopy,
     assetPeriodDerive,
     assetPeriodEditPeriodGet,
@@ -394,7 +392,6 @@ class PermissionTypeTransformer {
         case r'asset.view': return Permission.assetPeriodView;
         case r'asset.download': return Permission.assetPeriodDownload;
         case r'asset.upload': return Permission.assetPeriodUpload;
-        case r'asset.replace': return Permission.assetPeriodReplace;
         case r'asset.copy': return Permission.assetPeriodCopy;
         case r'asset.derive': return Permission.assetPeriodDerive;
         case r'asset.edit.get': return Permission.assetPeriodEditPeriodGet;

open-api/immich-openapi-specs.json

@@ -4216,89 +4216,6 @@
         ],
         "x-immich-permission": "asset.download",
         "x-immich-state": "Stable"
-      },
-      "put": {
-        "deprecated": true,
-        "description": "Replace the asset with new file, without changing its id.",
-        "operationId": "replaceAsset",
-        "parameters": [
-          {
-            "name": "id",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          },
-          {
-            "name": "key",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "$ref": "#/components/schemas/AssetMediaReplaceDto"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AssetMediaResponseDto"
-                }
-              }
-            },
-            "description": "Asset replaced successfully"
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "summary": "Replace asset",
-        "tags": [
-          "Assets",
-          "Deprecated"
-        ],
-        "x-immich-history": [
-          {
-            "version": "v1",
-            "state": "Added"
-          },
-          {
-            "version": "v1",
-            "state": "Deprecated",
-            "replacementId": "copyAsset"
-          }
-        ],
-        "x-immich-permission": "asset.replace",
-        "x-immich-state": "Deprecated"
       }
     },
     "/assets/{id}/thumbnail": {
@@ -16610,49 +16527,6 @@
         ],
         "type": "object"
       },
-      "AssetMediaReplaceDto": {
-        "properties": {
-          "assetData": {
-            "description": "Asset file data",
-            "format": "binary",
-            "type": "string"
-          },
-          "deviceAssetId": {
-            "description": "Device asset ID",
-            "type": "string"
-          },
-          "deviceId": {
-            "description": "Device ID",
-            "type": "string"
-          },
-          "duration": {
-            "description": "Duration (for videos)",
-            "type": "string"
-          },
-          "fileCreatedAt": {
-            "description": "File creation date",
-            "format": "date-time",
-            "type": "string"
-          },
-          "fileModifiedAt": {
-            "description": "File modification date",
-            "format": "date-time",
-            "type": "string"
-          },
-          "filename": {
-            "description": "Filename",
-            "type": "string"
-          }
-        },
-        "required": [
-          "assetData",
-          "deviceAssetId",
-          "deviceId",
-          "fileCreatedAt",
-          "fileModifiedAt"
-        ],
-        "type": "object"
-      },
       "AssetMediaResponseDto": {
         "properties": {
           "id": {
@@ -19699,7 +19573,6 @@
           "asset.view",
           "asset.download",
           "asset.upload",
-          "asset.replace",
           "asset.copy",
           "asset.derive",
           "asset.edit.get",

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

@@ -1028,22 +1028,6 @@ export type AssetOcrResponseDto = {
     /** Normalized y coordinate of box corner 4 (0-1) */
     y4: number;
 };
-export type AssetMediaReplaceDto = {
-    /** Asset file data */
-    assetData: Blob;
-    /** Device asset ID */
-    deviceAssetId: string;
-    /** Device ID */
-    deviceId: string;
-    /** Duration (for videos) */
-    duration?: string;
-    /** File creation date */
-    fileCreatedAt: string;
-    /** File modification date */
-    fileModifiedAt: string;
-    /** Filename */
-    filename?: string;
-};
 export type SignUpDto = {
     /** User email */
     email: string;
@@ -4270,27 +4254,6 @@ export function downloadAsset({ edited, id, key, slug }: {
         ...opts
     }));
 }
-/**
- * Replace asset
- */
-export function replaceAsset({ id, key, slug, assetMediaReplaceDto }: {
-    id: string;
-    key?: string;
-    slug?: string;
-    assetMediaReplaceDto: AssetMediaReplaceDto;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: AssetMediaResponseDto;
-    }>(`/assets/${encodeURIComponent(id)}/original${QS.query(QS.explode({
-        key,
-        slug
-    }))}`, oazapfts.multipart({
-        ...opts,
-        method: "PUT",
-        body: assetMediaReplaceDto
-    })));
-}
 /**
  * View asset thumbnail
  */
@@ -6920,7 +6883,6 @@ export enum Permission {
     AssetView = "asset.view",
     AssetDownload = "asset.download",
     AssetUpload = "asset.upload",
-    AssetReplace = "asset.replace",
     AssetCopy = "asset.copy",
     AssetDerive = "asset.derive",
     AssetEditGet = "asset.edit.get",

server/src/controllers/asset-media.controller.ts

@@ -8,7 +8,6 @@ import {
   Param,
   ParseFilePipe,
   Post,
-  Put,
   Query,
   Req,
   Res,
@@ -28,10 +27,8 @@ import {
   AssetBulkUploadCheckDto,
   AssetMediaCreateDto,
   AssetMediaOptionsDto,
-  AssetMediaReplaceDto,
   AssetMediaSize,
   CheckExistingAssetsDto,
-  UploadFieldName,
 } from 'src/dtos/asset-media.dto';
 import { AssetDownloadOriginalDto } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
@@ -112,36 +109,6 @@ export class AssetMediaController {
     await sendFile(res, next, () => this.service.downloadOriginal(auth, id, dto), this.logger);
   }
 
-  @Put(':id/original')
-  @UseInterceptors(FileUploadInterceptor)
-  @ApiConsumes('multipart/form-data')
-  @ApiResponse({
-    status: 200,
-    description: 'Asset replaced successfully',
-    type: AssetMediaResponseDto,
-  })
-  @Endpoint({
-    summary: 'Replace asset',
-    description: 'Replace the asset with new file, without changing its id.',
-    history: new HistoryBuilder().added('v1').deprecated('v1', { replacementId: 'copyAsset' }),
-  })
-  @Authenticated({ permission: Permission.AssetReplace, sharedLink: true })
-  async replaceAsset(
-    @Auth() auth: AuthDto,
-    @Param() { id }: UUIDParamDto,
-    @UploadedFiles(new ParseFilePipe({ validators: [new FileNotEmptyValidator([UploadFieldName.ASSET_DATA])] }))
-    files: UploadFiles,
-    @Body() dto: AssetMediaReplaceDto,
-    @Res({ passthrough: true }) res: Response,
-  ): Promise<AssetMediaResponseDto> {
-    const { file } = getFiles(files);
-    const responseDto = await this.service.replaceAsset(auth, id, dto, file);
-    if (responseDto.status === AssetMediaStatus.DUPLICATE) {
-      res.status(HttpStatus.OK);
-    }
-    return responseDto;
-  }
-
   @Get(':id/thumbnail')
   @FileResponse()
   @Authenticated({ permission: Permission.AssetView, sharedLink: true })

server/src/dtos/asset-media.dto.ts

@@ -93,8 +93,6 @@ export class AssetMediaCreateDto extends AssetMediaBase {
   [UploadFieldName.SIDECAR_DATA]?: any;
 }
 
-export class AssetMediaReplaceDto extends AssetMediaBase {}
-
 export class AssetBulkUploadCheckItem {
   @ApiProperty({ description: 'Asset ID' })
   @IsString()

server/src/enum.ts

@@ -105,7 +105,6 @@ export enum Permission {
   AssetView = 'asset.view',
   AssetDownload = 'asset.download',
   AssetUpload = 'asset.upload',
-  AssetReplace = 'asset.replace',
   AssetCopy = 'asset.copy',
   AssetDerive = 'asset.derive',
 

server/src/services/api.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, NotAcceptableException } from '@nestjs/common';
 import { Interval } from '@nestjs/schedule';
 import { NextFunction, Request, Response } from 'express';
 import { readFileSync } from 'node:fs';
@@ -72,6 +72,13 @@ export class ApiService {
         return next();
       }
 
+      const responseType = request.accepts('text/html');
+      if (!responseType) {
+        throw new NotAcceptableException(
+          `The route ${request.path} was requested as ${request.header('accept')}, but only returns text/html`,
+        );
+      }
+
       let status = 200;
       let html = index;
 
@@ -105,7 +112,7 @@ export class ApiService {
         html = render(index, meta);
       }
 
-      res.status(status).type('text/html').header('Cache-Control', 'no-store').send(html);
+      res.status(status).type(responseType).header('Cache-Control', 'no-store').send(html);
     };
   }
 }

server/src/services/asset-media.service.ts

@@ -2,7 +2,6 @@ import { BadRequestException, Injectable, InternalServerErrorException, NotFound
 import { extname } from 'node:path';
 import sanitize from 'sanitize-filename';
 import { StorageCore } from 'src/cores/storage.core';
-import { Asset } from 'src/database';
 import {
   AssetBulkUploadCheckResponseDto,
   AssetMediaResponseDto,
@@ -15,22 +14,13 @@ import {
   AssetBulkUploadCheckDto,
   AssetMediaCreateDto,
   AssetMediaOptionsDto,
-  AssetMediaReplaceDto,
   AssetMediaSize,
   CheckExistingAssetsDto,
   UploadFieldName,
 } from 'src/dtos/asset-media.dto';
 import { AssetDownloadOriginalDto } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import {
-  AssetFileType,
-  AssetStatus,
-  AssetVisibility,
-  CacheControl,
-  JobName,
-  Permission,
-  StorageFolder,
-} from 'src/enum';
+import { AssetFileType, AssetVisibility, CacheControl, JobName, Permission, StorageFolder } from 'src/enum';
 import { AuthRequest } from 'src/middleware/auth.guard';
 import { BaseService } from 'src/services/base.service';
 import { UploadFile, UploadRequest } from 'src/types';
@@ -163,40 +153,6 @@ export class AssetMediaService extends BaseService {
     }
   }
 
-  async replaceAsset(
-    auth: AuthDto,
-    id: string,
-    dto: AssetMediaReplaceDto,
-    file: UploadFile,
-    sidecarFile?: UploadFile,
-  ): Promise<AssetMediaResponseDto> {
-    try {
-      await this.requireAccess({ auth, permission: Permission.AssetUpdate, ids: [id] });
-      const asset = await this.assetRepository.getById(id);
-
-      if (!asset) {
-        throw new Error('Asset not found');
-      }
-
-      this.requireQuota(auth, file.size);
-
-      await this.replaceFileData(asset.id, dto, file, sidecarFile?.originalPath);
-
-      // Next, create a backup copy of the existing record. The db record has already been updated above,
-      // but the local variable holds the original file data paths.
-      const copiedPhoto = await this.createCopy(asset);
-      // and immediate trash it
-      await this.assetRepository.updateAll([copiedPhoto.id], { deletedAt: new Date(), status: AssetStatus.Trashed });
-      await this.eventRepository.emit('AssetTrash', { assetId: copiedPhoto.id, userId: auth.user.id });
-
-      await this.userRepository.updateUsage(auth.user.id, file.size);
-
-      return { status: AssetMediaStatus.REPLACED, id: copiedPhoto.id };
-    } catch (error: any) {
-      return this.handleUploadError(error, auth, file, sidecarFile);
-    }
-  }
-
   async downloadOriginal(auth: AuthDto, id: string, dto: AssetDownloadOriginalDto): Promise<ImmichFileResponse> {
     await this.requireAccess({ auth, permission: Permission.AssetDownload, ids: [id] });
 
@@ -357,82 +313,6 @@ export class AssetMediaService extends BaseService {
     throw error;
   }
 
-  /**
-   * Updates the specified assetId to the specified photo data file properties: checksum, path,
-   * timestamps, deviceIds, and sidecar. Derived properties like: faces, smart search info, etc
-   * are UNTOUCHED. The photo data files modification times on the filesysytem are updated to
-   * the specified timestamps. The exif db record is upserted, and then A METADATA_EXTRACTION
-   * job is queued to update these derived properties.
-   */
-  private async replaceFileData(
-    assetId: string,
-    dto: AssetMediaReplaceDto,
-    file: UploadFile,
-    sidecarPath?: string,
-  ): Promise<void> {
-    await this.assetRepository.update({
-      id: assetId,
-
-      checksum: file.checksum,
-      originalPath: file.originalPath,
-      type: mimeTypes.assetType(file.originalPath),
-      originalFileName: file.originalName,
-
-      deviceAssetId: dto.deviceAssetId,
-      deviceId: dto.deviceId,
-      fileCreatedAt: dto.fileCreatedAt,
-      fileModifiedAt: dto.fileModifiedAt,
-      localDateTime: dto.fileCreatedAt,
-      duration: dto.duration || null,
-
-      livePhotoVideoId: null,
-    });
-
-    await (sidecarPath
-      ? this.assetRepository.upsertFile({ assetId, type: AssetFileType.Sidecar, path: sidecarPath })
-      : this.assetRepository.deleteFile({ assetId, type: AssetFileType.Sidecar }));
-
-    await this.storageRepository.utimes(file.originalPath, new Date(), new Date(dto.fileModifiedAt));
-    await this.assetRepository.upsertExif(
-      { assetId, fileSizeInByte: file.size },
-      { lockedPropertiesBehavior: 'override' },
-    );
-    await this.jobRepository.queue({
-      name: JobName.AssetExtractMetadata,
-      data: { id: assetId, source: 'upload' },
-    });
-  }
-
-  /**
-   * Create a 'shallow' copy of the specified asset record creating a new asset record in the database.
-   * Uses only vital properties excluding things like: stacks, faces, smart search info, etc,
-   * and then queues a METADATA_EXTRACTION job.
-   */
-  private async createCopy(asset: Omit<Asset, 'id'>) {
-    const created = await this.assetRepository.create({
-      ownerId: asset.ownerId,
-      originalPath: asset.originalPath,
-      originalFileName: asset.originalFileName,
-      libraryId: asset.libraryId,
-      deviceAssetId: asset.deviceAssetId,
-      deviceId: asset.deviceId,
-      type: asset.type,
-      checksum: asset.checksum,
-      fileCreatedAt: asset.fileCreatedAt,
-      localDateTime: asset.localDateTime,
-      fileModifiedAt: asset.fileModifiedAt,
-      livePhotoVideoId: asset.livePhotoVideoId,
-    });
-
-    const { size } = await this.storageRepository.stat(created.originalPath);
-    await this.assetRepository.upsertExif(
-      { assetId: created.id, fileSizeInByte: size },
-      { lockedPropertiesBehavior: 'override' },
-    );
-    await this.jobRepository.queue({ name: JobName.AssetExtractMetadata, data: { id: created.id, source: 'copy' } });
-    return created;
-  }
-
   private async create(ownerId: string, dto: AssetMediaCreateDto, file: UploadFile, sidecarFile?: UploadFile) {
     const asset = await this.assetRepository.create({
       ownerId,

server/src/utils/transform.spec.ts

@@ -155,6 +155,33 @@ describe('transformFaceBoundingBox', () => {
       expect(result.boundingBoxX2).toBe(50);
       expect(result.boundingBoxY2).toBe(50);
     });
+
+    it('should always return whole numbers', () => {
+      const edits: AssetEditActionItem[] = [
+        { action: AssetEditAction.Crop, parameters: { x: 50, y: 50, width: 250, height: 250 } },
+      ];
+
+      expect(transformFaceBoundingBox(baseFace, edits, { width: 1000, height: 400 })).toMatchObject({
+        boundingBoxX1: 50,
+        boundingBoxY1: 0,
+        boundingBoxX2: 150,
+        boundingBoxY2: 50,
+      });
+
+      expect(transformFaceBoundingBox(baseFace, edits, { width: 1001, height: 401 })).toMatchObject({
+        boundingBoxX1: 50,
+        boundingBoxY1: 0,
+        boundingBoxX2: 150,
+        boundingBoxY2: 50,
+      });
+
+      expect(transformFaceBoundingBox(baseFace, edits, { width: 999, height: 399 })).toMatchObject({
+        boundingBoxX1: 49,
+        boundingBoxY1: -0,
+        boundingBoxX2: 149,
+        boundingBoxY2: 49,
+      });
+    });
   });
 });
 

server/src/utils/transform.ts

@@ -179,10 +179,10 @@ export const transformFaceBoundingBox = (
   // Ensure x1,y1 is top-left and x2,y2 is bottom-right
   const [p1, p2] = transformedPoints;
   return {
-    boundingBoxX1: Math.min(p1.x, p2.x),
-    boundingBoxY1: Math.min(p1.y, p2.y),
-    boundingBoxX2: Math.max(p1.x, p2.x),
-    boundingBoxY2: Math.max(p1.y, p2.y),
+    boundingBoxX1: Math.trunc(Math.min(p1.x, p2.x)),
+    boundingBoxY1: Math.trunc(Math.min(p1.y, p2.y)),
+    boundingBoxX2: Math.trunc(Math.max(p1.x, p2.x)),
+    boundingBoxY2: Math.trunc(Math.max(p1.y, p2.y)),
     imageWidth: currentWidth,
     imageHeight: currentHeight,
   };

server/test/medium/specs/services/person.service.spec.ts

@@ -591,10 +591,10 @@ describe(PersonService.name, () => {
         expect.arrayContaining([
           expect.objectContaining({
             person: expect.objectContaining({ id: person.id }),
-            boundingBoxX1: expect.closeTo(25, 1),
-            boundingBoxY1: expect.closeTo(50, 1),
-            boundingBoxX2: expect.closeTo(100, 1),
-            boundingBoxY2: expect.closeTo(100, 1),
+            boundingBoxX1: 25,
+            boundingBoxY1: 49,
+            boundingBoxX2: 99,
+            boundingBoxY2: 100,
           }),
         ]),
       );