Merge pull request #276 from cmu-delphi/development

Added caching

Author: dmytrotsko

src/indicatorsets/utils.py

@@ -6,6 +6,7 @@
 
 import requests
 from django.conf import settings
+from django.core.cache import cache
 from django.http import JsonResponse
 from epiweeks import Week
 from delphi_utils import get_structured_logger
@@ -814,14 +815,18 @@ def get_num_locations_from_meta(indicators):
     indicators = set(
         (indicator["source"], indicator["name"]) for indicator in indicators
     )
-    try:
-        metadata = requests.get(
-            f"{settings.EPIDATA_URL}covidcast_meta/", timeout=5
-        ).json()["epidata"]
-        for r in metadata:
-            if (r["data_source"], r["signal"]) in indicators:
-                timeseries_count += r["num_locations"]
-    except Exception as e:
-        print(f"Error fetching covidcast metadata: {e}")
-        return 0
+    metadata = cache.get("covidcast_meta")
+    if metadata is None:
+        try:
+            metadata = requests.get(
+                f"{settings.EPIDATA_URL}covidcast_meta/", timeout=5
+            ).json()["epidata"]
+            # Cache for 24 hours
+            cache.set("covidcast_meta", metadata, 60 * 60 * 24)
+        except Exception as e:
+            print(f"Error fetching covidcast metadata: {e}")
+            return 0
+    for r in metadata:
+        if (r["data_source"], r["signal"]) in indicators:
+            timeseries_count += r["num_locations"]
     return timeseries_count

src/indicatorsets/views.py

@@ -245,7 +245,8 @@ def get_context_data(self, **kwargs):
             ),
         ).order_by("beta_last", "-is_top_priority", "-delphi_hosted", "name")
         related_indicators = self.get_related_indicators(
-            filter.indicators_qs, filter.qs.values_list("id", flat=True)
+            filter.indicators_qs.select_related("indicator_set", "source"),
+            filter.qs.values_list("id", flat=True),
         )
         context["related_indicators"] = json.dumps(related_indicators)
         context["num_of_timeseries"] = get_num_locations_from_meta(