From f3bd395f11bcaca52268ba0aee21164d3ea3c07e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 2 Jul 2024 13:04:51 +0530
Subject: [PATCH] New loc

---
 .../components/Search/SearchBar/searchInput/index.tsx    | 2 +-
 web/apps/photos/src/components/ml/MLSearchSettings.tsx   | 2 +-
 web/apps/photos/src/components/ml/PeopleList.tsx         | 4 ++--
 web/apps/photos/src/pages/_app.tsx                       | 6 +++---
 web/apps/photos/src/services/logout.ts                   | 2 +-
 web/apps/photos/src/services/searchService.ts            | 9 ++++++---
 web/apps/photos/src/types/search/index.ts                | 4 ++--
 .../face => packages/new/photos/services/ml}/cluster.ts  | 0
 .../face => packages/new/photos/services/ml}/crop.ts     | 0
 web/packages/new/photos/services/{face => ml}/db.ts      | 0
 .../face => packages/new/photos/services/ml}/f-index.ts  | 0
 .../new/photos/services/ml}/face.worker.ts               | 0
 .../face => packages/new/photos/services/ml}/image.ts    | 0
 web/packages/new/photos/services/{face => ml}/index.ts   | 0
 .../face => packages/new/photos/services/ml}/indexer.ts  | 0
 .../new/photos/services/ml}/indexer.worker.ts            | 0
 .../new/photos/services/ml}/machineLearningService.ts    | 4 ++--
 .../new/photos/services/ml}/mlWorkManager.ts             | 2 +-
 .../face => packages/new/photos/services/ml}/people.ts   | 0
 .../face => packages/new/photos/services/ml}/remote.ts   | 0
 web/packages/new/photos/services/{face => ml}/types.ts   | 0
 web/packages/new/photos/services/{face => ml}/worker.ts  | 0
 22 files changed, 19 insertions(+), 16 deletions(-)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/cluster.ts (100%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/crop.ts (100%)
 rename web/packages/new/photos/services/{face => ml}/db.ts (100%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/f-index.ts (100%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/face.worker.ts (100%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/image.ts (100%)
 rename web/packages/new/photos/services/{face => ml}/index.ts (100%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/indexer.ts (100%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/indexer.worker.ts (100%)
 rename web/{apps/photos/src/services/machineLearning => packages/new/photos/services/ml}/machineLearningService.ts (97%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/mlWorkManager.ts (99%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/people.ts (100%)
 rename web/{apps/photos/src/services/face => packages/new/photos/services/ml}/remote.ts (100%)
 rename web/packages/new/photos/services/{face => ml}/types.ts (100%)
 rename web/packages/new/photos/services/{face => ml}/worker.ts (100%)

diff --git a/web/apps/photos/src/components/Search/SearchBar/searchInput/index.tsx b/web/apps/photos/src/components/Search/SearchBar/searchInput/index.tsx
index d2fc70ee30..599a27fe79 100644
--- a/web/apps/photos/src/components/Search/SearchBar/searchInput/index.tsx
+++ b/web/apps/photos/src/components/Search/SearchBar/searchInput/index.tsx
@@ -10,8 +10,8 @@ import { useCallback, useContext, useEffect, useRef, useState } from "react";
 import { components } from "react-select";
 import AsyncSelect from "react-select/async";
 import { InputActionMeta } from "react-select/src/types";
-import type { Person } from "services/face/people";
 import { City } from "services/locationSearchService";
+import type { Person } from "services/ml/people";
 import {
     getAutoCompleteSuggestions,
     getDefaultOptions,
diff --git a/web/apps/photos/src/components/ml/MLSearchSettings.tsx b/web/apps/photos/src/components/ml/MLSearchSettings.tsx
index 14ad139352..9deb9613a2 100644
--- a/web/apps/photos/src/components/ml/MLSearchSettings.tsx
+++ b/web/apps/photos/src/components/ml/MLSearchSettings.tsx
@@ -18,7 +18,7 @@ import { t } from "i18next";
 import { AppContext } from "pages/_app";
 import { useContext, useEffect, useState } from "react";
 import { Trans } from "react-i18next";
-import { canEnableFaceIndexing } from "services/face/indexer";
+import { canEnableFaceIndexing } from "services/ml/indexer";
 import {
     getFaceSearchEnabledStatus,
     updateFaceSearchEnabledStatus,
diff --git a/web/apps/photos/src/components/ml/PeopleList.tsx b/web/apps/photos/src/components/ml/PeopleList.tsx
index 4e59588379..00936d5baa 100644
--- a/web/apps/photos/src/components/ml/PeopleList.tsx
+++ b/web/apps/photos/src/components/ml/PeopleList.tsx
@@ -4,8 +4,8 @@ import { Skeleton, styled } from "@mui/material";
 import { Legend } from "components/PhotoViewer/styledComponents/Legend";
 import { t } from "i18next";
 import React, { useEffect, useState } from "react";
-import { unidentifiedFaceIDs } from "services/face/indexer";
-import type { Person } from "services/face/people";
+import { unidentifiedFaceIDs } from "services/ml/indexer";
+import type { Person } from "services/ml/people";
 
 const FaceChipContainer = styled("div")`
     display: flex;
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index a74c2b3ab1..38a43561ad 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -50,12 +50,12 @@ import "photoswipe/dist/photoswipe.css";
 import { createContext, useContext, useEffect, useRef, useState } from "react";
 import LoadingBar from "react-top-loading-bar";
 import { resumeExportsIfNeeded } from "services/export";
+import { photosLogout } from "services/logout";
 import {
     isFaceIndexingEnabled,
     setIsFaceIndexingEnabled,
-} from "services/face/indexer";
-import mlWorkManager from "services/face/mlWorkManager";
-import { photosLogout } from "services/logout";
+} from "services/ml/indexer";
+import mlWorkManager from "services/ml/mlWorkManager";
 import {
     getFamilyPortalRedirectURL,
     getRoadmapRedirectURL,
diff --git a/web/apps/photos/src/services/logout.ts b/web/apps/photos/src/services/logout.ts
index fbf8249df2..a58dd3e4d0 100644
--- a/web/apps/photos/src/services/logout.ts
+++ b/web/apps/photos/src/services/logout.ts
@@ -2,11 +2,11 @@ import DownloadManager from "@/new/photos/services/download";
 import { terminateFaceWorker } from "@/new/photos/services/face";
 import { clearFaceData } from "@/new/photos/services/face/db";
 import { clearFeatureFlagSessionState } from "@/new/photos/services/feature-flags";
+import mlWorkManager from "@/new/photos/services/ml/mlWorkManager";
 import log from "@/next/log";
 import { accountLogout } from "@ente/accounts/services/logout";
 import { clipService } from "services/clip-service";
 import exportService from "./export";
-import mlWorkManager from "./face/mlWorkManager";
 
 /**
  * Logout sequence for the photos app.
diff --git a/web/apps/photos/src/services/searchService.ts b/web/apps/photos/src/services/searchService.ts
index 4ae4991a96..73cbb476ef 100644
--- a/web/apps/photos/src/services/searchService.ts
+++ b/web/apps/photos/src/services/searchService.ts
@@ -1,10 +1,15 @@
 import { FILE_TYPE } from "@/media/file-type";
+import {
+    faceIndexingStatus,
+    isFaceIndexingEnabled,
+} from "@/new/photos/services/ml/indexer";
+import mlWorkManager from "@/new/photos/services/ml/mlWorkManager";
 import { EnteFile } from "@/new/photos/types/file";
 import { isDesktop } from "@/next/app";
 import log from "@/next/log";
 import * as chrono from "chrono-node";
 import { t } from "i18next";
-import type { Person } from "services/face/people";
+import type { Person } from "services/ml/people";
 import { Collection } from "types/collection";
 import { EntityType, LocationTag, LocationTagData } from "types/entity";
 import {
@@ -21,8 +26,6 @@ import { getFormattedDate } from "utils/search";
 import { clipService, computeClipMatchScore } from "./clip-service";
 import { localCLIPEmbeddings } from "./embeddingService";
 import { getLatestEntities } from "./entityService";
-import { faceIndexingStatus, isFaceIndexingEnabled } from "./face/indexer";
-import mlWorkManager from "./face/mlWorkManager";
 import locationSearchService, { City } from "./locationSearchService";
 
 const DIGITS = new Set(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]);
diff --git a/web/apps/photos/src/types/search/index.ts b/web/apps/photos/src/types/search/index.ts
index 0e18d787ab..369a4a957c 100644
--- a/web/apps/photos/src/types/search/index.ts
+++ b/web/apps/photos/src/types/search/index.ts
@@ -1,8 +1,8 @@
 import { FILE_TYPE } from "@/media/file-type";
 import { EnteFile } from "@/new/photos/types/file";
-import type { FaceIndexingStatus } from "services/face/indexer";
-import type { Person } from "services/face/people";
 import { City } from "services/locationSearchService";
+import type { FaceIndexingStatus } from "services/ml/indexer";
+import type { Person } from "services/ml/people";
 import { LocationTagData } from "types/entity";
 
 export enum SuggestionType {
diff --git a/web/apps/photos/src/services/face/cluster.ts b/web/packages/new/photos/services/ml/cluster.ts
similarity index 100%
rename from web/apps/photos/src/services/face/cluster.ts
rename to web/packages/new/photos/services/ml/cluster.ts
diff --git a/web/apps/photos/src/services/face/crop.ts b/web/packages/new/photos/services/ml/crop.ts
similarity index 100%
rename from web/apps/photos/src/services/face/crop.ts
rename to web/packages/new/photos/services/ml/crop.ts
diff --git a/web/packages/new/photos/services/face/db.ts b/web/packages/new/photos/services/ml/db.ts
similarity index 100%
rename from web/packages/new/photos/services/face/db.ts
rename to web/packages/new/photos/services/ml/db.ts
diff --git a/web/apps/photos/src/services/face/f-index.ts b/web/packages/new/photos/services/ml/f-index.ts
similarity index 100%
rename from web/apps/photos/src/services/face/f-index.ts
rename to web/packages/new/photos/services/ml/f-index.ts
diff --git a/web/apps/photos/src/services/face/face.worker.ts b/web/packages/new/photos/services/ml/face.worker.ts
similarity index 100%
rename from web/apps/photos/src/services/face/face.worker.ts
rename to web/packages/new/photos/services/ml/face.worker.ts
diff --git a/web/apps/photos/src/services/face/image.ts b/web/packages/new/photos/services/ml/image.ts
similarity index 100%
rename from web/apps/photos/src/services/face/image.ts
rename to web/packages/new/photos/services/ml/image.ts
diff --git a/web/packages/new/photos/services/face/index.ts b/web/packages/new/photos/services/ml/index.ts
similarity index 100%
rename from web/packages/new/photos/services/face/index.ts
rename to web/packages/new/photos/services/ml/index.ts
diff --git a/web/apps/photos/src/services/face/indexer.ts b/web/packages/new/photos/services/ml/indexer.ts
similarity index 100%
rename from web/apps/photos/src/services/face/indexer.ts
rename to web/packages/new/photos/services/ml/indexer.ts
diff --git a/web/apps/photos/src/services/face/indexer.worker.ts b/web/packages/new/photos/services/ml/indexer.worker.ts
similarity index 100%
rename from web/apps/photos/src/services/face/indexer.worker.ts
rename to web/packages/new/photos/services/ml/indexer.worker.ts
diff --git a/web/apps/photos/src/services/machineLearning/machineLearningService.ts b/web/packages/new/photos/services/ml/machineLearningService.ts
similarity index 97%
rename from web/apps/photos/src/services/machineLearning/machineLearningService.ts
rename to web/packages/new/photos/services/ml/machineLearningService.ts
index be182219a8..97e3abcd69 100644
--- a/web/apps/photos/src/services/machineLearning/machineLearningService.ts
+++ b/web/packages/new/photos/services/ml/machineLearningService.ts
@@ -2,8 +2,8 @@ import { EnteFile } from "@/new/photos/types/file";
 import log from "@/next/log";
 import { CustomError, parseUploadErrorCodes } from "@ente/shared/error";
 import PQueue from "p-queue";
-import { syncWithLocalFilesAndGetFilesToIndex } from "services/face/indexer";
-import { FaceIndexerWorker } from "services/face/indexer.worker";
+import { syncWithLocalFilesAndGetFilesToIndex } from "services/ml/indexer";
+import { FaceIndexerWorker } from "services/ml/indexer.worker";
 
 const batchSize = 200;
 
diff --git a/web/apps/photos/src/services/face/mlWorkManager.ts b/web/packages/new/photos/services/ml/mlWorkManager.ts
similarity index 99%
rename from web/apps/photos/src/services/face/mlWorkManager.ts
rename to web/packages/new/photos/services/ml/mlWorkManager.ts
index 4476437ee1..072884c359 100644
--- a/web/apps/photos/src/services/face/mlWorkManager.ts
+++ b/web/packages/new/photos/services/ml/mlWorkManager.ts
@@ -8,7 +8,7 @@ import { Events, eventBus } from "@ente/shared/events";
 import { getToken, getUserID } from "@ente/shared/storage/localStorage/helpers";
 import debounce from "debounce";
 import PQueue from "p-queue";
-import type { DedicatedMLWorker } from "services/face/face.worker";
+import type { DedicatedMLWorker } from "services/ml/face.worker";
 
 export type JobState = "Scheduled" | "Running" | "NotScheduled";
 
diff --git a/web/apps/photos/src/services/face/people.ts b/web/packages/new/photos/services/ml/people.ts
similarity index 100%
rename from web/apps/photos/src/services/face/people.ts
rename to web/packages/new/photos/services/ml/people.ts
diff --git a/web/apps/photos/src/services/face/remote.ts b/web/packages/new/photos/services/ml/remote.ts
similarity index 100%
rename from web/apps/photos/src/services/face/remote.ts
rename to web/packages/new/photos/services/ml/remote.ts
diff --git a/web/packages/new/photos/services/face/types.ts b/web/packages/new/photos/services/ml/types.ts
similarity index 100%
rename from web/packages/new/photos/services/face/types.ts
rename to web/packages/new/photos/services/ml/types.ts
diff --git a/web/packages/new/photos/services/face/worker.ts b/web/packages/new/photos/services/ml/worker.ts
similarity index 100%
rename from web/packages/new/photos/services/face/worker.ts
rename to web/packages/new/photos/services/ml/worker.ts