Updated dependencies to have a fix for paho mqtt

Author: imbeacon

setup.py

@@ -21,7 +21,7 @@
 with open(path.join(this_directory, 'README.md')) as f:
     long_description = f.read()
 
-VERSION = "1.12.0"
+VERSION = "1.13.0"
 
 setup(
     version=VERSION,
@@ -35,5 +35,5 @@
     long_description_content_type="text/markdown",
     python_requires=">=3.9",
     packages=["."],
-    install_requires=['paho-mqtt>=2.1.0', 'requests>=2.31.0', 'orjson'],
+    install_requires=['tb-paho-mqtt-client>=2.1.1', 'requests>=2.31.0', 'orjson'],
     download_url='https://github.com/thingsboard/thingsboard-python-client-sdk/archive/%s.tar.gz' % VERSION)

tb_device_mqtt.py

@@ -16,6 +16,27 @@
 from copy import deepcopy
 from inspect import signature
 from time import sleep
+import importlib.util
+from utils import install_package
+
+def check_tb_paho_mqtt_installed():
+    try:
+        spec = importlib.util.find_spec("paho.mqtt")
+        if spec is None:
+            return False
+        module_path = spec.origin or "(built-in)"
+        if 'tb-paho-mqtt-client' in module_path:
+            return True
+        else:
+            return False
+    except Exception as e:
+        return False
+
+if not check_tb_paho_mqtt_installed():
+    try:
+        install_package('tb-paho-mqtt-client', version='>=2.1.1')
+    except Exception as e:
+        raise ImportError("tb-paho-mqtt-client is not installed, please install it manually.") from e
 
 import paho.mqtt.client as paho
 from math import ceil

utils.py

@@ -14,27 +14,34 @@
 
 from sys import executable
 from subprocess import check_call, CalledProcessError
+from pkg_resources import get_distribution, DistributionNotFound
 
 
 def install_package(package, version="upgrade"):
     result = False
-    if version.lower() == "upgrade":
+
+    def try_install(args):
         try:
-            result = check_call([executable, "-m", "pip", "install", package, "--upgrade", "--user"])
+            check_call([executable, "-m", "pip", *args])
+            return True
         except CalledProcessError:
-            result = check_call([executable, "-m", "pip", "install", package, "--upgrade"])
+            return False
+
+    if version.lower() == "upgrade":
+        args = ["install", package, "--upgrade"]
+        result = try_install(args + ["--user"])
+        if not result:
+            result = try_install(args)
     else:
-        from pkg_resources import get_distribution
-        current_package_version = None
         try:
-            current_package_version = get_distribution(package)
-        except Exception:
+            installed_version = get_distribution(package).version
+            if installed_version == version:
+                return True
+        except DistributionNotFound:
             pass
-        if current_package_version is None or current_package_version != version:
-            installation_sign = "==" if ">=" not in version else ""
-            try:
-                result = check_call(
-                    [executable, "-m", "pip", "install", package + installation_sign + version, "--user"])
-            except CalledProcessError:
-                result = check_call([executable, "-m", "pip", "install", package + installation_sign + version])
+        install_version = f"{package}=={version}" if ">=" not in version else f"{package}{version}"
+        args = ["install", install_version]
+        if not try_install(args + ["--user"]):
+            result = try_install(args)
+
     return result