move snake builder into game_runtime.py to not pass it around very where

server/services/game_runtime.py

@@ -1,14 +1,20 @@
-from typing import cast
+from typing import Protocol, cast
 import time
 
 from server.metrics import MetricsCollector
 from server.GameBoard import GameBoard
 
-from server.storage import StorageLoader
 from snakes import SnakeBuilder
 
+class GameStateStoreLike(Protocol):
+  async def save(self, game_id: str, game_board: GameBoard) -> None: ...
+
+  async def load(self, game_id: str) -> object | None: ...
+
+  async def delete(self, game_id: str) -> None: ...
+
 class GameRuntimeService:
-  def __init__(self, game_state_store:StorageLoader, snake_type:str, game_state_local_cache:bool, stale_game_timeout_sec:int):
+  def __init__(self, game_state_store:GameStateStoreLike, snake_type:str, game_state_local_cache:bool, stale_game_timeout_sec:int):
     self.game_state_store = game_state_store
     self.snake_type = snake_type
     self.game_state_local_cache = game_state_local_cache
@@ -22,7 +28,7 @@ class GameRuntimeService:
   def attach_metrics_collector(self, metrics_collector:MetricsCollector) -> None:
     self.metrics_collector = metrics_collector
 
-  async def create_game_board(self, game_state:dict, snake_builder:SnakeBuilder) -> GameBoard:
+  async def create_game_board(self, game_state:dict) -> GameBoard:
     game_id = game_state['game']['id']
     new_game_board = GameBoard(
       game_id=game_id,
@@ -31,7 +37,7 @@ class GameRuntimeService:
       ruleset=game_state['game']['ruleset'],
       source=game_state['game']['source'],
       map=game_state['game']['map'],
-      snake_class=snake_builder.build(self.snake_type),
+      snake_class=SnakeBuilder.build(self.snake_type),
     )
     await new_game_board.start_game(game_state)
 
@@ -57,9 +63,9 @@ class GameRuntimeService:
     self.game_last_seen_unix.pop(game_id, None)
     await self.game_state_store.delete(game_id)
 
-  async def get_game_board(self, game_state:dict, snake_builder:SnakeBuilder, end:bool=False) -> GameBoard:
+  async def get_game_board(self, game_state:dict, end:bool=False) -> GameBoard:
     game_id = game_state['game']['id']
-    game_board: GameBoard
+    game_board:GameBoard
     if self.game_state_local_cache and game_id in self.running_games:
       game_board = self.running_games[game_id]
     else:
@@ -69,13 +75,12 @@ class GameRuntimeService:
         if self.game_state_local_cache:
           self.running_games[game_id] = game_board
       else:
-        game_board = await self.create_game_board(game_state, snake_builder)
+        game_board = await self.create_game_board(game_state)
         if self.metrics_collector is not None:
           await self.metrics_collector.record_game_autocreated()
 
     if not end:
       self.game_move_counts[game_id] = self.game_move_counts.get(game_id, 0) + 1
-
     self.game_last_seen_unix[game_id] = int(time.time())
 
     game_board.read_game_data(game_state)