🎡 Codenames upgrade

Makefile

@@ -60,7 +60,7 @@ cover-html: cover-base
 	coverage html
 
 cover: cover-html
-	$(OPEN_FILE_COMMAND) htmlcov/index.html &
+	$(OPEN_FILE_COMMAND) htmlcov/index.html > /dev/null 2>&1 &
 	$(DEL_COMMAND) .coverage*
 
 # Packaging

codenames_solvers/gpt/gpt_spymaster.py

@@ -7,8 +7,8 @@
 from codenames.classic.state import ClassicSpymasterState
 from codenames.generic.board import Board
 from codenames.generic.move import Clue, GivenClue
-from codenames.generic.player import Team
 from codenames.generic.state import SpymasterState
+from codenames.generic.team import Team
 from codenames.utils.vocabulary.english import ENGLISH_WORDS
 
 from codenames_solvers.gpt.gpt_player import (

codenames_solvers/gpt/moves.py

@@ -2,7 +2,8 @@
 
 from codenames.classic.state import ClassicPlayerState
 from codenames.generic.move import GivenClue, GivenGuess
-from codenames.generic.player import PlayerRole, Team
+from codenames.generic.player import PlayerRole
+from codenames.generic.team import Team
 
 
 @dataclass

codenames_solvers/naive/naive_player.py

@@ -2,7 +2,8 @@
 
 from codenames.generic.board import Board
 from codenames.generic.card import CardColor
-from codenames.generic.player import Player, Team
+from codenames.generic.player import Player
+from codenames.generic.team import Team
 from gensim.models import KeyedVectors
 
 from codenames_solvers.models import (

codenames_solvers/naive/naive_spymaster.py

@@ -9,8 +9,9 @@
 from codenames.duet.state import DuetPlayerState
 from codenames.generic.board import Board
 from codenames.generic.move import Clue
-from codenames.generic.player import Spymaster, Team
+from codenames.generic.player import Spymaster
 from codenames.generic.state import PlayerState, SpymasterState
+from codenames.generic.team import Team
 from gensim.models import KeyedVectors
 
 from codenames_solvers.models import ModelFormatAdapter, ModelIdentifier

codenames_solvers/other/naive_cli_operative.py

@@ -4,8 +4,8 @@
 import numpy as np
 from codenames.generic.board import Board
 from codenames.generic.move import Guess
-from codenames.generic.player import Team
 from codenames.generic.state import OperativeState
+from codenames.generic.team import Team
 from gensim.models import KeyedVectors
 
 from codenames_solvers.cli import CLIOperative

pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "codenames-solvers"
-version = "1.9.1"
+version = "1.9.2"
 description = "Solvers implementation for Codenames board game in python."
 authors = ["Michael Kali <[email protected]>", "Asaf Kali <[email protected]>"]
 readme = "README.md"
@@ -24,7 +24,7 @@ all = ["openai"]
 # Core
 python = "^3.12,<3.13"
 the-spymaster-util = { version = "~3.2", extras = ["logging"] }
-codenames = ">=5.4.2"
+codenames = ">=5.5"
 pydantic = ">=2.4"
 # Numbers
 numpy = "^1.21"