Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile] Use Vision on iOS and Rust on Android for all OCR users

laurenspriema2ff8679a743
diff --git a/mobile/apps/photos/lib/services/machine_learning/ocr_service.dart b/mobile/apps/photos/lib/services/machine_learning/ocr_service.dart
index 6882462617..5f5357dfc0 100644
--- a/mobile/apps/photos/lib/services/machine_learning/ocr_service.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/ocr_service.dart
@@ -1,42 +1,33 @@
import "dart:io";
import "package:logging/logging.dart";
-import "package:photos/service_locator.dart";
-import "package:photos/services/machine_learning/ocr/legacy_mobile_ocr_backend.dart";
import "package:photos/services/machine_learning/ocr/ocr_backend.dart";
import "package:photos/services/machine_learning/ocr/ocr_models.dart";
import "package:photos/services/machine_learning/ocr/rust_ocr_backend.dart";
import "package:photos/services/machine_learning/ocr/vision_ocr_backend.dart";
-enum OcrBackendKind { legacy, rust, vision }
+enum OcrBackendKind { rust, vision }
class OcrService {
OcrService({
- required bool Function() rustOcrEnabled,
required bool isAndroid,
required bool isIOS,
- OcrBackend Function()? createLegacyBackend,
OcrBackend Function()? createRustBackend,
OcrBackend Function()? createVisionBackend,
- }) : _rustOcrEnabled = rustOcrEnabled,
- _isAndroid = isAndroid,
+ }) : _isAndroid = isAndroid,
_isIOS = isIOS,
- _createLegacyBackend = createLegacyBackend ?? LegacyMobileOcrBackend.new,
_createRustBackend = createRustBackend ?? RustOcrBackend.new,
_createVisionBackend = createVisionBackend ?? VisionOcrBackend.new;
static final instance = OcrService(
- rustOcrEnabled: () => flagService.rustOcr,
isAndroid: Platform.isAndroid,
isIOS: Platform.isIOS,
);
static final _logger = Logger("OcrService");
- final bool Function() _rustOcrEnabled;
final bool _isAndroid;
final bool _isIOS;
- final OcrBackend Function() _createLegacyBackend;
final OcrBackend Function() _createRustBackend;
final OcrBackend Function() _createVisionBackend;
late final OcrBackendKind backendKind = _chooseBackendKind();
@@ -49,16 +40,13 @@ class OcrService {
}
OcrBackendKind _preferredBackendKind() {
- if (!_rustOcrEnabled()) {
- return OcrBackendKind.legacy;
- }
- if (_isAndroid || _isIOS) {
+ if (_isAndroid) {
return OcrBackendKind.rust;
}
if (_isIOS) {
return OcrBackendKind.vision;
}
- return OcrBackendKind.legacy;
+ throw UnsupportedError("OCR is only supported on Android and iOS");
}
Future<ModelPreparationStatus> prepareModels({
@@ -102,7 +90,6 @@ class OcrService {
}
OcrBackend _createBackend(OcrBackendKind kind) => switch (kind) {
- OcrBackendKind.legacy => _createLegacyBackend(),
OcrBackendKind.rust => _createRustBackend(),
OcrBackendKind.vision => _createVisionBackend(),
};
diff --git a/mobile/packages/feature_flag/lib/src/flag_service.dart b/mobile/packages/feature_flag/lib/src/flag_service.dart
index 7356cc12af..a77d2de476 100644
--- a/mobile/packages/feature_flag/lib/src/flag_service.dart
+++ b/mobile/packages/feature_flag/lib/src/flag_service.dart
@@ -129,8 +129,6 @@ class FlagService {
bool get ocrOverlayEnabled => true;
- bool get rustOcr => internalUser;
-
bool get enableBgLocalUploadPriority => internalUser;
bool get syncRecoveryDiagnostics => internalUser;