mirror of
https://github.com/immich-app/immich.git
synced 2025-06-23 15:30:51 -04:00
* feat: faces-from-metadata - Import face regions from metadata Implements immich-app#1692. - OpenAPI spec changes to accomodate metadata face import configs. New settings to enable the feature. - Updates admin UI compoments - ML faces detection/recognition & Exif/Metadata faces compatibility Signed-off-by: BugFest <bugfest.dev@pm.me> * chore(web): remove unused file confirm-enable-import-faces * chore(web): format metadata-settings * fix(server): faces-from-metadata tests and format * fix(server): code refinements, nullable face asset sourceType * fix(server): Add RegionInfo to ImmichTags interface * fix(server): deleteAllFaces sourceType param can be undefined * fix(server): exiftool-vendored 27.0.0 moves readArgs into ExifToolOptions * fix(server): rename isImportFacesFromMetadataEnabled to isFaceImportEnabled * fix(server): simplify sourceType conditional * fix(server): small fixes * fix(server): handling sourceType * fix(server): sourceType enum * fix(server): refactor metadata applyTaggedFaces * fix(server): create/update signature changes * fix(server): reduce computational cost of Person.getManyByName * fix(server): use faceList instead of faceSet * fix(server): Skip regions without Name defined * fix(mobile): Update open-api (face assets feature changes) * fix(server): Face-Person reconciliation with map/index * fix(server): tags.RegionInfo.AppliedToDimensions must be defined to process face-region * fix(server): fix shared-link.service.ts format * fix(mobile): Update open-api after branch update * simplify * fix(server): minor fixes * fix(server): person create/update methods type enforcement * fix(server): style fixes * fix(server): remove unused metadata code * fix(server): metadata faces unit tests * fix(server): top level config metadata category * fix(server): rename upsertFaces to replaceFaces * fix(server): remove sourceType when unnecessary * fix(server): sourceType as ENUM * fix(server): format fixes * fix(server): fix tests after sourceType ENUM change * fix(server): remove unnecessary JobItem cast * fix(server): fix asset enum imports * fix(open-api): add metadata config * fix(mobile): update open-api after metadata open-api spec changes * fix(web): update web/api metadata config * fix(server): remove duplicated sourceType def * fix(server): update generated sql queries * fix(e2e): tests for metadata face import feature * fix(web): Fix check:typescript * fix(e2e): update subproject ref * fix(server): revert format changes to pass format checks after ci * fix(mobile): update open-api * fix(server,movile,open-api,mobile): sourceType as DB data type * fix(e2e): upload face asset after enabling metadata face import * fix(web): simplify metadata admin settings and i18n keys * Update person.repository.ts Co-authored-by: Jason Rasmussen <jason@rasm.me> * fix(server): asset_faces.sourceType column not nullable * fix(server): simplified syntax * fix(e2e): use SDK for everything except the endpoint being tested * fix(e2e): fix test format * chore: clean up * chore: clean up * chore: update e2e/test-assets --------- Signed-off-by: BugFest <bugfest.dev@pm.me> Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com> Co-authored-by: Jason Rasmussen <jason@rasm.me>
288 lines
9.0 KiB
TypeScript
288 lines
9.0 KiB
TypeScript
import { SystemMetadataKey } from 'src/enum';
|
|
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
|
|
import { ILoggerRepository } from 'src/interfaces/logger.interface';
|
|
import { IServerInfoRepository } from 'src/interfaces/server-info.interface';
|
|
import { IStorageRepository } from 'src/interfaces/storage.interface';
|
|
import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
|
|
import { IUserRepository } from 'src/interfaces/user.interface';
|
|
import { ServerService } from 'src/services/server.service';
|
|
import { newCryptoRepositoryMock } from 'test/repositories/crypto.repository.mock';
|
|
import { newLoggerRepositoryMock } from 'test/repositories/logger.repository.mock';
|
|
import { newServerInfoRepositoryMock } from 'test/repositories/server-info.repository.mock';
|
|
import { newStorageRepositoryMock } from 'test/repositories/storage.repository.mock';
|
|
import { newSystemMetadataRepositoryMock } from 'test/repositories/system-metadata.repository.mock';
|
|
import { newUserRepositoryMock } from 'test/repositories/user.repository.mock';
|
|
import { Mocked } from 'vitest';
|
|
|
|
describe(ServerService.name, () => {
|
|
let sut: ServerService;
|
|
let storageMock: Mocked<IStorageRepository>;
|
|
let userMock: Mocked<IUserRepository>;
|
|
let serverInfoMock: Mocked<IServerInfoRepository>;
|
|
let systemMock: Mocked<ISystemMetadataRepository>;
|
|
let loggerMock: Mocked<ILoggerRepository>;
|
|
let cryptoMock: Mocked<ICryptoRepository>;
|
|
|
|
beforeEach(() => {
|
|
storageMock = newStorageRepositoryMock();
|
|
userMock = newUserRepositoryMock();
|
|
serverInfoMock = newServerInfoRepositoryMock();
|
|
systemMock = newSystemMetadataRepositoryMock();
|
|
loggerMock = newLoggerRepositoryMock();
|
|
cryptoMock = newCryptoRepositoryMock();
|
|
|
|
sut = new ServerService(userMock, storageMock, systemMock, serverInfoMock, loggerMock, cryptoMock);
|
|
});
|
|
|
|
it('should work', () => {
|
|
expect(sut).toBeDefined();
|
|
});
|
|
|
|
describe('getStorage', () => {
|
|
it('should return the disk space as B', async () => {
|
|
storageMock.checkDiskUsage.mockResolvedValue({ free: 200, available: 300, total: 500 });
|
|
|
|
await expect(sut.getStorage()).resolves.toEqual({
|
|
diskAvailable: '300 B',
|
|
diskAvailableRaw: 300,
|
|
diskSize: '500 B',
|
|
diskSizeRaw: 500,
|
|
diskUsagePercentage: 60,
|
|
diskUse: '300 B',
|
|
diskUseRaw: 300,
|
|
});
|
|
|
|
expect(storageMock.checkDiskUsage).toHaveBeenCalledWith('upload/library');
|
|
});
|
|
|
|
it('should return the disk space as KiB', async () => {
|
|
storageMock.checkDiskUsage.mockResolvedValue({ free: 200_000, available: 300_000, total: 500_000 });
|
|
|
|
await expect(sut.getStorage()).resolves.toEqual({
|
|
diskAvailable: '293.0 KiB',
|
|
diskAvailableRaw: 300_000,
|
|
diskSize: '488.3 KiB',
|
|
diskSizeRaw: 500_000,
|
|
diskUsagePercentage: 60,
|
|
diskUse: '293.0 KiB',
|
|
diskUseRaw: 300_000,
|
|
});
|
|
|
|
expect(storageMock.checkDiskUsage).toHaveBeenCalledWith('upload/library');
|
|
});
|
|
|
|
it('should return the disk space as MiB', async () => {
|
|
storageMock.checkDiskUsage.mockResolvedValue({ free: 200_000_000, available: 300_000_000, total: 500_000_000 });
|
|
|
|
await expect(sut.getStorage()).resolves.toEqual({
|
|
diskAvailable: '286.1 MiB',
|
|
diskAvailableRaw: 300_000_000,
|
|
diskSize: '476.8 MiB',
|
|
diskSizeRaw: 500_000_000,
|
|
diskUsagePercentage: 60,
|
|
diskUse: '286.1 MiB',
|
|
diskUseRaw: 300_000_000,
|
|
});
|
|
|
|
expect(storageMock.checkDiskUsage).toHaveBeenCalledWith('upload/library');
|
|
});
|
|
|
|
it('should return the disk space as GiB', async () => {
|
|
storageMock.checkDiskUsage.mockResolvedValue({
|
|
free: 200_000_000_000,
|
|
available: 300_000_000_000,
|
|
total: 500_000_000_000,
|
|
});
|
|
|
|
await expect(sut.getStorage()).resolves.toEqual({
|
|
diskAvailable: '279.4 GiB',
|
|
diskAvailableRaw: 300_000_000_000,
|
|
diskSize: '465.7 GiB',
|
|
diskSizeRaw: 500_000_000_000,
|
|
diskUsagePercentage: 60,
|
|
diskUse: '279.4 GiB',
|
|
diskUseRaw: 300_000_000_000,
|
|
});
|
|
|
|
expect(storageMock.checkDiskUsage).toHaveBeenCalledWith('upload/library');
|
|
});
|
|
|
|
it('should return the disk space as TiB', async () => {
|
|
storageMock.checkDiskUsage.mockResolvedValue({
|
|
free: 200_000_000_000_000,
|
|
available: 300_000_000_000_000,
|
|
total: 500_000_000_000_000,
|
|
});
|
|
|
|
await expect(sut.getStorage()).resolves.toEqual({
|
|
diskAvailable: '272.8 TiB',
|
|
diskAvailableRaw: 300_000_000_000_000,
|
|
diskSize: '454.7 TiB',
|
|
diskSizeRaw: 500_000_000_000_000,
|
|
diskUsagePercentage: 60,
|
|
diskUse: '272.8 TiB',
|
|
diskUseRaw: 300_000_000_000_000,
|
|
});
|
|
|
|
expect(storageMock.checkDiskUsage).toHaveBeenCalledWith('upload/library');
|
|
});
|
|
|
|
it('should return the disk space as PiB', async () => {
|
|
storageMock.checkDiskUsage.mockResolvedValue({
|
|
free: 200_000_000_000_000_000,
|
|
available: 300_000_000_000_000_000,
|
|
total: 500_000_000_000_000_000,
|
|
});
|
|
|
|
await expect(sut.getStorage()).resolves.toEqual({
|
|
diskAvailable: '266.5 PiB',
|
|
diskAvailableRaw: 300_000_000_000_000_000,
|
|
diskSize: '444.1 PiB',
|
|
diskSizeRaw: 500_000_000_000_000_000,
|
|
diskUsagePercentage: 60,
|
|
diskUse: '266.5 PiB',
|
|
diskUseRaw: 300_000_000_000_000_000,
|
|
});
|
|
|
|
expect(storageMock.checkDiskUsage).toHaveBeenCalledWith('upload/library');
|
|
});
|
|
});
|
|
|
|
describe('ping', () => {
|
|
it('should respond with pong', () => {
|
|
expect(sut.ping()).toEqual({ res: 'pong' });
|
|
});
|
|
});
|
|
|
|
describe('getFeatures', () => {
|
|
it('should respond the server features', async () => {
|
|
await expect(sut.getFeatures()).resolves.toEqual({
|
|
smartSearch: true,
|
|
duplicateDetection: true,
|
|
facialRecognition: true,
|
|
importFaces: false,
|
|
map: true,
|
|
reverseGeocoding: true,
|
|
oauth: false,
|
|
oauthAutoLaunch: false,
|
|
passwordLogin: true,
|
|
search: true,
|
|
sidecar: true,
|
|
configFile: false,
|
|
trash: true,
|
|
email: false,
|
|
});
|
|
expect(systemMock.get).toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('getConfig', () => {
|
|
it('should respond the server configuration', async () => {
|
|
await expect(sut.getConfig()).resolves.toEqual({
|
|
loginPageMessage: '',
|
|
oauthButtonText: 'Login with OAuth',
|
|
trashDays: 30,
|
|
userDeleteDelay: 7,
|
|
isInitialized: undefined,
|
|
isOnboarded: false,
|
|
externalDomain: '',
|
|
});
|
|
expect(systemMock.get).toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('getStats', () => {
|
|
it('should total up usage by user', async () => {
|
|
userMock.getUserStats.mockResolvedValue([
|
|
{
|
|
userId: 'user1',
|
|
userName: '1 User',
|
|
photos: 10,
|
|
videos: 11,
|
|
usage: 12_345,
|
|
quotaSizeInBytes: 0,
|
|
},
|
|
{
|
|
userId: 'user2',
|
|
userName: '2 User',
|
|
photos: 10,
|
|
videos: 20,
|
|
usage: 123_456,
|
|
quotaSizeInBytes: 0,
|
|
},
|
|
{
|
|
userId: 'user3',
|
|
userName: '3 User',
|
|
photos: 100,
|
|
videos: 0,
|
|
usage: 987_654,
|
|
quotaSizeInBytes: 0,
|
|
},
|
|
]);
|
|
|
|
await expect(sut.getStatistics()).resolves.toEqual({
|
|
photos: 120,
|
|
videos: 31,
|
|
usage: 1_123_455,
|
|
usageByUser: [
|
|
{
|
|
photos: 10,
|
|
quotaSizeInBytes: 0,
|
|
usage: 12_345,
|
|
userName: '1 User',
|
|
userId: 'user1',
|
|
videos: 11,
|
|
},
|
|
{
|
|
photos: 10,
|
|
quotaSizeInBytes: 0,
|
|
usage: 123_456,
|
|
userName: '2 User',
|
|
userId: 'user2',
|
|
videos: 20,
|
|
},
|
|
{
|
|
photos: 100,
|
|
quotaSizeInBytes: 0,
|
|
usage: 987_654,
|
|
userName: '3 User',
|
|
userId: 'user3',
|
|
videos: 0,
|
|
},
|
|
],
|
|
});
|
|
|
|
expect(userMock.getUserStats).toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('setLicense', () => {
|
|
it('should save license if valid', async () => {
|
|
systemMock.set.mockResolvedValue();
|
|
|
|
const license = { licenseKey: 'IMSV-license-key', activationKey: 'activation-key' };
|
|
await sut.setLicense(license);
|
|
|
|
expect(systemMock.set).toHaveBeenCalledWith(SystemMetadataKey.LICENSE, expect.any(Object));
|
|
});
|
|
|
|
it('should not save license if invalid', async () => {
|
|
userMock.upsertMetadata.mockResolvedValue();
|
|
|
|
const license = { licenseKey: 'license-key', activationKey: 'activation-key' };
|
|
const call = sut.setLicense(license);
|
|
await expect(call).rejects.toThrowError('Invalid license key');
|
|
expect(userMock.upsertMetadata).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('deleteLicense', () => {
|
|
it('should delete license', async () => {
|
|
userMock.upsertMetadata.mockResolvedValue();
|
|
|
|
await sut.deleteLicense();
|
|
expect(userMock.upsertMetadata).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
});
|