Improve protection against old unsupported objects (e.g. LocationSourceForCallsign.NONE) coming back from the cache and throwing exceptions

core/sig_lookup_helper.py

@@ -114,16 +114,23 @@ def get_sig_ref_info(sig_name, ref_id):
         # OK, this is something we have to look up. Now check to see if our data store contains reference data and if
         # so, copy the data into the sig_ref object
         key = f"{sig_name}:{ref_id}"
-        lookup_data = DATA_STORE.sigrefs.get(key) if key in DATA_STORE.sigrefs else None
+        try:
-        if lookup_data:
+            lookup_data = DATA_STORE.sigrefs.get(key) if key in DATA_STORE.sigrefs else None
-            for key, value in lookup_data.__dict__.items():
+            if lookup_data:
-                if value is not None and sig_ref.__dict__.get(key) is None:
+                for key, value in lookup_data.__dict__.items():
-                    sig_ref.__dict__[key] = value
+                    if value is not None and sig_ref.__dict__.get(key) is None:
+                        sig_ref.__dict__[key] = value
 
-        else:
+            else:
-            # Maybe a super new reference we don't know about yet, but more likely a typo or a test reference,
+                # Maybe a super new reference we don't know about yet, but more likely a typo or a test reference,
-            # just silently ignore it.
+                # just silently ignore it.
-            logger.debug(f"{sig_name} database did not contain data for ref {ref_id}")
+                logger.debug(f"{sig_name} database did not contain data for ref {ref_id}")
+
+        except (ValueError, KeyError):
+            # Catch exceptions due to e.g. old versions of objects in the cache that are no longer compatible,
+            # and remove them from the cache.
+            del DATA_STORE.sigrefs[key]
+            return None
 
     except Exception:
         logger.exception(f"Exception when looking up sig_ref info for {sig_name} ref {ref_id}")

providers/callsigndata/callsign_data_provider.py

@@ -42,7 +42,13 @@ class CallsignDataProvider:
 
         if self.enabled:
             if callsign in self._storage:
-                return self._storage[callsign]
+                try:
+                    return self._storage[callsign]
+                except (ValueError, KeyError):
+                    # Catch exceptions due to e.g. old versions of objects in the cache that are no longer compatible,
+                    # and remove them from the cache.
+                    del self._storage[callsign]
+                    return None
             else:
                 c = self._perform_new_lookup(callsign, lookup_credentials)
                 if c:

templates/add_spot.html

@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789198850"></script>
+<script src="/static/js/add-spot.js?v=1789712909"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/alerts.html

@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789198850"></script>
+<script src="/static/js/alerts.js?v=1789712909"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/bands.html

@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789198850"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789712909"></script>
-<script src="/static/js/bands.js?v=1789198850"></script>
+<script src="/static/js/bands.js?v=1789712909"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/base.html

@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789198850" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789712909" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789198850"></script>
+<script src="/static/js/utils.js?v=1789712909"></script>
-<script src="/static/js/ui-ham.js?v=1789198850"></script>
+<script src="/static/js/ui-ham.js?v=1789712909"></script>
-<script src="/static/js/geo.js?v=1789198850"></script>
+<script src="/static/js/geo.js?v=1789712909"></script>
-<script src="/static/js/common.js?v=1789198850"></script>
+<script src="/static/js/common.js?v=1789712909"></script>
 {% end %}
 {% block body %}
 <div class="container">

templates/conditions.html

@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789198850"></script>
+<script src="/static/js/conditions.js?v=1789712909"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/map.html

@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789198850"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789712909"></script>
-<script src="/static/js/map.js?v=1789198850"></script>
+<script src="/static/js/map.js?v=1789712909"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/spots.html

@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789198850"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789712909"></script>
-<script src="/static/js/spots.js?v=1789198850"></script>
+<script src="/static/js/spots.js?v=1789712909"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/status.html

@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789198850"></script>
+<script src="/static/js/status.js?v=1789712909"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");