diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md index 27ed96ab16..0f4b211411 100644 --- a/desktop/CHANGELOG.md +++ b/desktop/CHANGELOG.md @@ -2,6 +2,7 @@ ## v1.7.5 (Unreleased) +- Face grouping (beta). - Directly upload to selected album on drag and drop. - Include shared files in export. - . diff --git a/web/packages/new/photos/services/ml/cluster.ts b/web/packages/new/photos/services/ml/cluster.ts index c0d81173b9..50c53bcc8e 100644 --- a/web/packages/new/photos/services/ml/cluster.ts +++ b/web/packages/new/photos/services/ml/cluster.ts @@ -301,10 +301,6 @@ const clusterBatchLinear = async ( if (csim > nnCosineSimilarity && csim >= threshold) { nnIndex = j; nnCosineSimilarity = csim; - - // If we've find something above our early exit threshold, stop - // looking for a better match (A way to speed up clustering). - if (csim >= 0.9) break; } } diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.ts index aeecff8f47..0c841e643d 100644 --- a/web/packages/new/photos/services/ml/index.ts +++ b/web/packages/new/photos/services/ml/index.ts @@ -14,7 +14,6 @@ import type { EnteFile } from "@/new/photos/types/file"; import { ensure } from "@/utils/ensure"; import { throttled } from "@/utils/promise"; import { proxy, transfer } from "comlink"; -import { isInternalUser } from "../feature-flags"; import { getRemoteFlag, updateRemoteFlag } from "../remote-store"; import { setSearchPeople } from "../search"; import type { UploadItem } from "../upload/types"; @@ -342,8 +341,6 @@ export const mlSync = async () => { const workerDidUnawaitedIndex = () => void updateClustersAndPeople(); const updateClustersAndPeople = async () => { - if (!(await isInternalUser())) return; - const masterKey = await masterKeyFromSession(); // Fetch existing cgroups from remote. diff --git a/web/packages/new/photos/services/ml/people.ts b/web/packages/new/photos/services/ml/people.ts index 79e9152b86..dbf67ec3d9 100644 --- a/web/packages/new/photos/services/ml/people.ts +++ b/web/packages/new/photos/services/ml/people.ts @@ -174,6 +174,10 @@ export const reconstructPeople = async (): Promise => { // in the UI. if (isHidden) return undefined; + // Older versions of the mobile app marked hidden cgroups by setting + // their name to an empty string. + if (!name) return undefined; + // Person faces from all the clusters assigned to this cgroup, sorted by // their score. const faces = assigned