Linting

Author: tjhowse

Dockerfile

@@ -4,8 +4,12 @@ run apk add --no-cache --virtual .build-deps gcc g++ make libffi-dev openssl-dev
 
 copy ["./dist/*.whl", "/modbus4mqtt/"]
 
+copy ["./modbus4mqtt/config", "/modbus4mqtt/config/"]
+
 run pip install /modbus4mqtt/*.whl
 
 run apk del .build-deps
 
+run rm /modbus4mqtt/*.whl
+
 entrypoint ["modbus4mqtt"]

build.sh

@@ -2,4 +2,4 @@
 
 rm -r dist
 uv build .
-docker build -t tjhowse/modbus4mqtt:1.0.0-rc1 .
+docker build -t tjhowse/modbus4mqtt:1.0.0-rc2 .

modbus4mqtt/modbus4mqtt.py

@@ -317,7 +317,7 @@ def _set_mqtt_connection_status(self, status: MqttConnectionStatus):
     def _on_message(self, client, userdata, msg):
         # print("got a message: {}: {}".format(msg.topic, msg.payload))
         # TODO Handle json_key writes. https://github.com/tjhowse/modbus4mqtt/issues/23
-        topic = msg.topic[len(self.prefix) :]
+        topic = msg.topic[len(self.prefix):]
         for register in [
             register for register in self.registers if "set_topic" in register
         ]:
@@ -424,9 +424,15 @@ def _validate_registers(registers):
                     )
                 )
 
-    def _load_modbus_config(self, path):
+    def _load_modbus_config(self, path: str) -> dict:
         yaml = YAML(typ="safe")
-        result = yaml.load(open(path, "r").read())
+        try:
+            result = yaml.load(open(path, "r").read())
+        except FileNotFoundError:
+            # Try to load the config from the pre-1.0.0 location. I.E. replace "config" with "modbus4mqtt"
+            alt_path = path.replace("config", "modbus4mqtt")
+            logging.warning("Failed to find config file on path: {}. Checking alternative path {}".format(path, alt_path))
+            result = yaml.load(open(alt_path, "r").read())
         registers = [
             register for register in result["registers"] if "pub_topic" in register
         ]

tests/test_modbus_server.py

@@ -308,6 +308,7 @@ async def test_mqtt_write(
     else:
         assert False, "Timeout waiting for Modbus register to update"
 
+
 if __name__ == "__main__":
     # Just run a modbus server
     modbus_server = ModbusServer()