Manav Rathi 1 yıl önce
ebeveyn
işleme
3db91d2034

+ 0 - 11
web/apps/photos/src/services/face/types.ts

@@ -198,8 +198,6 @@ export interface MLSyncContext {
     token: string;
     token: string;
     userID: number;
     userID: number;
 
 
-    faceCropService: FaceCropService;
-
     localFilesMap: Map<number, EnteFile>;
     localFilesMap: Map<number, EnteFile>;
     outOfSyncFiles: EnteFile[];
     outOfSyncFiles: EnteFile[];
     nSyncedFiles: number;
     nSyncedFiles: number;
@@ -238,15 +236,6 @@ export interface MLLibraryData {
 
 
 export declare type MLIndex = "files" | "people";
 export declare type MLIndex = "files" | "people";
 
 
-export interface FaceCropService {
-    method: Versioned<FaceCropMethod>;
-
-    getFaceCrop(
-        imageBitmap: ImageBitmap,
-        face: FaceDetection,
-    ): Promise<FaceCrop>;
-}
-
 export interface MachineLearningWorker {
 export interface MachineLearningWorker {
     closeLocalSyncContext(): Promise<void>;
     closeLocalSyncContext(): Promise<void>;
 
 

+ 4 - 1
web/apps/photos/src/services/machineLearning/faceService.ts

@@ -58,7 +58,10 @@ class FaceService {
     ) {
     ) {
         const { newMlFile } = fileContext;
         const { newMlFile } = fileContext;
         const imageBitmap = await fetchImageBitmapForContext(fileContext);
         const imageBitmap = await fetchImageBitmapForContext(fileContext);
-        newMlFile.faceCropMethod = syncContext.faceCropService.method;
+        newMlFile.faceCropMethod = {
+            value: "ArcFace",
+            version: 1,
+        };
 
 
         for (const face of newMlFile.faces) {
         for (const face of newMlFile.faces) {
             await this.saveFaceCrop(imageBitmap, face);
             await this.saveFaceCrop(imageBitmap, face);

+ 0 - 3
web/apps/photos/src/services/machineLearning/machineLearningService.ts

@@ -13,7 +13,6 @@ import { putEmbedding } from "services/embeddingService";
 import mlIDbStorage, { ML_SEARCH_CONFIG_NAME } from "services/face/db";
 import mlIDbStorage, { ML_SEARCH_CONFIG_NAME } from "services/face/db";
 import {
 import {
     Face,
     Face,
-    FaceCropService,
     FaceDetection,
     FaceDetection,
     Landmark,
     Landmark,
     MLLibraryData,
     MLLibraryData,
@@ -106,8 +105,6 @@ export class LocalMLSyncContext implements MLSyncContext {
     public token: string;
     public token: string;
     public userID: number;
     public userID: number;
 
 
-    public faceCropService: FaceCropService;
-
     public localFilesMap: Map<number, EnteFile>;
     public localFilesMap: Map<number, EnteFile>;
     public outOfSyncFiles: EnteFile[];
     public outOfSyncFiles: EnteFile[];
     public nSyncedFiles: number;
     public nSyncedFiles: number;