webex-bot 1.0.3__py2.py3-none-any.whl → 1.0.5__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.3'
+__version__ = '1.0.5'

webex_bot/webex_bot.py

@@ -57,6 +57,7 @@ class WebexBot(WebexWebsocketClient):
         log.info("Registering bot with Webex cloud")
         WebexWebsocketClient.__init__(self,
                                       teams_bot_token,
+                                      bot_name,
                                       on_message=self.process_incoming_message,
                                       on_card_action=self.process_incoming_card_action,
                                       proxies=proxies)

webex_bot/websockets/webex_websocket_client.py

@@ -43,6 +43,7 @@ MAX_BACKOFF_TIME = 240
 class WebexWebsocketClient(object):
     def __init__(self,
                  access_token,
+                 bot_name,
                  on_message=None,
                  on_card_action=None,
                  proxies=None):
@@ -50,9 +51,10 @@ class WebexWebsocketClient(object):
         self.teams = WebexAPI(access_token=access_token, proxies=proxies)
         self.tracking_id = f"webex-bot_{uuid.uuid4()}"
         self.session = requests.Session()
-        self.session.headers = self._get_headers()
         sdk_ua = self.teams._session.headers["User-Agent"]
-        self.teams._session.update_headers(self._get_headers(add_to_ua=f" ({sdk_ua})"))
+        self.add_to_ua = f" '{bot_name}' ({sdk_ua})"
+        self.session.headers = self._get_headers()
+        self.teams._session.update_headers(self._get_headers())
         # log the tracking ID
         logger.info(f"Tracking ID: {self.tracking_id}")
         self.device_info = None
@@ -69,11 +71,11 @@ class WebexWebsocketClient(object):
             if proxy_connect is None:
                 raise ImportError("Failed to load libraries for proxy, maybe forgot [proxy] option during installation.")
 
-    def _get_headers(self, add_to_ua=''):
+    def _get_headers(self):
         return {
             "Authorization": f"Bearer {self.access_token}",
             "Content-type": "application/json;charset=utf-8",
-            "User-Agent": f"webex_bot/{__version__}{add_to_ua}",
+            "User-Agent": f"webex_bot/{__version__}{self.add_to_ua}",
             "trackingid": self.tracking_id
         }
 
@@ -276,22 +278,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.3.dist-info → webex_bot-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex_bot
-Version: 1.0.3
+Version: 1.0.5
 Summary: Python package for a Webex Bot based on websockets.
 Home-page: https://github.com/fbradyirl/webex_bot
 Author: Finbarr Brady
@@ -452,6 +452,15 @@ bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 * 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.0.5 (2025-Sept-11)
+
+* Update UA
+
+
 [1]: https://github.com/aaugustin/websockets
 
 [2]: https://github.com/WebexCommunity/WebexPythonSDK

{webex_bot-1.0.3.dist-info → webex_bot-1.0.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
-webex_bot/__init__.py,sha256=wj46dBgRfdEfusELHz-gJWhMLFfmxqYol-gbZF8c9qY,95
+webex_bot/__init__.py,sha256=IPyvDdIw3m6Lu8TVS_YxA3iHXq4JSYGSWnVi6l5QE0c,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=QRia8QBXnWNt6iwj1kfpcWgPi7RT_DoQfqtdUUbsUTo,21278
+webex_bot/webex_bot.py,sha256=GRgUNK0XgfnsO3PcA_h9n4vLWdGV6keMAdpBznwU0Uk,21326
 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.3.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
-webex_bot-1.0.3.dist-info/METADATA,sha256=zyqdimzCG4GD9BHKkbnsDkZ9Q6VE_JCWE8-34mt4Dq4,14694
-webex_bot-1.0.3.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-webex_bot-1.0.3.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
-webex_bot-1.0.3.dist-info/RECORD,,
+webex_bot/websockets/webex_websocket_client.py,sha256=ZlyTyNZuWr7cbf0mHBPu7JB432gVwBKT2Gvq9K1Pv5k,13895
+webex_bot-1.0.5.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
+webex_bot-1.0.5.dist-info/METADATA,sha256=UglwdJNjf7QwkOaY-pnfhCuQpbg0o1NucZ1ljSoW3rc,14820
+webex_bot-1.0.5.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+webex_bot-1.0.5.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
+webex_bot-1.0.5.dist-info/RECORD,,