From 9f99e6c43c2f224947f587d78701cf565f06d2ca Mon Sep 17 00:00:00 2001 From: Zixuan James Li Date: Wed, 27 Jul 2022 17:39:07 -0400 Subject: [PATCH] cache: Fix type annotation for session_cache_items. This adds an assertion ensuring the type of `store` before accessing the `cache_key` attribute that does not exist in the base class. Also note that `.decode` returns `Dict[str, Any]` instead of a `str`. Signed-off-by: Zixuan James Li --- zerver/lib/cache_helpers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zerver/lib/cache_helpers.py b/zerver/lib/cache_helpers.py index d037547883..50fd9c5c48 100644 --- a/zerver/lib/cache_helpers.py +++ b/zerver/lib/cache_helpers.py @@ -20,6 +20,7 @@ from zerver.lib.cache import ( user_profile_by_api_key_cache_key, user_profile_cache_key, ) +from zerver.lib.safe_session_cached_db import SessionStore from zerver.lib.sessions import session_engine from zerver.lib.users import get_all_api_keys from zerver.models import ( @@ -59,13 +60,16 @@ def huddle_cache_items(items_for_remote_cache: Dict[str, Tuple[Huddle]], huddle: items_for_remote_cache[huddle_hash_cache_key(huddle.huddle_hash)] = (huddle,) -def session_cache_items(items_for_remote_cache: Dict[str, str], session: Session) -> None: +def session_cache_items( + items_for_remote_cache: Dict[str, Dict[str, object]], session: Session +) -> None: if settings.SESSION_ENGINE != "zerver.lib.safe_session_cached_db": # If we're not using the cached_db session engine, we there # will be no store.cache_key attribute, and in any case we # don't need to fill the cache, since it won't exist. return store = session_engine.SessionStore(session_key=session.session_key) + assert isinstance(store, SessionStore) items_for_remote_cache[store.cache_key] = store.decode(session.session_data)