Improved check for already installed library and installation process for the package

Author: imbeacon

tb_device_mqtt.py

@@ -16,20 +16,20 @@
 from copy import deepcopy
 from inspect import signature
 from time import sleep
-import importlib.util
+from importlib import metadata
 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:
+        dists = metadata.distributions()
+        for dist in dists:
+            if dist.metadata["Name"].lower() == "tb-paho-mqtt-client":
+                files = list(dist.files)
+                for file in files:
+                    if str(file).startswith("paho/mqtt"):
+                        return True
+        return False
+    except Exception:
         return False
 
 if not check_tb_paho_mqtt_installed():

utils.py

@@ -13,23 +13,24 @@
 # limitations under the License.
 
 from sys import executable
-from subprocess import check_call, CalledProcessError
+from subprocess import check_call, CalledProcessError, DEVNULL
 from pkg_resources import get_distribution, DistributionNotFound
 
 
 def install_package(package, version="upgrade"):
     result = False
 
-    def try_install(args):
+    def try_install(args, suppress_stderr=False):
         try:
-            check_call([executable, "-m", "pip", *args])
+            stderr = DEVNULL if suppress_stderr else None
+            check_call([executable, "-m", "pip", *args], stderr=stderr)
             return True
         except CalledProcessError:
             return False
 
     if version.lower() == "upgrade":
         args = ["install", package, "--upgrade"]
-        result = try_install(args + ["--user"])
+        result = try_install(args + ["--user"], suppress_stderr=True)
         if not result:
             result = try_install(args)
     else:
@@ -41,7 +42,7 @@ def try_install(args):
             pass
         install_version = f"{package}=={version}" if ">=" not in version else f"{package}{version}"
         args = ["install", install_version]
-        if not try_install(args + ["--user"]):
+        if not try_install(args + ["--user"], suppress_stderr=True):
             result = try_install(args)
 
     return result