Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-02-19 08:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update flask_server.py

Browse Source
This commit is contained in:
MacRimi
2026-01-31 11:44:32 +01:00
parent 0f5c83c1c2
commit 74e2584e4d
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
AppImage/scripts/flask_server.py
View File

@@ -398,13 +398,17 @@ def get_intel_gpu_processes_from_text():
try: try:
# print(f"[v0] Executing intel_gpu_top (text mode) to capture processes...", flush=True) # print(f"[v0] Executing intel_gpu_top (text mode) to capture processes...", flush=True)
pass pass
process = subprocess.Popen( try:
['intel_gpu_top'], process = subprocess.Popen(
stdout=subprocess.PIPE, ['intel_gpu_top'],
stderr=subprocess.PIPE, stdout=subprocess.PIPE,
text=True, stderr=subprocess.PIPE,
bufsize=1 text=True,
) bufsize=1
)
except FileNotFoundError:
# intel_gpu_top no está instalado, retornar lista vacía
return []
# Wait 2 seconds for intel_gpu_top to collect data # Wait 2 seconds for intel_gpu_top to collect data
time.sleep(2) time.sleep(2)
@@ -2608,7 +2612,6 @@ def identify_temperature_sensor(sensor_name, adapter, chip_name=None):
core_num = re.search(r'(\d+)', sensor_name) core_num = re.search(r'(\d+)', sensor_name)
return f"CPU Core {core_num.group(1)}" if core_num else "CPU Core" return f"CPU Core {core_num.group(1)}" if core_num else "CPU Core"
# <CHANGE> DDR5 Memory temperature sensors (SPD5118)
if "spd5118" in chip_lower or ("smbus" in adapter_lower and "temp1" in sensor_lower): if "spd5118" in chip_lower or ("smbus" in adapter_lower and "temp1" in sensor_lower):
# Try to identify which DIMM slot # Try to identify which DIMM slot
# Example: spd5118-i2c-0-50 -> i2c bus 0, address 0x50 (DIMM A1) # Example: spd5118-i2c-0-50 -> i2c bus 0, address 0x50 (DIMM A1)
@@ -2678,7 +2681,7 @@ def identify_fan(sensor_name, adapter, chip_name=None):
"""Identify what a fan sensor corresponds to, using hardware_monitor for GPU detection""" """Identify what a fan sensor corresponds to, using hardware_monitor for GPU detection"""
sensor_lower = sensor_name.lower() sensor_lower = sensor_name.lower()
adapter_lower = adapter.lower() if adapter else "" adapter_lower = adapter.lower() if adapter else ""
chip_lower = chip_name.lower() if chip_name else "" # <CHANGE> Add chip name chip_lower = chip_name.lower() if chip_name else "" # Add chip name
# GPU fans - Check both adapter and chip name for GPU drivers # GPU fans - Check both adapter and chip name for GPU drivers
if "pci adapter" in adapter_lower or "pci adapter" in chip_lower or any(gpu_driver in adapter_lower + chip_lower for gpu_driver in ["nouveau", "amdgpu", "radeon", "i915"]): if "pci adapter" in adapter_lower or "pci adapter" in chip_lower or any(gpu_driver in adapter_lower + chip_lower for gpu_driver in ["nouveau", "amdgpu", "radeon", "i915"]):
@@ -4623,7 +4626,7 @@ def get_hardware_info():
result = subprocess.run(['sensors'], capture_output=True, text=True, timeout=5) result = subprocess.run(['sensors'], capture_output=True, text=True, timeout=5)
if result.returncode == 0: if result.returncode == 0:
current_adapter = None current_adapter = None
current_chip = None # <CHANGE> Add chip name tracking current_chip = None # Add chip name tracking
fans = [] fans = []
for line in result.stdout.split('\n'): for line in result.stdout.split('\n'):
@@ -4631,7 +4634,6 @@ def get_hardware_info():
if not line: if not line:
continue continue
# <CHANGE> Detect chip name (e.g., "nouveau-pci-0200")
# Chip names don't have ":" and are not indented # Chip names don't have ":" and are not indented
if not ':' in line and not line.startswith(' ') and not line.startswith('Adapter'): if not ':' in line and not line.startswith(' ') and not line.startswith('Adapter'):
current_chip = line current_chip = line