Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(server): People count after updating recognized faces count #13288

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+45 −29
Open

fix(server): People count after updating recognized faces count #13288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e4abf7
fix(server): fix people count when updating faces count
jedi04 Oct 8, 2024
add02b7
Merge branch 'main' into fix/people-count
jedi04 Oct 8, 2024
7977637
fix(server): update person count sql
jedi04 Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/interfaces/person.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export interface IPersonRepository {
getRandomFace(personId: string): Promise<AssetFaceEntity | null>;
getStatistics(personId: string): Promise<PersonStatistics>;
reassignFace(assetFaceId: string, newPersonId: string): Promise<number>;
getNumberOfPeople(userId: string): Promise<PeopleStatistics>;
getNumberOfPeople(userId: string, options: PersonSearchOptions): Promise<PeopleStatistics>;
reassignFaces(data: UpdateFacesData): Promise<number>;
unassignFaces(options: UnassignFacesOptions): Promise<void>;
update(person: Partial<PersonEntity>): Promise<PersonEntity>;
Expand Down
34 changes: 21 additions & 13 deletions server/src/queries/person.repository.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,22 +250,30 @@ WHERE

-- PersonRepository.getNumberOfPeople
SELECT
COUNT(DISTINCT ("person"."id")) AS "total",
COUNT(DISTINCT ("person"."id")) FILTER (
COUNT(person.id) AS "total",
COUNT(person.id) FILTER (
WHERE
"person"."isHidden" = true
person."isHidden" = true
) AS "hidden"
FROM
"person" "person"
LEFT JOIN "asset_faces" "face" ON "face"."personId" = "person"."id"
INNER JOIN "assets" "asset" ON "asset"."id" = "face"."assetId"
AND ("asset"."deletedAt" IS NULL)
WHERE
"person"."ownerId" = $1
AND "asset"."isArchived" = false
AND "person"."thumbnailPath" != ''
HAVING
COUNT("face"."assetId") != 0
(
SELECT
"person"."id" AS "id",
"person"."isHidden" AS "isHidden"
FROM
"person" "person"
LEFT JOIN "asset_faces" "face" ON "face"."personId" = "person"."id"
INNER JOIN "assets" "asset" ON "asset"."id" = "face"."assetId"
AND ("asset"."deletedAt" IS NULL)
WHERE
"person"."ownerId" = $1
AND "asset"."isArchived" = false
AND "person"."thumbnailPath" != ''
GROUP BY
"person"."id"
HAVING
COUNT("face"."assetId") >= $2
) "person"

-- PersonRepository.getFacesByIds
SELECT
Expand Down
29 changes: 18 additions & 11 deletions server/src/repositories/person.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,17 +235,24 @@ export class PersonRepository implements IPersonRepository {
}

@GenerateSql({ params: [DummyValue.UUID] })
async getNumberOfPeople(userId: string): Promise<PeopleStatistics> {
const items = await this.personRepository
.createQueryBuilder('person')
.leftJoin('person.faces', 'face')
.where('person.ownerId = :userId', { userId })
.innerJoin('face.asset', 'asset')
.andWhere('asset.isArchived = false')
.andWhere("person.thumbnailPath != ''")
.select('COUNT(DISTINCT(person.id))', 'total')
.addSelect('COUNT(DISTINCT(person.id)) FILTER (WHERE person.isHidden = true)', 'hidden')
.having('COUNT(face.assetId) != 0')
async getNumberOfPeople(userId: string, options?: PersonSearchOptions): Promise<PeopleStatistics> {
const items = await this.dataSource
.createQueryBuilder()
.select('COUNT(person.id)', 'total')
.addSelect('COUNT(person.id) FILTER (WHERE person."isHidden" = true)', 'hidden')
.from((subQuery) => {
return subQuery
.select('person.id', 'id')
.addSelect('person.isHidden', 'isHidden')
.from(PersonEntity, 'person')
.leftJoin('person.faces', 'face')
.where('person.ownerId = :userId', { userId })
.innerJoin('face.asset', 'asset')
.andWhere('asset.isArchived = false')
.andWhere("person.thumbnailPath != ''")
.having('COUNT(face.assetId) >= :faces', { faces: options?.minimumFaceCount || 1 })
.groupBy('person.id');
}, 'person')
.getRawOne();

if (items == undefined) {
Expand Down
9 changes: 5 additions & 4 deletions server/src/services/person.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import {
} from 'src/interfaces/job.interface';
import { BoundingBox } from 'src/interfaces/machine-learning.interface';
import { CropOptions, ImageDimensions, InputDimensions } from 'src/interfaces/media.interface';
import { UpdateFacesData } from 'src/interfaces/person.interface';
import { PersonSearchOptions, UpdateFacesData } from 'src/interfaces/person.interface';
import { BaseService } from 'src/services/base.service';
import { checkAccess, requireAccess } from 'src/utils/access';
import { getAssetFiles } from 'src/utils/asset.util';
Expand All @@ -65,11 +65,12 @@ export class PersonService extends BaseService {
};

const { machineLearning } = await this.getConfig({ withCache: false });
const { items, hasNextPage } = await this.personRepository.getAllForUser(pagination, auth.user.id, {
const options: PersonSearchOptions = {
minimumFaceCount: machineLearning.facialRecognition.minFaces,
withHidden,
});
const { total, hidden } = await this.personRepository.getNumberOfPeople(auth.user.id);
};
const { items, hasNextPage } = await this.personRepository.getAllForUser(pagination, auth.user.id, options);
const { total, hidden } = await this.personRepository.getNumberOfPeople(auth.user.id, options);

return {
people: items.map((person) => mapPerson(person)),
Expand Down
Loading