🌴 Multiple fixes (#19)

Author: asaf-kali

Makefile

@@ -99,7 +99,7 @@ semrel-dev:
 format:
 	black .
 	isort .
-	ruff check --fix
+	ruff check --fix --unsafe-fixes
 
 check-ruff:
 	ruff check

codenames/classic/runner.py

@@ -59,7 +59,10 @@ def get_player(self, team: ClassicTeam, role: PlayerRole) -> Player:
 
 class ClassicGameRunner:
     def __init__(
-        self, players: ClassicGamePlayers, state: ClassicGameState | None = None, board: ClassicBoard | None = None
+        self,
+        players: ClassicGamePlayers,
+        state: ClassicGameState | None = None,
+        board: ClassicBoard | None = None,
     ):
         self.players = players
         if not state:
@@ -153,9 +156,12 @@ def find_team(players: Collection[Player], team: ClassicTeam) -> TeamPlayers:
             elif isinstance(player, Operative):
                 operative = player
             else:
-                raise ValueError(f"Player {player} is not a Spymaster or Operative")
+                msg = f"Player {player} is not a Spymaster or Operative"
+                raise ValueError(msg)
     if spymaster is None:
-        raise ValueError(f"No Spymaster found for team {team}")
+        msg = f"No Spymaster found for team {team}"
+        raise ValueError(msg)
     if operative is None:
-        raise ValueError(f"No Operative found for team {team}")
+        msg = f"No Operative found for team {team}"
+        raise ValueError(msg)
     return TeamPlayers(spymaster=spymaster, operative=operative)

codenames/classic/score.py

@@ -17,6 +17,4 @@ def new(blue: int, red: int) -> Score:
     def add_point(self, team: ClassicTeam) -> bool:
         team_score = self.blue if team == ClassicTeam.BLUE else self.red
         team_score.revealed += 1
-        if team_score.unrevealed == 0:
-            return True
-        return False
+        return team_score.unrevealed == 0

codenames/classic/state.py

@@ -121,7 +121,7 @@ def is_game_over(self) -> bool:
 
     def process_clue(self, clue: Clue) -> ClassicGivenClue | None:
         if self.is_game_over:
-            raise GameIsOver()
+            raise GameIsOver
         if self.current_player_role != PlayerRole.SPYMASTER:
             raise InvalidTurn("It's not the Spymaster's turn now!")
         self.clues.append(clue)
@@ -141,7 +141,7 @@ def process_clue(self, clue: Clue) -> ClassicGivenClue | None:
 
     def process_guess(self, guess: Guess) -> ClassicGivenGuess | None:
         if self.is_game_over:
-            raise GameIsOver()
+            raise GameIsOver
         if self.current_player_role != PlayerRole.OPERATIVE:
             raise InvalidTurn("It's not the Operative's turn now!")
         if guess.card_index == PASS_GUESS:

codenames/duet/state.py

@@ -105,7 +105,7 @@ def operative_state(self) -> DuetOperativeState:
 
     def process_clue(self, clue: Clue) -> DuetGivenClue | None:
         if self.is_game_over:
-            raise GameIsOver()
+            raise GameIsOver
         if self.current_player_role != PlayerRole.SPYMASTER:
             raise InvalidTurn("It's not the Spymaster's turn now!")
         self.clues.append(clue)
@@ -124,7 +124,7 @@ def process_clue(self, clue: Clue) -> DuetGivenClue | None:
 
     def process_guess(self, guess: Guess) -> DuetGivenGuess | None:
         if self.is_game_over:
-            raise GameIsOver()
+            raise GameIsOver
         if self.current_player_role != PlayerRole.OPERATIVE:
             raise InvalidTurn("It's not the Operative's turn now!")
         if guess.card_index == PASS_GUESS:
@@ -149,7 +149,7 @@ def process_guess(self, guess: Guess) -> DuetGivenGuess | None:
     def dual_card_revealed(self, guess: Guess):
         card = self.board[guess.card_index]
         if card.revealed:
-            assert not card.color == DuetColor.GREEN  # This should not happen
+            assert card.color != DuetColor.GREEN  # This should not happen
             return
         if card.color == DuetColor.GREEN:
             self._update_score(card_color=DuetColor.GREEN)
@@ -260,7 +260,8 @@ def game_result(self) -> GameResult | None:
         if not result_a or not result_b:
             return None
         # Otherwise, both sides, finished, no one lost, means the game is won
-        assert result_a.win and result_b.win
+        assert result_a.win
+        assert result_b.win
         return TARGET_REACHED
 
     @property

codenames/generic/board.py

@@ -3,7 +3,7 @@
 import abc
 import math
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Collection, Iterator, Union
+from typing import TYPE_CHECKING, Any, Collection, Iterator
 
 from pydantic import BaseModel, field_validator
 
@@ -27,13 +27,15 @@ class Board[C: CardColor](BaseModel, abc.ABC):
     def convert_cards(cls, v: Any) -> list[Card[C]]:
         return list(v)
 
-    def __getitem__(self, item: Union[int, str]) -> Card:
+    def __getitem__(self, item: int | str) -> Card:
         if isinstance(item, str):
             item = self.find_card_index(item)
         if not isinstance(item, int):
-            raise IndexError(f"Illegal index type for card: {item}")
+            msg = f"Illegal index type for card: {item}"
+            raise IndexError(msg)
         if item < 0 or item >= self.size:
-            raise IndexError(f"Card index out of bounds: {item}")
+            msg = f"Card index out of bounds: {item}"
+            raise IndexError(msg)
         return self.cards[item]
 
     def __iter__(self) -> Iterator[Card[C]]:  # type: ignore

codenames/generic/move.py

@@ -61,7 +61,8 @@ def __str__(self) -> str:
     def correct(self) -> bool:
         card_color = self.guessed_card.color
         if not card_color:
-            raise ValueError(f"Card {self.guessed_card} has no color set")
+            msg = f"Card {self.guessed_card} has no color set"
+            raise ValueError(msg)
         return self.for_clue.team.as_card_color == card_color
 
     @property

codenames/generic/player.py

@@ -61,4 +61,4 @@ def give_clue(self, game_state: S) -> Clue:
 class Operative[C: CardColor, T: Team, S: OperativeState](Player[C, T], abc.ABC):
     @abc.abstractmethod
     def guess(self, game_state: S) -> Guess:
-        raise NotImplementedError()
+        raise NotImplementedError

codenames/mini/state.py

@@ -19,16 +19,14 @@ def is_sudden_death(self) -> bool:
 
     def process_guess(self, guess: Guess) -> DuetGivenGuess | None:
         given_guess = super().process_guess(guess)
-        # If the guess is wrong or passed the turn, the timer is updated
-        if not given_guess or not given_guess.correct:
-            self._update_tokens(mistake=given_guess is not None)
+        # If the guess is correct, there is nothing to do
+        if given_guess and given_guess.correct:
             return given_guess
-        # If we reached our target score, and we are not in "sudden death", we consume a timer token
-        if self.is_game_over and not self.is_sudden_death:
-            self._update_tokens(mistake=False)
+        # Otherwise, the guess was incorrect or the operator passed the turn
+        self._update_tokens(is_mistake=given_guess is not None)
         return given_guess
 
-    def _update_tokens(self, mistake: bool) -> None:
+    def _update_tokens(self, is_mistake: bool) -> None:
         if self.timer_tokens >= 0:
             self.timer_tokens -= 1
         if self.timer_tokens == 0:
@@ -37,7 +35,7 @@ def _update_tokens(self, mistake: bool) -> None:
         elif self.timer_tokens < 0:
             self.game_result = TIMER_TOKENS_DEPLETED
             log.info("Timer tokens depleted (after sudden death)!")
-        if not mistake:
+        if not is_mistake:
             return
         self.allowed_mistakes -= 1
         if self.allowed_mistakes == 0:

codenames/online/codenames_game/adapter.py

@@ -5,13 +5,12 @@
 from dataclasses import dataclass
 from enum import StrEnum
 from time import sleep
-from typing import Callable, Mapping
+from typing import TYPE_CHECKING, Callable, Mapping
 
 from selenium import webdriver
 from selenium.common import ElementNotInteractableException
 from selenium.webdriver.chrome.service import Service
 from selenium.webdriver.common.by import By
-from selenium.webdriver.remote.webelement import WebElement
 
 from codenames.classic.board import ClassicBoard
 from codenames.generic.move import PASS_GUESS, Clue, Guess
@@ -28,6 +27,9 @@
 )
 from codenames.utils.formatting import wrap
 
+if TYPE_CHECKING:
+    from selenium.webdriver.remote.webelement import WebElement
+
 log = logging.getLogger(__name__)
 
 WEBAPP_URL = "https://codenames.game/"
@@ -279,7 +281,8 @@ def get_card_containers(self) -> list[WebElement]:
         card_elements = self.driver.find_elements(by=By.CLASS_NAME, value="card")
         card_elements = [element for element in card_elements if element.text != ""]
         if len(card_elements) < 25:
-            raise ValueError(f"Expected 25 cards, loaded {len(card_elements)}")
+            msg = f"Expected 25 cards, loaded {len(card_elements)}"
+            raise ValueError(msg)
         return self.driver.find_elements(By.XPATH, value="//div[@role='img']")
 
     def get_clue_input(self) -> WebElement:
@@ -343,11 +346,11 @@ def poll_elements[
             log.debug(f"Polling [{len(element_getters)}] elements...")
         try:
             return poll_elements(element_getters, timeout_sec=timeout_sec, poll_interval_sec=poll_interval_sec)
-        except Exception as e:
+        except Exception:
             if screenshot:
                 log.info(f"{self.log_prefix} Polling failed, saving screenshot...")
                 self.screenshot("failed polling")
-            raise e
+            raise
 
     def screenshot(self, tag: str, raise_on_error: bool = False) -> str | None:
         return save_screenshot(adapter=self, tag=tag, raise_on_error=raise_on_error)