simplify-MQTT-clients

app.py

@@ -51,23 +51,23 @@ rpi_client = None
 response_topic = None  # Will be set dynamically
 
 
-def create_client(client_type, host, port, username, password):
+def create_client(client_type):
     global bambu_client, rpi_client
     if client_type == "bambu":
         bambu_client = mqtt.Client()
-        bambu_client.username_pw_set(username, password)
+        bambu_client.username_pw_set(BAMBU_USERNAME, BAMBU_PASSWORD)
         bambu_client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
         bambu_client.on_connect = on_connect
         bambu_client.on_message = bambu_on_message
-        bambu_client.connect(host, port)
+        bambu_client.connect(BAMBU_HOST, BAMBU_PORT)
         bambu_client.loop_start()
     elif client_type == "rpi":
         rpi_client = mqtt.Client()
-        rpi_client.username_pw_set(username, password)
+        rpi_client.username_pw_set(RPI_USERNAME, RPI_PASSWORD)
         rpi_client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
         rpi_client.on_connect = on_connect
         rpi_client.on_message = rpi_on_message
-        rpi_client.connect(host, port)
+        rpi_client.connect(RPI_HOST, RPI_PORT)
         rpi_client.loop_start()
 
 
@@ -105,7 +105,7 @@ def get_data(serial=DEFAULT_SERIAL):
     global bambu_client, response_topic
 
     if bambu_client is None:
-        create_client("bambu", BAMBU_HOST, BAMBU_PORT, BAMBU_USERNAME, BAMBU_PASSWORD)
+        create_client("bambu")
 
     request_topic = f"bambu_a1_mini/request/{serial}"
     response_topic = f"bambu_a1_mini/response/{serial}"
@@ -217,7 +217,7 @@ def capture_image(url=None, use_test_image=False, test_image_name=None):
     global rpi_client, latest_data
 
     if rpi_client is None:
-        create_client("rpi", BAMBU_HOST, BAMBU_PORT, BAMBU_USERNAME, BAMBU_PASSWORD)
+        create_client("rpi")
 
     serial = DEFAULT_SERIAL
     request_topic = f"bambu_a1_mini/request/{serial}"
@@ -562,9 +562,14 @@ if __name__ == "__main__":
     logger.info("Starting Bambu A1 Mini Print Control application")
 
     try:
-        logger.info("Initializing MQTT client")
-        create_client("bambu", BAMBU_HOST, BAMBU_PORT, BAMBU_USERNAME, BAMBU_PASSWORD)
-        create_client("rpi", RPI_HOST, RPI_PORT, RPI_USERNAME, RPI_PASSWORD)
+        logger.info("Initializing Bambu MQTT client")
+        create_client("bambu")
+    except Exception as e:
+        logger.error(f"Failed to initialize Bambu MQTT: {e}")
+
+    try:
+        logger.info("Initializing RPI MQTT client")
+        create_client("rpi")
     except Exception as e:
         logger.error(f"Failed to initialize MQTT: {e}")