π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Use creation-time ranges for smart memories
Neeraj Gupta49fa6735edba
diff --git a/mobile/apps/photos/lib/services/memories/memory_file_index.dart b/mobile/apps/photos/lib/services/memories/memory_file_index.dartnew file mode 100644index 0000000000..b0eb6ee49c--- /dev/null+++ b/mobile/apps/photos/lib/services/memories/memory_file_index.dart@@ -0,0 +1,161 @@+part of "../smart_memories_service.dart";++typedef _CreationTimeRange = ({int start, int end});++class MemoryFileIndex {+ final List<EnteFile> files;+ final int _oldestYear;+ final int _newestYear;++ factory MemoryFileIndex(Iterable<EnteFile> source) {+ final files = source.toList();+ if (!_isCreationTimeDescending(files)) {+ final indexedFiles =+ <({EnteFile file, int position})>[+ for (var i = 0; i < files.length; i++)+ (file: files[i], position: i),+ ]..sort((a, b) {+ final timeCompare = b.file.creationTime!.compareTo(+ a.file.creationTime!,+ );+ return timeCompare != 0+ ? timeCompare+ : a.position.compareTo(b.position);+ });+ for (var i = 0; i < files.length; i++) {+ files[i] = indexedFiles[i].file;+ }+ }+ if (files.isEmpty) {+ return MemoryFileIndex._(files, 0, -1);+ }+ return MemoryFileIndex._(+ files,+ DateTime.fromMicrosecondsSinceEpoch(files.last.creationTime!).year,+ DateTime.fromMicrosecondsSinceEpoch(files.first.creationTime!).year,+ );+ }++ MemoryFileIndex._(this.files, this._oldestYear, this._newestYear);++ List<EnteFile> filesInDateRanges(+ Iterable<({DateTime start, DateTime end})> dateRanges,+ ) {+ return _filesInRanges(+ dateRanges.map(+ (range) => (+ start: range.start.microsecondsSinceEpoch,+ end: range.end.microsecondsSinceEpoch,+ ),+ ),+ );+ }++ List<EnteFile> filesForCalendar({+ Set<int> monthDays = const <int>{},+ int? month,+ int? week,+ }) {+ if (files.isEmpty) return <EnteFile>[];++ final yearCount = _newestYear - _oldestYear + 1;+ if (yearCount <= 0 || yearCount > files.length) {+ return files;+ }++ final ranges = <_CreationTimeRange>[];+ for (var year = _oldestYear; year <= _newestYear; year++) {+ for (final monthDay in monthDays) {+ final candidateMonth = monthDay ~/ 100;+ final candidateDay = monthDay % 100;+ final start = DateTime(year, candidateMonth, candidateDay);+ if (start.year != year ||+ start.month != candidateMonth ||+ start.day != candidateDay) {+ continue;+ }+ ranges.add((+ start: start.microsecondsSinceEpoch,+ end: DateTime(+ year,+ candidateMonth,+ candidateDay + 1,+ ).microsecondsSinceEpoch,+ ));+ }++ if (month != null) {+ ranges.add((+ start: DateTime(year, month).microsecondsSinceEpoch,+ end: DateTime(year, month + 1).microsecondsSinceEpoch,+ ));+ }++ if (week != null) {+ final start = DateTime(year, 1, 1 + (week - 1) * 7);+ if (start.year == year) {+ final weekEnd = DateTime(year, 1, 1 + week * 7);+ final yearEnd = DateTime(year + 1);+ ranges.add((+ start: start.microsecondsSinceEpoch,+ end: min(+ weekEnd.microsecondsSinceEpoch,+ yearEnd.microsecondsSinceEpoch,+ ),+ ));+ }+ }+ }+ return _filesInRanges(ranges);+ }++ List<EnteFile> _filesInRanges(Iterable<_CreationTimeRange> sourceRanges) {+ final ranges =+ sourceRanges.where((range) => range.start < range.end).toList()+ ..sort((a, b) => a.start.compareTo(b.start));+ if (ranges.isEmpty) return <EnteFile>[];++ final merged = <_CreationTimeRange>[];+ var current = ranges.first;+ for (final next in ranges.skip(1)) {+ if (next.start <= current.end) {+ current = (start: current.start, end: max(current.end, next.end));+ } else {+ merged.add(current);+ current = next;+ }+ }+ merged.add(current);++ final result = <EnteFile>[];+ for (final range in merged.reversed) {+ final firstIndex = _firstFileCreatedBefore(range.end);+ final endIndex = _firstFileCreatedBefore(range.start);+ result.addAll(files.getRange(firstIndex, endIndex));+ }+ return result;+ }++ int _firstFileCreatedBefore(int timestamp) {+ var low = 0;+ var high = files.length;+ while (low < high) {+ final middle = low + ((high - low) >> 1);+ if (files[middle].creationTime! >= timestamp) {+ low = middle + 1;+ } else {+ high = middle;+ }+ }+ return low;+ }++ static bool _isCreationTimeDescending(List<EnteFile> files) {+ for (var i = 1; i < files.length; i++) {+ if (files[i - 1].creationTime! < files[i].creationTime!) {+ return false;+ }+ }+ return true;+ }+}diff --git a/mobile/apps/photos/lib/services/smart_memories_service.dart b/mobile/apps/photos/lib/services/smart_memories_service.dartindex 01a96478c4..0ce2bea060 100644--- a/mobile/apps/photos/lib/services/smart_memories_service.dart+++ b/mobile/apps/photos/lib/services/smart_memories_service.dart@@ -45,6 +45,7 @@ import "package:photos/services/memories/photo_selector.dart";import "package:photos/services/search_service.dart";part "smart_memories_clip_calculator.dart";+part "memories/memory_file_index.dart";part "smart_memories_people_calculator.dart";part "smart_memories_time_calculator.dart";part "smart_memories_trip_calculator_v2.dart";@@ -68,6 +69,7 @@ typedef _PreparedMemoriesData = ({List<PersonEntity> persons,Map<String, String> faceIDsToPersonID,Map<int, EmbeddingVector> fileIDToImageEmbedding,+ MemoryFileIndex fileIndex,TripMemoriesAnalysis tripAnalysis,});@@ -851,8 +853,11 @@ class SmartMemoriesService {for (final embedding in computationContext.allImageEmbeddings) {fileIDToImageEmbedding[embedding.fileID] = embedding;}- final tripAnalysis = TripMemoriesCalculatorV2.analyze(+ final fileIndex = MemoryFileIndex(computationContext.allFileIdsToFile.values,+ );+ final tripAnalysis = TripMemoriesCalculatorV2.analyze(+ fileIndex.files,computationContext.allFileIdsToFile,isLocalGalleryMode: computationContext.isLocalGalleryMode,seenTimes: computationContext.seenTimes,@@ -862,6 +867,7 @@ class SmartMemoriesService {persons: persons,faceIDsToPersonID: faceIDsToPersonID,fileIDToImageEmbedding: fileIDToImageEmbedding,+ fileIndex: fileIndex,tripAnalysis: tripAnalysis,);}@@ -932,12 +938,13 @@ class SmartMemoriesService {// Some memory types need every file, so track used files by ID instead of// removing them from the source map.final fullSourceFiles = allFileIdsToFile.values;+ final fileIndex = preparedData.fileIndex;final usedMemoryFileIds = <int>{};final List<SmartMemory> memories = [];final onThisDayMemories = await _getOnThisDayResults(- fullSourceFiles,+ TimeMemoriesCalculator._filesForHistoricalWindow(fileIndex, now),now,seenTimes: seenTimes,collectionIDsToExclude: collectionIDsToExclude,@@ -1038,14 +1045,22 @@ class SmartMemoriesService {dev.log('ML disabled, skipping clip memories $t');}- final timeFiles = _collectAvailableFiles(- allFileIdsToFile,+ final timeFiles = _collectAvailableCandidates(+ TimeMemoriesCalculator._filesForTimeMemories(fileIndex, now),usedMemoryFileIds,+ isLocalGalleryMode: isLocalGalleryMode,);final timeMemories = await _onThisDayOrWeekResults(timeFiles,now,- recentSourceFiles: fullSourceFiles,+ recentSourceFiles: TimeMemoriesCalculator._filesForRecentTimeMemories(+ fileIndex,+ now,+ ),+ totalAvailableFileCount: _remainingFilesCount(+ allFileIdsToFile,+ usedMemoryFileIds,+ ),isLocalGalleryMode: isLocalGalleryMode,mlEnabled: mlEnabled,seenTimes: seenTimes,@@ -1065,9 +1080,10 @@ class SmartMemoriesService {"${_remainingFilesCount(allFileIdsToFile, usedMemoryFileIds)} $t",);- final fillerFiles = _collectAvailableFiles(- allFileIdsToFile,+ final fillerFiles = _collectAvailableCandidates(+ TimeMemoriesCalculator._filesForHistoricalWindow(fileIndex, now),usedMemoryFileIds,+ isLocalGalleryMode: isLocalGalleryMode,);final fillerMemories = await _getFillerResults(fillerFiles,@@ -1098,6 +1114,7 @@ class SmartMemoriesService {useLocalIntIds: isLocalGalleryMode,requireLocalId: isLocalGalleryMode,);+ final fileIndex = MemoryFileIndex(allFileIdsToFile.values);final usedMemoryFileIds = <int>{};final seenTimes = await _memoriesDB.getSeenTimes();final collectionIDsToExclude = await getCollectionIDsToExclude();@@ -1113,7 +1130,7 @@ class SmartMemoriesService {final List<SmartMemory> memories = [];final onThisDayMemories = await _getOnThisDayResults(- allFileIdsToFile.values,+ TimeMemoriesCalculator._filesForHistoricalWindow(fileIndex, now),now,seenTimes: seenTimes,collectionIDsToExclude: collectionIDsToExclude,@@ -1127,9 +1144,10 @@ class SmartMemoriesService {], isLocalGalleryMode: isLocalGalleryMode);}- final fillerFiles = _collectAvailableFiles(- allFileIdsToFile,+ final fillerFiles = _collectAvailableCandidates(+ TimeMemoriesCalculator._filesForHistoricalWindow(fileIndex, now),usedMemoryFileIds,+ isLocalGalleryMode: isLocalGalleryMode,);final fillerMemories = await _getFillerResults(fillerFiles,@@ -1150,16 +1168,21 @@ class SmartMemoriesService {return memories;}- static List<EnteFile> _collectAvailableFiles(- Map<int, EnteFile> allFileIdsToFile,- Set<int> usedMemoryFileIds,- ) {+ static List<EnteFile> _collectAvailableCandidates(+ Iterable<EnteFile> candidates,+ Set<int> usedMemoryFileIds, {+ required bool isLocalGalleryMode,+ }) {final availableFiles = <EnteFile>[];- for (final entry in allFileIdsToFile.entries) {- if (usedMemoryFileIds.contains(entry.key)) {+ for (final file in candidates) {+ final fileID = _memoryFileId(+ file,+ isLocalGalleryMode: isLocalGalleryMode,+ );+ if (fileID != null && usedMemoryFileIds.contains(fileID)) {continue;}- availableFiles.add(entry.value);+ availableFiles.add(file);}return availableFiles;}@@ -1287,6 +1310,7 @@ class SmartMemoriesService {Iterable<EnteFile> allFiles,DateTime currentTime, {required Iterable<EnteFile> recentSourceFiles,+ required int totalAvailableFileCount,required bool isLocalGalleryMode,required bool mlEnabled,required Map<int, int> seenTimes,@@ -1299,6 +1323,7 @@ class SmartMemoriesService {allFiles,currentTime,recentSourceFiles: recentSourceFiles,+ totalAvailableFileCount: totalAvailableFileCount,isLocalGalleryMode: isLocalGalleryMode,mlEnabled: mlEnabled,seenTimes: seenTimes,diff --git a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dartindex a63423bc04..272914f440 100644--- a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart+++ b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart@@ -7,6 +7,7 @@ class TimeMemoriesCalculator {Iterable<EnteFile> allFiles,DateTime currentTime, {Iterable<EnteFile>? recentSourceFiles,+ int? totalAvailableFileCount,required bool isLocalGalleryMode,required bool mlEnabled,required Map<int, int> seenTimes,@@ -20,8 +21,8 @@ class TimeMemoriesCalculator {final availableFiles = allFiles is List<EnteFile>? allFiles: allFiles.toList();- if (availableFiles.isEmpty) return [];final recentCandidates = recentSourceFiles ?? availableFiles;+ if (availableFiles.isEmpty && recentCandidates.isEmpty) return [];final startOfCurrentWeek = _startOfWeek(currentTime);final startOfPreviousWeek = startOfCurrentWeek.subtract(@@ -73,7 +74,8 @@ class TimeMemoriesCalculator {final currentMonth = currentTime.month;final currentYear = currentTime.year;final cutOffTime = currentTime.subtract(const Duration(days: 365));- final averageDailyPhotos = availableFiles.length / 365;+ final averageDailyPhotos =+ (totalAvailableFileCount ?? availableFiles.length) / 365;final significantDayThreshold = averageDailyPhotos * 0.25;final significantWeekThreshold = averageDailyPhotos * 0.40;@@ -344,6 +346,47 @@ class TimeMemoriesCalculator {return showDates;}+ static List<EnteFile> _filesForHistoricalWindow(+ MemoryFileIndex fileIndex,+ DateTime currentTime,+ ) {+ return fileIndex.filesForCalendar(+ monthDays: _historicalDayCandidates(currentTime),+ );+ }++ static List<EnteFile> _filesForTimeMemories(+ MemoryFileIndex fileIndex,+ DateTime currentTime,+ ) {+ return fileIndex.filesForCalendar(+ monthDays: _timeMemoryShowDates(currentTime).keys.toSet(),+ month: currentTime.month,+ week: getWeekNumber(currentTime),+ );+ }++ static List<EnteFile> _filesForRecentTimeMemories(+ MemoryFileIndex fileIndex,+ DateTime currentTime,+ ) {+ final startOfCurrentWeek = _startOfWeek(currentTime);+ final startOfCurrentMonth = _startOfMonth(currentTime);+ return fileIndex.filesInDateRanges([+ (+ start: startOfCurrentWeek.subtract(const Duration(days: 7)),+ end: startOfCurrentWeek,+ ),+ (+ start: DateTime(+ startOfCurrentMonth.year,+ startOfCurrentMonth.month - 1,+ ),+ end: startOfCurrentMonth,+ ),+ ]);+ }+static Set<int> _historicalDayCandidates(DateTime currentTime) {final candidates = <int>{};for (var offset = 0; offset <= kMemoriesUpdateFrequency.inDays; offset++) {diff --git a/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart b/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dartindex 3d4a4dc22c..fa60056ba7 100644--- a/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart+++ b/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart@@ -4,6 +4,7 @@ import "package:photos/models/file/file.dart";import "package:photos/models/file/file_type.dart";import "package:photos/models/location/location.dart";import "package:photos/models/memories/clip_memory.dart";+import "package:photos/models/memories/filler_memory.dart";import "package:photos/models/memories/memories_cache.dart";import "package:photos/models/memories/time_memory.dart";import "package:photos/models/ml/face/face_with_embedding.dart";@@ -113,7 +114,7 @@ void main() {);test(- "TimeMemoriesCalculator uses the full recent source for last week",+ "TimeMemoriesCalculator uses the recent source without historical candidates",() async {final currentTime = DateTime.utc(2026, 4, 10);final fullRecentSource = <EnteFile>[@@ -124,10 +125,8 @@ void main() {createdAt: DateTime.utc(2026, 4, 1 + dayOffset, 9 + photoIndex),),];- final depletedRemainingFiles = fullRecentSource.take(6).toList();-final memories = await TimeMemoriesCalculator.computeTimeMemories(- depletedRemainingFiles,+ const <EnteFile>[],currentTime,recentSourceFiles: fullRecentSource,isLocalGalleryMode: false,@@ -155,6 +154,56 @@ void main() {},);+ test("MemoryFileIndex merges ranges and preserves descending order", () {+ final index = MemoryFileIndex([+ _file(id: 2, createdAt: DateTime(2024, 1, 2)),+ _file(id: 4, createdAt: DateTime(2024, 1, 4)),+ _file(id: 1, createdAt: DateTime(2024, 1, 1)),+ _file(id: 3, createdAt: DateTime(2024, 1, 3)),+ ]);++ final files = index.filesInDateRanges([+ (start: DateTime(2024, 1, 1), end: DateTime(2024, 1, 3)),+ (start: DateTime(2024, 1, 2), end: DateTime(2024, 1, 4)),+ ]);++ expect(files.map((file) => file.uploadedFileID), [3, 2, 1]);+ });++ test(+ "MemoryFileIndex is a broad prefilter for exact date windows",+ () async {+ final currentTime = DateTime(2026, 8, 18, 12);+ final source = [+ _file(id: 1, createdAt: DateTime(2025, 8, 18, 10)),+ _file(id: 2, createdAt: DateTime(2025, 8, 18, 14)),+ _file(id: 3, createdAt: DateTime(2025, 8, 21, 11)),+ _file(id: 4, createdAt: DateTime(2025, 9, 1)),+ ];+ final indexedCandidates = MemoryFileIndex(+ source,+ ).filesForCalendar(monthDays: const {818, 819, 820, 821});++ final fullResult = await TimeMemoriesCalculator.computeFillerMemories(+ source,+ currentTime,+ seenTimes: const <int, int>{},+ );+ final indexedResult =+ await TimeMemoriesCalculator.computeFillerMemories(+ indexedCandidates,+ currentTime,+ seenTimes: const <int, int>{},+ );++ Iterable<int?> selectedIDs(List<FillerMemory> memories) => memories+ .expand((memory) => memory.memories)+ .map((memory) => memory.file.uploadedFileID);+ expect(selectedIDs(indexedResult), selectedIDs(fullResult));+ expect(selectedIDs(indexedResult), [2, 3]);+ },+ );+test("Filler memories preserve year-boundary, leap-day, and time-window matching",() async {