worker no longer sends extra request to game for data

aimmo-game-creator/Dockerfile

@@ -14,5 +14,4 @@ ENV WORKER_MANAGER=kubernetes
 CMD ["python", "./service.py", "0.0.0.0"]
 
 FROM base as tester
-ENV WORKER_MANAGER=kubernetes
 CMD ["python", "setup.py", "test"]

aimmo-game-worker/Dockerfile

@@ -15,5 +15,4 @@ ENV FLASK_ENV='development'
 CMD python ./service.py 0.0.0.0 $PORT $DATA_URL
 
 FROM base as tester
-ENV WORKER_MANAGER=kubernetes
 CMD python setup.py test

aimmo-game-worker/service.py

@@ -23,10 +23,9 @@ def get_code_and_options():
 
 @app.route('/turn/', methods=['POST'])
 def process_turn():
-    code, options = get_code_and_options()
     data = flask.request.get_json()
     world_map = WorldMap(**data['world_map'])
-
+    code, options = data['code'], data['options']
     avatar_state = AvatarState(location=data['avatar_state']['location'],
                                score=data['avatar_state']['score'],
                                health=data['avatar_state']['health'])

aimmo-game/Dockerfile

@@ -9,7 +9,6 @@ COPY --from=builder /usr/local/lib/python3.6/site-packages /usr/local/lib/python
 COPY . .
 
 FROM base as tester
-ENV WORKER_MANAGER=kubernetes
 CMD python setup.py test
 
 FROM base as runner

aimmo-game/simulation/worker.py

@@ -8,6 +8,7 @@ class Worker(object):
     def __init__(self, worker_url):
         self.url = worker_url
         self.log = None
+        self.code = None
         self.serialised_action = None
         self.has_code_updated = False
 
@@ -18,7 +19,13 @@ def _set_defaults(self):
 
     def fetch_data(self, state_view):
         try:
-            response = requests.post(self.url, json=state_view)
+            code_and_options = {
+                'code': self.code,
+                'options': {},
+                'state': None,
+            }
+            data = {**state_view, **code_and_options}
+            response = requests.post(self.url, json=data)
             response.raise_for_status()
             data = response.json()
             self.serialised_action = data['action']

aimmo-game/simulation/worker_managers/worker_manager.py

@@ -10,32 +10,16 @@
 LOGGER = logging.getLogger(__name__)
 
 
-class _WorkerManagerData(object):
-    """
-    This class is thread safe
-    """
-
-    def __init__(self, user_codes):
-        self._user_codes = user_codes
-
-    def set_code(self, player):
-        self._user_codes[player['id']] = player['code']
-
-    def get_code(self, player_id):
-        return self._user_codes[player_id]
-
-
 class WorkerManager(object):
     """
     Methods of this class must be thread safe unless explicitly stated.
     """
     def __init__(self, port=5000):
-        self._data = _WorkerManagerData({})
         self.player_id_to_worker = {}
         self.port = port
 
     def get_code(self, player_id):
-        return self._data.get_code(player_id)
+        return self.player_id_to_worker[player_id].code
 
     def fetch_all_worker_data(self, player_id_to_game_state):
         """
@@ -44,7 +28,8 @@ def fetch_all_worker_data(self, player_id_to_game_state):
         """
         def prepare_request_threads():
             return [Thread(target=worker.fetch_data,
-                           args=(player_id_to_game_state[player_id],)) for (player_id, worker) in self.player_id_to_worker.items()]
+                           args=(player_id_to_game_state[player_id],))
+                    for (player_id, worker) in self.player_id_to_worker.items()]
 
         def timed_process_for_worker_turn_requests(duration):
             threads = prepare_request_threads()
@@ -69,7 +54,7 @@ def remove_worker(self, player_id):
         raise NotImplementedError
 
     def update_code(self, player):
-        self._data.set_code(player)
+        self.player_id_to_worker[player['id']].code = player['code']
 
     def add_new_worker(self, player_id):
         worker_url_base = self.create_worker(player_id)

version.txt

@@ -1 +1 @@
-0.5.1
+0.5.2