π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Fold PersonFeedbackService into PersonService
laurenspriem14d7dca48d75
diff --git a/mobile/apps/photos/lib/service_locator.dart b/mobile/apps/photos/lib/service_locator.dartindex b809a4d03d..4138de3680 100644--- a/mobile/apps/photos/lib/service_locator.dart+++ b/mobile/apps/photos/lib/service_locator.dart@@ -33,7 +33,6 @@ import "package:photos/services/library_sharing_local_store.dart";import "package:photos/services/library_sharing_service.dart";import "package:photos/services/location_service.dart";import "package:photos/services/machine_learning/compute_controller.dart";-import "package:photos/services/machine_learning/face_ml/person/person_feedback_service.dart";import "package:photos/services/magic_cache_service.dart";import "package:photos/services/memories_cache_service.dart";import "package:photos/services/permission/service.dart";@@ -247,12 +246,6 @@ ComputeController get computeController {return _computeController!;}-PersonFeedbackService? _personFeedbackService;-PersonFeedbackService get personFeedbackService {- _personFeedbackService ??= PersonFeedbackService();- return _personFeedbackService!;-}-PermissionService? _permissionService;PermissionService get permissionService {_permissionService ??= PermissionService(ServiceLocator.instance.prefs);diff --git a/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_feedback_service.dart b/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_feedback_service.dartdeleted file mode 100644index 32b5fbf864..0000000000--- a/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_feedback_service.dart+++ /dev/null@@ -1,68 +0,0 @@-import "dart:async" show unawaited;--import "package:logging/logging.dart";-import "package:photos/core/event_bus.dart";-import "package:photos/events/diff_sync_complete_event.dart";-import "package:photos/events/people_changed_event.dart";-import "package:photos/service_locator.dart" show isLocalGalleryMode;-import "package:photos/services/machine_learning/face_ml/person/person_service.dart";--class PersonFeedbackService {- static final _logger = Logger("PersonFeedbackService");-- PersonFeedbackService() {- Bus.instance.on<DiffSyncCompleteEvent>().listen((event) {- unawaited(syncPersonFeedback());- });- Bus.instance.on<PeopleChangedEvent>().listen((event) {- if (event.type != PeopleEventType.syncDone) {- _shouldReconcilePeople = true;- }- });- }-- bool _shouldReconcilePeople = false;- bool _syncRequested = false;- Future<void>? _syncFuture;-- Future<void> syncPersonFeedback() {- _syncRequested = true;- return _syncFuture ??= _runPendingSyncs();- }-- Future<void> _runPendingSyncs() async {- try {- do {- _syncRequested = false;- await _syncPersonFeedbackInternal();- } while (_syncRequested);- } finally {- _syncFuture = null;- }- }-- Future<void> _syncPersonFeedbackInternal() async {- if (isLocalGalleryMode) {- _logger.finest("Skipping person feedback sync in local gallery mode");- return;- }-- if (_shouldReconcilePeople) {- _shouldReconcilePeople = false;- try {- await PersonService.instance.reconcileClusters();- } catch (_) {- _shouldReconcilePeople = true;- rethrow;- }- Bus.instance.fire(PeopleChangedEvent(type: PeopleEventType.syncDone));- } else {- final didChange = await PersonService.instance- .fetchRemoteClusterFeedback();- if (didChange) {- _logger.info("people: got remote data update");- Bus.instance.fire(PeopleChangedEvent(type: PeopleEventType.syncDone));- }- }- }-}diff --git a/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_service.dart b/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_service.dartindex c80042d27f..cacecdcd36 100644--- a/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_service.dart+++ b/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_service.dart@@ -10,6 +10,7 @@ import "package:logging/logging.dart";import "package:photos/core/configuration.dart";import "package:photos/core/event_bus.dart";import "package:photos/db/ml/db.dart";+import "package:photos/events/diff_sync_complete_event.dart";import "package:photos/events/people_changed_event.dart";import "package:photos/gateways/entity/models/type.dart";import "package:photos/models/file/file.dart";@@ -74,6 +75,12 @@ class PersonService {int _personCacheGeneration = 0;int _cachedRemoteSyncTime = 0;+ // Static so the feedback-sync state machine survives init() re-creating the+ // instance; an in-flight sync must keep serializing new requests.+ static bool _shouldReconcilePeople = false;+ static bool _syncRequested = false;+ static Future<void>? _syncFuture;+static PersonService get instance {if (_instance == null) {throw Exception("PersonService not initialized");@@ -90,7 +97,18 @@ class PersonService {MLDataDB faceMLDataDB,SharedPreferences prefs,) {+ final bool isFirstInit = _instance == null;_instance = PersonService(entityService, faceMLDataDB, prefs);+ if (isFirstInit) {+ Bus.instance.on<DiffSyncCompleteEvent>().listen((event) {+ unawaited(instance.syncPersonFeedback());+ });+ Bus.instance.on<PeopleChangedEvent>().listen((event) {+ if (event.type != PeopleEventType.syncDone) {+ _shouldReconcilePeople = true;+ }+ });+ }final settings = LocalSettings(prefs);final savedAutoMerge = settings.autoMergeThresholdOverride;if (savedAutoMerge != null) {@@ -271,10 +289,50 @@ class PersonService {{for (final person in persons) person.remoteID: person};}- Future<void> reconcileClusters() async {+ Future<void> syncPersonFeedback() {+ _syncRequested = true;+ return _syncFuture ??= _runPendingSyncs();+ }++ Future<void> _runPendingSyncs() async {+ try {+ do {+ _syncRequested = false;+ await _syncPersonFeedbackInternal();+ } while (_syncRequested);+ } finally {+ _syncFuture = null;+ }+ }++ Future<void> _syncPersonFeedbackInternal() async {+ if (isLocalGalleryMode) {+ logger.finest("Skipping person feedback sync in local gallery mode");+ return;+ }++ if (_shouldReconcilePeople) {+ _shouldReconcilePeople = false;+ try {+ await _reconcileClusters();+ } catch (_) {+ _shouldReconcilePeople = true;+ rethrow;+ }+ Bus.instance.fire(PeopleChangedEvent(type: PeopleEventType.syncDone));+ } else {+ final didChange = await _pullAndApplyRemoteFeedback();+ if (didChange) {+ logger.info("people: got remote data update");+ Bus.instance.fire(PeopleChangedEvent(type: PeopleEventType.syncDone));+ }+ }+ }++ Future<void> _reconcileClusters() async {final EnteWatch? w = kDebugMode ? EnteWatch("reconcileClusters") : null;w?.start();- await fetchRemoteClusterFeedback(skipClusterUpdateIfNoChange: false);+ await _pullAndApplyRemoteFeedback(skipClusterUpdateIfNoChange: false);w?.log("Stored remote feedback");final dbPersonClusterInfo = await faceMLDataDB.getPersonToClusterIdToFaceIds();@@ -537,7 +595,7 @@ class PersonService {}// Returns true when remote feedback was downloaded or newly applied locally.- Future<bool> fetchRemoteClusterFeedback({+ Future<bool> _pullAndApplyRemoteFeedback({bool skipClusterUpdateIfNoChange = true,}) async {if (isLocalGalleryMode) {diff --git a/mobile/apps/photos/lib/services/machine_learning/ml_service.dart b/mobile/apps/photos/lib/services/machine_learning/ml_service.dartindex 95cc9fe364..688c77b844 100644--- a/mobile/apps/photos/lib/services/machine_learning/ml_service.dart+++ b/mobile/apps/photos/lib/services/machine_learning/ml_service.dart@@ -352,7 +352,7 @@ class MLService {Future<void> sync() async {await fileDataService.syncFDStatus();- await personFeedbackService.syncPersonFeedback();+ await PersonService.instance.syncPersonFeedback();}Future<void> runAllML({bool force = false}) async {@@ -569,7 +569,7 @@ class MLService {final faceIdNotToCluster = <String, List<String>>{};if (!isLocalGalleryMode) {_logger.info('Pulling remote feedback before actually clustering');- await PersonService.instance.fetchRemoteClusterFeedback();+ await PersonService.instance.syncPersonFeedback();final persons = await PersonService.instance.getPersons();for (final person in persons) {if (person.data.rejectedFaceIDs.isNotEmpty) {diff --git a/mobile/apps/photos/lib/ui/settings/debug/ml_debug_settings_page.dart b/mobile/apps/photos/lib/ui/settings/debug/ml_debug_settings_page.dartindex 98bd2af827..2dce8fdcb2 100644--- a/mobile/apps/photos/lib/ui/settings/debug/ml_debug_settings_page.dart+++ b/mobile/apps/photos/lib/ui/settings/debug/ml_debug_settings_page.dart@@ -791,7 +791,7 @@ class _MLDebugSettingsPageState extends State<MLDebugSettingsPage> {Future<void> _onTriggerClustering(BuildContext context) async {try {- await PersonService.instance.fetchRemoteClusterFeedback();+ await PersonService.instance.syncPersonFeedback();MLService.instance.debugIndexingDisabled = false;await MLService.instance.clusterAllImages();Bus.instance.fire(PeopleChangedEvent());@@ -836,7 +836,7 @@ class _MLDebugSettingsPageState extends State<MLDebugSettingsPage> {Future<void> _onSyncPersonMappings(BuildContext context) async {try {- await personFeedbackService.syncPersonFeedback();+ await PersonService.instance.syncPersonFeedback();if (!context.mounted) return;showShortToast(context, "Done");} catch (e, s) {diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dartindex 46fdbbdc56..2a7582015d 100644--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart@@ -1361,7 +1361,7 @@ class _HomeWidgetState extends State<HomeWidget> {_personSyncTriggered = true;unawaited(entityService.syncEntities().then((_) async {- await personFeedbackService.syncPersonFeedback();+ await PersonService.instance.syncPersonFeedback();await PersonService.instance.refreshPersonCache();}),);