add web placeholder, server endpoint, migration, various fixes

open-api/immich-openapi-specs.json

@@ -1213,6 +1213,41 @@
         ]
       }
     },
+    "/asset/duplicates": {
+      "get": {
+        "operationId": "getAssetDuplicates",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "items": {
+                    "$ref": "#/components/schemas/AssetResponseDto"
+                  },
+                  "type": "array"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "Asset"
+        ]
+      }
+    },
     "/asset/exist": {
       "post": {
         "description": "Checks if multiple assets exist on the server and returns all existing - used by background backup",

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

@@ -1323,6 +1323,14 @@ export function getAllUserAssetsByDeviceId({ deviceId }: {
         ...opts
     }));
 }
+export function getAssetDuplicates(opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: AssetResponseDto[];
+    }>("/asset/duplicates", {
+        ...opts
+    }));
+}
 /**
  * Checks if multiple assets exist on the server and returns all existing - used by background backup
  */

server/src/controllers/asset.controller.ts

@@ -70,6 +70,11 @@ export class AssetController {
     return this.service.getStatistics(auth, dto);
   }
 
+  @Get('duplicates')
+  getAssetDuplicates(@Auth() auth: AuthDto): Promise<AssetResponseDto[]> {
+    return this.service.getDuplicates(auth);
+  }
+
   @Post('jobs')
   @HttpCode(HttpStatus.NO_CONTENT)
   runAssetJobs(@Auth() auth: AuthDto, @Body() dto: AssetJobsDto): Promise<void> {

server/src/cores/system-config.core.ts

@@ -71,7 +71,7 @@ export const defaults = Object.freeze<SystemConfig>({
     clip: {
       enabled: true,
       modelName: 'ViT-B-32__openai',
-      duplicateThreshold: 0.01,
+      duplicateThreshold: 0.03,
     },
     facialRecognition: {
       enabled: true,

server/src/entities/asset-duplicate.entity.ts

@@ -4,7 +4,7 @@ import { Entity, Index, JoinColumn, OneToMany, PrimaryColumn } from 'typeorm';
 @Entity('asset_duplicates')
 @Index('asset_duplicates_assetId_uindex', ['assetId'], { unique: true })
 export class AssetDuplicateEntity {
-  @OneToMany(() => AssetEntity, (asset) => asset.duplicates)
+  @OneToMany(() => AssetEntity, (asset) => asset.duplicates, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
   @JoinColumn({ name: 'assetId', referencedColumnName: 'id' })
   assets!: AssetEntity;
 

server/src/entities/asset.entity.ts

@@ -1,4 +1,5 @@
 import { AlbumEntity } from 'src/entities/album.entity';
+import { AssetDuplicateEntity } from 'src/entities/asset-duplicate.entity';
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
 import { AssetStackEntity } from 'src/entities/asset-stack.entity';
@@ -24,7 +25,6 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm';
-import { AssetDuplicateEntity } from './asset-duplicate.entity';
 
 export const ASSET_CHECKSUM_CONSTRAINT = 'UQ_assets_owner_library_checksum';
 
@@ -173,7 +173,7 @@ export class AssetEntity {
   @Column({ nullable: true })
   duplicateId?: string | null;
 
-  @ManyToOne(() => AssetDuplicateEntity, { nullable: true, onDelete: 'SET NULL', onUpdate: 'CASCADE' })
+  @ManyToOne(() => AssetDuplicateEntity, { nullable: true })
   @JoinColumn({ name: 'duplicateId' })
   duplicates?: AssetDuplicateEntity | null;
 }

server/src/interfaces/asset.interface.ts

@@ -61,6 +61,7 @@ export interface AssetBuilderOptions {
   isArchived?: boolean;
   isFavorite?: boolean;
   isTrashed?: boolean;
+  isDuplicate?: boolean;
   albumId?: string;
   personId?: string;
   userIds?: string[];
@@ -172,8 +173,9 @@ export interface IAssetRepository {
   getTimeBuckets(options: TimeBucketOptions): Promise<TimeBucketItem[]>;
   getTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise<AssetEntity[]>;
   upsertExif(exif: Partial<ExifEntity>): Promise<void>;
-  upsertJobStatus(jobStatus: Partial<AssetJobStatusEntity>): Promise<void>;
+  upsertJobStatus(jobStatus: Partial<AssetJobStatusEntity> | Partial<AssetJobStatusEntity>[]): Promise<void>;
   getAssetIdByCity(userId: string, options: AssetExploreFieldOptions): Promise<SearchExploreItem<string>>;
   getAssetIdByTag(userId: string, options: AssetExploreFieldOptions): Promise<SearchExploreItem<string>>;
+  getDuplicates(options: AssetBuilderOptions): Promise<AssetEntity[]>;
   searchMetadata(query: string, userIds: string[], options: MetadataSearchOptions): Promise<AssetEntity[]>;
 }

server/src/interfaces/search.interface.ts

@@ -179,6 +179,7 @@ export interface FaceEmbeddingSearch extends SearchEmbeddingOptions {
 
 export interface AssetDuplicateSearch {
   assetId: string;
+  embedding: Embedding;
   userIds: string[];
   maxDistance?: number;
 }

server/src/migrations/1711989989911-CreateAssetDuplicateTable.ts

@@ -0,0 +1,36 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class CreateAssetDuplicateTable1711989989911 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        CREATE TABLE asset_duplicates (
+            id uuid,
+            "assetId" uuid REFERENCES assets ON UPDATE CASCADE ON DELETE CASCADE,
+            PRIMARY KEY (id, "assetId")
+        );
+    `);
+
+    await queryRunner.query(`ALTER TABLE assets ADD COLUMN "duplicateId" uuid`);
+
+    await queryRunner.query(`ALTER TABLE asset_job_status ADD COLUMN "duplicatesDetectedAt" timestamptz`);
+
+    await queryRunner.query(`
+        ALTER TABLE assets
+          ADD CONSTRAINT asset_duplicates_id
+            FOREIGN KEY ("duplicateId", id)
+            REFERENCES asset_duplicates DEFERRABLE INITIALLY DEFERRED
+    `);
+
+    await queryRunner.query(`
+        CREATE UNIQUE INDEX "asset_duplicates_assetId_uindex"
+        ON asset_duplicates ("assetId")
+    `);
+
+    await queryRunner.query(`CREATE INDEX "IDX_assets_duplicateId" ON assets ("duplicateId")`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE assets DROP COLUMN "duplicateId"`);
+    await queryRunner.query(`DROP TABLE asset_duplicates`);
+  }
+}

server/src/repositories/asset-duplicate.repository.ts

@@ -22,7 +22,7 @@ export class AssetDuplicateRepository implements IAssetDuplicateRepository {
         await manager.update(AssetDuplicateEntity, { id: In(oldDuplicateIds) }, { id });
       }
       await manager.update(AssetEntity, { id: In(assetIds) }, { duplicateId: id });
-      await manager.update(AssetEntity, { duplicateId: In(oldDuplicateIds) }, { duplicateId: id }); // TODO: cascade should handle this, but it doesn't seem to
+      await manager.update(AssetEntity, { duplicateId: In(oldDuplicateIds) }, { duplicateId: id });
     });
   }