From 3a76d94a08fd8c74d4b9bdc27ece8422012d339b Mon Sep 17 00:00:00 2001 From: Trevor Bayless <3620552+trevorbayless@users.noreply.github.com> Date: Tue, 25 Jun 2024 17:20:40 -0500 Subject: [PATCH] Properly display exceptions if caught during game creation --- .../game/online_game/online_game_model.py | 54 ++++++++++--------- .../game/online_game/online_game_presenter.py | 2 + 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/cli_chess/core/game/online_game/online_game_model.py b/src/cli_chess/core/game/online_game/online_game_model.py index 64ee4dc..87a2321 100644 --- a/src/cli_chess/core/game/online_game/online_game_model.py +++ b/src/cli_chess/core/game/online_game/online_game_model.py @@ -38,30 +38,36 @@ def __init__(self, game_parameters: dict, is_vs_ai: bool): @threaded def create_game(self) -> None: """Sends a request to lichess to start an AI challenge using the selected game parameters""" - # Note: Only subscribe to IEM events right before creating challenge to lessen chance of grabbing another game - self.api_iem.add_event_listener(self._handle_iem_event) - self._notify_game_model_updated(EventTopics.GAME_SEARCH) - self.searching = True - - if self.vs_ai: # Challenge Lichess AI (stockfish) - self.api_client.challenges.create_ai(level=self.game_metadata.players[not self.my_color].ai_level, - clock_limit=self.game_metadata.clocks[WHITE].time * 60, # challenges need time in seconds - clock_increment=self.game_metadata.clocks[WHITE].increment, - color=COLOR_NAMES[self.game_metadata.my_color], - variant=self.game_metadata.variant) - else: # Find a random opponent - payload = { - "rated": str(self.game_metadata.rated).lower(), - "time": self.game_metadata.clocks[WHITE].time, - "increment": self.game_metadata.clocks[WHITE].increment, - "variant": self.game_metadata.variant, - "color": COLOR_NAMES[self.game_metadata.my_color], - "ratingRange": "", - } - - for _ in self.api_client.board._r.post("/api/board/seek", data=payload, fmt=TEXT, stream=True): - if not self.searching: - break + try: + # Note: Only subscribe to IEM events right before creating challenge to lessen chance of grabbing another game + self.api_iem.add_event_listener(self._handle_iem_event) + self._notify_game_model_updated(EventTopics.GAME_SEARCH) + self.searching = True + + if self.vs_ai: # Challenge Lichess AI (stockfish) + self.api_client.challenges.create_ai(level=self.game_metadata.players[not self.my_color].ai_level, + clock_limit=self.game_metadata.clocks[WHITE].time * 60, # challenges need time in seconds + clock_increment=self.game_metadata.clocks[WHITE].increment, + color=COLOR_NAMES[self.game_metadata.my_color], + variant=self.game_metadata.variant) + else: # Find a random opponent + payload = { + "rated": str(self.game_metadata.rated).lower(), + "time": self.game_metadata.clocks[WHITE].time, + "increment": self.game_metadata.clocks[WHITE].increment, + "variant": self.game_metadata.variant, + "color": COLOR_NAMES[self.game_metadata.my_color], + "ratingRange": "", + } + for _ in self.api_client.board._r.post("/api/board/seek", data=payload, fmt=TEXT, stream=True): + if not self.searching: + break + except Exception as e: + # Since this exception happened in a thread, notify via the model event instead of raising + self.searching = False + msg = f"Error creating online game: {e}" + log.error(msg) + self._notify_game_model_updated(EventTopics.ERROR, msg=msg) def _start_game(self, game_id: str) -> None: """Called when a game is started. Sets proper class variables diff --git a/src/cli_chess/core/game/online_game/online_game_presenter.py b/src/cli_chess/core/game/online_game/online_game_presenter.py index 31d9111..4a9afe3 100644 --- a/src/cli_chess/core/game/online_game/online_game_presenter.py +++ b/src/cli_chess/core/game/online_game/online_game_presenter.py @@ -29,6 +29,8 @@ def update(self, *args, **kwargs) -> None: super().update(*args, **kwargs) if EventTopics.GAME_SEARCH in args: self.view.alert.show_alert("Searching for opponent...", AlertType.NEUTRAL) + elif EventTopics.ERROR in args: + self.view.alert.show_alert(kwargs.get('msg', "An unspecified error has occurred"), AlertType.ERROR) def _parse_and_present_game_over(self) -> None: """Triages game over status for parsing and sending to the view for display"""