helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-07 17:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(server): don't re-run face recognition on assets without any faces (#4854)

Browse source 
* Add AssetJobStatus

* fentity

* Add jobStatus field to AssetEntity

* Fix the migration doc paths

* Filter on facesRecognizedAt

* Set facesRecognizedAt field

* Test for facesRecognizedAt

* Done testing

* Adjust FK properties

* Add tests for WithoutProperty.FACES

* chore: non-nullable

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
Sushain Cherivirala 2023-11-09 17:55:00 -08:00 • committed by GitHub
parent 75c065c83a
commit 986bbfa831
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 119 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

54
server/test/e2e/asset.e2e-spec.ts
View file

@ -6,9 +6,12 @@ import {
LoginResponseDto,
SharedLinkResponseDto,
TimeBucketSize,
WithoutProperty,
usePagination,
} from '@app/domain';
import { AssetController } from '@app/immich';
import { AssetEntity, AssetType, SharedLinkType } from '@app/infra/entities';
import { AssetRepository } from '@app/infra/repositories';
import { INestApplication } from '@nestjs/common';
import { api } from '@test/api';
import { errorStub, uuidStub } from '@test/fixtures';
@ -788,4 +791,55 @@ describe(`${AssetController.name} (e2e)`, () => {
expect(asset.stack).toEqual(expect.arrayContaining([expect.objectContaining({ id: asset3.id })]));
});
});
describe(AssetRepository.name, () => {
describe('getWithout', () => {
describe('WithoutProperty.FACES', () => {
const getAssetIdsWithoutFaces = async () => {
const assetPagination = usePagination(10, (pagination) =>
assetRepository.getWithout(pagination, WithoutProperty.FACES),
);
let assets: AssetEntity[] = [];
for await (const assetsPage of assetPagination) {
assets = [...assets, ...assetsPage];
}
return assets.map((a) => a.id);
};
beforeEach(async () => {
await assetRepository.save({ id: asset1.id, resizePath: '/path/to/resize' });
expect(await getAssetIdsWithoutFaces()).toContain(asset1.id);
});
describe('with recognized faces', () => {
beforeEach(async () => {
const personRepository = app.get<IPersonRepository>(IPersonRepository);
const person = await personRepository.create({ ownerId: asset1.ownerId, name: 'Test Person' });
await personRepository.createFace({ assetId: asset1.id, personId: person.id });
});
it('should not return asset with facesRecognizedAt unset', async () => {
expect(await getAssetIdsWithoutFaces()).not.toContain(asset1.id);
});
it('should not return asset with facesRecognizedAt set', async () => {
await assetRepository.upsertJobStatus({ assetId: asset1.id, facesRecognizedAt: new Date() });
expect(await getAssetIdsWithoutFaces()).not.toContain(asset1.id);
});
});
describe('without recognized faces', () => {
it('should return asset with facesRecognizedAt unset', async () => {
expect(await getAssetIdsWithoutFaces()).toContain(asset1.id);
});
it('should not return asset with facesRecognizedAt set', async () => {
expect(await getAssetIdsWithoutFaces()).toContain(asset1.id);
await assetRepository.upsertJobStatus({ assetId: asset1.id, facesRecognizedAt: new Date() });
expect(await getAssetIdsWithoutFaces()).not.toContain(asset1.id);
});
});
});
});
});
});