Updated graph code

Author: Oget565

.github/workflows/deploy-bot.yml

@@ -21,4 +21,5 @@ jobs:
       - name: Build and deploy
         run: |
           docker compose down
-          docker compose up -d --build
+          docker compose build --no-cache
+          docker compose up -d

app/graph/cpu_load.png

@@ -3,44 +3,32 @@
 import datetime
 import os
 
-
 def graph_cpu_load(db_report):
     now = datetime.datetime.now()
     window_start = now - datetime.timedelta(hours=24)
 
-    times = []
-    loads = []
+    time = []
+    load = []
 
     for entry in db_report:
-        t = datetime.datetime.fromtimestamp(entry['timestamp'])
-        if t >= window_start:
-            times.append(t)
-            loads.append(entry['cpu_prcnt'])
-
-    if not times:
-        times = [window_start, now]
-        loads = [0, 0]
-
-    times, loads = zip(*sorted(zip(times, loads)))
+        dt = datetime.datetime.fromtimestamp(entry['timestamp'])
+        time.append(dt)
+        load.append(entry['cpu_prcnt'])
 
     plt.figure(figsize=(14, 6))
     plt.title("CPU Usage - Last 24 Hours", fontsize=14, fontweight='bold')
     plt.xlabel("Time", fontsize=12)
-    plt.ylabel("CPU Load (%)", fontsize=12)
+    plt.ylabel("CPU Load", fontsize=12)
 
-    plt.plot(times, loads, linewidth=1.5)
-
-    plt.grid(True, alpha=0.5, color='gray')
-    plt.ylim(0, 100)
-
-    ax = plt.gca()
-    ax.set_xlim(window_start, now)
-
-    ax.xaxis.set_major_locator(mdates.HourLocator(interval=2))
-    ax.xaxis.set_major_formatter(mdates.DateFormatter('%H:%M'))
+    plt.plot(time, load, linewidth=1.5)
+    plt.xlim(window_start, now)
 
+    plt.gca().xaxis.set_major_formatter(mdates.DateFormatter('%H:%M'))
+    plt.gca().xaxis.set_major_locator(mdates.HourLocator(interval=2))
     plt.gcf().autofmt_xdate()
-    plt.tight_layout()
+
+    plt.grid(True, alpha=0.5, color='gray')
+    #plt.ylim(0, 100)
 
     script_dir = os.path.dirname(os.path.abspath(__file__))
     save_path = os.path.join(script_dir, 'cpu_load.png')

app/graph/graph_24hr.py

@@ -11,7 +11,7 @@ async def five_min_clock(self):
             self.five_min_event.set()
             await asyncio.sleep(1)
             self.five_min_event.clear()
-            await asyncio.sleep(300)
+            await asyncio.sleep(20)
             print("Five minute clock triggered")
 
     async def day_cycle_clock(self):