From c557e4a7a590d6b15bf771b8f4867a5910d01266 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Sat, 18 May 2024 16:56:18 +0530 Subject: [PATCH] Inline --- web/apps/photos/src/services/face/f-index.ts | 37 ++++++++------------ 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/web/apps/photos/src/services/face/f-index.ts b/web/apps/photos/src/services/face/f-index.ts index 2883eb014..68c73172d 100644 --- a/web/apps/photos/src/services/face/f-index.ts +++ b/web/apps/photos/src/services/face/f-index.ts @@ -105,7 +105,21 @@ const indexFaces_ = async (enteFile: EnteFile, imageBitmap: ImageBitmap) => { const { width, height } = imageBitmap; fileContext.newMlFile.imageDimensions = { width, height }; - await syncFileFaceDetections(fileContext); + const faceDetections = await detectFaces(imageBitmap); + const detectedFaces = faceDetections?.map((detection) => { + return { + fileId: fileContext.enteFile.id, + detection, + } as DetectedFace; + }); + newMlFile.faces = detectedFaces?.map((detectedFace) => ({ + ...detectedFace, + id: makeFaceID(detectedFace, newMlFile.imageDimensions), + })); + // TODO-ML(MR): reenable faces filtering based on width + // ?.filter((f) => + // f.box.width > syncContext.config.faceDetection.minFaceSize + // ); if (newMlFile.faces && newMlFile.faces.length > 0) { await syncFileFaceCrops(fileContext); @@ -121,27 +135,6 @@ const indexFaces_ = async (enteFile: EnteFile, imageBitmap: ImageBitmap) => { return newMlFile; }; -const syncFileFaceDetections = async (fileContext: MLSyncFileContext) => { - const { newMlFile } = fileContext; - const imageBitmap = fileContext.imageBitmap; - const faceDetections = await detectFaces(imageBitmap); - // TODO-ML(MR): reenable faces filtering based on width - const detectedFaces = faceDetections?.map((detection) => { - return { - fileId: fileContext.enteFile.id, - detection, - } as DetectedFace; - }); - newMlFile.faces = detectedFaces?.map((detectedFace) => ({ - ...detectedFace, - id: makeFaceID(detectedFace, newMlFile.imageDimensions), - })); - // ?.filter((f) => - // f.box.width > syncContext.config.faceDetection.minFaceSize - // ); - log.info("[MLService] Detected Faces: ", newMlFile.faces?.length); -}; - /** * Detect faces in the given {@link imageBitmap}. *