Retropex/custom-ocean.xyz-dashboard
1
0
Fork 0
mirror of https://github.com/Retropex/custom-ocean.xyz-dashboard.git synced 2025-05-12 19:20:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update state_manager.py

Browse Source
This commit is contained in:
DJObleezy 2025-03-25 08:12:18 -07:00 committed by GitHub
parent 0cbbe8c6a8
commit 28c9e9592b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
state_manager.py
View File

@ -334,13 +334,32 @@ class StateManager:
if metrics.get(key) is not None: if metrics.get(key) is not None:
current_val = metrics[key] current_val = metrics[key]
arrow = "" arrow = ""
# Get the corresponding unit key if available
unit_key = f"{key}_unit"
current_unit = metrics.get(unit_key, "")
if key in arrow_history and arrow_history[key]: if key in arrow_history and arrow_history[key]:
try: try:
previous_val = arrow_history[key][-1]["value"] previous_val = arrow_history[key][-1]["value"]
if current_val > previous_val: previous_unit = arrow_history[key][-1].get("unit", "")
arrow = "↑"
elif current_val < previous_val: # Use the convert_to_ths function to normalize both values before comparison
arrow = "↓" if key.startswith("hashrate") and current_unit:
from models import convert_to_ths
norm_curr_val = convert_to_ths(float(current_val), current_unit)
norm_prev_val = convert_to_ths(float(previous_val), previous_unit if previous_unit else "th/s")
if norm_curr_val > norm_prev_val * 1.01: # 1% threshold to avoid minor fluctuations
arrow = "↑"
elif norm_curr_val < norm_prev_val * 0.99: # 1% threshold
arrow = "↓"
else:
# For non-hashrate values or when units are missing
if float(current_val) > float(previous_val) * 1.01:
arrow = "↑"
elif float(current_val) < float(previous_val) * 0.99:
arrow = "↓"
except Exception as e: except Exception as e:
logging.error(f"Error calculating arrow for {key}: {e}") logging.error(f"Error calculating arrow for {key}: {e}")
@ -348,15 +367,23 @@ class StateManager:
arrow_history[key] = [] arrow_history[key] = []
if not arrow_history[key] or arrow_history[key][-1]["time"] != current_second: if not arrow_history[key] or arrow_history[key][-1]["time"] != current_second:
arrow_history[key].append({ entry = {
"time": current_second, "time": current_second,
"value": current_val, "value": current_val,
"arrow": arrow "arrow": arrow,
}) }
# Add unit information if available
if current_unit:
entry["unit"] = current_unit
arrow_history[key].append(entry)
else: else:
arrow_history[key][-1]["value"] = current_val arrow_history[key][-1]["value"] = current_val
arrow_history[key][-1]["arrow"] = arrow arrow_history[key][-1]["arrow"] = arrow
# Update unit if available
if current_unit:
arrow_history[key][-1]["unit"] = current_unit
# Cap history to three hours worth (180 entries) # Cap history to three hours worth (180 entries)
if len(arrow_history[key]) > MAX_HISTORY_ENTRIES: if len(arrow_history[key]) > MAX_HISTORY_ENTRIES:
arrow_history[key] = arrow_history[key][-MAX_HISTORY_ENTRIES:] arrow_history[key] = arrow_history[key][-MAX_HISTORY_ENTRIES:]
@ -368,7 +395,11 @@ class StateManager:
for entry in entries: for entry in entries:
minute = entry["time"][:5] # extract HH:MM minute = entry["time"][:5] # extract HH:MM
minute_groups[minute] = entry # take last entry for that minute minute_groups[minute] = entry # take last entry for that minute
aggregated_history[key] = list(minute_groups.values())
# Sort by time to ensure chronological order
aggregated_history[key] = sorted(list(minute_groups.values()),
key=lambda x: x["time"])
metrics["arrow_history"] = aggregated_history metrics["arrow_history"] = aggregated_history
metrics["history"] = hashrate_history metrics["history"] = hashrate_history