webex-bot 1.0.4__py2.py3-none-any.whl → 1.0.6__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.4'
+__version__ = '1.0.6'

webex_bot/webex_bot.py

@@ -30,6 +30,7 @@ class WebexBot(WebexWebsocketClient):
                  bot_name="Webex Bot",
                  bot_help_subtitle="Here are my available commands. Click one to begin.",
                  threads=True,
+                 allow_bot_to_bot=False,
                  help_command=None,
                  log_level="INFO",
                  proxies=None):
@@ -41,10 +42,11 @@ class WebexBot(WebexWebsocketClient):
         @param approved_domains: List of domains which are allowed to chat to this bot.
         @param approved_rooms: List of rooms whose members are allowed to chat to this bot.
         @param device_url: WDM Url
-        @param include_demo_commands: If True, any demo commands will be included.
+        @param include_demo_commands: If True, any demo commands will be included. (default False)
         @param bot_name: Your custom name for the bot.
         @param bot_help_subtitle: Text to show in the help card.
-        @param threads: If True, respond to msg by creating a thread.
+        @param threads: If True, respond to msg by creating a thread. (default True)
+        @param allow_bot_to_bot: If True, incoming messages from other bots will be processed. Use with caution to avoid message loops. (default False)
         @param help_command: If None, use internal HelpCommand, otherwise override.
         @param log_level: Set loggin level.
         @param proxies: Dictionary of proxies for connections.
@@ -57,6 +59,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)
@@ -90,6 +93,7 @@ class WebexBot(WebexWebsocketClient):
         self.approval_parameters_check()
         self.bot_display_name = ""
         self.threads = threads
+        self.allow_bot_to_bot = allow_bot_to_bot
 
     @backoff.on_exception(backoff.expo, requests.exceptions.ConnectionError)
     def get_me_info(self):
@@ -202,9 +206,12 @@ class WebexBot(WebexWebsocketClient):
         raw_message = teams_message.text
         is_one_on_one_space = 'ONE_ON_ONE' in activity['target']['tags']
 
-        if activity['actor']['type'] != 'PERSON':
-            log.debug('message is from a bot, ignoring')
+        if activity['actor']['type'] != 'PERSON' and not self.allow_bot_to_bot:
+            log.warning('Message is from a bot, ignoring')
             return
+        else:
+            log.warning(
+                f"Message is from a bot and allow_bot_to_bot is {self.allow_bot_to_bot}. Be careful not to create a message loop!")
 
         # Log details on message
         log.info(f"Message from {user_email}: {teams_message}")

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
         }
 
@@ -279,7 +281,7 @@ class WebexWebsocketClient(object):
         # 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())
@@ -287,19 +289,19 @@ class WebexWebsocketClient(object):
                 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))
@@ -308,15 +310,15 @@ class WebexWebsocketClient(object):
                     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.4.dist-info → webex_bot-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex_bot
-Version: 1.0.4
+Version: 1.0.6
 Summary: Python package for a Webex Bot based on websockets.
 Home-page: https://github.com/fbradyirl/webex_bot
 Author: Finbarr Brady
@@ -455,7 +455,14 @@ bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 ### 1.0.4 (2025-Jul-01)
 
 * Add retry mechanism with backoff for websocket 404 errors
-*
+
+### 1.0.5 (2025-Sept-11)
+
+* Update UA
+
+### 1.0.6 (2025-Sept-17)
+
+* Allow flag to disable bot to bot check
 
 [1]: https://github.com/aaugustin/websockets
 

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

@@ -1,7 +1,7 @@
-webex_bot/__init__.py,sha256=Tzm9k-JrR1ZSrXQY5OyBg6ljQWMbUK_6TZJCUgCGfBU,95
+webex_bot/__init__.py,sha256=qc-1SbTkooTynnF9zQGCoDfMfosolKxMvBBa8Mw_qFk,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=tlogg1mu30et-O38B8eNMbHIHhs0g2bwL6uZEOSMDeg,21802
 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=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,,
+webex_bot/websockets/webex_websocket_client.py,sha256=ZlyTyNZuWr7cbf0mHBPu7JB432gVwBKT2Gvq9K1Pv5k,13895
+webex_bot-1.0.6.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
+webex_bot-1.0.6.dist-info/METADATA,sha256=bxwRlGcbQlHJ5nA4qAbuxJ2eyo4NY0WroHetB0rlhbg,14887
+webex_bot-1.0.6.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+webex_bot-1.0.6.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
+webex_bot-1.0.6.dist-info/RECORD,,