Преглед изворни кода

Merge pull request #861 from ente-io/objects

Neeraj Gupta пре 2 година
родитељ
комит
948e25a4ac

+ 1 - 3
lib/main.dart

@@ -161,9 +161,7 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
     });
   }
   FeatureFlagService.instance.init();
-  if (FeatureFlagService.instance.isInternalUserOrDebugBuild()) {
-    await ObjectDetectionService.instance.init();
-  }
+  await ObjectDetectionService.instance.init();
   _logger.info("Initialization done");
 }
 

+ 5 - 1
lib/services/object_detection/object_detection_service.dart

@@ -8,6 +8,8 @@ import "package:photos/services/object_detection/tflite/classifier.dart";
 import "package:photos/services/object_detection/utils/isolate_utils.dart";
 
 class ObjectDetectionService {
+  static const scoreThreshold = 0.6;
+
   final _logger = Logger("ObjectDetectionService");
 
   /// Instance of [ObjectClassifier]
@@ -37,7 +39,9 @@ class ObjectDetectionService {
       final predictions = await _inference(isolateData);
       final Set<String> results = {};
       for (final Recognition result in predictions.recognitions) {
-        results.add(result.label);
+        if (result.score > scoreThreshold) {
+          results.add(result.label);
+        }
       }
       return results.toList();
     } catch (e, s) {

+ 8 - 11
lib/ui/viewer/file/file_info_widget.dart

@@ -10,7 +10,6 @@ import "package:photos/ente_theme_data.dart";
 import "package:photos/models/file.dart";
 import "package:photos/models/file_type.dart";
 import 'package:photos/services/collections_service.dart';
-import "package:photos/services/feature_flag_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/divider_widget.dart';
 import 'package:photos/ui/components/icon_button_widget.dart';
@@ -237,16 +236,14 @@ class _FileInfoWidgetState extends State<FileInfoWidget> {
               : DeviceFoldersListOfFileWidget(allDeviceFoldersOfFile),
         ),
       ),
-      FeatureFlagService.instance.isInternalUserOrDebugBuild()
-          ? SizedBox(
-              height: 62,
-              child: ListTile(
-                horizontalTitleGap: 0,
-                leading: const Icon(Icons.image_search),
-                title: ObjectTagsWidget(file),
-              ),
-            )
-          : null,
+      SizedBox(
+        height: 62,
+        child: ListTile(
+          horizontalTitleGap: 0,
+          leading: const Icon(Icons.image_search),
+          title: ObjectTagsWidget(file),
+        ),
+      ),
       (file.uploadedFileID != null && file.updationTime != null)
           ? ListTile(
               horizontalTitleGap: 2,