paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

cache: Fix type annotation for session_cache_items.

Browse Source 
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 <p359101898@gmail.com>
This commit is contained in:
Zixuan James Li
2022-07-27 17:39:07 -04:00
committed by Tim Abbott
parent 707ae0e7c1
commit 9f99e6c43c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/cache_helpers.py
View File

@@ -20,6 +20,7 @@ from zerver.lib.cache import (
user_profile_by_api_key_cache_key, user_profile_by_api_key_cache_key,
user_profile_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.sessions import session_engine
from zerver.lib.users import get_all_api_keys from zerver.lib.users import get_all_api_keys
from zerver.models import ( 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,) 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 settings.SESSION_ENGINE != "zerver.lib.safe_session_cached_db":
# If we're not using the cached_db session engine, we there # If we're not using the cached_db session engine, we there
# will be no store.cache_key attribute, and in any case we # will be no store.cache_key attribute, and in any case we
# don't need to fill the cache, since it won't exist. # don't need to fill the cache, since it won't exist.
return return
store = session_engine.SessionStore(session_key=session.session_key) 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) items_for_remote_cache[store.cache_key] = store.decode(session.session_data)