webex-bot 1.0.2__py2.py3-none-any.whl → 1.0.4__py2.py3-none-any.whl

webex_bot/__init__.py

@@ -1,4 +1,4 @@
 """Top-level package for Webex Bot."""
 
 __author__ = """Finbarr Brady"""
-__version__ = '1.0.2'
+__version__ = '1.0.4'

webex_bot/webex_bot.py

@@ -23,9 +23,9 @@ class WebexBot(WebexWebsocketClient):
 
     def __init__(self,
                  teams_bot_token,
-                 approved_users=[],
-                 approved_domains=[],
-                 approved_rooms=[],
+                 approved_users=None,
+                 approved_domains=None,
+                 approved_rooms=None,
                  include_demo_commands=False,
                  bot_name="Webex Bot",
                  bot_help_subtitle="Here are my available commands. Click one to begin.",
@@ -61,11 +61,12 @@ class WebexBot(WebexWebsocketClient):
                                       on_card_action=self.process_incoming_card_action,
                                       proxies=proxies)
 
+        me = self.get_me_info()
         if help_command is None:
             self.help_command = HelpCommand(
                 bot_name=bot_name,
                 bot_help_subtitle=bot_help_subtitle,
-                bot_help_image=self.teams.people.me().avatar)
+                bot_help_image=me.avatar)
         else:
             self.help_command = help_command
 
@@ -83,12 +84,11 @@ class WebexBot(WebexWebsocketClient):
         self.help_command.commands = self.commands
 
         self.card_callback_commands = {}
-        self.approved_users = approved_users
-        self.approved_domains = approved_domains
-        self.approved_rooms = approved_rooms
+        self.approved_users = approved_users if approved_users is not None else []
+        self.approved_domains = approved_domains if approved_domains is not None else []
+        self.approved_rooms = approved_rooms if approved_rooms is not None else []
         self.approval_parameters_check()
         self.bot_display_name = ""
-        self.get_me_info()
         self.threads = threads
 
     @backoff.on_exception(backoff.expo, requests.exceptions.ConnectionError)
@@ -100,6 +100,7 @@ class WebexBot(WebexWebsocketClient):
         self.bot_display_name = me.displayName
         log.info(f"Running as {me.type} '{me.displayName}' with email {me.emails}")
         log.debug(f"Running as bot '{me}'")
+        return me
 
     def add_command(self, command_class: Command):
         """

webex_bot/websockets/webex_websocket_client.py

@@ -276,22 +276,47 @@ class WebexWebsocketClient(object):
                 while True:
                     await _websocket_recv()
 
-        try:
-            asyncio.get_event_loop().run_until_complete(_connect_and_listen())
-        except InvalidStatusCode as e:
-            logger.error(f"WebSocket handshake to {ws_url} failed with status {e.status_code}")
-            if e.status_code == 404:
-                logger.info("Refreshing WDM device info and retrying...")
-                self._get_device_info(check_existing=False)
-                # update ws_url before retry
-                ws_url = self.device_info.get('webSocketUrl')
+        # Track the number of consecutive 404 errors to prevent infinite loops
+        max_404_retries = 3
+        current_404_retries = 0
+        
+        while True:
+            try:
                 asyncio.get_event_loop().run_until_complete(_connect_and_listen())
-            else:
-                raise
-        except Exception as runException:
-            logger.error(f"runException: {runException}")
-            if self._get_device_info(check_existing=False) is None:
-                logger.error('could not create device info')
-                raise Exception("No WDM device info")
-            # trigger re-connect
-            asyncio.get_event_loop().run_until_complete(_connect_and_listen())
+                # If we get here, the connection was successful, so break out of the loop
+                break
+            except InvalidStatusCode as e:
+                logger.error(f"WebSocket handshake to {ws_url} failed with status {e.status_code}")
+                
+                if e.status_code == 404:
+                    current_404_retries += 1
+                    if current_404_retries >= max_404_retries:
+                        logger.error(f"Reached maximum retries ({max_404_retries}) for 404 errors. Giving up.")
+                        raise Exception(f"Unable to connect to WebSocket after {max_404_retries} attempts. Device registration may be invalid.")
+                    
+                    logger.info(f"Refreshing WDM device info and retrying... (Attempt {current_404_retries} of {max_404_retries})")
+                    # Force a new device registration
+                    self._get_device_info(check_existing=False)
+                    # Update ws_url with the new device info
+                    ws_url = self.device_info.get('webSocketUrl')
+                    
+                    # Add a delay before retrying to avoid hammering the server
+                    logger.info(f"Waiting 5 seconds before retry attempt {current_404_retries}...")
+                    asyncio.get_event_loop().run_until_complete(asyncio.sleep(5))
+                else:
+                    # For non-404 errors, just raise the exception
+                    raise
+            except Exception as runException:
+                logger.error(f"runException: {runException}")
+                
+                # Check if we can get device info
+                if self._get_device_info(check_existing=False) is None:
+                    logger.error('could not create device info')
+                    raise Exception("No WDM device info")
+                    
+                # Update the URL in case it changed
+                ws_url = self.device_info.get('webSocketUrl')
+                
+                # Wait a bit before reconnecting
+                logger.info("Waiting 5 seconds before attempting to reconnect...")
+                asyncio.get_event_loop().run_until_complete(asyncio.sleep(5))

{webex_bot-1.0.2.dist-info → webex_bot-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex_bot
-Version: 1.0.2
+Version: 1.0.4
 Summary: Python package for a Webex Bot based on websockets.
 Home-page: https://github.com/fbradyirl/webex_bot
 Author: Finbarr Brady
@@ -447,9 +447,15 @@ bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 
 * Fix for [issue #48][i48] - Fix for `Commands not being received` issue.
 
-### 1.0.2 (2025-Jun-04)
+### 1.0.3 (2025-Jun-04)
 
 * Add connection headers to requests.
+* Only call me people API once per run.
+
+### 1.0.4 (2025-Jul-01)
+
+* Add retry mechanism with backoff for websocket 404 errors
+*
 
 [1]: https://github.com/aaugustin/websockets
 

{webex_bot-1.0.2.dist-info → webex_bot-1.0.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-webex_bot/__init__.py,sha256=z10qJtsBNxE7VupOXWcCIc71MOHpNYWOpfXhxa1PbAA,95
+webex_bot/__init__.py,sha256=Tzm9k-JrR1ZSrXQY5OyBg6ljQWMbUK_6TZJCUgCGfBU,95
 webex_bot/exceptions.py,sha256=qs9yVitfJtvxwBMC8uCvTDOxUQ_oZjWFf1dU8Oaue14,740
 webex_bot/formatting.py,sha256=jvPKym-z8CIJygpPVTVbt6vFXQo9_HQHpRDJB-nh-SI,382
-webex_bot/webex_bot.py,sha256=np5uGnVJc-l9jrbD9UPeoZU5JeuD8THLWd6Ml9HTlJ4,21153
+webex_bot/webex_bot.py,sha256=QRia8QBXnWNt6iwj1kfpcWgPi7RT_DoQfqtdUUbsUTo,21278
 webex_bot/cards/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webex_bot/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webex_bot/commands/echo.py,sha256=STY-MikBRjUteDK-g8G4GPB0V-Yi7siPN1DRMXrT-QU,3399
@@ -10,9 +10,9 @@ webex_bot/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 webex_bot/models/command.py,sha256=MyThlDaEkGlj1fDE_i_wr79O3QboakimRme8yI744yo,5327
 webex_bot/models/response.py,sha256=d4k2ohR5SUVzvuQzcnm7jQQVTMB0gH9Kz9y09vkoAaU,2545
 webex_bot/websockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-webex_bot/websockets/webex_websocket_client.py,sha256=9V5y6yFSoXggaDVjCU6UfQjQKDNLsk6c1vhN8At-2as,12513
-webex_bot-1.0.2.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
-webex_bot-1.0.2.dist-info/METADATA,sha256=m4S8pE7KfYG4PoLqa3NBfjZ-wXYMGHzlADtqfwkcYBw,14654
-webex_bot-1.0.2.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-webex_bot-1.0.2.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
-webex_bot-1.0.2.dist-info/RECORD,,
+webex_bot/websockets/webex_websocket_client.py,sha256=qVbYquh_FJ-rDZeWspcDydBJOw96U3UcYZSX2XfYYoY,13964
+webex_bot-1.0.4.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
+webex_bot-1.0.4.dist-info/METADATA,sha256=Ni8h1xfMT6ijtlWsucOGK9yqTM2S0GbN3Jw1CAbZFjw,14782
+webex_bot-1.0.4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+webex_bot-1.0.4.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
+webex_bot-1.0.4.dist-info/RECORD,,