z4d-certified-devices 3.215__py3-none-any.whl → 4.216__py3-none-any.whl

z4d_certified_devices/Certified/Tuya/TS130F-Blind.json

@@ -15,7 +15,8 @@
             "0005": "",
             "0006": "",
             "0102": {
-                "Attributes": { 
+                "Attributes": {
+                    "f000": { "Enabled": true, "Name": "Tuya_0102_f000", "DataType": "30" , "ActionList": [ "check_store_value"]},
                     "f002": { "Enabled": true, "Name": "Tuya_0102_f002", "DataType": "20" , "ActionList": [ "check_store_value"]},
                     "f003": { "Enabled": true, "Name": "Tuya_0102_f002", "DataType": "21" , "ActionList": [ "check_store_value"]}
                 }

z4d_certified_devices/__init__.py

@@ -1,66 +1,89 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Implementation of Zigbee for Domoticz plugin.
+#
+# This file is part of Zigbee for Domoticz plugin. https://github.com/zigbeefordomoticz/Domoticz-Zigbee
+# (C) 2015-2024
+#
+# Initial authors: zaraki673 & pipiche38
+#
+# SPDX-License-Identifier:    GPL-3.0 license
+
 import json
 import os.path
 from pathlib import Path
-from os import listdir
-from os.path import isdir, isfile, join
 
 from .version import __version__
 
 
 def z4d_import_device_configuration(self, path_name):
 
-    # Read DeviceConf for backward compatibility 
     model_certified = Path(path_name) / "Certified"
-    plugin_version = self.pluginParameters["PluginVersion"]
+    plugin_version = self.pluginParameters.get("PluginVersion")
+
+    if not os.path.isdir(model_certified):
+        self.log.logging("z4dCertifiedDevices", "Status", f"none existing Z4D Certified Db at {model_certified} !!!")
+        return
+    
+    for device_brand in os.listdir(model_certified):
+        if device_brand in ("README.md", ".PRECIOUS"):
+            continue
+
+        model_directory = model_certified / device_brand
+
+        for model_device_file in os.listdir(model_directory):
+            if model_device_file in ("README.md", ".PRECIOUS"):
+                continue
+
+            filename = model_directory / model_device_file
+            try:
+                with open(filename, "rt", encoding='utf-8') as file_handle:
+                    model_definition = json.load(file_handle)
+
+            except ValueError as error:
+                self.log.logging("z4dCertifiedDevices", "Error", f"JSON ConfFile: {filename} load failed with error: {error}, skiping this config file.")
+                continue
+
+            except Exception as error:
+                self.log.logging("z4dCertifiedDevices", "Error", f"JSON ConfFile: {filename} load general error: {error}, skiping this config file.")
+                continue
+
+            device_model_name = _get_model_name(model_device_file )
+            if device_model_name in self.DeviceConf:
+                self.log.logging("z4dCertifiedDevices", "Debug", f"Config for {device_brand}/{device_model_name} not loaded as already defined")
+                continue
 
-    if os.path.isdir(model_certified):
-        model_brand_list = [f for f in listdir(model_certified) if isdir(join(model_certified, f))]
+            self.log.logging("z4dCertifiedDevices", "Debug", f"processing certified {device_brand}/{device_model_name}")
 
-        for brand in model_brand_list:
-            if brand in ("README.md", ".PRECIOUS"):
+            if not _is_model_requirement_match_plugin_version(self, model_definition, plugin_version):
+                self.log.logging( "z4dCertifiedDevices", "Error", f"Certified Devices load skip this Certified device %{device_brand}-{device_model_name} requires Plugin version {model_definition['MinPluginVersion']}")
                 continue
 
-            model_directory = model_certified / brand
-
-            model_list = [f for f in listdir(model_directory) if isfile(join(model_directory, f))]
-
-            for model_device in model_list:
-                if model_device in ("README.md", ".PRECIOUS"):
-                    continue
-
-                filename = model_directory / model_device
-                with open(filename, "rt", encoding='utf-8') as handle:
-                    try:
-                        model_definition = json.load(handle)
-                    except ValueError as e:
-                        self.log.logging("z4dCertifiedDevices", "Error", "--> JSON ConfFile: %s load failed with error: %s" % (filename, str(e)))
-                        continue
-                    except Exception as e:
-                        self.log.logging("z4dCertifiedDevices", "Error", "--> JSON ConfFile: %s load general error: %s" % (filename, str(e)))
-                        continue
-
-                try:
-                    device_model_name = model_device.rsplit(".", 1)[0]
-                    if device_model_name in self.DeviceConf:
-                        self.log.logging( "z4dCertifiedDevices", "Debug", "--> Config for %s/%s not loaded as already defined" % (str(brand), str(device_model_name)),)
-                        continue
-
-                    self.log.logging( "z4dCertifiedDevices", "Debug", "--> Config for %s/%s" % (str(brand), str(device_model_name)))
-                    if "MinPluginVersion" in model_definition and plugin_version < model_definition["MinPluginVersion"]:
-                        self.log.logging( "z4dCertifiedDevices", "Log", "Certified Devices load skip this Certified device %s-%s requires Plugin version %s" % (
-                            str(brand), str(device_model_name), model_definition["MinPluginVersion"] ),)
-                        continue
-
-                    self.DeviceConf[device_model_name] = dict(model_definition)
-                    if "Identifier" in model_definition:
-                        self.log.logging( "z4dCertifiedDevices", "Debug", "--> Identifier found %s" % (str(model_definition["Identifier"])) )
-                        for x in model_definition["Identifier"]:
-                            self.log.logging( "z4dCertifiedDevices", "Debug", "-->     %s" %x)
-                            self.ModelManufMapping[ (x[0], x[1] )] = device_model_name
-
-                except Exception:
-                    self.log.logging("z4dCertifiedDevices", "Error", "--> Unexpected error when loading a configuration file")
-
-    self.log.logging("z4dCertifiedDevices", "Debug", "--> Config loaded: %s" % self.DeviceConf.keys())
-    self.log.logging("z4dCertifiedDevices", "Debug", "Certified Devices ModelManufMapping loaded - %s" %self.ModelManufMapping.keys())
-    self.log.logging("z4dCertifiedDevices", "Status", "Certified Devices loaded - %s confs loaded" %len(self.DeviceConf))
+            _process_device_config_file(self, device_model_name, model_definition)
+
+    self.log.logging("z4dCertifiedDevices", "Debug", f"Config loaded: {self.DeviceConf.keys()}")
+    self.log.logging("z4dCertifiedDevices", "Debug", f"Certified Devices ModelManufMapping loaded - {self.ModelManufMapping.keys()}")
+    
+    self.log.logging("z4dCertifiedDevices", "Status", f"{len(self.DeviceConf)} Certified devices loaded from z4d repository.")
+
+def _get_model_name(model_device_file ):
+    """ Purpose is to remove .json from filename to get the Device Model"""
+    basename = os.path.basename(model_device_file)
+    device_model_name = os.path.splitext(basename)[0]
+    return device_model_name
+
+
+def _is_model_requirement_match_plugin_version(self, model_definition, plugin_version):
+    """ is the config file working with this version of the plugin """
+    return not ("MinPluginVersion" in model_definition and plugin_version < model_definition["MinPluginVersion"])
+
+    
+def _process_device_config_file(self, device_model_name, model_definition):
+    """ let's load the config into DeviceConf , and if needed (Tuya) lets also load into the model name mapping"""
+    self.DeviceConf[device_model_name] = dict(model_definition)
+    if "Identifier" not in model_definition:
+        return
+    for identifier_tuple in model_definition["Identifier"]:
+        self.ModelManufMapping[ tuple(identifier_tuple) ] = device_model_name
+

z4d_certified_devices/version.py

@@ -1,3 +1,3 @@
-MAJOR_VERSION = 3
-MINOR_VERSION = 215
+MAJOR_VERSION = 4
+MINOR_VERSION = 216
 __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"

{z4d_certified_devices-3.215.dist-info → z4d_certified_devices-4.216.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: z4d-certified-devices
-Version: 3.215
+Version: 4.216
 Summary: "Certified devices for Zigbee for Domoticz plugin"
 Home-page: https://github.com/zigbeefordomoticz/z4d-certified-devices
 Author: "Patrick Pichon"

{z4d_certified_devices-3.215.dist-info → z4d_certified_devices-4.216.dist-info}/RECORD

@@ -1,5 +1,5 @@
-z4d_certified_devices/__init__.py,sha256=wdYFaADr5SrC5bXe1OBsrmpfJ7J6GN0H22o49UA4_Es,3533
-z4d_certified_devices/version.py,sha256=k2yVt36z12knLI1f7TtRRqLn3Yl1cKxMjLY5C7S_UuM,87
+z4d_certified_devices/__init__.py,sha256=i5sQ3ShnztbqZ3IeUr-smCqhcYLIaHZP5fkIoTXQZIo,3938
+z4d_certified_devices/version.py,sha256=nhitgsczADllPNQdvNMwO-BMwffB0xFqRF7_rPfvDm8,87
 z4d_certified_devices/Certified/README.md,sha256=1WnlKFf_NJon6zCJ0zfbBIOHES0L2YoE9EjzI2zhlDA,1415
 z4d_certified_devices/Certified/Adeo/LDSENK02F.json,sha256=eYpL0-1uta51sAzIpg7wIqUdl9AC16vYkrXZgW7AtA0,2067
 z4d_certified_devices/Certified/Adeo/LDSENK10.json,sha256=G_Z1dpeZv0kuJ9te9hsFOfdjQx-1FIFTf8F9gC5PZYA,843
@@ -528,7 +528,7 @@ z4d_certified_devices/Certified/Tuya/TS110F-2gang-dimmer.json,sha256=sa2uGLndg8x
 z4d_certified_devices/Certified/Tuya/TS110F-_TYZB01_qezuin6k.json,sha256=Xpj2aJZDmrO6JCz36JIF-QynFMwXh1hBKfmBVvU5JyQ,691
 z4d_certified_devices/Certified/Tuya/TS110F-_TZ3000_ktuoyvt5.json,sha256=dYqDJ0aC2sbNSTBrbkC117lJVR8CdpIYzvSBKXCqO6Q,605
 z4d_certified_devices/Certified/Tuya/TS110F-dimmer.json,sha256=dmXGs3TuUxj0UKA0PRxzH924lY7od663Y6FnUHG1qrk,886
-z4d_certified_devices/Certified/Tuya/TS130F-Blind.json,sha256=CEscNNRBqUzMNfPjXU8njLnfGLfx2wNba1fXlufA0Q4,1417
+z4d_certified_devices/Certified/Tuya/TS130F-Blind.json,sha256=T-2gvwkU7H7sSZLlpzQtR0lMDrsCEp7h05Q-5K79eh0,1547
 z4d_certified_devices/Certified/Tuya/TS130F-_TZ3000_1dd0d5yi-Blind.json,sha256=dvuNEF-OKc6rH2v8BFEWeHA8xLFKZTrmWWsrhsd0CcM,1094
 z4d_certified_devices/Certified/Tuya/TS130F-_TZ3000_1dd0d5yi-Vanne.json,sha256=UbvH2DCQJg2gBwZi-L5EvLHUZsjthfUAAP1jho3s8zQ,1112
 z4d_certified_devices/Certified/Tuya/TS130F-_TZ3000_1dd0d5yi.json,sha256=Okz7fbPw0RkeNC4BPEIlu_Jyg3lxgG-DVxDdqkEWbik,1115
@@ -556,9 +556,9 @@ z4d_certified_devices/Certified/eWeLink/SA-003-Zigbee.json,sha256=PHqliTZ0_8a7F_
 z4d_certified_devices/Certified/eWeLink/SA-030-1.json,sha256=PHqliTZ0_8a7F_hbRVIVQ9A-sJipGrBD1jzhgkKJRvw,833
 z4d_certified_devices/Certified/eWeLink/SWITCH-ZR02.json,sha256=poSWAakR1iWJyvCXx5vgjYga38l6QYZM5C0MSk5vqas,835
 z4d_certified_devices/Certified/eWeLink/SWITCH-ZR03-1.json,sha256=poSWAakR1iWJyvCXx5vgjYga38l6QYZM5C0MSk5vqas,835
-z4d_certified_devices-3.215.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-z4d_certified_devices-3.215.dist-info/METADATA,sha256=pC-qSYQYL9JnLMqXmtxeIY1jEQ7yMlACij8EHxT8cVo,36878
-z4d_certified_devices-3.215.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-z4d_certified_devices-3.215.dist-info/top_level.txt,sha256=dZpL9ibb5CtTAY-pS-wGk-1jh9d-q04ogJ-Dfskashk,22
-z4d_certified_devices-3.215.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-z4d_certified_devices-3.215.dist-info/RECORD,,
+z4d_certified_devices-4.216.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+z4d_certified_devices-4.216.dist-info/METADATA,sha256=fFxxo-DCZeQ__njEvAuWRX-6ad4vMbaKTrK_leXkvnQ,36878
+z4d_certified_devices-4.216.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+z4d_certified_devices-4.216.dist-info/top_level.txt,sha256=dZpL9ibb5CtTAY-pS-wGk-1jh9d-q04ogJ-Dfskashk,22
+z4d_certified_devices-4.216.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+z4d_certified_devices-4.216.dist-info/RECORD,,