Revive code

Author: romasku

docs/updating.md

@@ -103,7 +103,7 @@ ota:
 Z2M versions older than v2.0.0 need a different configuration (and we will drop support soon):
 ```yaml
 external_converters:
-  - switch_custom.js
+  - switch_custom.mjs
   - tuya_with_ota.js
 ota:
   zigbee_ota_override_index_location: PATH

helper_scripts/make_z2m_custom_converters.py

@@ -1,8 +1,8 @@
 import argparse
-from jinja2 import Environment, FileSystemLoader, select_autoescape
 from pathlib import Path
-import yaml
 
+import yaml
+from jinja2 import Environment, FileSystemLoader, select_autoescape
 
 env = Environment(
     loader=FileSystemLoader("helper_scripts/templates"),
@@ -19,9 +19,6 @@
     parser.add_argument(
         "db_file", metavar="INPUT", type=str, help="File with device db"
     )
-    parser.add_argument(
-        "--z2m-v1", action=argparse.BooleanOptionalAction, help="Use old z2m"
-    )
 
     args = parser.parse_args()
 
@@ -31,11 +28,10 @@
     devices = []
 
     for device in db.values():
-
         # Skip if build == no. Defaults to yes
         if not device.get("build", True):
             continue
-      
+
         config = device["config_str"]
         zb_manufacturer, zb_model, *peripherals = config.rstrip(";").split(";")
 
@@ -46,13 +42,13 @@
         for peripheral in peripherals:
             if peripheral[0] == "R":
                 relay_cnt += 1
-            if peripheral[0] == 'S':
+            if peripheral[0] == "S":
                 switch_cnt += 1
-            if peripheral[0] == 'I':
+            if peripheral[0] == "I":
                 indicators_cnt += 1
-            if peripheral[0] == 'L':
+            if peripheral[0] == "L":
                 has_dedicated_net_led = True
-        
+
         if switch_cnt == 1:
             switch_names = ["switch"]
         elif switch_cnt == 2:
@@ -71,20 +67,20 @@
         else:
             relay_names = [f"relay_{index}" for index in range(relay_cnt)]
 
-        devices.append({
-            "zb_models": [zb_model] + (device.get("old_zb_models") or []),
-            "model": device.get("override_z2m_device") or device["stock_converter_model"],
-            "switchNames": switch_names,
-            "relayNames": relay_names,
-            "relayIndicatorNames": relay_names[:indicators_cnt],
-            "has_dedicated_net_led": has_dedicated_net_led,
-        })
+        devices.append(
+            {
+                "zb_models": [zb_model] + (device.get("old_zb_models") or []),
+                "model": device.get("override_z2m_device")
+                or device["stock_converter_model"],
+                "switchNames": switch_names,
+                "relayNames": relay_names,
+                "relayIndicatorNames": relay_names[:indicators_cnt],
+                "has_dedicated_net_led": has_dedicated_net_led,
+            }
+        )
 
-    template = env.get_template("switch_custom.js.jinja")
+    template = env.get_template("switch_custom.mjs.jinja")
 
-    print(template.render(devices=devices, z2m_v1=args.z2m_v1))
+    print(template.render(devices=devices))
 
     exit(0)
-
-    
-

helper_scripts/make_z2m_tuya_converters.py

@@ -1,26 +1,25 @@
 import argparse
-from jinja2 import Environment, FileSystemLoader, select_autoescape
 from pathlib import Path
+
 import yaml
+from jinja2 import Environment, FileSystemLoader, select_autoescape
 
 env = Environment(
     loader=FileSystemLoader("helper_scripts/templates"),
     autoescape=select_autoescape(),
     trim_blocks=True,
-    lstrip_blocks=True
+    lstrip_blocks=True,
 )
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Create Zigbee2mqtt converter for tuya devices with ota",
-        epilog="Generates a js file that adds ota support for given tuya models")
-    parser.add_argument(
-        "db_file", metavar="INPUT", type=str, help="File with device db"
+    parser = argparse.ArgumentParser(
+        description="Create Zigbee2mqtt converter for tuya devices with ota",
+        epilog="Generates a js file that adds ota support for given tuya models",
     )
     parser.add_argument(
-        "--z2m-v1", action=argparse.BooleanOptionalAction, help="Use old z2m"
+        "db_file", metavar="INPUT", type=str, help="File with device db"
     )
 
-
     args = parser.parse_args()
 
     db_str = Path(args.db_file).read_text()
@@ -29,18 +28,17 @@
     manufacturers = {
         "Tuya": ["TS0001", "TS0002", "TS0003", "TS0004"],
         "Moes": [],
-        "AVATTO": []
+        "AVATTO": [],
     }
 
     # Prepare containers for multiple pinout models
     multiple_pinouts = {key: [] for key in manufacturers}
 
     for entry in db.values():
-      
         # Skip if build == no. Defaults to yes
         if not entry.get("build", True):
             continue
-      
+
         model = entry.get("stock_converter_model")
         mfr = entry.get("stock_converter_manufacturer", "Tuya")
         if model is None or mfr not in manufacturers:
@@ -61,14 +59,15 @@
 
     template = env.get_template("tuya_with_ota.js.jinja")
 
-    print(template.render(
-        tuyaModels=sorted(list(set(tuyaModels))),
-        tuyaMultiplePinoutsModels=sorted(list(set(tuyaMultiplePinoutsModels))),
-        moesModels=sorted(list(set(moesModels))),
-        moesMultiplePinoutsModels=sorted(list(set(moesMultiplePinoutsModels))),
-        avattoModels=sorted(list(set(avattoModels))),
-        avattoMultiplePinoutsModels=sorted(list(set(avattoMultiplePinoutsModels))),
-         z2m_v1=args.z2m_v1)
+    print(
+        template.render(
+            tuyaModels=sorted(list(set(tuyaModels))),
+            tuyaMultiplePinoutsModels=sorted(list(set(tuyaMultiplePinoutsModels))),
+            moesModels=sorted(list(set(moesModels))),
+            moesMultiplePinoutsModels=sorted(list(set(moesMultiplePinoutsModels))),
+            avattoModels=sorted(list(set(avattoModels))),
+            avattoMultiplePinoutsModels=sorted(list(set(avattoMultiplePinoutsModels))),
+        )
     )
-   
-    exit(0)
+
+    exit(0)