فهرست منبع

Move semantic_search into machine_learning

vishnukvmd 1 سال پیش
والد
کامیت
5094e1a4be

+ 1 - 1
lib/app.dart

@@ -13,7 +13,7 @@ import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
-import "package:photos/services/semantic_search/semantic_search_service.dart";
+import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/ui/tabs/home_widget.dart';
 import "package:photos/ui/viewer/actions/file_viewer.dart";

+ 1 - 1
lib/core/configuration.dart

@@ -25,9 +25,9 @@ import 'package:photos/services/billing_service.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/favorites_service.dart';
 import 'package:photos/services/ignored_files_service.dart';
+import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import 'package:photos/services/memories_service.dart';
 import 'package:photos/services/search_service.dart';
-import "package:photos/services/semantic_search/semantic_search_service.dart";
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/file_uploader.dart';

+ 1 - 1
lib/main.dart

@@ -30,11 +30,11 @@ import 'package:photos/services/feature_flag_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/semantic_search/semantic_search_service.dart';
 import 'package:photos/services/memories_service.dart';
 import 'package:photos/services/push_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/search_service.dart';
-import 'package:photos/services/semantic_search/semantic_search_service.dart';
 import "package:photos/services/storage_bonus_service.dart";
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/services/trash_sync_service.dart';

+ 1 - 1
lib/services/semantic_search/embedding_store.dart → lib/services/machine_learning/semantic_search/embedding_store.dart

@@ -9,7 +9,7 @@ import "package:photos/db/embeddings_db.dart";
 import "package:photos/db/files_db.dart";
 import "package:photos/models/embedding.dart";
 import "package:photos/models/file/file.dart";
-import "package:photos/services/semantic_search/remote_embedding.dart";
+import 'package:photos/services/machine_learning/semantic_search/remote_embedding.dart';
 import "package:photos/utils/crypto_util.dart";
 import "package:photos/utils/file_download_util.dart";
 import "package:shared_preferences/shared_preferences.dart";

+ 1 - 1
lib/services/semantic_search/frameworks/ggml.dart → lib/services/machine_learning/semantic_search/frameworks/ggml.dart

@@ -1,7 +1,7 @@
 import "package:clip_ggml/clip_ggml.dart";
 import "package:computer/computer.dart";
 import "package:logging/logging.dart";
-import 'package:photos/services/semantic_search/frameworks/ml_framework.dart';
+import 'package:photos/services/machine_learning/semantic_search/frameworks/ml_framework.dart';
 
 class GGML extends MLFramework {
   static const kModelBucketEndpoint = "https://models.ente.io/";

+ 0 - 0
lib/services/semantic_search/frameworks/ml_framework.dart → lib/services/machine_learning/semantic_search/frameworks/ml_framework.dart


+ 3 - 3
lib/services/semantic_search/frameworks/onnx/onnx.dart → lib/services/machine_learning/semantic_search/frameworks/onnx/onnx.dart

@@ -1,9 +1,9 @@
 import "package:computer/computer.dart";
 import "package:logging/logging.dart";
 import "package:onnxruntime/onnxruntime.dart";
-import "package:photos/services/semantic_search/frameworks/ml_framework.dart";
-import "package:photos/services/semantic_search/frameworks/onnx/onnx_image_encoder.dart";
-import "package:photos/services/semantic_search/frameworks/onnx/onnx_text_encoder.dart";
+import 'package:photos/services/machine_learning/semantic_search/frameworks/ml_framework.dart';
+import 'package:photos/services/machine_learning/semantic_search/frameworks/onnx/onnx_image_encoder.dart';
+import 'package:photos/services/machine_learning/semantic_search/frameworks/onnx/onnx_text_encoder.dart';
 
 class ONNX extends MLFramework {
   static const kModelBucketEndpoint = "https://models.ente.io/";

+ 0 - 0
lib/services/semantic_search/frameworks/onnx/onnx_image_encoder.dart → lib/services/machine_learning/semantic_search/frameworks/onnx/onnx_image_encoder.dart


+ 1 - 1
lib/services/semantic_search/frameworks/onnx/onnx_text_encoder.dart → lib/services/machine_learning/semantic_search/frameworks/onnx/onnx_text_encoder.dart

@@ -5,7 +5,7 @@ import "dart:typed_data";
 import "package:flutter/services.dart";
 import "package:logging/logging.dart";
 import "package:onnxruntime/onnxruntime.dart";
-import "package:photos/services/semantic_search/frameworks/onnx/onnx_text_tokenizer.dart";
+import 'package:photos/services/machine_learning/semantic_search/frameworks/onnx/onnx_text_tokenizer.dart';
 
 class OnnxTextEncoder {
   static const kVocabFilePath = "assets/models/clip/bpe_simple_vocab_16e6.txt";

+ 0 - 0
lib/services/semantic_search/frameworks/onnx/onnx_text_tokenizer.dart → lib/services/machine_learning/semantic_search/frameworks/onnx/onnx_text_tokenizer.dart


+ 0 - 0
lib/services/semantic_search/remote_embedding.dart → lib/services/machine_learning/semantic_search/remote_embedding.dart


+ 4 - 4
lib/services/semantic_search/semantic_search_service.dart → lib/services/machine_learning/semantic_search/semantic_search_service.dart

@@ -14,10 +14,10 @@ import "package:photos/events/file_uploaded_event.dart";
 import "package:photos/models/embedding.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/services/collections_service.dart";
-import "package:photos/services/semantic_search/embedding_store.dart";
-import "package:photos/services/semantic_search/frameworks/ggml.dart";
-import "package:photos/services/semantic_search/frameworks/ml_framework.dart";
-import 'package:photos/services/semantic_search/frameworks/onnx/onnx.dart';
+import 'package:photos/services/machine_learning/semantic_search/embedding_store.dart';
+import 'package:photos/services/machine_learning/semantic_search/frameworks/ggml.dart';
+import 'package:photos/services/machine_learning/semantic_search/frameworks/ml_framework.dart';
+import 'package:photos/services/machine_learning/semantic_search/frameworks/onnx/onnx.dart';
 import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/device_info.dart";
 import "package:photos/utils/local_settings.dart";

+ 1 - 1
lib/services/search_service.dart

@@ -25,7 +25,7 @@ import 'package:photos/models/search/generic_search_result.dart';
 import "package:photos/models/search/search_types.dart";
 import 'package:photos/services/collections_service.dart';
 import "package:photos/services/location_service.dart";
-import 'package:photos/services/semantic_search/semantic_search_service.dart';
+import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import "package:photos/states/location_screen_state.dart";
 import "package:photos/ui/viewer/location/add_location_sheet.dart";
 import "package:photos/ui/viewer/location/location_screen.dart";

+ 2 - 2
lib/ui/settings/machine_learning_settings_page.dart

@@ -6,8 +6,8 @@ import "package:photos/core/event_bus.dart";
 import 'package:photos/events/embedding_updated_event.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/services/feature_flag_service.dart";
-import "package:photos/services/semantic_search/frameworks/ml_framework.dart";
-import "package:photos/services/semantic_search/semantic_search_service.dart";
+import 'package:photos/services/machine_learning/semantic_search/frameworks/ml_framework.dart';
+import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/components/buttons/icon_button_widget.dart";