update fetch + label

app.py

@@ -3,6 +3,8 @@ import pandas as pd
 import numpy as np
 import requests
 import time
+from datetime import datetime
+import altair as alt
 
 st.set_page_config(
     page_title="Real-Time IoT",
@@ -26,21 +28,27 @@ DATA_URL = 'https://trace.vfsc.vn/iot/xxx'
 
 
 def load_data(n):
-    print(n)
-    response = requests.get(DATA_URL, params = {"items": n})
+    response = requests.get(DATA_URL) if n <= 0 else requests.get(DATA_URL, params = {"items": n})
 
     plan = response.json()['plan'] 
     data = response.json()['data']
 
     return data
 
-df = pd.DataFrame.from_dict(load_data(1))
-df.rename({'Lat' : 'lat', 'Lng' : 'lon'}, axis='columns', inplace=True)
 
+def is_duplicate(s):
+    st.write(s)
+    check_candidate = (s["Id"], s["Time"])
+    res = check_candidate in st.session_state["duplicates"]
+    st.session_state["duplicates"].add(check_candidate)
+    return res
 
 if "count" not in st.session_state:
-    st.session_state['count'] = 1
+    st.session_state['count'] = 10
 
+df = pd.DataFrame.from_dict(load_data(st.session_state['count']))
+df.rename({'Lat' : 'lat', 'Lng' : 'lon'}, axis='columns', inplace=True)
+st.session_state["duplicates"] = set(zip(df["Id"], df["Time"]))
 
 col1, col2 = st.columns(2)
 
@@ -51,7 +59,7 @@ data_col   = "STemp"
 with col1:
     data_col = st.selectbox(
         "Choose column to plot",
-        [col for col in df.columns if col.lower() in "upt, batv, solv, stemp, moment".split(", ")],
+        [col for col in df.columns if col.lower() in "upt, batv, solv, stemp".split(", ")],
     )
 
     # st.checkbox("Disable selectbox widget", key="disabled")
@@ -63,13 +71,33 @@ with col1:
 with col2:
     placeholder = st.empty()
     while True:
-        df = pd.DataFrame.from_dict(load_data(st.session_state["count"]))
-        df.rename({'Lat' : 'lat', 'Lng' : 'lon'}, axis='columns', inplace=True)
+        # new_df = pd.DataFrame.from_dict(load_data(st.session_state["count"]))
+        # new_df.rename({'Lat' : 'lat', 'Lng' : 'lon'}, axis='columns', inplace=True)
+
+        new_data = pd.DataFrame.from_dict(load_data(0)).rename({'Lat' : 'lat', 'Lng' : 'lon'}, axis='columns').iloc[-1]
+            # print(df.iloc[-1]["Id"], new_data["Id"])
+        if is_duplicate(new_data):
+            pass
+            # st.write("Dup")
+        else:
+            df.loc[len(df)] = new_data
+
+        # df = pd.concat([df, pd.DataFrame(new_ele)])
+
+        chart_data = pd.DataFrame(
+            df[data_col].tolist(),
+            df["moment"].apply(lambda timestr : datetime.strptime(timestr, '%d/%m/%Y %H:%M:%S').time().strftime("%H:%M:%S")).tolist()
+        )
+
+        # chart_data.set_index('date')
+
         with placeholder.container():
-            st.map(df)
             if graph_type == 'Line':
-                st.line_chart(df[data_col])
+                st.bar_chart(chart_data)
             elif graph_type == 'Bar':
-                st.bar_chart(df[data_col])
-            time.sleep(3)
-        st.session_state["count"] += 1
+                st.bar_chart(chart_data)
+                # st.bar_chart(chart_data["data"], y = chart_data["label"])
+            # st.map(df)
+            st.write(df)
+        time.sleep(15)
+        # st.session_state["count"] += 1