beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move FaceML inside Machine Learning directory

Browse source
This commit is contained in:
laurenspriem 2024-03-20 15:51:57 +05:30
parent 1819ea834a
commit a4582c0e55
41 changed files with 61 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mobile/lib/db/ml_data_db.dart
View file

@ -4,9 +4,9 @@ import 'package:logging/logging.dart';
import 'package:path/path.dart' show join;
import 'package:path_provider/path_provider.dart';
import 'package:photos/models/ml/ml_typedefs.dart';
import "package:photos/services/face_ml/face_feedback.dart/cluster_feedback.dart";
import "package:photos/services/face_ml/face_feedback.dart/feedback_types.dart";
import "package:photos/services/face_ml/face_ml_result.dart";
import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart';
import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart';
import 'package:photos/services/machine_learning/face_ml/face_ml_result.dart';
import 'package:sqflite/sqflite.dart';
/// Stores all data for the ML-related features. The database can be accessed by `MlDataDB.instance.database`.

2
mobile/lib/face/db.dart
View file

@ -11,7 +11,7 @@ import "package:photos/face/db_model_mappers.dart";
import "package:photos/face/model/face.dart";
import "package:photos/face/model/person.dart";
import "package:photos/models/file/file.dart";
import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
import 'package:sqflite/sqflite.dart';
/// Stores all data for the ML-related features. The database can be accessed by `MlDataDB.instance.database`.

2
mobile/lib/face/db_fields.dart
View file

@ -1,5 +1,5 @@
// Faces Table Fields & Schema Queries
import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
const facesTable = 'faces';
const fileIDColumn = 'file_id';

2
mobile/lib/face/model/face.dart
View file

@ -1,5 +1,5 @@
import "package:photos/face/model/detection.dart";
import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
class Face {
final int fileID;

2
mobile/lib/main.dart
View file

@ -25,13 +25,13 @@ import 'package:photos/services/app_lifecycle_service.dart';
import 'package:photos/services/billing_service.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/services/entity_service.dart";
import "package:photos/services/face_ml/face_ml_service.dart";
import 'package:photos/services/favorites_service.dart';
import 'package:photos/services/feature_flag_service.dart';
import 'package:photos/services/home_widget_service.dart';
import 'package:photos/services/local_file_update_service.dart';
import 'package:photos/services/local_sync_service.dart';
import "package:photos/services/location_service.dart";
import 'package:photos/services/machine_learning/face_ml/face_ml_service.dart';
import 'package:photos/services/machine_learning/file_ml/remote_fileml_service.dart';
import "package:photos/services/machine_learning/machine_learning_controller.dart";
import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';

0
mobile/lib/services/face_ml/face_alignment/alignment_result.dart → mobile/lib/services/machine_learning/face_ml/face_alignment/alignment_result.dart
View file

2
mobile/lib/services/face_ml/face_alignment/similarity_transform.dart → mobile/lib/services/machine_learning/face_ml/face_alignment/similarity_transform.dart
View file

@ -1,7 +1,7 @@
import 'dart:math' show atan2;
import 'package:ml_linalg/linalg.dart';
import 'package:photos/extensions/ml_linalg_extensions.dart';
import "package:photos/services/face_ml/face_alignment/alignment_result.dart";
import 'package:photos/services/machine_learning/face_ml/face_alignment/alignment_result.dart';
/// Class to compute the similarity transform between two sets of points.
///

0
mobile/lib/services/face_ml/face_clustering/cosine_distance.dart → mobile/lib/services/machine_learning/face_ml/face_clustering/cosine_distance.dart
View file

2
mobile/lib/services/face_ml/face_clustering/linear_clustering_service.dart → mobile/lib/services/machine_learning/face_ml/face_clustering/linear_clustering_service.dart
View file

@ -6,7 +6,7 @@ import "dart:typed_data";
import "package:logging/logging.dart";
import "package:photos/generated/protos/ente/common/vector.pb.dart";
import "package:photos/services/face_ml/face_clustering/cosine_distance.dart";
import 'package:photos/services/machine_learning/face_ml/face_clustering/cosine_distance.dart';
import "package:synchronized/synchronized.dart";
class FaceInfo {

0
mobile/lib/services/face_ml/face_detection/detection.dart → mobile/lib/services/machine_learning/face_ml/face_detection/detection.dart
View file

2
mobile/lib/services/face_ml/face_detection/naive_non_max_suppression.dart → mobile/lib/services/machine_learning/face_ml/face_detection/naive_non_max_suppression.dart
View file

@ -1,6 +1,6 @@
import 'dart:math' as math show max, min;
import "package:photos/services/face_ml/face_detection/detection.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
List<FaceDetectionRelative> naiveNonMaxSuppression({
required List<FaceDetectionRelative> detections,

8
mobile/lib/services/face_ml/face_detection/yolov5face/onnx_face_detection.dart → mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/onnx_face_detection.dart
View file

@ -9,10 +9,10 @@ import "package:computer/computer.dart";
import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
import 'package:onnxruntime/onnxruntime.dart';
import "package:photos/services/face_ml/face_detection/detection.dart";
import "package:photos/services/face_ml/face_detection/naive_non_max_suppression.dart";
import "package:photos/services/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart";
import "package:photos/services/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/naive_non_max_suppression.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart';
import "package:photos/services/remote_assets_service.dart";
import "package:photos/utils/image_ml_isolate.dart";
import "package:photos/utils/image_ml_util.dart";

0
mobile/lib/services/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart → mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart
View file

0
mobile/lib/services/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart → mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart
View file

2
mobile/lib/services/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart → mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_filter_extract_detections.dart
View file

@ -1,6 +1,6 @@
import 'dart:developer' as dev show log;
import "package:photos/services/face_ml/face_detection/detection.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
List<FaceDetectionRelative> yoloOnnxFilterExtractDetections(
double minScoreSigmoidThreshold,

4
mobile/lib/services/face_ml/face_detection/yolov5face/yolo_model_config.dart → mobile/lib/services/machine_learning/face_ml/face_detection/yolov5face/yolo_model_config.dart
View file

@ -1,5 +1,5 @@
import "package:photos/services/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart";
import "package:photos/services/face_ml/model_file.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_options.dart';
import 'package:photos/services/machine_learning/face_ml/model_file.dart';
class YOLOModelConfig {
final String modelPath;

0
mobile/lib/services/face_ml/face_embedding/face_embedding_exceptions.dart → mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_exceptions.dart
View file

0
mobile/lib/services/face_ml/face_embedding/face_embedding_options.dart → mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_options.dart
View file

8
mobile/lib/services/face_ml/face_embedding/face_embedding_service.dart → mobile/lib/services/machine_learning/face_ml/face_embedding/face_embedding_service.dart
View file

@ -6,10 +6,10 @@ import 'dart:typed_data' show Uint8List;
import "package:flutter/foundation.dart";
import "package:logging/logging.dart";
import 'package:photos/models/ml/ml_typedefs.dart';
import "package:photos/services/face_ml/face_detection/detection.dart";
import "package:photos/services/face_ml/face_embedding/face_embedding_exceptions.dart";
import "package:photos/services/face_ml/face_embedding/face_embedding_options.dart";
import "package:photos/services/face_ml/face_embedding/mobilefacenet_model_config.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_exceptions.dart';
import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_options.dart';
import 'package:photos/services/machine_learning/face_ml/face_embedding/mobilefacenet_model_config.dart';
import 'package:photos/utils/image_ml_isolate.dart';
import 'package:photos/utils/image_ml_util.dart';
import 'package:tflite_flutter/tflite_flutter.dart';

4
mobile/lib/services/face_ml/face_embedding/mobilefacenet_model_config.dart → mobile/lib/services/machine_learning/face_ml/face_embedding/mobilefacenet_model_config.dart
View file

@ -1,5 +1,5 @@
import "package:photos/services/face_ml/face_embedding/face_embedding_options.dart";
import "package:photos/services/face_ml/model_file.dart";
import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_options.dart';
import 'package:photos/services/machine_learning/face_ml/model_file.dart';
class MobileFaceNetModelConfig {
final String modelPath;

2
mobile/lib/services/face_ml/face_embedding/onnx_face_embedding.dart → mobile/lib/services/machine_learning/face_ml/face_embedding/onnx_face_embedding.dart
View file

@ -5,7 +5,7 @@ import 'dart:typed_data' show Float32List;
import 'package:computer/computer.dart';
import 'package:logging/logging.dart';
import 'package:onnxruntime/onnxruntime.dart';
import "package:photos/services/face_ml/face_detection/detection.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
import "package:photos/services/remote_assets_service.dart";
import "package:photos/utils/image_ml_isolate.dart";
import "package:synchronized/synchronized.dart";

6
mobile/lib/services/face_ml/face_feedback.dart/cluster_feedback.dart → mobile/lib/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart
View file

@ -1,8 +1,8 @@
import "dart:convert";
import "package:photos/services/face_ml/face_clustering/cosine_distance.dart";
import "package:photos/services/face_ml/face_feedback.dart/feedback.dart";
import "package:photos/services/face_ml/face_feedback.dart/feedback_types.dart";
import 'package:photos/services/machine_learning/face_ml/face_clustering/cosine_distance.dart';
import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/feedback.dart';
import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart';
abstract class ClusterFeedback extends Feedback {
static final Map<FeedbackType, Function(String)> fromJsonStringRegistry = {

6
mobile/lib/services/face_ml/face_feedback.dart/face_feedback_service.dart → mobile/lib/services/machine_learning/face_ml/face_feedback.dart/face_feedback_service.dart
View file

@ -1,8 +1,8 @@
import "package:logging/logging.dart";
import "package:photos/db/ml_data_db.dart";
import "package:photos/services/face_ml/face_detection/detection.dart";
import "package:photos/services/face_ml/face_feedback.dart/cluster_feedback.dart";
import "package:photos/services/face_ml/face_ml_result.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart';
import 'package:photos/services/machine_learning/face_ml/face_ml_result.dart';
class FaceFeedbackService {
final _logger = Logger("FaceFeedbackService");

2
mobile/lib/services/face_ml/face_feedback.dart/feedback.dart → mobile/lib/services/machine_learning/face_ml/face_feedback.dart/feedback.dart
View file

@ -1,5 +1,5 @@
import "package:photos/models/ml/ml_versions.dart";
import "package:photos/services/face_ml/face_feedback.dart/feedback_types.dart";
import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart';
import "package:uuid/uuid.dart";
abstract class Feedback {

0
mobile/lib/services/face_ml/face_feedback.dart/feedback_types.dart → mobile/lib/services/machine_learning/face_ml/face_feedback.dart/feedback_types.dart
View file

2
mobile/lib/services/face_ml/face_filtering/blur_detection_service.dart → mobile/lib/services/machine_learning/face_ml/face_filtering/blur_detection_service.dart
View file

@ -1,5 +1,5 @@
import 'package:logging/logging.dart';
import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
class BlurDetectionService {
final _logger = Logger('BlurDetectionService');

2
mobile/lib/services/face_ml/face_filtering/face_filtering_constants.dart → mobile/lib/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart
View file

@ -1,4 +1,4 @@
import "package:photos/services/face_ml/face_detection/yolov5face/onnx_face_detection.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/onnx_face_detection.dart';
/// Blur detection threshold
const kLaplacianThreshold = 15;

0
mobile/lib/services/face_ml/face_ml_exceptions.dart → mobile/lib/services/machine_learning/face_ml/face_ml_exceptions.dart
View file

2
mobile/lib/services/face_ml/face_ml_methods.dart → mobile/lib/services/machine_learning/face_ml/face_ml_methods.dart
View file

@ -1,4 +1,4 @@
import "package:photos/services/face_ml/face_ml_version.dart";
import 'package:photos/services/machine_learning/face_ml/face_ml_version.dart';
/// Represents a face detection method with a specific version.
class FaceDetectionMethod extends VersionedMethod {

12
mobile/lib/services/face_ml/face_ml_result.dart → mobile/lib/services/machine_learning/face_ml/face_ml_result.dart
View file

@ -6,12 +6,12 @@ import "package:photos/db/ml_data_db.dart";
import "package:photos/models/file/file.dart";
import 'package:photos/models/ml/ml_typedefs.dart';
import "package:photos/models/ml/ml_versions.dart";
import "package:photos/services/face_ml/face_alignment/alignment_result.dart";
import "package:photos/services/face_ml/face_clustering/cosine_distance.dart";
import "package:photos/services/face_ml/face_detection/detection.dart";
import "package:photos/services/face_ml/face_feedback.dart/cluster_feedback.dart";
import 'package:photos/services/face_ml/face_filtering/face_filtering_constants.dart';
import "package:photos/services/face_ml/face_ml_methods.dart";
import 'package:photos/services/machine_learning/face_ml/face_alignment/alignment_result.dart';
import 'package:photos/services/machine_learning/face_ml/face_clustering/cosine_distance.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
import 'package:photos/services/machine_learning/face_ml/face_feedback.dart/cluster_feedback.dart';
import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
import 'package:photos/services/machine_learning/face_ml/face_ml_methods.dart';
final _logger = Logger('ClusterResult_FaceMlResult');

18
mobile/lib/services/face_ml/face_ml_service.dart → mobile/lib/services/machine_learning/face_ml/face_ml_service.dart
View file

@ -25,15 +25,15 @@ import "package:photos/models/file/extensions/file_props.dart";
import "package:photos/models/file/file.dart";
import "package:photos/models/file/file_type.dart";
import "package:photos/models/ml/ml_versions.dart";
import "package:photos/services/face_ml/face_clustering/linear_clustering_service.dart";
import "package:photos/services/face_ml/face_detection/detection.dart";
import 'package:photos/services/face_ml/face_detection/yolov5face/onnx_face_detection.dart';
import "package:photos/services/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart";
import "package:photos/services/face_ml/face_embedding/face_embedding_exceptions.dart";
import 'package:photos/services/face_ml/face_embedding/onnx_face_embedding.dart';
import "package:photos/services/face_ml/face_filtering/face_filtering_constants.dart";
import "package:photos/services/face_ml/face_ml_exceptions.dart";
import "package:photos/services/face_ml/face_ml_result.dart";
import 'package:photos/services/machine_learning/face_ml/face_clustering/linear_clustering_service.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/onnx_face_detection.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/yolov5face/yolo_face_detection_exceptions.dart';
import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_exceptions.dart';
import 'package:photos/services/machine_learning/face_ml/face_embedding/onnx_face_embedding.dart';
import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
import 'package:photos/services/machine_learning/face_ml/face_ml_exceptions.dart';
import 'package:photos/services/machine_learning/face_ml/face_ml_result.dart';
import 'package:photos/services/machine_learning/file_ml/file_ml.dart';
import 'package:photos/services/machine_learning/file_ml/remote_fileml_service.dart';
import "package:photos/services/search_service.dart";

0
mobile/lib/services/face_ml/face_ml_version.dart → mobile/lib/services/machine_learning/face_ml/face_ml_version.dart
View file

0
mobile/lib/services/face_ml/face_search_service.dart → mobile/lib/services/machine_learning/face_ml/face_search_service.dart
View file

2
mobile/lib/services/face_ml/feedback/cluster_feedback.dart → mobile/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
View file

@ -11,7 +11,7 @@ import "package:photos/face/db.dart";
import "package:photos/face/model/person.dart";
import "package:photos/generated/protos/ente/common/vector.pb.dart";
import "package:photos/models/file/file.dart";
import "package:photos/services/face_ml/face_clustering/cosine_distance.dart";
import 'package:photos/services/machine_learning/face_ml/face_clustering/cosine_distance.dart';
import "package:photos/services/search_service.dart";
class ClusterFeedbackService {

0
mobile/lib/services/face_ml/model_file.dart → mobile/lib/services/machine_learning/face_ml/model_file.dart
View file

4
mobile/lib/ui/settings/debug/face_debug_section_widget.dart
View file

@ -8,8 +8,8 @@ import "package:photos/events/people_changed_event.dart";
import "package:photos/extensions/stop_watch.dart";
import "package:photos/face/db.dart";
import "package:photos/face/model/person.dart";
import "package:photos/services/face_ml/face_ml_service.dart";
import "package:photos/services/face_ml/feedback/cluster_feedback.dart";
import 'package:photos/services/machine_learning/face_ml/face_ml_service.dart';
import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/components/captioned_text_widget.dart';
import 'package:photos/ui/components/expandable_menu_item_widget.dart';

2
mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
View file

@ -20,8 +20,8 @@ import 'package:photos/models/gallery_type.dart';
import "package:photos/models/metadata/common_keys.dart";
import 'package:photos/models/selected_files.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/services/face_ml/feedback/cluster_feedback.dart";
import 'package:photos/services/hidden_service.dart';
import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
import "package:photos/theme/colors.dart";
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/actions/collection/collection_file_actions.dart';

2
mobile/lib/ui/viewer/people/add_person_action_sheet.dart
View file

@ -10,7 +10,7 @@ import "package:photos/events/people_changed_event.dart";
import "package:photos/face/db.dart";
import "package:photos/face/model/person.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/services/face_ml/feedback/cluster_feedback.dart";
import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
import 'package:photos/theme/colors.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/common/loading_widget.dart';

2
mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
View file

@ -6,7 +6,7 @@ import "package:photos/events/people_changed_event.dart";
import "package:photos/face/db.dart";
import "package:photos/face/model/person.dart";
import "package:photos/models/file/file.dart";
import "package:photos/services/face_ml/feedback/cluster_feedback.dart";
import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/components/buttons/button_widget.dart";
import "package:photos/ui/components/models/button_type.dart";

4
mobile/lib/utils/image_ml_isolate.dart
View file

@ -9,8 +9,8 @@ import 'package:flutter_isolate/flutter_isolate.dart';
import "package:logging/logging.dart";
import "package:photos/face/model/box.dart";
import 'package:photos/models/ml/ml_typedefs.dart';
import "package:photos/services/face_ml/face_alignment/alignment_result.dart";
import "package:photos/services/face_ml/face_detection/detection.dart";
import 'package:photos/services/machine_learning/face_ml/face_alignment/alignment_result.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
import "package:photos/utils/image_ml_util.dart";
import "package:synchronized/synchronized.dart";

8
mobile/lib/utils/image_ml_util.dart
View file

@ -18,10 +18,10 @@ import 'package:flutter/painting.dart' as paint show decodeImageFromList;
import 'package:ml_linalg/linalg.dart';
import "package:photos/face/model/box.dart";
import 'package:photos/models/ml/ml_typedefs.dart';
import "package:photos/services/face_ml/face_alignment/alignment_result.dart";
import "package:photos/services/face_ml/face_alignment/similarity_transform.dart";
import "package:photos/services/face_ml/face_detection/detection.dart";
import 'package:photos/services/face_ml/face_filtering/blur_detection_service.dart';
import 'package:photos/services/machine_learning/face_ml/face_alignment/alignment_result.dart';
import 'package:photos/services/machine_learning/face_ml/face_alignment/similarity_transform.dart';
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
import 'package:photos/services/machine_learning/face_ml/face_filtering/blur_detection_service.dart';
/// All of the functions in this file are helper functions for the [ImageMlIsolate] isolate.
/// Don't use them outside of the isolate, unless you are okay with UI jank!!!!