Move main config to config.toml

config.toml

@@ -1,4 +1,14 @@
-[mqtt]
+[logging]
+level = "DEBUG"
+
+[homeassistant]
+entity = "climate.chaudiere"
+secondary_entities = [
+	"sensor.esptic_tempo",
+	"sensor.rte_tempo_prochaine_couleur",
+]
+
+[homeassistant.mqtt]
 username = "oin"
 password = "n+Bi58l7LxbH5nEJ"
 host = "homeassistant.local"

oin_thermostat/__main__.py

@@ -1,20 +1,35 @@
 import logging
+import sys
 import tomllib
 
 from .mqtt import HAClient
 
-if __name__ == "__main__":
+logger = logging.getLogger(__name__)
-    with open("config.toml", "rb") as config_file:
+config_path = "config.toml"
+
+
+def main():
+    with open(config_path, "rb") as config_file:
         config = tomllib.load(config_file)
 
-    logging.basicConfig(level=logging.DEBUG)
+    logging.basicConfig(**config.get("logging", dict()))
+
+    ha_config = config.get("homeassistant")
+    if ha_config is None:
+        logger.error(f"Missing home assistant config in <{config_path}>")
+        logger.error(f"\t{config}")
+        sys.exit(1)
 
     client = HAClient(
-        "climate.chaudiere",
+        ha_config.get("entity"),
-        ["sensor.esptic_tempo", "sensor.rte_tempo_prochaine_couleur"],
+        ha_config.get("secondary_entities"),
-        config.get("mqtt", dict()),
+        mqtt_config=ha_config.get("mqtt"),
     )
 
     client.connect()
 
     client.loop()
+
+
+if __name__ == "__main__":
+    main()

oin_thermostat/mqtt.py

@@ -14,18 +14,20 @@ class HAClient:
         self,
         entity: str,
         secondary_entities: list[str] = [],
-        config: dict = dict(),
+        mqtt_config: dict = dict(),
     ) -> None:
         self.entity = entity
         self.secondary_entities = secondary_entities
-        self.config = config
+        self.config = mqtt_config
 
         self.state_topic = "oin/state"
         self.availability_topic = "oin/availability"
 
         self.client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
+        username = self.config.get("username", None)
+        logger.debug(f"Setting up MQTT with user <{username}>")
         self.client.username_pw_set(
-            username=self.config.get("username", None),
+            username=username,
             password=self.config.get("password", None),
         )
 
@@ -48,9 +50,12 @@ class HAClient:
         }
 
     def connect(self) -> None:
-        logger.debug("Connecting to HA...")
         self.client.will_set(self.availability_topic, "offline", retain=True)
-        self.client.connect(self.config.get("host"), self.config.get("port", 1883))
+
+        host = self.config.get("host")
+        port = self.config.get("port", 1883)
+        logger.debug(f"Connecting to <{host}> on port <{port}>")
+        self.client.connect(host, port)
 
         self.subscribe(entity_topic(self.entity), self.state_update)
         for entity in self.secondary_entities: