refresh faces

open-api/immich-openapi-specs.json

@@ -8170,8 +8170,9 @@
       },
       "AssetJobName": {
         "enum": [
-          "regenerate-thumbnail",
+          "refresh-faces",
           "refresh-metadata",
+          "regenerate-thumbnail",
           "transcode-video"
         ],
         "type": "string"
@@ -9230,8 +9231,7 @@
           }
         },
         "required": [
-          "command",
-          "force"
+          "command"
         ],
         "type": "object"
       },

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

@@ -548,7 +548,7 @@ export type AllJobStatusResponseDto = {
 };
 export type JobCommandDto = {
     command: JobCommand;
-    force: boolean;
+    force?: boolean;
 };
 export type LibraryResponseDto = {
     assetCount: number;
@@ -3350,8 +3350,9 @@ export enum Reason {
     UnsupportedFormat = "unsupported-format"
 }
 export enum AssetJobName {
-    RegenerateThumbnail = "regenerate-thumbnail",
+    RefreshFaces = "refresh-faces",
     RefreshMetadata = "refresh-metadata",
+    RegenerateThumbnail = "regenerate-thumbnail",
     TranscodeVideo = "transcode-video"
 }
 export enum AssetMediaSize {

server/src/dtos/asset.dto.ts

@@ -89,8 +89,9 @@ export class AssetIdsDto {
 }
 
 export enum AssetJobName {
-  REGENERATE_THUMBNAIL = 'regenerate-thumbnail',
+  REFRESH_FACES = 'refresh-faces',
   REFRESH_METADATA = 'refresh-metadata',
+  REGENERATE_THUMBNAIL = 'regenerate-thumbnail',
   TRANSCODE_VIDEO = 'transcode-video',
 }
 

server/src/dtos/job.dto.ts

@@ -17,7 +17,7 @@ export class JobCommandDto {
   command!: JobCommand;
 
   @ValidateBoolean({ optional: true })
-  force!: boolean;
+  force?: boolean;
 }
 
 export class JobCountsDto {

server/src/interfaces/person.interface.ts

@@ -59,7 +59,7 @@ export interface IPersonRepository {
   delete(entities: PersonEntity[]): Promise<void>;
   deleteAll(): Promise<void>;
   deleteAllFaces(options: DeleteAllFacesOptions): Promise<void>;
-  replaceFaces(assetId: string, entities: Partial<AssetFaceEntity>[], sourceType?: string): Promise<string[]>;
+  refreshFaces(facesToAdd: Partial<AssetFaceEntity>[], faceIdsToRemove: string[]): Promise<void>;
   getAllFaces(pagination: PaginationOptions, options?: FindManyOptions<AssetFaceEntity>): Paginated<AssetFaceEntity>;
   getFaceById(id: string): Promise<AssetFaceEntity>;
   getFaceByIdWithAssets(

server/src/repositories/asset.repository.ts

@@ -123,7 +123,6 @@ export class AssetRepository implements IAssetRepository {
       relations: {
         exifInfo: true,
         smartInfo: true,
-        tags: true,
         faces: {
           person: true,
         },

server/src/repositories/person.repository.ts

@@ -5,6 +5,7 @@ import { ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
 import { AssetEntity } from 'src/entities/asset.entity';
+import { FaceSearchEntity } from 'src/entities/face-search.entity';
 import { PersonEntity } from 'src/entities/person.entity';
 import {
   AssetFaceId,
@@ -29,6 +30,7 @@ export class PersonRepository implements IPersonRepository {
     @InjectRepository(AssetEntity) private assetRepository: Repository<AssetEntity>,
     @InjectRepository(PersonEntity) private personRepository: Repository<PersonEntity>,
     @InjectRepository(AssetFaceEntity) private assetFaceRepository: Repository<AssetFaceEntity>,
+    @InjectRepository(FaceSearchEntity) private faceSearchRepository: Repository<FaceSearchEntity>,
     @InjectRepository(AssetJobStatusEntity) private jobStatusRepository: Repository<AssetJobStatusEntity>,
   ) {}
 
@@ -284,12 +286,26 @@ export class PersonRepository implements IPersonRepository {
     return res.map((row) => row.id);
   }
 
-  async replaceFaces(assetId: string, entities: AssetFaceEntity[], sourceType: string): Promise<string[]> {
-    return this.dataSource.transaction(async (manager) => {
-      await manager.delete(AssetFaceEntity, { assetId, sourceType });
-      const assetFaces = await manager.save(AssetFaceEntity, entities);
-      return assetFaces.map(({ id }) => id);
-    });
+  async refreshFaces(facesToAdd: Partial<AssetFaceEntity>[], faceIdsToRemove: string[]): Promise<void> {
+    const deletedCte = this.assetFaceRepository
+      .createQueryBuilder()
+      .delete()
+      .where('id = ANY(:faceIdsToRemove)', { faceIdsToRemove });
+
+    if (facesToAdd.length === 0) {
+      await deletedCte.execute();
+      return;
+    }
+
+    const addedCte = this.assetFaceRepository.createQueryBuilder().insert().values(facesToAdd);
+
+    await this.faceSearchRepository
+      .createQueryBuilder()
+      .addCommonTableExpression(deletedCte, 'deleted')
+      .addCommonTableExpression(addedCte, 'added')
+      .insert()
+      .values(facesToAdd.map((face) => face.faceSearch!))
+      .execute();
   }
 
   async update(entities: Partial<PersonEntity>[]): Promise<PersonEntity[]> {

server/src/services/asset.service.ts

@@ -113,7 +113,6 @@ export class AssetService {
       id,
       {
         exifInfo: true,
-        tags: true,
         sharedLinks: true,
         smartInfo: true,
         owner: true,
@@ -166,7 +165,6 @@ export class AssetService {
       exifInfo: true,
       owner: true,
       smartInfo: true,
-      tags: true,
       faces: {
         person: true,
       },
@@ -298,6 +296,11 @@ export class AssetService {
 
     for (const id of dto.assetIds) {
       switch (dto.name) {
+        case AssetJobName.REFRESH_FACES: {
+          jobs.push({ name: JobName.FACE_DETECTION, data: { id } });
+          break;
+        }
+
         case AssetJobName.REFRESH_METADATA: {
           jobs.push({ name: JobName.METADATA_EXTRACTION, data: { id } });
           break;

server/src/services/metadata.service.spec.ts

@@ -981,11 +981,11 @@ describe(MetadataService.name, () => {
       metadataMock.readTags.mockResolvedValue(metadataStub.withFaceNoName);
       personMock.getDistinctNames.mockResolvedValue([]);
       personMock.create.mockResolvedValue([]);
-      personMock.replaceFaces.mockResolvedValue([]);
+      personMock.refreshFaces.mockResolvedValue([]);
       personMock.update.mockResolvedValue([]);
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
       expect(personMock.create).toHaveBeenCalledWith([]);
-      expect(personMock.replaceFaces).toHaveBeenCalledWith(assetStub.primaryImage.id, [], SourceType.EXIF);
+      expect(personMock.refreshFaces).toHaveBeenCalledWith(assetStub.primaryImage.id, [], SourceType.EXIF);
       expect(personMock.update).toHaveBeenCalledWith([]);
     });
 
@@ -995,11 +995,11 @@ describe(MetadataService.name, () => {
       metadataMock.readTags.mockResolvedValue(metadataStub.withFaceEmptyName);
       personMock.getDistinctNames.mockResolvedValue([]);
       personMock.create.mockResolvedValue([]);
-      personMock.replaceFaces.mockResolvedValue([]);
+      personMock.refreshFaces.mockResolvedValue([]);
       personMock.update.mockResolvedValue([]);
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
       expect(personMock.create).toHaveBeenCalledWith([]);
-      expect(personMock.replaceFaces).toHaveBeenCalledWith(assetStub.primaryImage.id, [], SourceType.EXIF);
+      expect(personMock.refreshFaces).toHaveBeenCalledWith(assetStub.primaryImage.id, [], SourceType.EXIF);
       expect(personMock.update).toHaveBeenCalledWith([]);
     });
 
@@ -1009,13 +1009,13 @@ describe(MetadataService.name, () => {
       metadataMock.readTags.mockResolvedValue(metadataStub.withFace);
       personMock.getDistinctNames.mockResolvedValue([]);
       personMock.create.mockResolvedValue([personStub.withName]);
-      personMock.replaceFaces.mockResolvedValue(['face-asset-uuid']);
+      personMock.refreshFaces.mockResolvedValue(['face-asset-uuid']);
       personMock.update.mockResolvedValue([personStub.withName]);
       await sut.handleMetadataExtraction({ id: assetStub.primaryImage.id });
       expect(assetMock.getByIds).toHaveBeenCalledWith([assetStub.primaryImage.id]);
       expect(personMock.getDistinctNames).toHaveBeenCalledWith(assetStub.primaryImage.ownerId, { withHidden: true });
       expect(personMock.create).toHaveBeenCalledWith([expect.objectContaining({ name: personStub.withName.name })]);
-      expect(personMock.replaceFaces).toHaveBeenCalledWith(
+      expect(personMock.refreshFaces).toHaveBeenCalledWith(
         assetStub.primaryImage.id,
         [
           {
@@ -1048,13 +1048,13 @@ describe(MetadataService.name, () => {
       metadataMock.readTags.mockResolvedValue(metadataStub.withFace);
       personMock.getDistinctNames.mockResolvedValue([{ id: personStub.withName.id, name: personStub.withName.name }]);
       personMock.create.mockResolvedValue([]);
-      personMock.replaceFaces.mockResolvedValue(['face-asset-uuid']);
+      personMock.refreshFaces.mockResolvedValue(['face-asset-uuid']);
       personMock.update.mockResolvedValue([personStub.withName]);
       await sut.handleMetadataExtraction({ id: assetStub.primaryImage.id });
       expect(assetMock.getByIds).toHaveBeenCalledWith([assetStub.primaryImage.id]);
       expect(personMock.getDistinctNames).toHaveBeenCalledWith(assetStub.primaryImage.ownerId, { withHidden: true });
       expect(personMock.create).toHaveBeenCalledWith([]);
-      expect(personMock.replaceFaces).toHaveBeenCalledWith(
+      expect(personMock.refreshFaces).toHaveBeenCalledWith(
         assetStub.primaryImage.id,
         [
           {

server/src/services/metadata.service.ts

@@ -219,7 +219,7 @@ export class MetadataService {
 
   async handleMetadataExtraction({ id }: IEntityJob): Promise<JobStatus> {
     const { metadata } = await this.configCore.getConfig({ withCache: true });
-    const [asset] = await this.assetRepository.getByIds([id]);
+    const [asset] = await this.assetRepository.getByIds([id], { faces: { person: false } });
     if (!asset) {
       return JobStatus.FAILED;
     }
@@ -525,7 +525,7 @@ export class MetadataService {
       return;
     }
 
-    const discoveredFaces: Partial<AssetFaceEntity>[] = [];
+    const facesToAdd: Partial<AssetFaceEntity>[] = [];
     const existingNames = await this.personRepository.getDistinctNames(asset.ownerId, { withHidden: true });
     const existingNameMap = new Map(existingNames.map(({ id, name }) => [name.toLowerCase(), id]));
     const missing: Partial<PersonEntity>[] = [];
@@ -553,7 +553,7 @@ export class MetadataService {
         sourceType: SourceType.EXIF,
       };
 
-      discoveredFaces.push(face);
+      facesToAdd.push(face);
       if (!existingNameMap.has(loweredName)) {
         missing.push({ id: personId, ownerId: asset.ownerId, name: region.Name });
         missingWithFaceAsset.push({ id: personId, faceAssetId: face.id });
@@ -562,21 +562,29 @@ export class MetadataService {
 
     if (missing.length > 0) {
       this.logger.debug(`Creating missing persons: ${missing.map((p) => `${p.name}/${p.id}`)}`);
+      const newPersons = await this.personRepository.create(missing);
+      const jobs = newPersons.map(
+        (person) => ({ name: JobName.GENERATE_PERSON_THUMBNAIL, data: { id: person.id } }) as const,
+      );
+      await this.jobRepository.queueAll(jobs);
     }
 
-    const newPersons = await this.personRepository.create(missing);
+    const facesToRemove = asset.faces.filter((face) => face.sourceType === SourceType.EXIF).map((face) => face.id);
+    if (facesToRemove.length > 0) {
+      this.logger.debug(`Removing ${facesToRemove.length} faces for asset ${asset.id}`);
+    }
 
-    const faceIds = await this.personRepository.replaceFaces(asset.id, discoveredFaces, SourceType.EXIF);
-    this.logger.debug(`Created ${faceIds.length} faces for asset ${asset.id}`);
+    if (facesToAdd.length > 0) {
+      this.logger.debug(`Creating ${facesToAdd} faces from metadata for asset ${asset.id}`);
+    }
 
-    await this.personRepository.update(missingWithFaceAsset);
+    if (facesToRemove.length > 0 || facesToAdd.length > 0) {
+      await this.personRepository.refreshFaces(facesToAdd, facesToRemove);
+    }
 
-    await this.jobRepository.queueAll(
-      newPersons.map((person) => ({
-        name: JobName.GENERATE_PERSON_THUMBNAIL,
-        data: { id: person.id },
-      })),
-    );
+    if (missingWithFaceAsset.length > 0) {
+      await this.personRepository.update(missingWithFaceAsset);
+    }
   }
 
   private async exifData(