webex-bot 0.6.1__tar.gz → 1.0.0__tar.gz

{webex_bot-0.6.1/webex_bot.egg-info → webex_bot-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex_bot
-Version: 0.6.1
+Version: 1.0.0
 Summary: Python package for a Webex Bot based on websockets.
 Home-page: https://github.com/fbradyirl/webex_bot
 Author: Finbarr Brady
@@ -443,6 +443,13 @@ bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 
 * 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.
+
+### 0.7.0 (2025-Jun-04)
+
+* Add connection headers to requests.
 
 [1]: https://github.com/aaugustin/websockets
 
@@ -489,3 +496,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.1 → webex_bot-1.0.0}/README.md

@@ -403,6 +403,13 @@ bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 
 * 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.
+
+### 0.7.0 (2025-Jun-04)
+
+* Add connection headers to requests.
 
 [1]: https://github.com/aaugustin/websockets
 
@@ -449,3 +456,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.1 → webex_bot-1.0.0}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.1
+current_version = 1.0.0
 commit = True
 tag = True
 

{webex_bot-0.6.1 → webex_bot-1.0.0}/setup.py

@@ -45,6 +45,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/fbradyirl/webex_bot',
-    version='0.6.1',
+    version='1.0.0',
     zip_safe=False,
 )

{webex_bot-0.6.1 → webex_bot-1.0.0}/webex_bot/__init__.py

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

{webex_bot-0.6.1 → webex_bot-1.0.0}/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-0.6.1 → webex_bot-1.0.0}/webex_bot/websockets/webex_websocket_client.py

@@ -12,6 +12,8 @@ import websockets
 from webexpythonsdk import WebexAPI
 from websockets.exceptions import InvalidStatusCode
 
+from webex_bot import __version__
+
 try:
     from websockets_proxy import Proxy, proxy_connect
 except ImportError:
@@ -20,7 +22,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",
@@ -41,25 +43,37 @@ 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.tracking_id = f"webex-bot_{uuid.uuid4()}"
+        self.session = requests.Session()
+        self.session.headers = self._get_headers()
+        # log the tracking ID
+        logger.info(f"Tracking ID: {self.tracking_id}")
         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
         self.websocket = None
         self.share_id = None
-
+        if self.proxies:
+            self.session.proxies = proxies
         if self.proxies:
             # Connecting through a proxy
             if proxy_connect is None:
                 raise ImportError("Failed to load libraries for proxy, maybe forgot [proxy] option during installation.")
 
+    def _get_headers(self):
+        return {
+            "Authorization": f"Bearer {self.access_token}",
+            "User-Agent": f"webex_bot/{__version__}",
+            "trackingid": self.tracking_id
+        }
+
     def _process_incoming_websocket_message(self, msg):
         """
         Handle websocket data.
@@ -136,10 +150,7 @@ class WebexWebsocketClient(object):
         logger.debug(f"activity_id={activity_id}")
         conversation_message_url = conversation_url.replace(f"conversations/{conv_target_id}",
                                                             f"{verb}/{activity_id}")
-        headers = {"Authorization": f"Bearer {self.access_token}"}
-        conversation_message = requests.get(conversation_message_url,
-                                            headers=headers,
-                                            proxies=self.proxies).json()
+        conversation_message = self.session.get(conversation_message_url).json()
         logger.debug(f"conversation_message={conversation_message}")
         return conversation_message['id']
 
@@ -155,6 +166,22 @@ 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):
+        params = {"format": "hostmap"}
+        response = self.session.get(DEFAULT_U2C_URL, 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.
@@ -164,8 +191,8 @@ class WebexWebsocketClient(object):
         if check_existing:
             logger.debug('Getting device list')
             try:
-                resp = self.teams._session.get(f"{self.device_url}/devices")
-                for device in resp['devices']:
+                resp = self.session.get(f"{self.device_url}/devices")
+                for device in resp.json()['devices']:
                     if device['name'] == DEVICE_DATA['name']:
                         self.device_info = device
                         logger.debug(f"device_info: {self.device_info}")
@@ -175,12 +202,12 @@ class WebexWebsocketClient(object):
 
             logger.info('Device does not exist, creating')
 
-        resp = self.teams._session.post(f"{self.device_url}/devices", json=DEVICE_DATA)
+        resp = self.session.post(f"{self.device_url}/devices", json=DEVICE_DATA)
         if resp is None:
             raise Exception("could not create WDM device")
-        self.device_info = resp
+        self.device_info = resp.json()
         logger.debug(f"self.device_info: {self.device_info}")
-        return resp
+        return self.device_info
 
     def stop(self):
         def terminate():
@@ -226,14 +253,14 @@ class WebexWebsocketClient(object):
             if self.proxies and "wss" in self.proxies:
                 logger.info(f"Using proxy for websocket connection: {self.proxies['wss']}")
                 proxy = Proxy.from_url(self.proxies["wss"])
-                connect = proxy_connect(ws_url, ssl=ssl_context, proxy=proxy)
+                connect = proxy_connect(ws_url, ssl=ssl_context, proxy=proxy, extra_headers=self._get_headers())
             elif self.proxies and "https" in self.proxies:
                 logger.info(f"Using proxy for websocket connection: {self.proxies['https']}")
                 proxy = Proxy.from_url(self.proxies["https"])
-                connect = proxy_connect(ws_url, ssl=ssl_context, proxy=proxy)
+                connect = proxy_connect(ws_url, ssl=ssl_context, proxy=proxy, extra_headers=self._get_headers())
             else:
                 logger.debug(f"Not using proxy for websocket connection.")
-                connect = websockets.connect(ws_url, ssl=ssl_context)
+                connect = websockets.connect(ws_url, ssl=ssl_context, extra_headers=self._get_headers())
 
             async with connect as _websocket:
                 self.websocket = _websocket
@@ -264,4 +291,4 @@ class WebexWebsocketClient(object):
                 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.1 → webex_bot-1.0.0/webex_bot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex_bot
-Version: 0.6.1
+Version: 1.0.0
 Summary: Python package for a Webex Bot based on websockets.
 Home-page: https://github.com/fbradyirl/webex_bot
 Author: Finbarr Brady
@@ -443,6 +443,13 @@ bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 
 * 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.
+
+### 0.7.0 (2025-Jun-04)
+
+* Add connection headers to requests.
 
 [1]: https://github.com/aaugustin/websockets
 
@@ -489,3 +496,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