Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-11-19 03:56:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update flask_server.py

Browse Source
This commit is contained in:
MacRimi
2025-10-10 17:09:23 +02:00
parent 7783e9ed20
commit 29893b89b3
1 changed files with 90 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
AppImage/scripts/flask_server.py
View File

@@ -2236,6 +2236,7 @@ def get_detailed_gpu_info(gpu):
print(f"[v0] Parsing fdinfo with {len(fdinfo)} entries", flush=True) print(f"[v0] Parsing fdinfo with {len(fdinfo)} entries", flush=True)
# CHANGE: Corregir parseo de fdinfo con estructura anidada
# fdinfo es un diccionario donde las claves son los PIDs (como strings) # fdinfo es un diccionario donde las claves son los PIDs (como strings)
for pid_str, proc_data in fdinfo.items(): for pid_str, proc_data in fdinfo.items():
try: try:
@@ -2248,9 +2249,16 @@ def get_detailed_gpu_info(gpu):
print(f"[v0] Processing fdinfo entry: PID={pid_str}, Name={process_info['name']}", flush=True) print(f"[v0] Processing fdinfo entry: PID={pid_str}, Name={process_info['name']}", flush=True)
# Parse VRAM usage for this process # La estructura real es: proc_data -> usage -> usage -> datos
if 'VRAM' in proc_data: # Acceder al segundo nivel de 'usage'
vram_data = proc_data['VRAM'] usage_outer = proc_data.get('usage', {})
usage_data = usage_outer.get('usage', {})
print(f"[v0] Usage data keys: {list(usage_data.keys())}", flush=True)
# Parse VRAM usage for this process (está dentro de usage.usage)
if 'VRAM' in usage_data:
vram_data = usage_data['VRAM']
if isinstance(vram_data, dict) and 'value' in vram_data: if isinstance(vram_data, dict) and 'value' in vram_data:
vram_mb = vram_data['value'] vram_mb = vram_data['value']
process_info['memory'] = { process_info['memory'] = {
@@ -2260,80 +2268,97 @@ def get_detailed_gpu_info(gpu):
} }
print(f"[v0] VRAM: {vram_mb} MB", flush=True) print(f"[v0] VRAM: {vram_mb} MB", flush=True)
# Parse GTT (Graphics Translation Table) usage # Parse GTT (Graphics Translation Table) usage (está dentro de usage.usage)
if 'GTT' in proc_data: if 'GTT' in usage_data:
gtt_data = proc_data['GTT'] gtt_data = usage_data['GTT']
if isinstance(gtt_data, dict) and 'value' in gtt_data: if isinstance(gtt_data, dict) and 'value' in gtt_data:
gtt_mb = gtt_data['value'] gtt_mb = gtt_data['value']
# Add GTT to total memory if not already counted # Add GTT to total memory if not already counted
if 'total' not in process_info['memory']: if 'total' not in process_info['memory']:
process_info['memory']['total'] = int(gtt_mb * 1024 * 1024) process_info['memory']['total'] = int(gtt_mb * 1024 * 1024)
else:
# Add GTT to existing VRAM
process_info['memory']['total'] += int(gtt_mb * 1024 * 1024)
print(f"[v0] GTT: {gtt_mb} MB", flush=True) print(f"[v0] GTT: {gtt_mb} MB", flush=True)
# Parse engine utilization for this process # Parse engine utilization for this process (están dentro de usage.usage)
if 'usage' in proc_data: # GFX (Graphics/Render)
usage = proc_data['usage'] if 'GFX' in usage_data:
print(f"[v0] Usage data: {usage}", flush=True) gfx_usage = usage_data['GFX']
if isinstance(gfx_usage, dict) and 'value' in gfx_usage:
# GFX (Graphics/Render) val = gfx_usage['value']
if 'GFX' in usage: if val > 0:
gfx_usage = usage['GFX'] process_info['engines']['Render/3D'] = f"{val:.1f}%"
if isinstance(gfx_usage, dict) and 'value' in gfx_usage: print(f"[v0] GFX: {val}%", flush=True)
val = gfx_usage['value']
if val > 0: # Compute
process_info['engines']['Render/3D'] = f"{val:.1f}%" if 'Compute' in usage_data:
print(f"[v0] GFX: {val}%", flush=True) comp_usage = usage_data['Compute']
if isinstance(comp_usage, dict) and 'value' in comp_usage:
# COMP (Compute) val = comp_usage['value']
if 'COMP' in usage: if val > 0:
comp_usage = usage['COMP'] process_info['engines']['Compute'] = f"{val:.1f}%"
if isinstance(comp_usage, dict) and 'value' in comp_usage: print(f"[v0] Compute: {val}%", flush=True)
val = comp_usage['value']
if val > 0: # DMA (Direct Memory Access)
process_info['engines']['Compute'] = f"{val:.1f}%" if 'DMA' in usage_data:
print(f"[v0] COMP: {val}%", flush=True) dma_usage = usage_data['DMA']
if isinstance(dma_usage, dict) and 'value' in dma_usage:
# DMA (Direct Memory Access) val = dma_usage['value']
if 'DMA' in usage: if val > 0:
dma_usage = usage['DMA'] process_info['engines']['DMA'] = f"{val:.1f}%"
if isinstance(dma_usage, dict) and 'value' in dma_usage: print(f"[v0] DMA: {val}%", flush=True)
val = dma_usage['value']
if val > 0: # Decode (Video Decode)
process_info['engines']['DMA'] = f"{val:.1f}%" if 'Decode' in usage_data:
print(f"[v0] DMA: {val}%", flush=True) dec_usage = usage_data['Decode']
if isinstance(dec_usage, dict) and 'value' in dec_usage:
# DEC (Decode/Video) val = dec_usage['value']
if 'DEC' in usage: if val > 0:
dec_usage = usage['DEC'] process_info['engines']['Video'] = f"{val:.1f}%"
if isinstance(dec_usage, dict) and 'value' in dec_usage: print(f"[v0] Decode: {val}%", flush=True)
val = dec_usage['value']
if val > 0: # Encode (Video Encode)
process_info['engines']['Video'] = f"{val:.1f}%" if 'Encode' in usage_data:
print(f"[v0] DEC: {val}%", flush=True) enc_usage = usage_data['Encode']
if isinstance(enc_usage, dict) and 'value' in enc_usage:
# ENC (Encode) val = enc_usage['value']
if 'ENC' in usage: if val > 0:
enc_usage = usage['ENC'] process_info['engines']['VideoEncode'] = f"{val:.1f}%"
if isinstance(enc_usage, dict) and 'value' in enc_usage: print(f"[v0] Encode: {val}%", flush=True)
val = enc_usage['value']
if val > 0: # Media (Media Engine)
process_info['engines']['VideoEncode'] = f"{val:.1f}%" if 'Media' in usage_data:
print(f"[v0] ENC: {val}%", flush=True) media_usage = usage_data['Media']
if isinstance(media_usage, dict) and 'value' in media_usage:
# CPU (CPU usage by GPU driver) val = media_usage['value']
if 'CPU' in usage: if val > 0:
cpu_usage = usage['CPU'] process_info['engines']['Media'] = f"{val:.1f}%"
if isinstance(cpu_usage, dict) and 'value' in cpu_usage: print(f"[v0] Media: {val}%", flush=True)
val = cpu_usage['value']
if val > 0: # CPU (CPU usage by GPU driver)
process_info['engines']['CPU'] = f"{val:.1f}%" if 'CPU' in usage_data:
print(f"[v0] CPU: {val}%", flush=True) cpu_usage = usage_data['CPU']
if isinstance(cpu_usage, dict) and 'value' in cpu_usage:
val = cpu_usage['value']
if val > 0:
process_info['engines']['CPU'] = f"{val:.1f}%"
print(f"[v0] CPU: {val}%", flush=True)
# VCN_JPEG (JPEG Decode)
if 'VCN_JPEG' in usage_data:
jpeg_usage = usage_data['VCN_JPEG']
if isinstance(jpeg_usage, dict) and 'value' in jpeg_usage:
val = jpeg_usage['value']
if val > 0:
process_info['engines']['JPEG'] = f"{val:.1f}%"
print(f"[v0] VCN_JPEG: {val}%", flush=True)
# Add the process even if it has no active engines at this moment # Add the process even if it has no active engines at this moment
# (may have allocated memory but is not actively using the GPU) # (may have allocated memory but is not actively using the GPU)
if process_info['memory'] or process_info['engines']: if process_info['memory'] or process_info['engines']:
processes.append(process_info) processes.append(process_info)
print(f"[v0] Added AMD GPU process: {process_info['name']} (PID: {process_info['pid']})", flush=True) print(f"[v0] Added AMD GPU process: {process_info['name']} (PID: {process_info['pid']}) - Memory: {process_info['memory']}, Engines: {process_info['engines']}", flush=True)
else: else:
print(f"[v0] Skipped process {process_info['name']} - no memory or engine usage", flush=True) print(f"[v0] Skipped process {process_info['name']} - no memory or engine usage", flush=True)