🔥 Generics and typing fixes

Author: asaf-kali

README.md

@@ -29,7 +29,7 @@ import logging
 import sys
 
 from codenames.classic.board import ClassicBoard
-from codenames.classic.color import ClassicTeam
+from codenames.classic.player import ClassicTeam
 from codenames.classic.runner import ClassicGamePlayers, ClassicGameRunner
 from codenames.generic.move import Clue, Guess
 from codenames.generic.player import Operative, Spymaster
@@ -61,13 +61,14 @@ class CLIOperative(Operative):
         card_index = game_state.board.find_card_index(word=card_word)
         return Guess(card_index=card_index)
 
+
 ############
 # Run Game #
 ############
 
 def run_classic_cli_game():
     # Init players
-    blue_spymaster = CLISpymaster(name="Yoda",team= ClassicTeam.BLUE)
+    blue_spymaster = CLISpymaster(name="Yoda", team=ClassicTeam.BLUE)
     blue_operative = CLIOperative(name="Luke", team=ClassicTeam.BLUE)
     red_spymaster = CLISpymaster(name="Einstein", team=ClassicTeam.RED)
     red_operative = CLIOperative(name="Newton", team=ClassicTeam.RED)

codenames/classic/board.py

@@ -4,7 +4,8 @@
 import random
 from typing import Self
 
-from codenames.classic.color import ClassicColor, ClassicTeam
+from codenames.classic.color import ClassicColor
+from codenames.classic.player import ClassicTeam
 from codenames.classic.types import ClassicCard, ClassicCards
 from codenames.generic.board import Board, Vocabulary
 from codenames.utils.builder import extract_random_subset

codenames/classic/color.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from codenames.generic.card import CardColor
-from codenames.generic.player import Team
 
 
 class ClassicColor(CardColor):
@@ -15,19 +14,6 @@ def emoji(self) -> str:
         return CARD_COLOR_TO_EMOJI[self]
 
 
-class ClassicTeam(Team):
-    BLUE = "BLUE"
-    RED = "RED"
-
-    @property
-    def as_card_color(self) -> ClassicColor:
-        return ClassicColor.BLUE if self == ClassicTeam.BLUE else ClassicColor.RED
-
-    @property
-    def opponent(self) -> ClassicTeam:
-        return ClassicTeam.BLUE if self == ClassicTeam.RED else ClassicTeam.RED
-
-
 CARD_COLOR_TO_EMOJI = {
     ClassicColor.RED: "🟥",
     ClassicColor.BLUE: "🟦",

codenames/classic/player.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+import abc
+
+from codenames.classic.color import ClassicColor
+from codenames.generic.player import Operative, Player, Spymaster, Team
+
+
+class ClassicTeam(Team):
+    BLUE = "BLUE"
+    RED = "RED"
+
+    @property
+    def as_card_color(self) -> ClassicColor:
+        return ClassicColor.BLUE if self == ClassicTeam.BLUE else ClassicColor.RED
+
+    @property
+    def opponent(self) -> ClassicTeam:
+        return ClassicTeam.BLUE if self == ClassicTeam.RED else ClassicTeam.RED
+
+
+class ClassicPlayer(Player[ClassicColor, ClassicTeam]):
+    pass
+
+
+class ClassicSpymaster(Spymaster[ClassicColor, ClassicTeam], abc.ABC):
+    pass
+
+
+class ClassicOperative(Operative[ClassicColor, ClassicTeam], abc.ABC):
+    pass

codenames/classic/runner.py

@@ -5,7 +5,7 @@
 from typing import Collection, Iterator
 
 from codenames.classic.board import ClassicBoard
-from codenames.classic.color import ClassicTeam
+from codenames.classic.player import ClassicTeam
 from codenames.classic.state import ClassicGameState
 from codenames.classic.winner import Winner
 from codenames.generic.exceptions import InvalidGuess

codenames/classic/score.py

@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel
 
-from codenames.classic.color import ClassicTeam
+from codenames.classic.player import ClassicTeam
 from codenames.generic.state import TeamScore
 
 

codenames/classic/state.py

@@ -4,7 +4,8 @@
 from pydantic import field_validator
 
 from codenames.classic.board import ClassicBoard
-from codenames.classic.color import ClassicColor, ClassicTeam
+from codenames.classic.color import ClassicColor
+from codenames.classic.player import ClassicTeam
 from codenames.classic.score import Score
 from codenames.classic.types import ClassicCard, ClassicGivenClue, ClassicGivenGuess
 from codenames.classic.winner import Winner, WinningReason
@@ -56,11 +57,11 @@ def parse_given_guesses(cls, v: Any) -> list[ClassicGivenGuess]:
         return guesses
 
 
-class ClassicSpymasterState(SpymasterState, ClassicPlayerState):
+class ClassicSpymasterState(ClassicPlayerState, SpymasterState[ClassicColor, ClassicTeam]):
     pass
 
 
-class ClassicOperativeState(OperativeState, ClassicPlayerState):
+class ClassicOperativeState(ClassicPlayerState, OperativeState[ClassicColor, ClassicTeam]):
     left_guesses: int
 
 

codenames/classic/types.py

@@ -1,4 +1,5 @@
-from codenames.classic.color import ClassicColor, ClassicTeam
+from codenames.classic.color import ClassicColor
+from codenames.classic.player import ClassicTeam
 from codenames.generic.card import Card
 from codenames.generic.move import GivenClue, GivenGuess
 

codenames/classic/winner.py

@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel
 
-from codenames.classic.color import ClassicTeam
+from codenames.classic.player import ClassicTeam
 
 
 class WinningReason(StrEnum):

codenames/duet/player.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from abc import ABC
+import abc
 
 from codenames.duet.card import DuetColor
 from codenames.generic.player import Operative, Spymaster, Team
@@ -14,5 +14,13 @@ def as_card_color(self) -> DuetColor:
         return DuetColor.GREEN  # Naive implementation
 
 
-class DuetPlayer(Spymaster[DuetTeam], Operative[DuetTeam], ABC):
+class DuetPlayer(Spymaster[DuetColor, DuetTeam], Operative[DuetColor, DuetTeam], abc.ABC):
+    pass
+
+
+class DuetSpymaster(Spymaster[DuetColor, DuetTeam], abc.ABC):
+    pass
+
+
+class DuetOperative(Operative[DuetColor, DuetTeam], abc.ABC):
     pass