Comment out
This commit is contained in:
parent
7f5c951910
commit
37abeac87b
|
@ -160,11 +160,9 @@ const FaceCropImageView: React.FC<FaceCropImageViewProps> = ({ faceID }) => {
|
||||||
.then(async (data) => {
|
.then(async (data) => {
|
||||||
if (data) return data;
|
if (data) return data;
|
||||||
/*
|
/*
|
||||||
TODO(MR): Also, get this to work on web too.
|
TODO(MR): regen if needed and get this to work on web too.
|
||||||
cachedOrNew("face-crops", cacheKey, async () => {
|
cachedOrNew("face-crops", cacheKey, async () => {
|
||||||
return machineLearningService.regenerateFaceCrop(
|
return regenerateFaceCrop(faceId);
|
||||||
faceId,
|
|
||||||
);
|
|
||||||
})*/
|
})*/
|
||||||
const cache = await blobCache("face-crops");
|
const cache = await blobCache("face-crops");
|
||||||
return await cache.get(faceID);
|
return await cache.get(faceID);
|
||||||
|
|
|
@ -23,10 +23,7 @@ export class DedicatedMLWorker {
|
||||||
return mlService.sync(token, userID);
|
return mlService.sync(token, userID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async regenerateFaceCrop(token: string, faceID: string) {
|
|
||||||
await downloadManager.init(APPS.PHOTOS, { token });
|
|
||||||
return mlService.regenerateFaceCrop(faceID);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
expose(DedicatedMLWorker, self);
|
expose(DedicatedMLWorker, self);
|
||||||
|
|
|
@ -111,4 +111,21 @@ export const syncPeopleIndex = async () => {
|
||||||
|
|
||||||
// await mlIDbStorage.setIndexVersion("people", filesVersion);
|
// await mlIDbStorage.setIndexVersion("people", filesVersion);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public async regenerateFaceCrop(token: string, faceID: string) {
|
||||||
|
await downloadManager.init(APPS.PHOTOS, { token });
|
||||||
|
return mlService.regenerateFaceCrop(faceID);
|
||||||
|
}
|
||||||
|
|
||||||
|
export const regenerateFaceCrop = async (faceID: string) => {
|
||||||
|
const fileID = Number(faceID.split("-")[0]);
|
||||||
|
const personFace = await mlIDbStorage.getFace(fileID, faceID);
|
||||||
|
if (!personFace) {
|
||||||
|
throw Error("Face not found");
|
||||||
|
}
|
||||||
|
|
||||||
|
const file = await getLocalFile(personFace.fileId);
|
||||||
|
const imageBitmap = await fetchImageBitmap(file);
|
||||||
|
return await saveFaceCrop(imageBitmap, personFace);
|
||||||
|
};
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -6,13 +6,12 @@ import { DedicatedCryptoWorker } from "@ente/shared/crypto/internal/crypto.worke
|
||||||
import { CustomError, parseUploadErrorCodes } from "@ente/shared/error";
|
import { CustomError, parseUploadErrorCodes } from "@ente/shared/error";
|
||||||
import PQueue from "p-queue";
|
import PQueue from "p-queue";
|
||||||
import mlIDbStorage, { ML_SEARCH_CONFIG_NAME } from "services/face/db";
|
import mlIDbStorage, { ML_SEARCH_CONFIG_NAME } from "services/face/db";
|
||||||
import { fetchImageBitmap, getLocalFile } from "services/face/file";
|
|
||||||
import { putFaceEmbedding } from "services/face/remote";
|
import { putFaceEmbedding } from "services/face/remote";
|
||||||
import { MlFileData } from "services/face/types";
|
import { MlFileData } from "services/face/types";
|
||||||
import { getLocalFiles } from "services/fileService";
|
import { getLocalFiles } from "services/fileService";
|
||||||
import { EnteFile } from "types/file";
|
import { EnteFile } from "types/file";
|
||||||
import { isInternalUserForML } from "utils/user";
|
import { isInternalUserForML } from "utils/user";
|
||||||
import { indexFaces, saveFaceCrop } from "../face/f-index";
|
import { indexFaces } from "../face/f-index";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO-ML(MR): What and why.
|
* TODO-ML(MR): What and why.
|
||||||
|
@ -137,10 +136,6 @@ class MachineLearningService {
|
||||||
return !error && nOutOfSyncFiles > 0;
|
return !error && nOutOfSyncFiles > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async regenerateFaceCrop(faceID: string) {
|
|
||||||
return regenerateFaceCrop(faceID);
|
|
||||||
}
|
|
||||||
|
|
||||||
private newMlData(fileId: number) {
|
private newMlData(fileId: number) {
|
||||||
return {
|
return {
|
||||||
fileId,
|
fileId,
|
||||||
|
@ -407,15 +402,3 @@ export function logQueueStats(queue: PQueue, name: string) {
|
||||||
console.error(`queuestats: ${name}: Error, `, error),
|
console.error(`queuestats: ${name}: Error, `, error),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export const regenerateFaceCrop = async (faceID: string) => {
|
|
||||||
const fileID = Number(faceID.split("-")[0]);
|
|
||||||
const personFace = await mlIDbStorage.getFace(fileID, faceID);
|
|
||||||
if (!personFace) {
|
|
||||||
throw Error("Face not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
const file = await getLocalFile(personFace.fileId);
|
|
||||||
const imageBitmap = await fetchImageBitmap(file);
|
|
||||||
return await saveFaceCrop(imageBitmap, personFace);
|
|
||||||
};
|
|
||||||
|
|
Loading…
Reference in a new issue