webex-bot 0.6.0__py2.py3-none-any.whl → 0.6.2__py2.py3-none-any.whl

webex_bot/__init__.py

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

webex_bot/webex_bot.py

@@ -1,8 +1,8 @@
 """Main module."""
 import logging
 import os
-
 import types
+
 import backoff
 import coloredlogs
 import requests
@@ -14,7 +14,7 @@ from webex_bot.exceptions import BotException
 from webex_bot.formatting import quote_info
 from webex_bot.models.command import CALLBACK_KEYWORD_KEY, Command, COMMAND_KEYWORD_KEY
 from webex_bot.models.response import Response
-from webex_bot.websockets.webex_websocket_client import WebexWebsocketClient, DEFAULT_DEVICE_URL
+from webex_bot.websockets.webex_websocket_client import WebexWebsocketClient
 
 log = logging.getLogger(__name__)
 
@@ -26,7 +26,6 @@ class WebexBot(WebexWebsocketClient):
                  approved_users=[],
                  approved_domains=[],
                  approved_rooms=[],
-                 device_url=DEFAULT_DEVICE_URL,
                  include_demo_commands=False,
                  bot_name="Webex Bot",
                  bot_help_subtitle="Here are my available commands. Click one to begin.",
@@ -60,7 +59,6 @@ class WebexBot(WebexWebsocketClient):
                                       teams_bot_token,
                                       on_message=self.process_incoming_message,
                                       on_card_action=self.process_incoming_card_action,
-                                      device_url=device_url,
                                       proxies=proxies)
 
         if help_command is None:

webex_bot/websockets/webex_websocket_client.py

@@ -10,6 +10,7 @@ import certifi
 import requests
 import websockets
 from webexpythonsdk import WebexAPI
+from websockets.exceptions import InvalidStatusCode
 
 try:
     from websockets_proxy import Proxy, proxy_connect
@@ -19,7 +20,7 @@ except ImportError:
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_DEVICE_URL = "https://wdm-a.wbx2.com/wdm/api/v1"
+DEFAULT_U2C_URL = "https://u2c.wbx2.com/u2c/api/v1/catalog"
 
 DEVICE_DATA = {
     "deviceName": "pywebsocket-client",
@@ -40,14 +41,13 @@ MAX_BACKOFF_TIME = 240
 class WebexWebsocketClient(object):
     def __init__(self,
                  access_token,
-                 device_url=DEFAULT_DEVICE_URL,
                  on_message=None,
                  on_card_action=None,
                  proxies=None):
         self.access_token = access_token
         self.teams = WebexAPI(access_token=access_token, proxies=proxies)
-        self.device_url = device_url
         self.device_info = None
+        self.device_url = self._get_device_url()
         self.on_message = on_message
         self.on_card_action = on_card_action
         self.proxies = proxies
@@ -154,6 +154,25 @@ class WebexWebsocketClient(object):
         asyncio.run(self.websocket.send(json.dumps(ack_message)))
         logger.info(f"WebSocket ack message with id={message_id}. Complete.")
 
+    def _get_device_url(self):
+        headers = {}
+        headers["Authorization"] = 'Bearer ' + self.access_token
+
+        params = {"format": "hostmap"}
+        response = requests.get(DEFAULT_U2C_URL, headers=headers, params=params)
+
+        # check for 401 Unauthorized
+        if response.status_code == 401:
+            logger.error("Unauthorized access. Please check your access token.")
+            raise Exception("Unauthorized access. Please check your access token.")
+
+        data = response.json()
+
+        wdm_url = data["serviceLinks"].get("wdm")  # or whatever key your hostmap uses
+        logging.info(f"wdm url: {wdm_url}")
+        return wdm_url
+
+
     def _get_device_info(self, check_existing=True):
         """
         Get device info from Webex Cloud.
@@ -193,6 +212,9 @@ class WebexWebsocketClient(object):
                 logger.error('could not get/create device info')
                 raise Exception("No WDM device info")
 
+        # Pull out URL now so we can log it on failure
+        ws_url = self.device_info.get('webSocketUrl')
+
         async def _websocket_recv():
             message = await self.websocket.recv()
             logger.debug("WebSocket Received Message(raw): %s\n" % message)
@@ -204,10 +226,17 @@ class WebexWebsocketClient(object):
                 logger.warning(
                     f"An exception occurred while processing message. Ignoring. {messageProcessingException}")
 
-        @backoff.on_exception(backoff.expo, websockets.ConnectionClosedError, max_time=MAX_BACKOFF_TIME)
-        @backoff.on_exception(backoff.expo, websockets.ConnectionClosedOK, max_time=MAX_BACKOFF_TIME)
-        @backoff.on_exception(backoff.expo, websockets.ConnectionClosed, max_time=MAX_BACKOFF_TIME)
-        @backoff.on_exception(backoff.expo, socket.gaierror, max_time=MAX_BACKOFF_TIME)
+        @backoff.on_exception(
+            backoff.expo,
+            (
+                websockets.ConnectionClosedError,
+                websockets.ConnectionClosedOK,
+                websockets.ConnectionClosed,
+                socket.gaierror,
+                InvalidStatusCode,
+            ),
+            max_time=MAX_BACKOFF_TIME
+        )
         async def _connect_and_listen():
             ws_url = self.device_info['webSocketUrl']
             logger.info(f"Opening websocket connection to {ws_url}")
@@ -237,10 +266,20 @@ class WebexWebsocketClient(object):
 
         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')
+                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())
+            asyncio.get_event_loop().run_until_complete(_connect_and_listen())

{webex_bot-0.6.0.dist-info → webex_bot-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex_bot
-Version: 0.6.0
+Version: 0.6.2
 Summary: Python package for a Webex Bot based on websockets.
 Home-page: https://github.com/fbradyirl/webex_bot
 Author: Finbarr Brady
@@ -438,6 +438,15 @@ to
 bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 ```
 
+
+### 0.6.1 (2025-May-19)
+
+* Handle and retry on InvalidStatusCode in Websocket loop
+
+### 0.6.2 (2025-May-23)
+
+* Fix for [issue #48][i48] - Fix for `Commands not being received` issue.
+
 [1]: https://github.com/aaugustin/websockets
 
 [2]: https://github.com/WebexCommunity/WebexPythonSDK
@@ -483,3 +492,5 @@ bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 [i13]: https://github.com/fbradyirl/webex_bot/issues/13
 
 [i20]: https://github.com/fbradyirl/webex_bot/issues/20
+
+[i48]: https://github.com/fbradyirl/webex_bot/issues/48

{webex_bot-0.6.0.dist-info → webex_bot-0.6.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-webex_bot/__init__.py,sha256=S5gT3L7JqYWDSwjnLQa_VGARrFqlB4Q6IF_ElUCnWWs,95
+webex_bot/__init__.py,sha256=EP4VtizaH3ugEVwSp88ObjRczYV5ZlL4rNJ1vMC9BkA,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=pLNmcAP7J9ZG9QnEDZLYZJa_y1qtO5vudhT0fAi2stA,21282
+webex_bot/webex_bot.py,sha256=np5uGnVJc-l9jrbD9UPeoZU5JeuD8THLWd6Ml9HTlJ4,21153
 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=kYepNP4gK0dddPndtK6ltCg52TYMhMtMHVKkxO15jTs,10618
-webex_bot-0.6.0.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
-webex_bot-0.6.0.dist-info/METADATA,sha256=cOLj7txCMm0F0rwwtSmNb9Vf0T54sO6Jx3U6h--dPC0,14348
-webex_bot-0.6.0.dist-info/WHEEL,sha256=AeO2BvogYWm3eGaHCvhzmUYt8ia7KfURiHzO_1atlys,109
-webex_bot-0.6.0.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
-webex_bot-0.6.0.dist-info/RECORD,,
+webex_bot/websockets/webex_websocket_client.py,sha256=byESKbgWa4x-tGX0DboWGfB3cpCAmPVyiL19V4FGVAc,11903
+webex_bot-0.6.2.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
+webex_bot-0.6.2.dist-info/METADATA,sha256=HjomyzkjM0IFLrU7KD-eOCudzO2RtSLATk_9xcWjtgM,14590
+webex_bot-0.6.2.dist-info/WHEEL,sha256=egKm5cKfE6OqlHwodY8Jjp4yqZDBXgsj09UsV5ojd_U,109
+webex_bot-0.6.2.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
+webex_bot-0.6.2.dist-info/RECORD,,

{webex_bot-0.6.0.dist-info → webex_bot-0.6.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any