RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recognize: add faceid to response 

Signed-off-by: Varun Patil <varunpatil@ucla.edu>
pull/504/head
Varun Patil 2023-03-15 16:12:55 -07:00
parent 1ef3f576b0
commit 8044298ab8
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Controller/DaysController.php
View File

@ -211,7 +211,7 @@ class DaysController extends ApiBase
// Filter only for one face on Recognize
if (($recognize = $this->request->getParam('recognize')) && $this->recognizeIsEnabled()) {
$transforms[] = [$this->timelineQuery, 'transformPeopleRecognitionFilter', $recognize];
$transforms[] = [$this->timelineQuery, 'transformPeopleRecognitionFilter', $recognize, $aggregateOnly];
$faceRect = $this->request->getParam('facerect');
if ($faceRect && !$aggregateOnly) {

15
lib/Db/TimelineQueryPeopleRecognize.php
View File

@ -11,7 +11,7 @@ trait TimelineQueryPeopleRecognize
{
protected IDBConnection $connection;
public function transformPeopleRecognitionFilter(IQueryBuilder &$query, string $userId, string $faceStr)
public function transformPeopleRecognitionFilter(IQueryBuilder &$query, string $userId, string $faceStr, bool $isAggregate)
{
// Get name and uid of face user
$faceNames = explode('/', $faceStr);
@ -21,17 +21,28 @@ trait TimelineQueryPeopleRecognize
$faceUid = $faceNames[0];
$faceName = $faceNames[1];
if (!$isAggregate) {
// Multiple detections for the same image
$query->addSelect('rfd.id AS faceid');
}
// Join with cluster
$clusterQuery = null;
if ($faceName !== 'NULL') {
$nameField = is_numeric($faceName) ? 'rfc.id' : 'rfc.title';
$query->innerJoin('m', 'recognize_face_clusters', 'rfc', $query->expr()->andX(
$query->expr()->eq('rfc.user_id', $query->createNamedParameter($faceUid)),
$query->expr()->eq($nameField, $query->createNamedParameter($faceName)),
));
$clusterQuery = $query->expr()->eq('rfd.cluster_id', 'rfc.id');
} else {
$clusterQuery = $query->expr()->isNull('rfd.cluster_id');
}
// Join with detections
$query->innerJoin('m', 'recognize_face_detections', 'rfd', $query->expr()->andX(
$query->expr()->eq('rfd.file_id', 'm.fileid'),
$query->expr()->eq('rfd.cluster_id', 'rfc.id'),
$clusterQuery,
));
}

13
src/components/Timeline.vue
View File

@ -1189,13 +1189,14 @@ export default defineComponent({
// Duplicate detection.
// These may be valid, e.g. in face rects. All we need to have
// is a unique Vue key for the v-for loop.
if (seen.has(photo.fileid)) {
const val = seen.get(photo.fileid);
photo.key = `${photo.fileid}-${val}`;
seen.set(photo.fileid, val + 1);
const key = photo.faceid || photo.fileid;
if (seen.has(key)) {
const val = seen.get(key);
photo.key = `${key}-${val}`;
seen.set(key, val + 1);
} else {
photo.key = `${photo.fileid}`;
seen.set(photo.fileid, 1);
photo.key = `${key}`;
seen.set(key, 1);
}
// Add photo to row

2
src/types.ts
View File

@ -92,6 +92,8 @@ export type IPhoto = {
};
};
/** Face detection ID */
faceid?: number;
/** Face dimensions */
facerect?: IFaceRect;