Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-10-11 04:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update flask_server.py

Browse Source
This commit is contained in:
MacRimi
2025-10-09 19:52:44 +02:00
parent 845eab6f53
commit eb954fb10d
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
AppImage/scripts/flask_server.py
View File

@@ -1626,21 +1626,33 @@ def get_detailed_gpu_info(gpu):
print(f"[v0] Current user: {os.getenv('USER', 'unknown')}", flush=True) print(f"[v0] Current user: {os.getenv('USER', 'unknown')}", flush=True)
print(f"[v0] Current working directory: {os.getcwd()}", flush=True) print(f"[v0] Current working directory: {os.getcwd()}", flush=True)
cmd = ['intel_gpu_top', '-J'] cmd = 'intel_gpu_top -J'
print(f"[v0] Executing command: {' '.join(cmd)}", flush=True) print(f"[v0] Executing command: {cmd}", flush=True)
drm_devices = ['/dev/dri/card0', '/dev/dri/renderD128']
for drm_dev in drm_devices:
if os.path.exists(drm_dev):
readable = os.access(drm_dev, os.R_OK)
writable = os.access(drm_dev, os.W_OK)
print(f"[v0] {drm_dev}: readable={readable}, writable={writable}", flush=True)
process = subprocess.Popen( process = subprocess.Popen(
cmd, cmd,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
text=True, text=True,
bufsize=1 bufsize=1,
shell=True, # Use shell=True for proper context
env=os.environ.copy() # Copy all environment variables
) )
print(f"[v0] Process started with PID: {process.pid}", flush=True) print(f"[v0] Process started with PID: {process.pid}", flush=True)
print(f"[v0] Waiting 2 seconds for intel_gpu_top to initialize...", flush=True)
time.sleep(2)
start_time = time.time() start_time = time.time()
timeout = 5 # 5 seconds timeout timeout = 3 # Reduced timeout to 3 seconds
json_objects = [] json_objects = []
buffer = "" buffer = ""
brace_count = 0 brace_count = 0
@@ -1687,9 +1699,8 @@ def get_detailed_gpu_info(gpu):
else: else:
print(f"[v0] No 'clients' key in this JSON object", flush=True) print(f"[v0] No 'clients' key in this JSON object", flush=True)
# Stop after finding 5 JSON objects if len(json_objects) >= 10:
if len(json_objects) >= 5: print(f"[v0] Collected 10 JSON objects, stopping...", flush=True)
print(f"[v0] Collected 5 JSON objects, stopping...", flush=True)
break break
except json.JSONDecodeError: except json.JSONDecodeError:
pass pass
@@ -1706,6 +1717,14 @@ def get_detailed_gpu_info(gpu):
print(f"[v0] Collected {len(json_objects)} JSON objects total", flush=True) print(f"[v0] Collected {len(json_objects)} JSON objects total", flush=True)
if not any('clients' in obj for obj in json_objects):
try:
stderr_output = process.stderr.read()
if stderr_output:
print(f"[v0] intel_gpu_top stderr (no clients found): {stderr_output}", flush=True)
except:
pass
best_json = None best_json = None
for json_obj in json_objects: for json_obj in json_objects:
if 'clients' in json_obj and len(json_obj['clients']) > 0: if 'clients' in json_obj and len(json_obj['clients']) > 0:
@@ -1823,9 +1842,12 @@ def get_detailed_gpu_info(gpu):
else: else:
print(f"[v0] WARNING: No valid JSON objects found", flush=True) print(f"[v0] WARNING: No valid JSON objects found", flush=True)
# Check stderr for errors # Check stderr for errors
stderr_output = process.stderr.read() try:
if stderr_output: stderr_output = process.stderr.read()
print(f"[v0] intel_gpu_top stderr: {stderr_output}", flush=True) if stderr_output:
print(f"[v0] intel_gpu_top stderr: {stderr_output}", flush=True)
except:
pass
except Exception as e: except Exception as e:
print(f"[v0] Error running intel_gpu_top: {e}", flush=True) print(f"[v0] Error running intel_gpu_top: {e}", flush=True)
@@ -2794,7 +2816,7 @@ def api_hardware():
'motherboard': hardware_info.get('motherboard', {}), 'motherboard': hardware_info.get('motherboard', {}),
'bios': hardware_info.get('motherboard', {}).get('bios', {}), # Extract BIOS info 'bios': hardware_info.get('motherboard', {}).get('bios', {}), # Extract BIOS info
'memory_modules': hardware_info.get('memory_modules', []), 'memory_modules': hardware_info.get('memory_modules', []),
'storage_devices': hardware_info.get('storage_devices', []), # Fixed: use hardware_data 'storage_devices': hardware_info.get('storage_devices', []), # Fixed: use hardware_info
'pci_devices': hardware_info.get('pci_devices', []), 'pci_devices': hardware_info.get('pci_devices', []),
'temperatures': hardware_info.get('sensors', {}).get('temperatures', []), 'temperatures': hardware_info.get('sensors', {}).get('temperatures', []),
'fans': all_fans, # Return combined fans (sensors + IPMI) 'fans': all_fans, # Return combined fans (sensors + IPMI)