Graph code updated

Author: Oget565

app/graph/cpu_load.png

@@ -2,58 +2,49 @@
 import matplotlib.dates as mdates
 import datetime
 import os
-from collections import defaultdict
 
 
 def graph_cpu_load(db_report):
-    raw_time = []
-    raw_load = []
+    now = datetime.datetime.now()
+    window_start = now - datetime.timedelta(hours=24)
 
-    for db_data in db_report:
-        raw_time.append(datetime.datetime.fromtimestamp(db_data['timestamp']))
-        raw_load.append(db_data['cpu_prcnt'])
+    times = []
+    loads = []
 
-    interval_hours = 2
-    interval_seconds = interval_hours * 3600
-    buckets = defaultdict(list)
+    for entry in db_report:
+        t = datetime.datetime.fromtimestamp(entry['timestamp'])
+        if t >= window_start:
+            times.append(t)
+            loads.append(entry['cpu_prcnt'])
 
-    for time_point, load_point in zip(raw_time, raw_load):
-        timestamp = time_point.timestamp()
-        bucket_key = int(timestamp // interval_seconds) * interval_seconds
-        buckets[bucket_key].append(load_point)
+    if not times:
+        times = [window_start, now]
+        loads = [0, 0]
 
-    averaged_time = []
-    averaged_load = []
+    times, loads = zip(*sorted(zip(times, loads)))
 
-    for bucket_timestamp in sorted(buckets.keys()):
-        averaged_time.append(datetime.datetime.fromtimestamp(bucket_timestamp))
-        averaged_load.append(sum(buckets[bucket_timestamp]) / len(buckets[bucket_timestamp]))
+    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.figure(figsize=(12, 6))
-    plt.title("CPU Usage")
-    plt.xlabel("Time")
-    plt.ylabel("Load")
-    plt.plot(averaged_time, averaged_load, linewidth=2, marker='o', markersize=4)
+    plt.plot(times, loads, linewidth=1.5)
 
-    now = datetime.datetime.now()
-    now_rounded = now.replace(minute=0, second=0, microsecond=0) + datetime.timedelta(hours=1)
-    twenty_four_hours_ago = (now - datetime.timedelta(hours=24)).replace(minute=0, second=0, microsecond=0)
+    plt.grid(True, alpha=0.5, color='gray')
+    plt.ylim(0, 100)
 
-    plt.xlim(twenty_four_hours_ago, now_rounded)
+    ax = plt.gca()
+    ax.set_xlim(window_start, now)
 
-    plt.gca().xaxis.set_major_locator(mdates.HourLocator(interval=2))
-    plt.gca().xaxis.set_major_formatter(mdates.DateFormatter('%H:%M'))
+    ax.xaxis.set_major_locator(mdates.HourLocator(interval=2))
+    ax.xaxis.set_major_formatter(mdates.DateFormatter('%H:%M'))
 
     plt.gcf().autofmt_xdate()
-    plt.grid(True, alpha=0.3)
     plt.tight_layout()
 
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    graph_dir = current_dir
-    os.makedirs(graph_dir, exist_ok=True)
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    save_path = os.path.join(script_dir, 'cpu_load.png')
 
-    save_path = os.path.join(graph_dir, 'cpu_load.png')
     print(f"Saving graph to: {save_path}")
-
-    plt.savefig(save_path, dpi=150)
-    plt.close()
+    plt.savefig(save_path, dpi=150, bbox_inches='tight')
+    plt.close()