Update

Author: Ematerasu

AIService/Server.py

@@ -51,29 +51,17 @@ def CloseServer(self, request, context):
 
 class Server:
 
-    _instance = None
-    _lock = Lock()
-
-    def __new__(cls, *args, **kwargs):
-        with cls._lock:
-            if not cls._instance:
-                cls._instance = super().__new__(cls)
-                cls._instance.active_bots = 0
-                cls._instance.server = None
-                cls._instance.lock = Lock()
-        return cls._instance
-
+    def __init__(self):
+        self.active_bots = 0
     def add_bot(self):
-        with self.lock:
-            self.active_bots += 1
-            print(f"Bot connected. Active bots: {self.active_bots}")
+        self.active_bots += 1
+        print(f"Bot connected. Active bots: {self.active_bots}")
 
     def bot_disconnected(self):
-        with self.lock:
-            self.active_bots -= 1
-            print(f"Bot disconnected. Active bots: {self.active_bots}")
-            if self.active_bots == 0:
-                self.shutdown_server()
+        self.active_bots -= 1
+        print(f"Bot disconnected. Active bots: {self.active_bots}")
+        if self.active_bots == 0:
+            self.shutdown_server()
 
     def shutdown_server(self):
         if self.server:

Bots/MaxPrestigeBot.py

@@ -9,8 +9,15 @@ def select_patron(self, available_patrons):
         return random.choice(available_patrons)
 
     def play(self, game_state, possible_moves):
-        #print(f"MaxPrestigeBot play")
-        # game_state.debug_print()
+        best_move = None
+        best_prestige = -1
+
+        for first_move in possible_moves:
+            new_game_state, new_moves = game_state.apply_move(first_move)
+
+            for second_move in new_moves:
+                final_game_state, _ = new_game_state.apply_move(second_move)
+
         return random.choice(possible_moves)
 
     def game_end(self, final_state):

Bots/RandomBot.py

@@ -9,7 +9,7 @@ def select_patron(self, available_patrons):
         return random.choice(available_patrons)
 
     def play(self, game_state, possible_moves):
-        game_state.debug_print()
+        # game_state.debug_print()
         return random.choice(possible_moves)
 
     def game_end(self, final_state):

Game/game.py

@@ -10,9 +10,8 @@ def __init__(self):
     def register_bot(self, bot_instance: BaseAI):
         self.bots.append(bot_instance)
 
-    def run(self, bot1Name: str, bot2Name: str, start_game_runner=True, runs=1, enable_logs="NONE", log_destination="", seed=None, timeout=30):
-        server = Server()
-        grpc_server = server.run_grpc_server(filter(lambda bot: bot.bot_name == bot1Name or bot.bot_name == bot2Name, self.bots))
+    def run(self, bot1Name: str, bot2Name: str, start_game_runner=True, runs=1, threads=1, enable_logs="NONE", log_destination="", seed=None, timeout=30):
+        bots = filter(lambda bot: bot.bot_name == bot1Name or bot.bot_name == bot2Name, self.bots)
         if start_game_runner:
             if any([bot1Name == bot.bot_name for bot in self.bots]):
                 bot1Name = "grpc:" + bot1Name
@@ -21,13 +20,20 @@ def run(self, bot1Name: str, bot2Name: str, start_game_runner=True, runs=1, enab
             run_game_runner(
                 bot1Name,
                 bot2Name, 
-                runs=runs, 
+                runs=runs,
+                threads=threads,
                 enable_logs=enable_logs,
                 log_destination=log_destination,
                 seed=seed,
                 timeout=timeout
             )
+
+    def _run_bot_instances(self, bots: List[BaseAI]):
+        server = Server()
+        grpc_server = server.run_grpc_server(bots)
+
         try:
             grpc_server.wait_for_termination()
         except KeyboardInterrupt:
+            grpc_server.close()
             print("Server interrupted by user.")