fix: simplify cache by handling expired keys as KeyErrors

Author: alukach

src/stac_auth_proxy/utils/cache.py

@@ -15,9 +15,6 @@ class MemoryCache:
     cache: dict[tuple[Any], tuple[Any, float]] = field(default_factory=dict)
     _last_pruned: float = field(default_factory=time)
 
-    class Expired(Exception):
-        """Exception raised when a cache entry has expired."""
-
     def __getitem__(self, key: Any) -> Any:
         """Get a value from the cache if it is not expired."""
         if key not in self.cache:
@@ -30,7 +27,7 @@ def __getitem__(self, key: Any) -> Any:
             msg = f"{self._key_str(key)} in cache, but expired."
             del self.cache[key]
             logger.debug(msg)
-            raise self.Expired(f"{key} expired")
+            raise KeyError(f"{key} expired")
 
         logger.debug(f"{self._key_str(key)} in cache, returning cached result.")
         return result
@@ -45,14 +42,14 @@ def __contains__(self, key: Any) -> bool:
         try:
             self[key]
             return True
-        except (KeyError, self.Expired):
+        except KeyError:
             return False
 
     def get(self, key: Any) -> Any:
         """Get a value from the cache."""
         try:
             return self[key]
-        except (KeyError, self.Expired):
+        except KeyError:
             return None
 
     def _prune(self):

tests/test_cache.py

@@ -43,7 +43,7 @@ def test_memory_cache_expiration():
         mock_time.return_value = 1006.0  # 6 seconds later
 
         # Test expired key
-        with pytest.raises(MemoryCache.Expired):
+        with pytest.raises(KeyError):
             cache[key]
 
         # Test contains after expiration