NF: Introduce HTTP POST publishing

Author: Debilski

pelita/game.py

@@ -17,7 +17,7 @@
 from .exceptions import NoFoodWarning, PelitaBotError, PelitaIllegalGameState
 from .gamestate_filters import noiser, relocate_expired_food, update_food_age, in_homezone
 from .layout import get_legal_positions, initial_positions
-from .network import Controller, RemotePlayerFailure, RemotePlayerRecvTimeout, RemotePlayerSendError, ZMQPublisher
+from .network import Controller, RemotePlayerFailure, RemotePlayerRecvTimeout, RemotePlayerSendError, ZMQPublisher, POSTPublisher
 from .team import RemoteTeam, make_team
 from .viewer import (AsciiViewer, ProgressViewer, ReplayWriter, ReplyToViewer,
                      ResultPrinter)
@@ -272,6 +272,9 @@ def setup_viewers(viewers, print_result=True):
             zmq_context = zmq.Context()
             zmq_external_publisher = ZMQPublisher(address=viewer_opts, bind=False, zmq_context=zmq_context)
             viewer_state['viewers'].append(zmq_external_publisher)
+        elif viewer == 'http-post-to':
+            post_publisher = POSTPublisher(address=viewer_opts)
+            viewer_state['viewers'].append(post_publisher)
         elif viewer == 'tk':
             zmq_context = zmq.Context()
             zmq_publisher = ZMQPublisher(address='tcp://127.0.0.1', zmq_context=zmq_context)

pelita/network.py

@@ -333,6 +333,31 @@ def recv_timeout(self, expected_id, timeout):
     def __repr__(self):
         return "RemotePlayerConnection(%r)" % self.socket
 
+
+class POSTPublisher:
+    """ A viewer which dumps to a given stream.
+    """
+    def __init__(self, address):
+        import httpx
+        self.url = address
+        self.http_session = httpx.Client()
+
+    def _send(self, action, data):
+        # import requests
+
+        info = {'round': data['round'], 'turn': data['turn']}
+        # TODO: this should be game_phase
+        if data['gameover']:
+            info['gameover'] = True
+        _logger.debug(f"--#> [{action}] %r", info)
+        message = {"__action__": action, "__data__": data}
+        as_json = json.dumps(message, cls=SetEncoder)
+        self.http_session.post(self.url, content=as_json)
+
+    def show_state(self, game_state):
+        self._send(action="observe", data=game_state)
+
+
 class ZMQPublisher:
     """ Sets up a simple Publisher which sends all viewed events
     over a zmq connection.

pelita/scripts/pelita_main.py

@@ -280,6 +280,8 @@ def long_help(s):
                                help=long_help('Communicate the result of the game on this channel.'))
 advanced_settings.add_argument('--publish', type=str, metavar='URL', dest='publish_to',
                                help=long_help('Publish the game to this zmq socket.'))
+advanced_settings.add_argument('--http-post', type=str, metavar='URL', dest='http_post_to',
+                               help=long_help('POST the game to this http socket.'))
 advanced_settings.add_argument('--controller', type=str, metavar='URL', default="tcp://127.0.0.1",
                                help=long_help('Channel for controlling the game.'))
 
@@ -355,6 +357,8 @@ def main():
         viewers.append(('reply-to', args.reply_to))
     if args.publish_to:
         viewers.append(('publish-to', args.publish_to))
+    if args.http_post_to:
+        viewers.append(('http-post-to', args.http_post_to))
     if args.write_replay:
         viewers.append(('write-replay-to', args.write_replay))
 

pelita/scripts/pelita_tournament.py

@@ -140,9 +140,9 @@ def setup():
             del config["bonusmatch"]
             break
 
-    res = input_choice("Should the web-viewer be activated? (publishes to tcp://127.0.0.1:5559) (y/n)", [], "yn")
+    res = input_choice("Should the web-viewer be activated? (publishes to http://localhost:3000/api/collect) (y/n)", [], "yn")
     if res == "y":
-        config['publish'] = "tcp://127.0.0.1:5559"
+        config['publish'] = "http://localhost:3000/api/collect"
     elif res == "n":
         config['publish'] = None
 

pelita/tournament/__init__.py

@@ -12,6 +12,7 @@
 import time
 from dataclasses import dataclass
 
+import httpx
 import yaml
 import zmq
 
@@ -137,7 +138,7 @@ def call_pelita(team_specs, *, rounds, size, viewer, seed, timeout=3, initial_ti
     seed = ['--seed', seed] if seed else []
     timeout = ['--timeout', str(timeout)]
     initial_timeout = ['--initial-timeout', str(initial_timeout)]
-    publish = ['--publish', publish] if publish else []
+    publish = ['--http-post', publish] if publish else []
     write_replay = ['--write-replay', write_replay] if write_replay else []
     store_output = ['--store-output', store_output] if store_output else []
     append_blue = ['--append-blue', team_infos[0]] if team_infos[0] else []
@@ -306,11 +307,9 @@ def __init__(self, config):
         self.tournament_log_file = None
 
         if self.publish:
-            ctx = zmq.Context()
-            self.socket = ctx.socket(zmq.PUB)
-            self.socket.connect(self.publish)
+            self.http_session = httpx.Client()
         else:
-            self.socket = None
+            self.http_session = None
 
     @property
     def team_ids(self):
@@ -329,13 +328,14 @@ def team_spec(self, team):
         return self.teams[team]["spec"]
 
     def send_remote(self, action, data=None):
-        if not self.socket:
+        if not self.http_session:
             return
+
         if data is None:
             publish_string = {"__action__": action}
         else:
             publish_string = {"__action__": action, "__data__": data}
-        self.socket.send_json(publish_string)
+        self.http_session.post(self.publish, content=json.dumps(publish_string))
 
     def _print(self, *args, **kwargs):
         print(*args, **kwargs)

pyproject.toml

@@ -32,6 +32,7 @@ dependencies = [
     "zeroconf",
     "rich",
     "click",
+    "httpx"
 ]
 dynamic = ["version"]
 

tournament.yaml

@@ -3,7 +3,7 @@ location: Munich
 date: 2015
 seed: null
 bonusmatch: True
-publish: tcp://127.0.0.1:5559
+#publish: http://localhost:3000/api/collect
 teams:
   - spec: pelita/player/StoppingPlayer
     members: