More strict mypy config (#701)

* Improved mypy config

* Ignore venv in mypy

* More strict mypy config

* incl

* reorder

* exit poetry package mode

* some type error fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* 0 type errors remain

* name & unused imports

* minor cleanups

---------

Co-authored-by: Josh <joshua.smith@super.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 3 people

app/api/domains/cho.py

@@ -4,7 +4,6 @@
 
 import asyncio
 import hashlib
-import logging
 import re
 import struct
 import time
@@ -18,7 +17,6 @@
 from zoneinfo import ZoneInfo
 
 import bcrypt
-import databases.core
 from fastapi import APIRouter
 from fastapi import Response
 from fastapi.param_functions import Header
@@ -298,7 +296,7 @@ async def handle(self, player: Player) -> None:
             app.state.sessions.players.enqueue(app.packets.user_stats(player))
 
 
-IGNORED_CHANNELS = ["#highlight", "#userlog"]
+IGNORED_CHANNELS: list[str] = ["#highlight", "#userlog"]
 
 
 @register(ClientPackets.SEND_PUBLIC_MESSAGE)
@@ -886,14 +884,14 @@ async def handle_osu_login_request(
         if (
             not channel.auto_join
             or not channel.can_read(player.priv)
-            or channel._name == "#lobby"  # (can't be in mp lobby @ login)
+            or channel.real_name == "#lobby"  # (can't be in mp lobby @ login)
         ):
             continue
 
         # send chan info to all players who can see
         # the channel (to update their playercounts)
         chan_info_packet = app.packets.channel_info(
-            channel._name,
+            channel.real_name,
             channel.topic,
             len(channel.players),
         )
@@ -950,29 +948,28 @@ async def handle_osu_login_request(
             read=False,
         )
 
-        if mail_rows:
-            sent_to: set[int] = set()
-
-            for msg in mail_rows:
-                # Add "Unread messages" header as the first message
-                # for any given sender, to make it clear that the
-                # messages are coming from the mail system.
-                if msg["from_id"] not in sent_to:
-                    data += app.packets.send_message(
-                        sender=msg["from_name"],
-                        msg="Unread messages",
-                        recipient=msg["to_name"],
-                        sender_id=msg["from_id"],
-                    )
-                    sent_to.add(msg["from_id"])
+        sent_to: set[int] = set()
 
-                msg_time = datetime.fromtimestamp(msg["time"])
+        for msg in mail_rows:
+            # Add "Unread messages" header as the first message
+            # for any given sender, to make it clear that the
+            # messages are coming from the mail system.
+            if msg["from_id"] not in sent_to:
                 data += app.packets.send_message(
                     sender=msg["from_name"],
-                    msg=f'[{msg_time:%a %b %d @ %H:%M%p}] {msg["msg"]}',
+                    msg="Unread messages",
                     recipient=msg["to_name"],
                     sender_id=msg["from_id"],
                 )
+                sent_to.add(msg["from_id"])
+
+            msg_time = datetime.fromtimestamp(msg["time"])
+            data += app.packets.send_message(
+                sender=msg["from_name"],
+                msg=f'[{msg_time:%a %b %d @ %H:%M%p}] {msg["msg"]}',
+                recipient=msg["to_name"],
+                sender_id=msg["from_id"],
+            )
 
         if not player.priv & Privileges.VERIFIED:
             # this is the player's first login, verify their
@@ -1025,10 +1022,10 @@ async def handle_osu_login_request(
 
     if app.state.services.datadog:
         if not player.restricted:
-            app.state.services.datadog.increment("bancho.online_players")
+            app.state.services.datadog.increment("bancho.online_players")  # type: ignore[no-untyped-call]
 
         time_taken = time.time() - login_time
-        app.state.services.datadog.histogram("bancho.login_time", time_taken)
+        app.state.services.datadog.histogram("bancho.login_time", time_taken)  # type: ignore[no-untyped-call]
 
     user_os = "unix (wine)" if running_under_wine else "win32"
     country_code = player.geoloc["country"]["acronym"].upper()
@@ -1763,7 +1760,9 @@ async def handle(self, player: Player) -> None:
 
         if player.match.is_scrimming:
             # determine winner, update match points & inform players.
-            asyncio.create_task(player.match.update_matchpoints(was_playing))
+            asyncio.create_task(  # type: ignore[unused-awaitable]
+                player.match.update_matchpoints(was_playing),
+            )
 
 
 @register(ClientPackets.MATCH_CHANGE_MODS)
@@ -2109,7 +2108,9 @@ def __init__(self, reader: BanchoPacketReader) -> None:
 
     async def handle(self, player: Player) -> None:
         unrestrcted_ids = [p.id for p in app.state.sessions.players.unrestricted]
-        is_online = lambda o: o in unrestrcted_ids and o != player.id
+
+        def is_online(o: int) -> bool:
+            return o in unrestrcted_ids and o != player.id
 
         for online in filter(is_online, self.user_ids):
             target = app.state.sessions.players.get(id=online)

app/api/domains/osu.py

@@ -190,7 +190,7 @@ async def osuGetBeatmapInfo(
     num_requests = len(form_data.Filenames) + len(form_data.Ids)
     log(f"{player} requested info for {num_requests} maps.", Ansi.LCYAN)
 
-    ret = []
+    response_lines: list[str] = []
 
     for idx, map_filename in enumerate(form_data.Filenames):
         # try getting the map from sql
@@ -214,7 +214,7 @@ async def osuGetBeatmapInfo(
         ):
             grades[score["mode"]] = score["grade"]
 
-        ret.append(
+        response_lines.append(
             "{i}|{id}|{set_id}|{md5}|{status}|{grades}".format(
                 i=idx,
                 id=beatmap["id"],
@@ -230,7 +230,7 @@ async def osuGetBeatmapInfo(
             f"{player} requested map(s) info by id ({form_data.Ids})",
         )
 
-    return Response("\n".join(ret).encode())
+    return Response("\n".join(response_lines).encode())
 
 
 @router.get("/web/osu-getfavourites.php")
@@ -707,11 +707,11 @@ async def osuSubmitModularSelector(
         """ Score submission checks completed; submit the score. """
 
         if app.state.services.datadog:
-            app.state.services.datadog.increment("bancho.submitted_scores")
+            app.state.services.datadog.increment("bancho.submitted_scores")  # type: ignore[no-untyped-call]
 
         if score.status == SubmissionStatus.BEST:
             if app.state.services.datadog:
-                app.state.services.datadog.increment("bancho.submitted_scores_best")
+                app.state.services.datadog.increment("bancho.submitted_scores_best")  # type: ignore[no-untyped-call]
 
             if score.bmap.has_leaderboard:
                 if score.bmap.status == RankedStatus.Loved and score.mode in (
@@ -1093,7 +1093,7 @@ async def getReplay(
 
     # increment replay views for this score
     if score.player is not None and player.id != score.player.id:
-        app.state.loop.create_task(score.increment_replay_views())
+        app.state.loop.create_task(score.increment_replay_views())  # type: ignore[unused-awaitable]
 
     return FileResponse(file)
 
@@ -1302,6 +1302,7 @@ async def getScores(
 
         map_filename = unquote_plus(map_filename)  # TODO: is unquote needed?
 
+        map_exists = False
         if has_set_id:
             # we can look it up in the specific set from cache
             for bmap in app.state.cache.beatmapset[map_set_id].maps:
@@ -1335,7 +1336,7 @@ async def getScores(
     # we've found a beatmap for the request.
 
     if app.state.services.datadog:
-        app.state.services.datadog.increment("bancho.leaderboards_served")
+        app.state.services.datadog.increment("bancho.leaderboards_served")  # type: ignore[no-untyped-call]
 
     if bmap.status < RankedStatus.Ranked:
         # only show leaderboards for ranked,
@@ -1546,14 +1547,6 @@ async def banchoConnect(
     return Response(b"")
 
 
-_checkupdates_cache = {  # default timeout is 1h, set on request.
-    "cuttingedge": {"check": None, "path": None, "timeout": 0},
-    "stable40": {"check": None, "path": None, "timeout": 0},
-    "beta40": {"check": None, "path": None, "timeout": 0},
-    "stable": {"check": None, "path": None, "timeout": 0},
-}
-
-
 @router.get("/web/check-updates.php")
 async def checkUpdates(
     request: Request,
@@ -1770,7 +1763,7 @@ async def register_account(
             await stats_repo.create_all_modes(player_id=player["id"])
 
         if app.state.services.datadog:
-            app.state.services.datadog.increment("bancho.registrations")
+            app.state.services.datadog.increment("bancho.registrations")  # type: ignore[no-untyped-call]
 
         log(f"<{username} ({player['id']})> has registered!", Ansi.LGREEN)
 

app/api/init_api.py

@@ -83,14 +83,14 @@ async def lifespan(asgi_app: BanchoAPI) -> AsyncIterator[None]:
         )
 
     await app.state.services.database.connect()
-    await app.state.services.redis.initialize()
+    await app.state.services.redis.initialize()  # type: ignore[unused-awaitable]
 
     if app.state.services.datadog is not None:
-        app.state.services.datadog.start(
+        app.state.services.datadog.start(  # type: ignore[no-untyped-call]
             flush_in_thread=True,
             flush_interval=15,
         )
-        app.state.services.datadog.gauge("bancho.online_players", 0)
+        app.state.services.datadog.gauge("bancho.online_players", 0)  # type: ignore[no-untyped-call]
 
     app.state.services.ip_resolver = app.state.services.IPResolver()
 
@@ -119,8 +119,8 @@ async def lifespan(asgi_app: BanchoAPI) -> AsyncIterator[None]:
     await app.state.services.redis.aclose()
 
     if app.state.services.datadog is not None:
-        app.state.services.datadog.stop()
-        app.state.services.datadog.flush()
+        app.state.services.datadog.stop()  # type: ignore[no-untyped-call]
+        app.state.services.datadog.flush()  # type: ignore[no-untyped-call]
 
 
 def init_exception_handlers(asgi_app: BanchoAPI) -> None:

app/api/v1/api.py

@@ -66,7 +66,7 @@
 
 @router.get("/calculate_pp")
 async def api_calculate_pp(
-    token: HTTPCredentials = Depends(http_bearer_scheme),
+    token: HTTPCredentials | None = Depends(http_bearer_scheme),
     beatmap_id: int = Query(None, alias="id", min=0, max=2_147_483_647),
     nkatu: int = Query(None, max=2_147_483_647),
     ngeki: int = Query(None, max=2_147_483_647),

app/commands.py

@@ -424,7 +424,10 @@ def parse__with__command_args(
         return ParsingError("Invalid syntax: !with <acc/nmiss/combo/mods ...>")
 
     # !with 95% 1m 429x hddt
-    acc = mods = combo = nmiss = None
+    combo: int | None = None
+    nmiss: int | None = None
+    mods: Mods | None = None
+    acc: float | None = None
 
     # parse acc, misses, combo and mods from arguments.
     # tried to balance complexity vs correctness here
@@ -877,7 +880,7 @@ async def user(ctx: Context) -> str | None:
             f'[{"Bot" if player.is_bot_client else "Player"}] {display_name} ({player.id})',
             f"Privileges: {priv_list}",
             f"Donator: {donator_info}",
-            f"Channels: {[c._name for c in player.channels]}",
+            f"Channels: {[c.real_name for c in player.channels]}",
             f"Logged in: {timeago.format(player.login_time)}",
             f"Last server interaction: {timeago.format(player.last_recv_time)}",
             f"osu! build: {osu_version} | Tourney: {player.is_tourney_client}",
@@ -1639,7 +1642,7 @@ async def mp_addref(ctx: Context, match: Match) -> str | None:
     if target in match.refs:
         return f"{target} is already a match referee!"
 
-    match._refs.add(target)
+    match.referees.add(target)
     return f"{target.name} added to match referees."
 
 
@@ -1660,7 +1663,7 @@ async def mp_rmref(ctx: Context, match: Match) -> str | None:
     if target is match.host:
         return "The host is always a referee!"
 
-    match._refs.remove(target)
+    match.referees.remove(target)
     return f"{target.name} removed from match referees."
 
 
@@ -2487,6 +2490,7 @@ async def process_commands(
     trigger = trigger.lower()
 
     # check if any command sets match.
+    commands: list[Command] = []
     for cmd_set in command_sets:
         if trigger == cmd_set.trigger:
             if not args:

app/objects/channel.py

@@ -37,15 +37,14 @@ def __init__(
         auto_join: bool = True,
         instance: bool = False,
     ) -> None:
-        # TODO: think of better names than `_name` and `name`
-        self._name = name  # 'real' name ('#{multi/spec}_{id}')
+        self.real_name = name
 
-        if self._name.startswith("#spec_"):
+        if self.real_name.startswith("#spec_"):
             self.name = "#spectator"
-        elif self._name.startswith("#multi_"):
+        elif self.real_name.startswith("#multi_"):
             self.name = "#multiplayer"
         else:
-            self.name = self._name
+            self.name = self.real_name
 
         self.topic = topic
         self.read_priv = read_priv
@@ -56,7 +55,7 @@ def __init__(
         self.players: list[Player] = []
 
     def __repr__(self) -> str:
-        return f"<{self._name}>"
+        return f"<{self.real_name}>"
 
     def __contains__(self, player: Player) -> bool:
         return player in self.players

app/objects/collections.py

@@ -41,12 +41,12 @@ def __repr__(self) -> str:
         # XXX: we use the "real" name, aka
         # #multi_1 instead of #multiplayer
         # #spect_1 instead of #spectator.
-        return f'[{", ".join(c._name for c in self)}]'
+        return f'[{", ".join(c.real_name for c in self)}]'
 
     def get_by_name(self, name: str) -> Channel | None:
         """Get a channel from the list by `name`."""
         for channel in self:
-            if channel._name == name:
+            if channel.real_name == name:
                 return channel
 
         return None

app/objects/match.py

@@ -166,7 +166,7 @@ def __init__(
         self.has_public_history = has_public_history
 
         self.host_id = host_id
-        self._refs: set[Player] = set()
+        self.referees: set[Player] = set()
 
         self.map_id = map_id
         self.map_md5 = map_md5
@@ -232,12 +232,7 @@ def map_embed(self) -> str:
     @property
     def refs(self) -> set[Player]:
         """Return all players with referee permissions."""
-        refs = self._refs
-
-        if self.host is not None:
-            refs.add(self.host)
-
-        return refs
+        return self.referees | {self.host}
 
     def __repr__(self) -> str:
         return f"<{self.name} ({self.id})>"