merge: PR #165 from dev

Weekly release 2024-07-15

ckanext/versioned_datastore/lib/datastore_utils.py

@@ -1,7 +1,7 @@
 from ckan import model
 from ckan.plugins import toolkit, PluginImplementations
 from splitgill.indexing.utils import DOC_TYPE
-import time
+from cachetools import cached, TTLCache
 
 from . import common
 from ..interfaces import IVersionedDatastore
@@ -288,6 +288,7 @@ def is_ingestible(resource):
     )
 
 
+@cached(cache=TTLCache(maxsize=10, ttl=300))
 def get_queue_length(queue_name):
     """
     This will only get the pending jobs in a queue, not any jobs that are currently
@@ -304,5 +305,6 @@ def get_queue_length(queue_name):
     return len(queued_jobs)
 
 
+@cached(cache=TTLCache(maxsize=10, ttl=300))
 def get_es_health():
     return {'ping': common.ES_CLIENT.ping(), 'info': common.ES_CLIENT.info()}

pyproject.toml

@@ -32,7 +32,8 @@ dependencies = [
     "six>=1.11.0",
     "xlrd==1.1.0",
     "fastavro==1.7.0",
-    "ckantools>=0.3.0"
+    "ckantools>=0.3.0",
+    "cachetools>=4.2.4"
 ]
 
 [project.optional-dependencies]