From bbed1c052a442940201b8a173356f761a5a9cec9 Mon Sep 17 00:00:00 2001 From: vishnukvmd Date: Fri, 5 Jan 2024 15:16:27 +0530 Subject: [PATCH] Inject model from upstream --- lib/services/semantic_search/embedding_store.dart | 12 ++++++------ .../semantic_search/semantic_search_service.dart | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/services/semantic_search/embedding_store.dart b/lib/services/semantic_search/embedding_store.dart index 7b80e4153..143cc59d6 100644 --- a/lib/services/semantic_search/embedding_store.dart +++ b/lib/services/semantic_search/embedding_store.dart @@ -10,7 +10,6 @@ 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/semantic_search/semantic_search_service.dart"; import "package:photos/utils/crypto_util.dart"; import "package:photos/utils/file_download_util.dart"; import "package:shared_preferences/shared_preferences.dart"; @@ -34,15 +33,15 @@ class EmbeddingStore { _preferences = await SharedPreferences.getInstance(); } - Future pullEmbeddings() async { + Future pullEmbeddings(Model model) async { if (_syncStatus != null) { return _syncStatus!.future; } _syncStatus = Completer(); - var remoteEmbeddings = await _getRemoteEmbeddings(); + var remoteEmbeddings = await _getRemoteEmbeddings(model); await _storeRemoteEmbeddings(remoteEmbeddings.embeddings); while (remoteEmbeddings.hasMore) { - remoteEmbeddings = await _getRemoteEmbeddings(); + remoteEmbeddings = await _getRemoteEmbeddings(model); await _storeRemoteEmbeddings(remoteEmbeddings.embeddings); } _syncStatus!.complete(); @@ -90,7 +89,8 @@ class EmbeddingStore { } } - Future _getRemoteEmbeddings({ + Future _getRemoteEmbeddings( + Model model, { int limit = 500, }) async { final remoteEmbeddings = []; @@ -100,7 +100,7 @@ class EmbeddingStore { final response = await _dio.get( "/embeddings/diff", queryParameters: { - "model": SemanticSearchService.kCurrentModel.name, + "model": model.name, "sinceTime": sinceTime, "limit": limit, }, diff --git a/lib/services/semantic_search/semantic_search_service.dart b/lib/services/semantic_search/semantic_search_service.dart index edc3d6eab..5f21292fb 100644 --- a/lib/services/semantic_search/semantic_search_service.dart +++ b/lib/services/semantic_search/semantic_search_service.dart @@ -92,7 +92,7 @@ class SemanticSearchService { return; } _isSyncing = true; - await EmbeddingStore.instance.pullEmbeddings(); + await EmbeddingStore.instance.pullEmbeddings(kCurrentModel); await _backFill(); _isSyncing = false; }