Fix latest flake completely broken, fix latest typing issues.

bemani/frontend/app.py

@@ -4,7 +4,7 @@ import traceback
 from typing import Callable, Dict, Any, Optional, List
 from react.jsx import JSXTransformer  # type: ignore
 from flask import Flask, flash, request, redirect, Response, url_for, render_template, got_request_exception, jsonify as flask_jsonify
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 from functools import wraps
 
 from bemani.common import AESCipher, GameConstants

bemani/frontend/base.py

@@ -1,9 +1,9 @@
 # vim: set fileencoding=utf-8
 import copy
 from abc import ABC
-from typing import Any, Dict, Iterator, List, Optional, Set, Tuple
+from typing import Any, Dict, Iterator, List, Optional, Set, Tuple, cast
 
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.common import GameConstants, Profile, ValidatedDict, ID
 from bemani.data import Data, Config, Score, Attempt, Link, Song, UserID, RemoteUser
@@ -108,7 +108,8 @@ class FrontendBase(ABC):
         if not force_db_load:
             cached_songs = self.cache.get(f'{self.game.value}.sorted_songs')
             if cached_songs is not None:
-                return cached_songs
+                # Not sure why mypy insists that this is a str instead of Any.
+                return cast(Dict[int, Dict[str, Any]], cached_songs)
 
         # Find all songs in the game, process notecounts and difficulties
         songs: Dict[int, Dict[str, Any]] = {}

bemani/frontend/bishi/bishi.py

@@ -2,7 +2,7 @@
 import copy
 from typing import Any, Dict, Iterator, Tuple
 
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.backend.bishi import BishiBashiFactory
 from bemani.common import Profile, ValidatedDict, ID, GameConstants

bemani/frontend/ddr/cache.py

@@ -1,4 +1,4 @@
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.data import Config, Data
 from bemani.frontend.app import app

bemani/frontend/iidx/cache.py

@@ -1,4 +1,4 @@
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.data import Config, Data
 from bemani.frontend.app import app

bemani/frontend/iidx/iidx.py

@@ -1,7 +1,7 @@
 # vim: set fileencoding=utf-8
 from typing import Any, Dict, Iterator, Optional, Tuple, List
 
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.backend.iidx import IIDXFactory, IIDXBase
 from bemani.common import Profile, ValidatedDict, GameConstants, RegionConstants

bemani/frontend/jubeat/cache.py

@@ -1,4 +1,4 @@
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.data import Config, Data
 from bemani.frontend.app import app

bemani/frontend/mga/mga.py

@@ -2,7 +2,7 @@
 import copy
 from typing import Any, Dict, Iterator, Tuple
 
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.backend.mga import MetalGearArcadeFactory
 from bemani.common import Profile, ValidatedDict, ID, GameConstants

bemani/frontend/museca/cache.py

@@ -1,4 +1,4 @@
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.data import Config, Data
 from bemani.frontend.app import app

bemani/frontend/museca/museca.py

@@ -1,7 +1,7 @@
 # vim: set fileencoding=utf-8
 from typing import Any, Dict, Iterator, List, Tuple
 
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.backend.museca import MusecaFactory, MusecaBase
 from bemani.common import GameConstants, VersionConstants, DBConstants, Profile, ValidatedDict

bemani/frontend/popn/cache.py

@@ -1,4 +1,4 @@
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.data import Config, Data
 from bemani.frontend.app import app

bemani/frontend/reflec/cache.py

@@ -1,4 +1,4 @@
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.data import Config, Data
 from bemani.frontend.app import app

bemani/frontend/reflec/reflec.py

@@ -1,7 +1,7 @@
 # vim: set fileencoding=utf-8
 from typing import Any, Dict, Iterator, List, Tuple
 
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.backend.reflec import ReflecBeatFactory, ReflecBeatBase
 from bemani.common import GameConstants, Profile, ValidatedDict

bemani/frontend/sdvx/cache.py

@@ -1,4 +1,4 @@
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.data import Config, Data
 from bemani.frontend.app import app

bemani/frontend/sdvx/sdvx.py

@@ -1,7 +1,7 @@
 # vim: set fileencoding=utf-8
 from typing import Any, Dict, Iterator, List, Tuple
 
-from flask_caching import Cache  # type: ignore
+from flask_caching import Cache
 
 from bemani.backend.sdvx import SoundVoltexFactory, SoundVoltexBase
 from bemani.common import GameConstants, Profile, ValidatedDict

bemani/frontend/types.py

@@ -3,7 +3,7 @@ from typing import Optional, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from flask.ctx import _AppCtxGlobals
-    from flask_caching import Cache  # type: ignore
+    from flask_caching import Cache
 
     from bemani.data import Config, Data, UserID
 

requirements.txt

@@ -15,7 +15,7 @@ types-Werkzeug
 types-Flask
 types-freezegun
 types-python-dateutil
-flake8
+flake8==4.0.1
 typed-ast
 freezegun
 pyreact