added all graphs

app.py

@@ -17,6 +17,10 @@ import pytz
 experiment = None
 running = []
 temp_graph = None
+od_graph = None
+norm_od_graph = None
+growth_rate_graph = None
+all_graph = False
 
 REQUEST_INTERVAL = 60
 
@@ -99,7 +103,13 @@ def on_message(client, userdata, message):
     payload = message.payload.decode("utf-8")
     data = json.loads(payload)
     global temp_graph
-    temp_graph = data.get("data", None)
+    global od_graph
+    global norm_od_graph
+    global growth_rate_graph
+    temp_graph = data.get("temperature", None)
+    od_graph = data.get("od", None)
+    norm_od_graph = data.get("normalized_od", None) 
+    growth_rate_graph = data.get("growth_rate", None)
 
 async def publish_temperature_request(client, experiment, filter_mod_N, lookback, reactor):
         """Publish a temperature request to the request topic."""
@@ -113,13 +123,17 @@ async def publish_temperature_request(client, experiment, filter_mod_N, lookback
         payload_str = json.dumps(payload)
         client.publish("pioreactor/control", payload_str)
 
-async def periodic_temp_reading(client, reactor, experiment):
+async def periodic_temp_reading(client, reactor, experiment, placeholder):
     try:
-        await publish_temperature_request(client, experiment, 1, 100000, reactor)
+        while True:
+            await publish_temperature_request(client, experiment, 1, 100000, reactor)
+            global temp_graph
+            placeholder.write(temp_graph)
+            await asyncio.sleep(REQUEST_INTERVAL)
     except asyncio.CancelledError:
         pass
 
-async def run_mqtt_client(client):
+async def run_mqtt_client(client, placeholder):
     client.subscribe(f"pioreactor/{reactor}/temp_reading")
     client.subscribe(f"pioreactor/{reactor}/od_reading")
     client.subscribe(f"pioreactor/{reactor}/growth_rate")
@@ -127,7 +141,7 @@ async def run_mqtt_client(client):
     client.on_message = on_message
 
     client.loop_start()
-    await periodic_temp_reading(client, reactor, st.session_state["experiment"])
+    await periodic_temp_reading(client, reactor, st.session_state["experiment"], placeholder)
 
 def get_running_jobs(client, reactor):
     payload = {
@@ -148,6 +162,19 @@ def get_running_jobs(client, reactor):
 
     while experiment is None and (time.time() - start_time) < timeout:
         time.sleep(1)
+    
+async def get_graph(placeholder):
+    try:
+        st.session_state["client"].loop_start()
+        st.session_state["client"].subscribe(f"pioreactor/{reactor}/temperature")
+        st.session_state["client"].message_callback_add(f"pioreactor/{reactor}/temperature", on_message)
+        while True:
+            await publish_temperature_request(st.session_state["client"], st.session_state["experiment"], 1, 100000, reactor)
+            await asyncio.sleep(REQUEST_INTERVAL)
+            global temp_graph
+            placeholder.write(temp_graph)
+    except asyncio.CancelledError:
+        pass
 
 
 if submit_button:
@@ -705,29 +732,62 @@ if st.session_state["experiment"] is not None:
 
     st.header("Graphs")
 
-    payload = {
-        "command": "get_temperature_readings",
-        "experiment": st.session_state["experiment"],
-        "filter_mod": 1,
-        "lookback": 100,
-        "reactor": reactor
-    }
+    
 
     st.session_state["client"].loop_start()
-    st.session_state["client"].on_message = on_message
-    payload_str = json.dumps(payload)
-    st.session_state["client"].subscribe(f"pioreactor/{reactor}/temperature")
+    st.session_state["client"].subscribe(f"pioreactor/{reactor}/readings")
+    st.session_state["client"].message_callback_add(f"pioreactor/{reactor}/readings", on_message)
 
     temp_graph_actual = []
 
     st.subheader("Temperature Graph")
-    amount_of_data = st.radio("Amount of data", ["1 hour", "24 hours", "All data"], index=1)
+    amount_of_data = st.radio("Amount of data", ["1 hour", "24 hours", "All data"], index=1, key="temp")
     placeholder = st.empty()
 
+    st.subheader("OD Reading Graph")
+    amount_of_data2 = st.radio("Amount of data", ["1 hour", "24 hours", "All data"], index=1, key="od")
+    placeholder2 = st.empty()
+
+    st.subheader("Normalized OD Reading Graph")
+    amount_of_data3 = st.radio("Amount of data", ["1 hour", "24 hours", "All data"], index=1, key="norm_od")
+    placeholder3 = st.empty()
+
+    st.subheader("Growth Rate Graph")
+    amount_of_data4 = st.radio("Amount of data", ["1 hour", "24 hours", "All data"], index=1, key="growth_rate")
+    placeholder4 = st.empty()
+
+    # get_graph(placeholder)
 
     while True:
+        if st.session_state.get("df", None) is not None:
+            placeholder.line_chart(st.session_state["df"], x_label="Time", y_label="Temperature (°C)")
+        if st.session_state.get("df2", None) is not None:
+            placeholder2.line_chart(st.session_state["df2"], x_label="Time", y_label="OD Reading")
+        if st.session_state.get("df3", None) is not None:
+            placeholder3.line_chart(st.session_state["df3"], x_label="Time", y_label="Normalized OD Reading")
+        if st.session_state.get("df4", None) is not None:
+            placeholder4.line_chart(st.session_state["df4"], x_label="Time", y_label="Growth Rate")
+
         temp_graph = None
+        payload = {
+            "command": "get_readings",
+            "experiment": st.session_state["experiment"],
+            "reactor": reactor,
+            "filter_mod": 1,
+            "lookback": 100000,
+            "filter_mod2": 188,
+            "lookback2": 100000,
+            "filter_mod3": 188,
+            "lookback3": 100000,
+            "filter_mod4": 188,
+            "lookback4": 100000,
+            "amount": amount_of_data,
+            "amount2": amount_of_data2,
+            "amount3": amount_of_data3,
+            "amount4": amount_of_data4
+        }
 
+        payload_str = json.dumps(payload)
         st.session_state["client"].publish("pioreactor/control", payload_str, qos=1)
 
         timeout = 30
@@ -736,7 +796,10 @@ if st.session_state["experiment"] is not None:
         while temp_graph is None and (time.time() - start_time) < timeout:
             time.sleep(1)
 
-        temp_graph = temp_graph[0]
+        if temp_graph is None or od_graph is None or norm_od_graph is None or growth_rate_graph is None:
+            st.error("Failed to retrieve data.")
+            st.stop()
+
 
         for temp in temp_graph:
             utc_time = datetime.strptime(temp["x"], "%Y-%m-%dT%H:%M:%S.%fZ")
@@ -745,19 +808,53 @@ if st.session_state["experiment"] is not None:
             local_time = utc_time.astimezone(local_tz)
             temp["x"] = local_time.strftime("%Y-%m-%d %H:%M:%S")
 
-        # Filter the data based on the amount of data requested
-        # Data is in 4 minute intervals
-        if amount_of_data == "1 hour" and len(temp_graph) > 15:
-            temp_graph = temp_graph[-15:]
-        elif amount_of_data == "24 hours" and len(temp_graph) > 360:
-            temp_graph = temp_graph[-360:]
+        for od in od_graph:
+            utc_time = datetime.strptime(od["x"], "%Y-%m-%dT%H:%M:%S.%fZ")
+            local_tz = pytz.timezone("America/New_York")
+            utc_time = utc_time.replace(tzinfo=pytz.utc)
+            local_time = utc_time.astimezone(local_tz)
+            od["x"] = local_time.strftime("%Y-%m-%d %H:%M:%S")
+        
+        for norm_od in norm_od_graph:
+            utc_time = datetime.strptime(norm_od["x"], "%Y-%m-%dT%H:%M:%S.%fZ")
+            local_tz = pytz.timezone("America/New_York")
+            utc_time = utc_time.replace(tzinfo=pytz.utc)
+            local_time = utc_time.astimezone(local_tz)
+            norm_od["x"] = local_time.strftime("%Y-%m-%d %H:%M:%S")
 
+        for growth_rate in growth_rate_graph:
+            utc_time = datetime.strptime(growth_rate["x"], "%Y-%m-%dT%H:%M:%S.%fZ")
+            local_tz = pytz.timezone("America/New_York")
+            utc_time = utc_time.replace(tzinfo=pytz.utc)
+            local_time = utc_time.astimezone(local_tz)
+            growth_rate["x"] = local_time.strftime("%Y-%m-%d %H:%M:%S")
 
+        # Filter the data based on the amount of data requested
+        # Data is in 4 minute intervals
+       
         df = pd.DataFrame(temp_graph)
         df = df.set_index("x")
 
+        df2 = pd.DataFrame(od_graph)
+        df2 = df2.set_index("x")
+
+        df3 = pd.DataFrame(norm_od_graph)
+        df3 = df3.set_index("x")
+
+        df4 = pd.DataFrame(growth_rate_graph)
+        df4 = df4.set_index("x")
+
         placeholder.line_chart(df, x_label="Time", y_label="Temperature (°C)")
+        placeholder2.line_chart(df2, x_label="Time", y_label="OD Reading")
+        placeholder3.line_chart(df3, x_label="Time", y_label="Normalized OD Reading")
+        placeholder4.line_chart(df4, x_label="Time", y_label="Growth Rate")
+    
+        st.session_state["df"] = df
+        st.session_state["df2"] = df2
+        st.session_state["df3"] = df3
+        st.session_state["df4"] = df4
         
         time.sleep(REQUEST_INTERVAL)
     
+