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

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

@@ -51,6 +51,8 @@ class WebexWebsocketClient(object):
         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})"))
         # log the tracking ID
         logger.info(f"Tracking ID: {self.tracking_id}")
         self.device_info = None
@@ -67,10 +69,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):
+    def _get_headers(self, add_to_ua=''):
         return {
             "Authorization": f"Bearer {self.access_token}",
-            "User-Agent": f"webex_bot/{__version__}",
+            "Content-type": "application/json;charset=utf-8",
+            "User-Agent": f"webex_bot/{__version__}{add_to_ua}",
             "trackingid": self.tracking_id
         }
 

{webex_bot-1.0.1.dist-info → webex_bot-1.0.3.dist-info}/METADATA

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

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

@@ -1,7 +1,7 @@
-webex_bot/__init__.py,sha256=Ba94OAcUVxOZ9CT2e5BJD6f23esc-61Npra1Kos2f1I,95
+webex_bot/__init__.py,sha256=wj46dBgRfdEfusELHz-gJWhMLFfmxqYol-gbZF8c9qY,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=v9fljWBqJKytu9KjXU6Av_zRFF6IQocTTv34TmHqeZ4,12279
-webex_bot-1.0.1.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
-webex_bot-1.0.1.dist-info/METADATA,sha256=8Nii561-A21ZzTitu9VuzlhGl4Q0_-FETcKlUIW8qZI,14654
-webex_bot-1.0.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-webex_bot-1.0.1.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
-webex_bot-1.0.1.dist-info/RECORD,,
+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,,