Rebase master & re-apply linting/type fixes

Author: Fizzadar

synapse/_scripts/update_synapse_database.py

@@ -98,7 +98,9 @@ def main() -> None:
     hs_config = yaml.safe_load(args.database_config)
 
     if "database" not in hs_config and "databases" not in hs_config:
-        sys.stderr.write("The configuration file must have a 'database' or 'databases' section.\n")
+        sys.stderr.write(
+            "The configuration file must have a 'database' or 'databases' section.\n"
+        )
         sys.exit(4)
 
     config = HomeServerConfig()

synapse/storage/databases/main/roommember.py

@@ -121,7 +121,9 @@ def __init__(
             )
 
         external_sharded_cache = self.hs.get_external_sharded_cache()
-        self._get_joined_profiles_from_event_ids.enable_redis_cache(external_sharded_cache)
+        self._get_joined_profiles_from_event_ids.enable_redis_cache(  # type: ignore
+            external_sharded_cache
+        )
 
     @wrap_as_background_process("_count_known_servers")
     async def _count_known_servers(self) -> int:

synapse/util/caches/descriptors.py

@@ -40,6 +40,7 @@
 from twisted.python.failure import Failure
 
 from synapse.logging.context import make_deferred_yieldable, preserve_fn
+from synapse.replication.tcp.external_sharded_cache import ExternalShardedCache
 from synapse.util import unwrapFirstError
 from synapse.util.async_helpers import delay_cancellation
 from synapse.util.caches.deferred_cache import DeferredCache
@@ -59,6 +60,7 @@ class _CachedFunction(Generic[F]):
     prefill: Any = None
     cache: Any = None
     num_args: Any = None
+    tree: bool = False
 
     __name__: str
 
@@ -529,7 +531,7 @@ def errback_all(f: Failure) -> None:
             else:
                 return defer.succeed(results)
 
-        def enable_redis_cache(external_sharded_cache):
+        def enable_redis_cache(external_sharded_cache: ExternalShardedCache) -> None:
             if getattr(cached_method, "redis_enabled", False):
                 return
 
@@ -545,13 +547,14 @@ def enable_redis_cache(external_sharded_cache):
             assert not self.add_cache_context
 
             # Cache invalidations are not allowed with Redis backed caches (currently)
-            def block_invalidate():
+            def block_invalidate() -> None:
                 raise Exception("Cannot invalidate Redis backed @cachedList")
+
             cached_method.invalidate = block_invalidate
             cached_method.invalidate_all = block_invalidate
             cached_method.redis_enabled = True
 
-        wrapped.enable_redis_cache = enable_redis_cache
+        wrapped.enable_redis_cache = enable_redis_cache  # type: ignore
         obj.__dict__[self.orig.__name__] = wrapped
 
         return wrapped

synapse/util/caches/redis_caches.py

@@ -1,20 +1,22 @@
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Generic, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, Generic, List, Optional, Union
 
 from synapse.util.caches.lrucache import KT, VT, AsyncLruCache, T
 
 if TYPE_CHECKING:
     from synapse.replication.tcp.external_sharded_cache import ExternalShardedCache
 
 
-def redisCachedList(redis_shard_cache, cache_name, list_name):
-    def decorator(f):
+def redisCachedList(
+    redis_shard_cache: ExternalShardedCache, cache_name: str, list_name: str
+) -> Callable:
+    def decorator(f: Callable) -> Callable:
         @wraps(f)
-        async def _wrapped(**kwargs):
-            keys = kwargs[list_name]
+        async def _wrapped(**kwargs: Any) -> Dict[str, Any]:
+            keys: List[str] = kwargs[list_name]
             values = await redis_shard_cache.mget(cache_name, keys)
 
-            missing_keys = set(keys) - set(values.keys())
+            missing_keys = list(set(keys) - set(values.keys()))
             kwargs[list_name] = missing_keys
             missing_values = await f(**kwargs)
             await redis_shard_cache.mset(cache_name, missing_values)