enh: use cached database partly for showing 'my_data' (#5)

Author: paulmueller

dcoraid/dbmodel/db_api_cached.py

@@ -74,18 +74,19 @@ def get_collections(self, refresh=False):
             clist += self.ai.get_collections()
         return clist
 
-    def get_datasets_user_following(self):
+    def get_datasets_user_following(self) -> DBExtract:
         """Return datasets the user is following"""
         # TODO: Use datasets in self._mc
         return self.ai.get_datasets_user_following()
 
-    def get_datasets_user_owned(self):
+    def get_datasets_user_owned(self) -> DBExtract:
         """Return datasets the user created"""
         own_list = self._mc.datasets_user_owned
         ds_list = self._mc.datasets
-        return [ds for (ds, byuser) in zip(ds_list, own_list) if byuser]
+        owned = [ds for (ds, byuser) in zip(ds_list, own_list) if byuser]
+        return DBExtract(owned)
 
-    def get_datasets_user_shared(self):
+    def get_datasets_user_shared(self) -> DBExtract:
         """Return datasets shared with the user"""
         # TODO: Use datasets in self._mc
         return self.ai.get_datasets_user_shared()

dcoraid/dbmodel/meta_cache.py

@@ -47,15 +47,15 @@ def __init__(self,
         # a list of dataset IDs as values.
         self._registry_org = {}
 
-        # List of booleans indicating whether dataset was created by the user
-        self.datasets_user_owned = []
-
-        # Dictionary of databases for persistent storage
+        #: Dictionary of databases for persistent storage
         self._databases = {}
 
-        # List of dataset dictionaries
+        #: List of dataset dictionaries
         self.datasets = []
 
+        #: List of booleans indicating whether dataset was created by the user
+        self.datasets_user_owned = []
+
         # Search blob array
         self._srt_blobs = None
 
@@ -125,6 +125,12 @@ def _initialize(self, circle_ids=None):
         #: list of datasets, sorted by creation date descending
         self.datasets = [datasets[ii] for ii in sort_idx]
 
+        #: List of booleans indicating whether dataset was created by the user
+        self.datasets_user_owned = [
+            ds_dict["creator_user_id"] == self.user_id
+            for ds_dict in self.datasets
+        ]
+
     def __enter__(self):
         return self
 
@@ -262,7 +268,7 @@ def _upsert_dataset_insert(self, ds_dict):
         # user's dataset list
         self.datasets_user_owned.insert(
             new_idx,
-            ds_dict["creator_user_id"] == self.user_id
+            ds_dict["creator_user_id"] == self.user_id,
             )
 
     def _upsert_dataset_update(self, ds_dict):

dcoraid/gui/panel_my_data/widget_my_data.py

@@ -6,7 +6,7 @@
 from PyQt6 import uic, QtCore, QtWidgets
 
 from ...common import ConnectionTimeoutErrors
-from ...dbmodel import APIInterrogator, DBExtract
+from ...dbmodel import DBExtract
 
 from ..api import get_ckan_api
 from ..main import DCORAid
@@ -34,18 +34,18 @@ def __init__(self, *args, **kwargs):
 
     @QtCore.pyqtSlot()
     def on_refresh_private_data(self):
+        self.find_main_window().check_update_database(force=True)
         self.setCursor(QtCore.Qt.CursorShape.WaitCursor)
         api = get_ckan_api()
         data = DBExtract()
         if api.is_available() and api.api_key:
             try:
-                db = APIInterrogator(api=api)
                 if self.checkBox_user_following.isChecked():
-                    data += db.get_datasets_user_following()
+                    data += self.database.get_datasets_user_following()
                 if self.checkBox_user_owned.isChecked():
-                    data += db.get_datasets_user_owned()
+                    data += self.database.get_datasets_user_owned()
                 if self.checkBox_user_shared.isChecked():
-                    data += db.get_datasets_user_shared()
+                    data += self.database.get_datasets_user_shared()
                 self.user_filter_chain.set_db_extract(data)
             except ConnectionTimeoutErrors:
                 logger.error(tb.format_exc())
@@ -64,5 +64,4 @@ def find_main_window():
                 return widget
 
     def set_database(self, database):
-        # TODO: Use this database for searches
         self.database = database

tests/test_dbmodel_api.py

@@ -196,6 +196,8 @@ def test_search_dataset_since_time():
     # Create a dataset
     ds_dict = common.make_dataset_for_download()
 
+    time.sleep(.5)
+
     # Run the query again
     de1 = db.search_dataset_via_api(since_time=tstart)
     # The new dataset should be in the results.