🏞️ Solvers: Support Duet game type

Makefile

@@ -127,7 +127,7 @@ check-mypy:
 	mypy .
 
 check-pylint:
-	pylint solvers/ --fail-under=9.68
+	pylint solvers/ --fail-under=10
 
 lint: format
 	pre-commit run --all-files

pyproject.toml

@@ -24,7 +24,7 @@ all = ["openai"]
 # Core
 python = "^3.12,<3.13"
 the-spymaster-util = { version = "~3.2", extras = ["logging"] }
-codenames = ">=5.0.4,<5.1"
+codenames = ">=5.1.2"
 pydantic = ">=2.4"
 # Numbers
 numpy = "^1.21"
@@ -122,8 +122,8 @@ disable = [
 ]
 extension-pkg-allow-list = ["pydantic"]
 ignore = [
-    "sna_hinter.py",
+    "solvers/sna",
+    "solvers/olympic",
     "algebra.py",
-    "olympic_hinter.py",
     "board_heuristics.py",
 ]

solvers/gpt/gpt_spymaster.py

@@ -7,7 +7,7 @@
 from codenames.generic.move import Clue, GivenClue
 from codenames.generic.player import Spymaster, Team
 from codenames.generic.state import SpymasterState
-from codenames.resources.english import ENGLISH_WORDS
+from codenames.utils.vocabulary.english import ENGLISH_WORDS
 
 from solvers.gpt.gpt_player import (
     HINTER_TURN_COMMAND,

solvers/naive/naive_spymaster.py

@@ -4,7 +4,9 @@
 
 import numpy as np
 from codenames.classic.color import ClassicColor
-from codenames.classic.state import ClassicState
+from codenames.classic.state import ClassicPlayerState
+from codenames.duet.card import DuetColor
+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
@@ -116,11 +118,18 @@ def give_clue(
 
 
 def _get_proposal_colors(state: PlayerState) -> ProposalColors:
-    if isinstance(state, ClassicState):
+    if isinstance(state, ClassicPlayerState):
         return ProposalColors(
             team=state.current_team.as_card_color,
             opponent=state.current_team.opponent.as_card_color,
             neutral=ClassicColor.NEUTRAL,
             assassin=ClassicColor.ASSASSIN,
         )
+    if isinstance(state, DuetPlayerState):
+        return ProposalColors(
+            team=state.current_team.as_card_color,
+            opponent=None,
+            neutral=DuetColor.NEUTRAL,
+            assassin=DuetColor.ASSASSIN,
+        )
     raise NotImplementedError(f"Unsupported state type: {type(state)}")

tests/resources/resource_manager.py

@@ -0,0 +1,7 @@
+import os
+
+RESOURCE_DIR = os.path.join(os.path.dirname(__file__))
+
+
+def get_resource_path(resource_name: str) -> str:
+    return os.path.join(RESOURCE_DIR, resource_name)

tests/test_naive_flow_classical.py

@@ -9,9 +9,10 @@
 
 from solvers.naive.naive_operative import NaiveOperative
 from solvers.naive.naive_spymaster import NaiveSpymaster
-from tests.words import ALL_WORDS
+from tests.resources.resource_manager import get_resource_path
+from tests.resources.words import ALL_WORDS
 
-VECTORS_FILE_NAME = "tests/small_model.csv"
+VECTORS_FILE_NAME = get_resource_path("small_model.csv")
 
 
 def mock_load_word2vec_format(*args, **kwargs):

utils/logging.py

@@ -7,13 +7,13 @@
 def configure_logging(
     formatter: Optional[str] = None, level: Optional[str] = None, mute_solvers: bool = False, mute_online: bool = True
 ):
-    handlers = {
-        "file": {
-            "class": "logging.FileHandler",
-            "filename": "run.log",
-            "formatter": "debug",
-        },
-    }
+    # handlers = {
+    #     "file": {
+    #         "class": "logging.FileHandler",
+    #         "filename": "run.log",
+    #         "formatter": "debug",
+    #     },
+    # }
     loggers = {
         "selenium": {"level": "INFO"},
         "urllib3": {"level": "INFO"},
@@ -24,14 +24,14 @@ def configure_logging(
     dict_config = get_dict_config(
         std_formatter=formatter,
         root_log_level=level,
-        extra_handlers=handlers,
+        # extra_handlers=handlers,
         extra_loggers=loggers,
     )
-    dict_config["root"]["handlers"].append("file")
+    # dict_config["root"]["handlers"].append("file")
 
-    if mute_solvers:
-        dict_config["loggers"]["solvers"] = {"handlers": ["file"], "propagate": False}  # type: ignore
-    if mute_online:
-        dict_config["loggers"]["codenames.online"] = {"handlers": ["file"], "propagate": False}  # type: ignore
+    # if mute_solvers:
+    # dict_config["loggers"]["solvers"] = {"handlers": ["file"], "propagate": False}  # type: ignore
+    # if mute_online:
+    # dict_config["loggers"]["codenames.online"] = {"handlers": ["file"], "propagate": False}  # type: ignore
     dictConfig(dict_config)
     print("Logging configured.")