Bump types-requests from 2.31.0.8 to 2.31.0.9

pajbot/apiwrappers/bttv.py

@@ -55,6 +55,9 @@ def fetch_channel_emotes(self, channel_id: str) -> list[Emote]:
         try:
             response = self.get(["cached", "users", "twitch", channel_id])
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 404:
                 # user does not have any BTTV emotes
                 return []

pajbot/apiwrappers/queup.py

@@ -107,6 +107,9 @@ def fetch_current_song(self, room_id: str) -> Optional[QueUpQueueSong]:
         try:
             response = self.get(["room", room_id, "playlist", "active"])
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 404:
                 # No songs in active queue.
                 return None

pajbot/apiwrappers/seventv/api.py

@@ -84,6 +84,9 @@ def fetch_channel_emotes(self, channel_id: str) -> list[Emote]:
         try:
             raw_response = self.get_response(f"users/twitch/{channel_id}")
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 404:
                 # user does not have a 7TV account
                 return []

pajbot/apiwrappers/twitch/helix.py

@@ -244,6 +244,9 @@ def request(self, method, endpoint, params, headers, authorization=None, json=No
         try:
             return super().request(method, endpoint, params, headers, authorization, json)
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 429:
                 # retry once after rate limit resets...
                 rate_limit_reset = datetime.fromtimestamp(int(e.response.headers["Ratelimit-Reset"]), tz=timezone.utc)

pajbot/bot.py

@@ -648,6 +648,9 @@ def _ban(self, user_id: str, reason: Optional[str] = None) -> None:
         try:
             self.twitch_helix_api.ban_user(self.streamer.id, self.bot_user.id, self.bot_token_manager, user_id, reason)
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to ban user with id {user_id}, unauthorized: {e} - {e.response.text}")
             else:
@@ -674,6 +677,9 @@ def _unban(self, user_id: str) -> None:
         try:
             self.twitch_helix_api.unban_user(self.streamer.id, self.bot_user.id, user_id, self.bot_token_manager)
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to unban user with id {user_id}, unauthorized: {e} - {e.response.text}")
             else:
@@ -709,6 +715,9 @@ def _untimeout(self, user_id: str) -> None:
                 log.error(f"User with ID {user_id} is currently banned! Will not untimeout.")
                 return
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to get banned user status with id {user_id}, unauthorized: {e} - {e.response.text}")
                 return
@@ -719,6 +728,9 @@ def _untimeout(self, user_id: str) -> None:
         try:
             self.twitch_helix_api.unban_user(self.streamer.id, self.bot_user.id, user_id, self.bot_token_manager)
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to untimeout user with id {user_id}, unauthorized: {e} - {e.response.text}")
             else:
@@ -750,6 +762,9 @@ def _timeout(self, user_id: str, duration: int, reason: Optional[str] = None) ->
                 self.streamer.id, self.bot_user.id, self.bot_token_manager, user_id, duration, reason
             )
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to timeout user with id {user_id}, unauthorized: {e} - {e.response.text}")
             else:
@@ -781,6 +796,9 @@ def delete_message(self, msg_id: str, channel_id: Optional[str] = None) -> None:
         try:
             self.twitch_helix_api.delete_single_message(channel_id, self.bot_user.id, self.bot_token_manager, msg_id)
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to delete message, unauthorized: {e} - {e.response.text}")
                 self.send_message("Error: The bot must be re-authed in order to delete a message.")
@@ -816,6 +834,9 @@ def whisper(self, user: User | UserBasics, message: str) -> None:
             try:
                 self.twitch_helix_api.send_whisper(self.bot_user.id, user.id, message, self.bot_token_manager)
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to send whisper, unauthorized: {e} - {e.response.text}")
                 else:
@@ -956,6 +977,9 @@ def announce(self, message: str, channel_id: Optional[str] = None) -> None:
                 self.bot_token_manager,
             )
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to post announcement, unauthorized: {e} - {e.response.text}")
                 self.send_message("Error: The bot must be re-authed in order to post announcements.")

pajbot/modules/basic/followage.py

@@ -210,6 +210,9 @@ def _handle_command(
         try:
             follow_since = bot.twitch_helix_api.get_follow_since(broadcaster.id, user.id, bot.bot_token_manager)
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.info(f"Failed to fetch follow since, error 401: {e.response.text}")
                 bot.execute_now(

pajbot/modules/basic/stream_update.py

@@ -93,6 +93,9 @@ def update_game(self, bot: Bot, source, message, **rest) -> Any:
                 authorization=bot.streamer_access_token_manager,
             )
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to update game to '{game_name}' - auth error")
                 bot.say(auth_error)
@@ -135,6 +138,9 @@ def update_title(self, bot: Bot, source, message, **rest) -> Any:
                 authorization=bot.streamer_access_token_manager,
             )
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(f"Failed to update title to '{title}' - auth error")
                 bot.say(auth_error)

pajbot/modules/default_chat_states.py

@@ -124,6 +124,9 @@ def on_stream_start(self, **rest) -> bool:
                     True,
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update emote only mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update emote only mode.")
@@ -139,6 +142,9 @@ def on_stream_start(self, **rest) -> bool:
                     True,
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update subscriber only mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update subscriber only mode.")
@@ -154,6 +160,9 @@ def on_stream_start(self, **rest) -> bool:
                     True,
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update unique chat mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update unique chat mode.")
@@ -170,6 +179,9 @@ def on_stream_start(self, **rest) -> bool:
                     self.settings["slow_time"],
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update slow mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update slow mode.")
@@ -188,6 +200,9 @@ def on_stream_start(self, **rest) -> bool:
                     duration_m=duration_m,
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update follower mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update follower mode.")
@@ -210,6 +225,9 @@ def on_stream_stop(self, **rest) -> bool:
                     True,
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update emote only mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update emote only mode.")
@@ -225,6 +243,9 @@ def on_stream_stop(self, **rest) -> bool:
                     True,
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update subscriber only mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update subscriber only mode.")
@@ -240,6 +261,9 @@ def on_stream_stop(self, **rest) -> bool:
                     True,
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update unique chat mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update unique chat mode.")
@@ -256,6 +280,9 @@ def on_stream_stop(self, **rest) -> bool:
                     self.settings["slow_time"],
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update slow mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update slow mode.")
@@ -274,6 +301,9 @@ def on_stream_stop(self, **rest) -> bool:
                     duration_m=duration_m,
                 )
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update follower mode, unauthorized: {e} - {e.response.text}")
                     self.bot.send_message("Error: The bot must be re-authed in order to update follower mode.")

pajbot/modules/moderators_refresh.py

@@ -64,6 +64,9 @@ def _update_moderators(self) -> None:
             )
             return
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(
                     "Cannot fetch moderators because no streamer token is present. Have the streamer login with the /streamer_login web route to enable moderator fetch."

pajbot/modules/paidsubmode.py

@@ -72,12 +72,17 @@ def paid_subon(self, bot: Bot, source: User, **rest) -> bool:
             try:
                 bot.twitch_helix_api.update_sub_mode(bot.streamer.id, bot.bot_user.id, bot.bot_token_manager, True)
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update subscriber only mode, unauthorized: {e} - {e.response.text}")
                     bot.send_message("Error: The bot must be re-authed in order to update subscriber only mode.")
                 else:
                     log.error(f"Failed to update subscriber only mode: {e} - {e.response.text}")
 
+                # TODO: Investigate whether we should return here
+
             bot.whisper(source, f"You just used {_cost} points to put the chat into subscribers mode!")
 
         return True
@@ -94,12 +99,17 @@ def paid_suboff(self, bot: Bot, source: User, **rest) -> bool:
             try:
                 bot.twitch_helix_api.update_sub_mode(bot.streamer.id, bot.bot_user.id, bot.bot_token_manager, False)
             except HTTPError as e:
+                if not e.response:
+                    raise e
+
                 if e.response.status_code == 401:
                     log.error(f"Failed to update subscriber only mode, unauthorized: {e} - {e.response.text}")
                     bot.send_message("Error: The bot must be re-authed in order to update subscriber only mode.")
                 else:
                     log.error(f"Failed to update subscriber only mode: {e} - {e.response.text}")
 
+                # TODO: Investigate if we should return here
+
             bot.whisper(source, f"You just used {_cost} points to turn off subscribers mode!")
 
         return True

pajbot/modules/subscriber_fetch.py

@@ -47,6 +47,9 @@ def _update_subscribers(self) -> None:
             )
             return
         except HTTPError as e:
+            if not e.response:
+                raise e
+
             if e.response.status_code == 401:
                 log.error(
                     "Cannot fetch subscribers because the streamer token does not grant access to the "

requirements-dev.txt

@@ -12,7 +12,7 @@ types-Markdown==3.5.0.0
 types-pkg-resources==0.1.3
 types-pytz==2023.3.1.1
 types-redis==4.6.0.7
-types-requests==2.31.0.8
+types-requests==2.31.0.9
 types-retry==0.9.9.4
 types-psycopg2==2.9.21.14
 types-colorama==0.4.15.12