python-trueconf-bot 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

{python_trueconf_bot-1.4.1.dist-info → python_trueconf_bot-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-trueconf-bot
-Version: 1.4.1
+Version: 1.4.2
 Summary: Lightweight and powerful framework for the TrueConf Server Chatbot API
 Author-email: TrueConf LLC <info@trueconf.com>, Anton Baadzhi <baadzhianton@gmail.com>
 License-Expression: BSD-3-Clause-Clear

{python_trueconf_bot-1.4.1.dist-info → python_trueconf_bot-1.4.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-python_trueconf_bot-1.4.1.dist-info/licenses/LICENSE,sha256=ftDuEzhr-yY_dsfpEQ2SKAP_dEAO-iPt96MBZq_K48o,1684
+python_trueconf_bot-1.4.2.dist-info/licenses/LICENSE,sha256=ftDuEzhr-yY_dsfpEQ2SKAP_dEAO-iPt96MBZq_K48o,1684
 trueconf/__init__.py,sha256=Ka9VLhsdu-jZPndOQI1QpUXWldpu8xTC2BfgW51Px5U,481
-trueconf/_version.py,sha256=R2qm3sd7mdm0pKpioGIIqoJSfPQ63QQwTYQPVKW0mt8,520
+trueconf/_version.py,sha256=M92Udlou7mMHSdniRD3tru4stsJfoWt74G8vTdtA1kI,528
 trueconf/exceptions.py,sha256=JlnOybf6XBVKGYPPN3STlruupdfQXrLdeZ_FbtUuMIs,7653
 trueconf/loggers.py,sha256=4dnq14qFo6fJ8SKZJCRZd0iJDYRqmcuX-ccv5FezxlQ,594
 trueconf/middleware.py,sha256=7yaS4UjZSrPb-lv5STmX8qGg1OamYbO5Nd5-IjPtbU4,2281
 trueconf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trueconf/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trueconf/client/bot.py,sha256=SfiNqCOr6_py2paBTqlnWYVRNZQYnVwLWLCbjgw_nMM,79151
+trueconf/client/bot.py,sha256=hbb9glTZB6dn591PuY3tKUD_y7xsiY13ToXVtvOZDMA,79769
 trueconf/client/context_controller.py,sha256=_aItNHblyFbEqRsnbOM3ESgPqg2Pkji7xidTx0gb6zk,660
 trueconf/client/session.py,sha256=CvHjxQXbkUyyS1r7YCFVL8al37zOYtnhw5ACNLJJDOc,1751
 trueconf/dispatcher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -149,13 +149,13 @@ trueconf/types/responses/upload_file_response.py,sha256=CmhLmby4MVny8KmfQ1aHW6UD
 trueconf/utils/__init__.py,sha256=O1ZS6uwnlZpSH19FEodZQ2fOLyua0SJYsIgEO70UIRg,39
 trueconf/utils/_generate_secret_for_survey.py,sha256=QclUSR_T2PU2mkUSCI3LG72HMTBTHAHaYFCm8gkevwI,242
 trueconf/utils/_ssl.py,sha256=pMEGtCQtnaeo5zD9cS15Sry2hBnUkDx8I0BVov9PV1c,1419
-trueconf/utils/_token.py,sha256=vbZp8hwHu59DzqMpE0MqeQ7EM55txLkKNDFV031Up6Q,2336
+trueconf/utils/_token.py,sha256=JltP8nFJaiSeM8BAIAdG664br3I3r2LW3pQRWIexOdo,2504
 trueconf/utils/_version_checker.py,sha256=U1AB0KgASTCuI68r7SiLGnWeeSy3T1yFqLNg8h3fjM0,2029
 trueconf/utils/split_text.py,sha256=0HTVv63kLo2gx1r-ImM47ejTR4X_uDkNr5QMxvWdTBo,18807
 trueconf/utils/formatting/__init__.py,sha256=Ii9rEamQdy8R0pVbmDf3xbdB4TtmgYyu2-RWRTCXukw,261
 trueconf/utils/formatting/decorations.py,sha256=iQzCdFBELn16llCgTTPk43K5-BzY6BGPc1M3V2Q0tPQ,2175
 trueconf/utils/formatting/text.py,sha256=pOW07TIV5vfvtWmGa2i2l_Q0UjFM6QMuowmsAjE9nyo,6867
-python_trueconf_bot-1.4.1.dist-info/METADATA,sha256=eo80EIOml1BZEu0Vva-jTvt8wRZ75lfVlewjoGAilM8,5700
-python_trueconf_bot-1.4.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python_trueconf_bot-1.4.1.dist-info/top_level.txt,sha256=GjgYdn_osTUuU-H8f59VhIS7MY44xLV7-D7veywJaeY,9
-python_trueconf_bot-1.4.1.dist-info/RECORD,,
+python_trueconf_bot-1.4.2.dist-info/METADATA,sha256=HYWuDK5ieWsw2uN7P9cHyV6ArUv1azJUCJyhk4mP7GE,5700
+python_trueconf_bot-1.4.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_trueconf_bot-1.4.2.dist-info/top_level.txt,sha256=GjgYdn_osTUuU-H8f59VhIS7MY44xLV7-D7veywJaeY,9
+python_trueconf_bot-1.4.2.dist-info/RECORD,,

{python_trueconf_bot-1.4.1.dist-info → python_trueconf_bot-1.4.2.dist-info}/WHEEL

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

trueconf/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.4.1'
-__version_tuple__ = version_tuple = (1, 4, 1)
+__version__ = version = '1.4.2'
+__version_tuple__ = version_tuple = (1, 4, 2)
 
-__commit_id__ = commit_id = None
+__commit_id__ = commit_id = 'g0603f16c3'

trueconf/client/bot.py

@@ -7,6 +7,7 @@ import signal
 import websockets
 import warnings
 import random
+from re import search
 from pathlib import Path
 from aiohttp import ClientSession, ClientTimeout, TCPConnector, FormData
 from async_property import async_cached_property
@@ -244,15 +245,30 @@ class Bot:
             return None
 
     async def __get_server_version(self):
+        port = "4307"
+        async with httpx.AsyncClient(verify=self.ssl_context, timeout=self.timeout) as client:
             try:
-                async with httpx.AsyncClient(verify=self.ssl_context, timeout=self.timeout) as client:
-                    response = await client.get(f"{self._protocol}://{self.server}:{self.port}/api/v4/server")
-                    version = response.json().get("product").get("version")
-                    loggers.chatbot.info(f"📦 Server version resolved: {version}")
+                response = await client.get(
+                    f"{self._protocol}://{self.server}:{self.port}/api/v4/endpoints/connects"
+                )
+                port = response.json()["connects"][0].split(":")[-1]
+            except (httpx.RequestError, KeyError, IndexError) as e:
+                loggers.chatbot.debug(f"Failed to get endpoints/connects: {e}")
+
+            try:
+                resp = await client.get(
+                    f"http://{self.server}:{port}/vsstatus",
+                    timeout=self.timeout,
+                )
+                m = search(r"TrueConf Server \b(\d{1,2}\.\d{1,2}\.\d{1,2}\.\d{1,5})\b", resp.text)
+                if m:
+                    version = m.group(1)
+                    loggers.chatbot.info(f"📦 Server engine version resolved: {version}")
                     return version
-            except Exception as e:
-                loggers.chatbot.error(f"Failed to get server version: {e}")
-                return None
+            except httpx.RequestError as e:
+                loggers.chatbot.debug(f"Failed to get server engine version: {e}")
+
+        return None
 
     @property
     def token(self) -> str:
@@ -277,12 +293,12 @@ class Bot:
         return await self.__get_domain_name()
 
     @async_cached_property
-    async def server_version(self) -> str:
+    async def server_version(self) -> str | None:
         """
-        Returns the domain name of the TrueConf server.
+        Returns the server version of the TrueConf server.
 
         Returns:
-            str: Domain name of the connected server.
+            str | None: Version of the connected server, or None if unavailable.
         """
 
         return await self.__get_server_version()

trueconf/utils/_token.py

@@ -4,7 +4,7 @@ from datetime import datetime
 from functools import lru_cache
 from typing import Optional
 
-from httpx import Client, HTTPStatusError
+from httpx import Client, HTTPStatusError, ConnectTimeout
 from ._ssl import SSLVerify
 from ..exceptions import TokenValidationError, InvalidGrantError
 
@@ -27,10 +27,11 @@ def _get_auth_token(
         "password": str(password)
     }
     with Client(timeout=timeout, verify=ssl_context) as client:
-        r = client.post(url, json=params)
-
         try:
+            r = client.post(url, json=params)
             r.raise_for_status()
+        except ConnectTimeout:
+            raise ConnectionError(f"Cannot connect to {server}:{port}. Server may be down or unreachable.") from None
         except HTTPStatusError as e:
             if e.response.status_code == 401:
                 if r.json().get("error_description", False):