Add pyrefly type checking (#1434)

Prefly is much faster than mypy and a bit stricter
Mypy will also still be checked on CI for now

Author: evroon

.github/workflows/backend.yml

@@ -56,6 +56,10 @@ jobs:
         run: uv run mypy --version && uv run mypy .
         working-directory: backend
 
+      - name: Run pyrefly
+        run: uv run pyrefly --version && uv run pyrefly check
+        working-directory: backend
+
       - name: Run pylint
         run: uv run pylint bracket tests cli.py
         working-directory: backend

backend/alembic/env.py

@@ -27,7 +27,8 @@ def run_migrations_offline() -> None:
 
 def run_migrations_online() -> None:
     config_ini_section = ALEMBIC_CONFIG.get_section(ALEMBIC_CONFIG.config_ini_section)
-    config_ini_section["sqlalchemy.url"] = str(config.pg_dsn)  # type: ignore[index]
+    assert config_ini_section is not None, "No section 'alembic' found in config.ini"
+    config_ini_section["sqlalchemy.url"] = str(config.pg_dsn)
 
     engine = engine_from_config(config_ini_section, prefix="sqlalchemy.", poolclass=pool.NullPool)
 

backend/bracket/config.py

@@ -38,7 +38,7 @@ class Config(BaseSettings):
     cors_origins: str = "*"
     jwt_secret: str
     auto_run_migrations: bool = True
-    pg_dsn: PostgresDsn = "postgresql://user:pass@localhost:5432/db"  # type: ignore[assignment]
+    pg_dsn: PostgresDsn = PostgresDsn("postgresql://user:pass@localhost:5432/db")
     sentry_dsn: str | None = None
 
     def is_cors_enabled(self) -> bool:
@@ -50,8 +50,8 @@ class CIConfig(Config):
 
 
 class DevelopmentConfig(Config):
-    admin_email: Annotated[str, Field("[email protected]")]
-    admin_password: Annotated[str, Field("aeGhoe1ahng2Aezai0Dei6Aih6dieHoo")]
+    admin_email: Annotated[str | None, Field("[email protected]")]
+    admin_password: Annotated[str | None, Field("aeGhoe1ahng2Aezai0Dei6Aih6dieHoo")]
     allow_insecure_http_sso: Annotated[bool, Field(True)]
     jwt_secret: Annotated[
         str, Field("7495204c062787f257b12d03b88d80da1d338796a6449666eb634c9efbbf5fa7")

backend/bracket/logic/ranking/calculation.py

@@ -1,7 +1,6 @@
 import math
 from collections import defaultdict
 from decimal import Decimal
-from typing import TypeVar
 
 from bracket.logic.ranking.statistics import START_ELO, TeamStatistics
 from bracket.models.db.match import MatchWithDetailsDefinitive
@@ -10,15 +9,12 @@
 from bracket.models.db.util import StageItemWithRounds
 from bracket.sql.rankings import get_ranking_for_stage_item
 from bracket.sql.teams import update_team_stats
-from bracket.utils.id_types import PlayerId, StageItemInputId, TeamId, TournamentId
+from bracket.utils.id_types import StageItemInputId, TournamentId
 
 K = 32
 D = 400
 
 
-TeamIdOrPlayerId = TypeVar("TeamIdOrPlayerId", bound=PlayerId | TeamId)
-
-
 def set_statistics_for_stage_item_input(
     team_index: int,
     stats: defaultdict[StageItemInputId, TeamStatistics],

backend/bracket/logic/ranking/elimination.py

@@ -38,15 +38,19 @@ def get_inputs_to_update_in_subsequent_elimination_rounds(
         ]
         original_inputs = updated_inputs.copy()
 
-        if subsequent_match.stage_item_input1_winner_from_match_id in affected_matches:
-            updated_inputs[0] = affected_matches[
+        if subsequent_match.stage_item_input1_winner_from_match_id is not None and (
+            affected_match1 := affected_matches.get(
                 subsequent_match.stage_item_input1_winner_from_match_id
-            ].get_winner()
+            )
+        ):
+            updated_inputs[0] = affected_match1.get_winner()
 
-        if subsequent_match.stage_item_input2_winner_from_match_id in affected_matches:
-            updated_inputs[1] = affected_matches[
+        if subsequent_match.stage_item_input2_winner_from_match_id is not None and (
+            affected_match2 := affected_matches.get(
                 subsequent_match.stage_item_input2_winner_from_match_id
-            ].get_winner()
+            )
+        ):
+            updated_inputs[1] = affected_match2.get_winner()
 
         if original_inputs != updated_inputs:
             input_ids = [input_.id if input_ else None for input_ in updated_inputs]

backend/bracket/models/db/match.py

@@ -67,8 +67,8 @@ def get_match_hash(
 
 
 class MatchWithDetailsDefinitive(Match):
-    stage_item_input1: StageItemInput
-    stage_item_input2: StageItemInput
+    stage_item_input1: StageItemInput  # pyrefly: ignore [bad-override]
+    stage_item_input2: StageItemInput  # pyrefly: ignore [bad-override]
     court: Court | None = None
 
     @property

backend/bracket/models/db/stage_item.py

@@ -50,14 +50,18 @@ class StageItemCreateBody(BaseModelORM):
     ranking_id: RankingId | None = None
 
     def get_name_or_default_name(self) -> str:
-        return self.name if self.name is not None else self.type.value.replace("_", " ").title()
+        return (
+            self.name if self.name is not None else str(self.type.value).replace("_", " ").title()
+        )
 
 
 class StageItemWithInputsCreate(StageItemCreateBody):
     inputs: list[StageItemInputCreateBody]
 
     def get_name_or_default_name(self) -> str:
-        return self.name if self.name is not None else self.type.value.replace("_", " ").title()
+        return (
+            self.name if self.name is not None else str(self.type.value).replace("_", " ").title()
+        )
 
     @model_validator(mode="before")
     def handle_inputs_length(cls, values: Any) -> Any:

backend/bracket/models/db/stage_item_inputs.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from decimal import Decimal
 
 from pydantic import BaseModel, Field
@@ -15,9 +17,6 @@ class StageItemInputBase(BaseModelORM):
 
 
 class StageItemInputGeneric(BaseModel):
-    team_id: TeamId | None = None
-    winner_from_stage_item_id: StageItemId | None = None
-    winner_position: int | None = None
     points: Decimal = Decimal("0.0")
     wins: int = 0
     draws: int = 0
@@ -30,12 +29,15 @@ def elo(self) -> Decimal:
         """
         return self.points
 
-    def __hash__(self) -> int:
-        return (
-            self.team_id,
-            self.winner_from_stage_item_id,
-            self.winner_position,
-        ).__hash__()
+
+def hash_stage_item_input(
+    self: StageItemInputTentative | StageItemInputFinal | StageItemInputEmpty,
+) -> int:
+    return (
+        self.team_id,
+        self.winner_from_stage_item_id,
+        self.winner_position,
+    ).__hash__()
 
 
 class StageItemInputTentative(StageItemInputBase, StageItemInputGeneric):
@@ -46,17 +48,25 @@ class StageItemInputTentative(StageItemInputBase, StageItemInputGeneric):
     def get_lookup_key(self) -> tuple[StageItemId, int]:
         return self.winner_from_stage_item_id, self.winner_position
 
+    __hash__ = hash_stage_item_input
+
 
 class StageItemInputFinal(StageItemInputBase, StageItemInputGeneric):
     team_id: TeamId
+    winner_from_stage_item_id: StageItemId | None = None
+    winner_position: int | None = None
     team: Team
 
+    __hash__ = hash_stage_item_input
+
 
 class StageItemInputEmpty(StageItemInputBase, StageItemInputGeneric):
     team_id: None = None
     winner_from_stage_item_id: None = None
     winner_position: None = None
 
+    __hash__ = hash_stage_item_input
+
 
 StageItemInput = StageItemInputTentative | StageItemInputFinal | StageItemInputEmpty
 

backend/bracket/models/db/team.py

@@ -46,7 +46,8 @@ def player_ids(self) -> list[PlayerId]:
         return [player.id for player in self.players]
 
     @field_validator("players", mode="before")
-    def handle_players(values: list[Player]) -> list[Player]:  # type: ignore[misc]
+    @staticmethod
+    def handle_players(values: list[Player]) -> list[Player]:
         if isinstance(values, str):
             values_json = json.loads(values)
             if values_json == [None]:

backend/bracket/models/db/user.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated
 
 from heliclockter import datetime_utc
-from pydantic import BaseModel, constr
+from pydantic import BaseModel, StringConstraints
 
 from bracket.models.db.account import UserAccountType
 from bracket.models.db.shared import BaseModelORM
@@ -30,8 +30,9 @@ class UserInsertable(UserBase):
     password_hash: str | None = None
 
 
-class User(UserInsertable):
+class User(UserBase):
     id: UserId
+    password_hash: str | None = None
 
 
 class UserPublic(UserBase):
@@ -44,7 +45,7 @@ class UserToUpdate(BaseModel):
 
 
 class UserPasswordToUpdate(BaseModel):
-    password: constr(min_length=8, max_length=48)  # type: ignore[valid-type]
+    password: Annotated[str, StringConstraints(min_length=8, max_length=48)]
 
 
 class DemoUserToRegister(BaseModelORM):
@@ -58,6 +59,6 @@ class UserToRegister(BaseModelORM):
     captcha_token: str
 
 
-class UserInDB(User):
+class UserInDB(UserBase):
     id: UserId
     password_hash: str