split singleton (major fix!), use form, add experiment_id checking, min upper y bound, better messages

app.py

@@ -7,6 +7,10 @@ import matplotlib.pyplot as plt
 import numpy as np
 from matplotlib.patches import Rectangle
 
+import secrets
+
+from time import time
+
 # Initialize Streamlit app
 st.title("Light-mixing Control Panel")
 
@@ -20,65 +24,65 @@ You may also be interested in the Acceleration Consortium's ["Hello World" micro
 """
 )
 
-# MQTT Configuration
-HIVEMQ_HOST = st.text_input(
-    "Enter your HiveMQ host:",
-    "248cc294c37642359297f75b7b023374.s2.eu.hivemq.cloud",
-    type="password",
-)
-HIVEMQ_USERNAME = st.text_input("Enter your HiveMQ username:", "sgbaird")
-HIVEMQ_PASSWORD = st.text_input(
-    "Enter your HiveMQ password:", "D.Pq5gYtejYbU#L", type="password"
-)
-PORT = st.number_input(
-    "Enter the port number:", min_value=1, max_value=65535, value=8883
-)
+max_power = 0.35
+max_value = round(max_power * 255)
 
-# User input for the Pico ID
-PICO_ID = st.text_input("Enter your Pico ID:", "test", type="password")
+with st.form("mqtt_form"):
 
-command_topic = f"sdl-demo/picow/{PICO_ID}/GPIO/28/"
-sensor_data_topic = f"sdl-demo/picow/{PICO_ID}/as7341/"
+    # MQTT Configuration
+    HIVEMQ_HOST = st.text_input(
+        "Enter your HiveMQ host:",
+        "248cc294c37642359297f75b7b023374.s2.eu.hivemq.cloud",
+        type="password",
+    )
+    HIVEMQ_USERNAME = st.text_input("Enter your HiveMQ username:", "sgbaird")
+    HIVEMQ_PASSWORD = st.text_input(
+        "Enter your HiveMQ password:", "D.Pq5gYtejYbU#L", type="password"
+    )
+    PORT = st.number_input(
+        "Enter the port number:", min_value=1, max_value=65535, value=8883
+    )
 
-max_power = 0.35
-max_value = round(max_power * 255)
+    # User input for the Pico ID
+    PICO_ID = st.text_input("Enter your Pico ID:", "test", type="password")
 
-# Information about the maximum power reduction
-st.info(
-    f"The upper limit for RGB power levels has been set to {max_value} instead of 255. NeoPixels are bright 😎"
-)
+    # Information about the maximum power reduction
+    st.info(
+        f"The upper limit for RGB power levels has been set to {max_value} instead of 255. NeoPixels are bright 😎"
+    )
 
-# Sliders for RGB values
-R = st.slider("Select the Red value:", min_value=0, max_value=max_value, value=0)
-G = st.slider("Select the Green value:", min_value=0, max_value=max_value, value=0)
-B = st.slider("Select the Blue value:", min_value=0, max_value=max_value, value=0)
+    # Sliders for RGB values
+    R = st.slider("Select the Red value:", min_value=0, max_value=max_value, value=0)
+    G = st.slider("Select the Green value:", min_value=0, max_value=max_value, value=0)
+    B = st.slider("Select the Blue value:", min_value=0, max_value=max_value, value=0)
 
-# # Initialize session state for messages and lock state
-if "messages" not in st.session_state:
-    st.session_state.messages = []
+    submit_button = st.form_submit_button(label="Send RGB Command")
 
-# if "locked" not in st.session_state:
-#     st.session_state.locked = False
+command_topic = f"sdl-demo/picow/{PICO_ID}/GPIO/28/"
+sensor_data_topic = f"sdl-demo/picow/{PICO_ID}/as7341/"
 
-# if "command_history" not in st.session_state:
-#     st.session_state.command_history = []
-# if "sensor_data_history" not in st.session_state:
-#     st.session_state.sensor_data_history = []
+# random session id to keep track of the session and filter out old data
+experiment_id = secrets.token_hex(4)  # 4 bytes = 8 characters
+sensor_data_file = f"sensor_data-{experiment_id}.json"
+
+# TODO: Session ID using st.session_state to have history of commands and sensor data
 
-# Queue to hold sensor data
 sensor_data_queue = queue.Queue()
 
 
 # Singleton: https://docs.streamlit.io/develop/api-reference/caching-and-state/st.cache_resource
 @st.cache_resource
-def get_paho_client(
-    sensor_data_topic, hostname, username, password=None, port=8883, tls=True
-):
+def create_paho_client(tls=True):
+    client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2, protocol=mqtt.MQTTv5)
+    if tls:
+        client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS_CLIENT)
+    return client
 
-    client = mqtt.Client(
-        mqtt.CallbackAPIVersion.VERSION2, protocol=mqtt.MQTTv5
-    )  # create new instance
 
+# Define setup separately since sensor_data is dynamic
+def setup_paho_client(
+    client, sensor_data_topic, hostname, username, password=None, port=8883
+):
     def on_message(client, userdata, msg):
         sensor_data_queue.put(json.loads(msg.payload))
 
@@ -90,8 +94,6 @@ def get_paho_client(
     client.on_connect = on_connect
     client.on_message = on_message
 
-    if tls:
-        client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS_CLIENT)
     client.username_pw_set(username, password)
     client.connect(hostname, port)
     client.loop_start()  # Use a non-blocking loop
@@ -99,7 +101,7 @@ def get_paho_client(
     return client
 
 
-def send_and_receive(client, command_topic, msg, queue_timeout=60):
+def send_command(client, command_topic, msg):
     print("Sending command...")
     result = client.publish(command_topic, json.dumps(msg), qos=2)
     result.wait_for_publish()  # Ensure the message is sent
@@ -109,13 +111,6 @@ def send_and_receive(client, command_topic, msg, queue_timeout=60):
     else:
         print(f"Failed to send command: {result.rc}")
 
-    try:
-        sensor_data = sensor_data_queue.get(True, queue_timeout)
-        return sensor_data
-    except queue.Empty:
-        st.error("No sensor data received within the timeout period.")
-        return None
-
 
 # Helper function to plot discrete spectral sensor data
 def plot_spectra(sensor_data):
@@ -140,7 +135,8 @@ def plot_spectra(sensor_data):
 
     # Adding rectangles for color bar effect
     dense_wavelengths = np.linspace(wavelengths.min(), wavelengths.max(), num_points)
-    rect_height = max(intensities) * 0.02  # Height of the rectangles
+    # rect_height = max(intensities) * 0.02  # Height of the rectangles
+    rect_height = 300
 
     for dw in dense_wavelengths:
         rect = Rectangle(
@@ -169,8 +165,8 @@ def plot_spectra(sensor_data):
     # Adjust limits and labels with larger font size
     ax.set_xlim(wavelengths.min() - 10, wavelengths.max() + 10)
     ax.set_ylim(
-        0, max(intensities) + 15
-    )  # Ensure the lower y limit is 0 and add buffer
+        0, max(30000, max(intensities) + 15)
+    )  # Ensure the lower y limit is 0 and add buffer with a minimum upper limit of 30000
     ax.set_xticks(wavelengths)
     ax.set_xlabel("Wavelength (nm)", fontsize=14)
     ax.set_ylabel("Intensity", fontsize=14)
@@ -181,33 +177,48 @@ def plot_spectra(sensor_data):
 
 
 # Publish button
-# if st.button("Send RGB Command", disabled=st.session_state.locked):
-if st.button("Send RGB Command"):
+if submit_button:
     if not PICO_ID or not HIVEMQ_HOST or not HIVEMQ_USERNAME or not HIVEMQ_PASSWORD:
         st.error("Please enter all required fields.")
     else:
-        # st.session_state.locked = True
-        st.info("Please wait while the command is sent...")
+        st.info(
+            f"Please wait while the command {R, G, B} for experiment {experiment_id} is sent..."
+        )
 
-        client = get_paho_client(
+        client = create_paho_client(tls=True)
+
+        client = setup_paho_client(
+            client,
             sensor_data_topic,
             HIVEMQ_HOST,
             HIVEMQ_USERNAME,
             password=HIVEMQ_PASSWORD,
             port=int(PORT),
-            tls=True,
         )
 
-        command_msg = {"R": R, "G": G, "B": B}
-        sensor_data = send_and_receive(
-            client, command_topic, command_msg, queue_timeout=15
-        )
+        command_msg = {"R": R, "G": G, "B": B, "_experiment_id": experiment_id}
+
+        session_timeout = time() + 60
+        send_command(client, command_topic, command_msg)
+
+        while True and time() < session_timeout:
 
-        # st.session_state.locked = False
+            sensor_data = sensor_data_queue.get(True, timeout=15)
 
-        print("Waiting for sensor data...")
+            input_message = sensor_data["_input_message"]
+            received_experiment_id = input_message["_experiment_id"]
 
-        if sensor_data:
-            st.success("Command sent successfully!")
-            plot_spectra(sensor_data)
-            st.write("Sensor Data Received:", sensor_data)
+            if sensor_data and received_experiment_id == experiment_id:
+                R1 = input_message["R"]
+                G1 = input_message["G"]
+                B1 = input_message["B"]
+                st.success(
+                    f"Command {R1, G1, B1} for experiment {experiment_id} sent successfully!"
+                )
+                plot_spectra(sensor_data)
+                st.write("Sensor Data Received:", sensor_data)
+                break
+            else:
+                st.warning(
+                    f"Received data for experiment {received_experiment_id} instead of {experiment_id}. Retrying..."
+                )