black

dgomes · Apr 24, 2022 · c7a2404 · c7a2404
1 parent 836693d
commit c7a2404
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 38 deletions.
diff --git a/config.py b/config.py
@@ -3,15 +3,30 @@
 
 import voluptuous as vol
 import yaml
-from consts import (ALL_SUPPORTED_LOG_LEVELS, CONF_CONFIG, CONF_DALI_DRIVER,
-                    CONF_DEVICES_NAMES_FILE, CONF_HA_DISCOVERY_PREFIX,
-                    CONF_LOG_COLOR, CONF_LOG_LEVEL, CONF_MQTT_BASE_TOPIC,
-                    CONF_MQTT_PASSWORD, CONF_MQTT_PORT, CONF_MQTT_SERVER,
-                    CONF_MQTT_USERNAME, DALI_DRIVERS, DEFAULT_DALI_DRIVER,
-                    DEFAULT_DEVICES_NAMES_FILE, DEFAULT_HA_DISCOVERY_PREFIX,
-                    DEFAULT_LOG_COLOR, DEFAULT_LOG_LEVEL,
-                    DEFAULT_MQTT_BASE_TOPIC, DEFAULT_MQTT_PORT,
-                    DEFAULT_MQTT_SERVER, LOG_FORMAT)
+from consts import (
+    ALL_SUPPORTED_LOG_LEVELS,
+    CONF_CONFIG,
+    CONF_DALI_DRIVER,
+    CONF_DEVICES_NAMES_FILE,
+    CONF_HA_DISCOVERY_PREFIX,
+    CONF_LOG_COLOR,
+    CONF_LOG_LEVEL,
+    CONF_MQTT_BASE_TOPIC,
+    CONF_MQTT_PASSWORD,
+    CONF_MQTT_PORT,
+    CONF_MQTT_SERVER,
+    CONF_MQTT_USERNAME,
+    DALI_DRIVERS,
+    DEFAULT_DALI_DRIVER,
+    DEFAULT_DEVICES_NAMES_FILE,
+    DEFAULT_HA_DISCOVERY_PREFIX,
+    DEFAULT_LOG_COLOR,
+    DEFAULT_LOG_LEVEL,
+    DEFAULT_MQTT_BASE_TOPIC,
+    DEFAULT_MQTT_PORT,
+    DEFAULT_MQTT_SERVER,
+    LOG_FORMAT,
+)
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers.polling import PollingObserver as Observer
 

diff --git a/dali_mqtt_daemon.py b/dali_mqtt_daemon.py
@@ -10,25 +10,48 @@
 import dali.address as address
 import dali.gear.general as gear
 import paho.mqtt.client as mqtt
-from consts import (ALL_SUPPORTED_LOG_LEVELS, CONF_CONFIG, CONF_DALI_DRIVER,
-                    CONF_DALI_LAMPS, CONF_DEVICES_NAMES_FILE,
-                    CONF_HA_DISCOVERY_PREFIX, CONF_LOG_COLOR, CONF_LOG_LEVEL,
-                    CONF_MQTT_BASE_TOPIC, CONF_MQTT_PASSWORD, CONF_MQTT_PORT,
-                    CONF_MQTT_SERVER, CONF_MQTT_USERNAME, DALI_DRIVERS,
-                    DALI_SERVER, DEFAULT_CONFIG_FILE,
-                    DEFAULT_HA_DISCOVERY_PREFIX, HA_DISCOVERY_PREFIX, HASSEB,
-                    LOG_FORMAT, MAX_RETRIES, MIN_BACKOFF_TIME,
-                    MIN_HASSEB_FIRMWARE_VERSION, MQTT_AVAILABLE,
-                    MQTT_BRIGHTNESS_COMMAND_TOPIC,
-                    MQTT_BRIGHTNESS_GET_COMMAND_TOPIC,
-                    MQTT_BRIGHTNESS_MAX_LEVEL_TOPIC,
-                    MQTT_BRIGHTNESS_MIN_LEVEL_TOPIC,
-                    MQTT_BRIGHTNESS_PHYSICAL_MINIMUM_LEVEL_TOPIC,
-                    MQTT_BRIGHTNESS_STATE_TOPIC, MQTT_COMMAND_TOPIC,
-                    MQTT_DALI2MQTT_STATUS, MQTT_NOT_AVAILABLE,
-                    MQTT_PAYLOAD_OFF, MQTT_PAYLOAD_ON,
-                    MQTT_SCAN_LAMPS_COMMAND_TOPIC, MQTT_STATE_TOPIC, RED_COLOR,
-                    TRIDONIC, YELLOW_COLOR)
+from consts import (
+    ALL_SUPPORTED_LOG_LEVELS,
+    CONF_CONFIG,
+    CONF_DALI_DRIVER,
+    CONF_DALI_LAMPS,
+    CONF_DEVICES_NAMES_FILE,
+    CONF_HA_DISCOVERY_PREFIX,
+    CONF_LOG_COLOR,
+    CONF_LOG_LEVEL,
+    CONF_MQTT_BASE_TOPIC,
+    CONF_MQTT_PASSWORD,
+    CONF_MQTT_PORT,
+    CONF_MQTT_SERVER,
+    CONF_MQTT_USERNAME,
+    DALI_DRIVERS,
+    DALI_SERVER,
+    DEFAULT_CONFIG_FILE,
+    DEFAULT_HA_DISCOVERY_PREFIX,
+    HA_DISCOVERY_PREFIX,
+    HASSEB,
+    LOG_FORMAT,
+    MAX_RETRIES,
+    MIN_BACKOFF_TIME,
+    MIN_HASSEB_FIRMWARE_VERSION,
+    MQTT_AVAILABLE,
+    MQTT_BRIGHTNESS_COMMAND_TOPIC,
+    MQTT_BRIGHTNESS_GET_COMMAND_TOPIC,
+    MQTT_BRIGHTNESS_MAX_LEVEL_TOPIC,
+    MQTT_BRIGHTNESS_MIN_LEVEL_TOPIC,
+    MQTT_BRIGHTNESS_PHYSICAL_MINIMUM_LEVEL_TOPIC,
+    MQTT_BRIGHTNESS_STATE_TOPIC,
+    MQTT_COMMAND_TOPIC,
+    MQTT_DALI2MQTT_STATUS,
+    MQTT_NOT_AVAILABLE,
+    MQTT_PAYLOAD_OFF,
+    MQTT_PAYLOAD_ON,
+    MQTT_SCAN_LAMPS_COMMAND_TOPIC,
+    MQTT_STATE_TOPIC,
+    RED_COLOR,
+    TRIDONIC,
+    YELLOW_COLOR,
+)
 from dali.command import YesNoResponse
 from dali.exceptions import DALIError
 from devicesnamesconfig import DevicesNamesConfig

diff --git a/devicesnamesconfig.py b/devicesnamesconfig.py
@@ -41,7 +41,10 @@ def load_devices_names_file(self):
             logger.error("In devices file %s: %s", self._path, error)
             raise DevicesNamesConfigLoadError()
         except Exception as err:
-            logger.error("Could not load device names config <%s>, a new one will be created after successfull start", self._path)
+            logger.error(
+                "Could not load device names config <%s>, a new one will be created after successfull start",
+                self._path,
+            )
 
     def save_devices_names_file(self, all_lamps):
         """Save configuration back to yaml file."""

diff --git a/lamp.py b/lamp.py
@@ -3,11 +3,21 @@
 import logging
 
 import dali.gear.general as gear
-from consts import (ALL_SUPPORTED_LOG_LEVELS, LOG_FORMAT, MQTT_AVAILABLE,
-                    MQTT_BRIGHTNESS_COMMAND_TOPIC, MQTT_BRIGHTNESS_STATE_TOPIC,
-                    MQTT_COMMAND_TOPIC, MQTT_DALI2MQTT_STATUS,
-                    MQTT_NOT_AVAILABLE, MQTT_PAYLOAD_OFF, MQTT_STATE_TOPIC,
-                    __author__, __email__, __version__)
+from consts import (
+    ALL_SUPPORTED_LOG_LEVELS,
+    LOG_FORMAT,
+    MQTT_AVAILABLE,
+    MQTT_BRIGHTNESS_COMMAND_TOPIC,
+    MQTT_BRIGHTNESS_STATE_TOPIC,
+    MQTT_COMMAND_TOPIC,
+    MQTT_DALI2MQTT_STATUS,
+    MQTT_NOT_AVAILABLE,
+    MQTT_PAYLOAD_OFF,
+    MQTT_STATE_TOPIC,
+    __author__,
+    __email__,
+    __version__,
+)
 from slugify import slugify
 
 logging.basicConfig(format=LOG_FORMAT)
@@ -46,10 +56,8 @@ def gen_ha_config(self, mqtt_base_topic):
             "obj_id": f"dali_light_{self.device_name}",
             "uniq_id": f"{type(self.driver).__name__}_{self.short_address}",
             "stat_t": MQTT_STATE_TOPIC.format(mqtt_base_topic, self.device_name),
-            "cmd_t": MQTT_COMMAND_TOPIC.format(
-                mqtt_base_topic, self.device_name
-            ),
-            "pl_off": MQTT_PAYLOAD_OFF.decode('utf-8'),
+            "cmd_t": MQTT_COMMAND_TOPIC.format(mqtt_base_topic, self.device_name),
+            "pl_off": MQTT_PAYLOAD_OFF.decode("utf-8"),
             "bri_stat_t": MQTT_BRIGHTNESS_STATE_TOPIC.format(
                 mqtt_base_topic, self.device_name
             ),