mirror of
https://github.com/immich-app/immich.git
synced 2025-02-04 01:09:14 -05:00
77e6a6d78b
* 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>
53 lines
1.6 KiB
TypeScript
53 lines
1.6 KiB
TypeScript
import { AssetEntity } from 'src/entities/asset.entity';
|
|
import { FaceSearchEntity } from 'src/entities/face-search.entity';
|
|
import { PersonEntity } from 'src/entities/person.entity';
|
|
import { SourceType } from 'src/enum';
|
|
import { Column, Entity, Index, ManyToOne, OneToOne, PrimaryGeneratedColumn } from 'typeorm';
|
|
|
|
@Entity('asset_faces', { synchronize: false })
|
|
@Index('IDX_asset_faces_assetId_personId', ['assetId', 'personId'])
|
|
@Index(['personId', 'assetId'])
|
|
export class AssetFaceEntity {
|
|
@PrimaryGeneratedColumn('uuid')
|
|
id!: string;
|
|
|
|
@Column()
|
|
assetId!: string;
|
|
|
|
@Column({ nullable: true, type: 'uuid' })
|
|
personId!: string | null;
|
|
|
|
@OneToOne(() => FaceSearchEntity, (faceSearchEntity) => faceSearchEntity.face, { cascade: ['insert'] })
|
|
faceSearch?: FaceSearchEntity;
|
|
|
|
@Column({ default: 0, type: 'int' })
|
|
imageWidth!: number;
|
|
|
|
@Column({ default: 0, type: 'int' })
|
|
imageHeight!: number;
|
|
|
|
@Column({ default: 0, type: 'int' })
|
|
boundingBoxX1!: number;
|
|
|
|
@Column({ default: 0, type: 'int' })
|
|
boundingBoxY1!: number;
|
|
|
|
@Column({ default: 0, type: 'int' })
|
|
boundingBoxX2!: number;
|
|
|
|
@Column({ default: 0, type: 'int' })
|
|
boundingBoxY2!: number;
|
|
|
|
@Column({ default: SourceType.MACHINE_LEARNING, type: 'enum', enum: SourceType })
|
|
sourceType!: SourceType;
|
|
|
|
@ManyToOne(() => AssetEntity, (asset) => asset.faces, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
|
|
asset!: AssetEntity;
|
|
|
|
@ManyToOne(() => PersonEntity, (person) => person.faces, {
|
|
onDelete: 'SET NULL',
|
|
onUpdate: 'CASCADE',
|
|
nullable: true,
|
|
})
|
|
person!: PersonEntity | null;
|
|
}
|