[WIP] Improved network protocol (more stable on slow clients)

.github/workflows/test_pytest.yml

@@ -55,6 +55,9 @@ jobs:
     - name: Run Pelita CLI as a script
       run: |
         pelita --null --rounds 100 --size small
+    - name: Run Pelita CLI without timeouts
+      run: |
+        pelita --null --rounds 100 --size small --no-timeout
     - name: Test Pelita template repo
       run: |
         # We must clone pelita_template to a location outside of the pelita repo

contrib/ci_engine.py

@@ -55,7 +55,7 @@
 from rich.console import Console
 from rich.table import Table
 
-from pelita.network import ZMQClientError
+from pelita.network import RemotePlayerFailure
 from pelita.scripts.script_utils import start_logging
 from pelita.tournament import call_pelita, check_team
 
@@ -126,7 +126,7 @@ def load_players(self):
                 _logger.debug('Querying team name for %s.' % pname)
                 team_name = check_team(player['path'])
                 self.dbwrapper.add_team_name(pname, team_name)
-            except ZMQClientError as e:
+            except RemotePlayerFailure as e:
                 e_type, e_msg = e.args
                 _logger.debug(f'Could not import {player} at path {path} ({e_type}): {e_msg}')
                 player['error'] = e.args

demo/benchmark_game.py

@@ -34,7 +34,7 @@
 layout = parse_layout(LAYOUT)
 
 def run(teams, max_rounds):
-    return run_game(teams, max_rounds=max_rounds, layout_dict=layout, print_result=False, allow_exceptions=True, store_output=subprocess.DEVNULL)
+    return run_game(teams, max_rounds=max_rounds, layout_dict=layout, print_result=False, raise_bot_exceptions=True, store_output=subprocess.DEVNULL)
 
 def parse_args():
     parser = argparse.ArgumentParser(description='Benchmark pelita run_game')

pelita/base_utils.py

@@ -1,5 +1,6 @@
 from random import Random
 
+import zmq
 
 def default_rng(seed=None):
     """Construct a new RNG from a given seed or return the same RNG.
@@ -12,3 +13,8 @@ def default_rng(seed=None):
     if isinstance(seed, Random):
         return seed
     return Random(seed)
+
+def default_zmq_context(zmq_context=None):
+    if zmq_context is None:
+        return zmq.Context()
+    return zmq_context

pelita/exceptions.py

@@ -1,19 +1,16 @@
 
-class FatalException(Exception): # TODO rename to FatalGameException etc
-    pass
-
-class NonFatalException(Exception):
+class NoFoodWarning(Warning):
+    """ Warns when a layout has no food during setup. """
     pass
 
-class PlayerTimeout(NonFatalException):
+class GameOverError(Exception):
+    """ raised from game when match is game over """
     pass
 
-class PlayerDisconnected(FatalException):
-    # unsure, if PlayerDisconnected should be fatal in the sense of that the team loses
-    # it could simply be a network error for both teams
-    # and it would be random who will be punished
+class PelitaBotError(Exception):
+    """ Raised when raise_bot_exceptions is turned on """
     pass
 
-class NoFoodWarning(Warning):
-    """ Warns when a layout has no food during setup. """
+class PelitaIllegalGameState(Exception):
+    """ Raised when there is something wrong with the game state """
     pass