Merge branch 'fix-request-protocol-consume-order' of github.com:cameronangliss/poke-env into none-battleorder-is-pass

Author: cameronangliss

src/poke_env/environment/pokemon.py

@@ -376,6 +376,7 @@ def set_hp_status(self, hp_status: str, store=False):
                 self.end_effect("yawn")
         else:
             hp = hp_status
+            self._status = None
 
         current_hp, max_hp = "".join([c for c in hp if c in "0123456789/"]).split("/")
         self._current_hp = int(current_hp)

src/poke_env/player/player.py

@@ -262,6 +262,9 @@ async def _handle_battle_message(self, split_messages: List[List[str]]):
         :type split_message: str
         """
         # Battle messages can be multiline
+        will_move = False
+        from_teampreview_request = False
+        maybe_default_order = False
         if (
             len(split_messages) > 1
             and len(split_messages[1]) > 1
@@ -284,7 +287,7 @@ async def _handle_battle_message(self, split_messages: List[List[str]]):
                     request = orjson.loads(split_message[2])
                     battle.parse_request(request)
                     if battle.move_on_next_request:
-                        await self._handle_battle_request(battle)
+                        will_move = True
                         battle.move_on_next_request = False
             elif split_message[1] == "win" or split_message[1] == "tie":
                 if split_message[1] == "win":
@@ -304,46 +307,53 @@ async def _handle_battle_message(self, split_messages: List[List[str]]):
                     "[Invalid choice] Sorry, too late to make a different move"
                 ):
                     if battle.trapped:
-                        await self._handle_battle_request(battle)
+                        will_move = True
                 elif split_message[2].startswith(
                     "[Unavailable choice] Can't switch: The active Pokémon is "
                     "trapped"
                 ) or split_message[2].startswith(
                     "[Invalid choice] Can't switch: The active Pokémon is trapped"
                 ):
                     battle.trapped = True
-                    await self._handle_battle_request(battle)
+                    will_move = True
                 elif split_message[2].startswith(
                     "[Invalid choice] Can't switch: You can't switch to an active "
                     "Pokémon"
                 ):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 elif split_message[2].startswith(
                     "[Invalid choice] Can't switch: You can't switch to a fainted "
                     "Pokémon"
                 ):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 elif split_message[2].startswith(
                     "[Invalid choice] Can't move: Invalid target for"
                 ):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 elif split_message[2].startswith(
                     "[Invalid choice] Can't move: You can't choose a target for"
                 ):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 elif split_message[2].startswith(
                     "[Invalid choice] Can't move: "
                 ) and split_message[2].endswith("needs a target"):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 elif (
                     split_message[2].startswith("[Invalid choice] Can't move: Your")
                     and " doesn't have a move matching " in split_message[2]
                 ):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 elif split_message[2].startswith(
                     "[Invalid choice] Incomplete choice: "
                 ):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 elif split_message[2].startswith(
                     "[Unavailable choice]"
                 ) and split_message[2].endswith("is disabled"):
@@ -356,25 +366,34 @@ async def _handle_battle_message(self, split_messages: List[List[str]]):
                     "[Invalid choice] Can't move: You sent more choices than unfainted"
                     " Pokémon."
                 ):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 elif split_message[2].startswith(
                     "[Invalid choice] Can't move: You can only Terastallize once per battle."
                 ):
-                    await self._handle_battle_request(battle, maybe_default_order=True)
+                    will_move = True
+                    maybe_default_order = True
                 else:
                     self.logger.critical("Unexpected error message: %s", split_message)
             elif split_message[1] == "turn":
                 battle.parse_message(split_message)
-                await self._handle_battle_request(battle)
+                will_move = True
             elif split_message[1] == "teampreview":
                 battle.parse_message(split_message)
-                await self._handle_battle_request(battle, from_teampreview_request=True)
+                will_move = True
+                from_teampreview_request = True
             elif split_message[1] == "bigerror":
                 self.logger.warning("Received 'bigerror' message: %s", split_message)
             elif split_message[1] == "uhtml" and split_message[2] == "otsrequest":
                 await self._handle_ots_request(battle.battle_tag)
             else:
                 battle.parse_message(split_message)
+        if will_move:
+            await self._handle_battle_request(
+                battle,
+                from_teampreview_request=from_teampreview_request,
+                maybe_default_order=maybe_default_order,
+            )
 
     async def _handle_battle_request(
         self,

src/poke_env/ps_client/ps_client.py

@@ -7,7 +7,7 @@
 from asyncio import CancelledError, Event, Lock, create_task, sleep
 from logging import Logger
 from time import perf_counter
-from typing import Any, List, Optional, Set
+from typing import Any, Dict, List, Optional, Set
 
 import requests
 import websockets.client as ws
@@ -85,6 +85,7 @@ def __init__(
         self._sending_lock = create_in_poke_loop(Lock)
 
         self.websocket: WebSocketClientProtocol
+        self.reqs: Dict[str, List[List[str]]] = {}
         self._logger: Logger = self._create_logger(log_level)
 
         if start_listening:
@@ -139,7 +140,18 @@ async def _handle_message(self, message: str):
             # For battles, this is the zero-th entry
             # Otherwise it is the one-th entry
             if split_messages[0][0].startswith(">battle"):
+                # Determine protocol and request
+                battle_tag = split_messages[0][0][1:]
+                request = self.reqs.pop(battle_tag, None)
+                if "|request|" in message:
+                    protocol = None
+                    self.reqs[battle_tag] = split_messages
+                else:
+                    protocol = split_messages
                 # Battle update
+                split_messages = protocol or [[f">{battle_tag}"]]
+                if request is not None:
+                    split_messages += [request[1]]
                 await self._handle_battle_message(split_messages)  # type: ignore
             elif split_messages[0][1] == "challstr":
                 # Confirms connection to the server: we can login