fix: reduce user circle list cache lifetime to 10 s

Author: paulmueller

CHANGELOG

@@ -3,6 +3,7 @@
  - feat: add circle archiving wizard GUI
  - fix: handle resource downloads whose target directory got deleted
  - fix: check for existence of persistent job list in upload
+ - fix: reduce user circle list cache lifetime to 10 s
  - enh: allow to programmatically abort download jobs
  - ref: move setup wizard to `wizard_init` submodule
 1.0.0

dcoraid/api/ckan_api.py

@@ -86,21 +86,23 @@ def __init__(self,
                 kwargs = {"backend": "sqlite",
                           "cache_name": pathlib.Path(caching)}
             self.req_ses = requests_cache.CachedSession(urls_expire_after={
-                # API calls without parameters; seconds cached
-                self.api_url + "user_show": 5,
-                self.api_url + "user_autocomplete": 30,
-                self.api_url + "group_list": 10,
-                self.api_url + "user_list": 30,
-                self.api_url + "status_show": 60,
-                self.api_url + "organization_list": 60,
+                # The first item that matches is used, so we have to specify
+                # longer URLs with shorted lifetime first.
                 # API calls with parameters
                 self.api_url + "package_search*": 10,
                 self.api_url + "package_collaborator_list_for_user*": 60,
-                self.api_url + "organization_list_for_user*": 60,
+                self.api_url + "organization_list_for_user*": 10,
                 self.api_url + "group_list_authz*": 60,
                 self.api_url + "dataset_followee_list*": 3600,
                 self.api_url + "package_show*": requests_cache.DO_NOT_CACHE,
                 self.api_url + "resource_show*": requests_cache.DO_NOT_CACHE,
+                # API calls without parameters; seconds cached
+                self.api_url + "user_show": 5,
+                self.api_url + "user_autocomplete": 30,
+                self.api_url + "group_list": 10,
+                self.api_url + "user_list": 30,
+                self.api_url + "status_show": 60,
+                self.api_url + "organization_list": 60,
                 "*": requests_cache.DO_NOT_CACHE,
                 },
                 **kwargs)

dcoraid/gui/panel_uploads/circle_mgr.py

@@ -9,7 +9,7 @@
 def get_user_circle_dicts():
     """Conveniently cache the organization list for the user
 
-    You must call `self._get_user_circle_dicts.cache_clear`
+    You must call `get_user_circle_dicts.cache_clear`
     if the circle list changes (e.g. because you added one).
     """
     api = get_ckan_api()
@@ -34,18 +34,17 @@ def ask_for_new_circle(parent_widget):
     text, ok_pressed = QtWidgets.QInputDialog.getText(
         parent_widget,
         "Circle required",
-        "You do not have access to any existing Circles. To upload\n"
-        + "datasets, you need to be either Editor or Admin in\n"
-        + "a Circle. You may create a Circle now or cancel and ask\n"
-        + "a colleague to add you to a Circle (Your user name is "
-        + "'{}').".format(ud["name"])
-        + "\n\nTo proceed with Circle creation, please choose a name:",
+        f"You do not have access to any existing Circles. To upload\n"
+        f"datasets, you need to be either Editor or Admin in\n"
+        f"a Circle. You may create a Circle now or cancel and ask\n"
+        f"a colleague to add you to a Circle (Your user name is "
+        f"'{ud['name']}')."
+        f"\n\nTo proceed with Circle creation, please choose a name:",
         QtWidgets.QLineEdit.EchoMode.Normal,
         f"{name}'s Circle")
     if ok_pressed and text != '':
-        cname = "user-circle-{}".format(ud["name"])
         cdict = api.post("organization_create",
-                         data={"name": cname,
+                         data={"name": f"user-circle-{ud['name']}",
                                "title": text.strip(),
                                })
         # invalidate cache, because now we have a new circle