diff --git a/modules/api/gpu.py b/modules/api/gpu.py index fac3ef23e..bdcffde81 100644 --- a/modules/api/gpu.py +++ b/modules/api/gpu.py @@ -42,7 +42,7 @@ Resut should always be: list[ResGPU] class ResGPU(BaseModel): name: str = Field(title="GPU Name") data: dict = Field(title="Name/Value data") - chart: list[float, float] = Field(title="Exactly two items to place on chart") + chart: tuple[float, float] = Field(title="Exactly two items to place on chart") """ if __name__ == '__main__': diff --git a/modules/api/models.py b/modules/api/models.py index dd8eb1b87..aa2bb197d 100644 --- a/modules/api/models.py +++ b/modules/api/models.py @@ -499,7 +499,7 @@ class ResScripts(BaseModel): class ResGPU(BaseModel): # definition of http response name: str = Field(title="GPU Name", description="GPU device name") data: dict = Field(title="Name/Value data", description="Key-value pairs of GPU metrics (utilization, temperature, clocks, memory, etc.)") - chart: list[float, float] = Field(title="Exactly two items to place on chart", description="Two numeric values for chart display (e.g., GPU utilization %, VRAM usage %)") + chart: tuple[float, float] = Field(title="Exactly two items to place on chart", description="Two numeric values for chart display (e.g., GPU utilization %, VRAM usage %)") class ItemLoadedModel(BaseModel): name: str = Field(title="Model Name", description="Model or component name") diff --git a/modules/api/nvml.py b/modules/api/nvml.py index 0dec562be..7a040696e 100644 --- a/modules/api/nvml.py +++ b/modules/api/nvml.py @@ -72,7 +72,7 @@ def get_nvml(): "System load": f'GPU {load.gpu}% | VRAM {load.memory}% | Temp {pynvml.nvmlDeviceGetTemperature(dev, 0)}C | Fan {pynvml.nvmlDeviceGetFanSpeed(dev)}%', 'State': get_reason(pynvml.nvmlDeviceGetCurrentClocksThrottleReasons(dev)), } - chart = [load.memory, load.gpu] + chart = (load.memory, load.gpu) devices.append({ 'name': name, 'data': data, diff --git a/modules/api/rocm_smi.py b/modules/api/rocm_smi.py index e7b9a2f74..fd95fa316 100644 --- a/modules/api/rocm_smi.py +++ b/modules/api/rocm_smi.py @@ -96,7 +96,7 @@ def get_rocm_smi(): 'Throttle reason': str(ThrottleStatus(int(rocm_smi_data[key].get("throttle_status", 0)))), } name = rocm_smi_data[key].get('Device Name', 'unknown') - chart = [load["memory"], load["gpu"]] + chart = (load["memory"], load["gpu"]) devices.append({ 'name': name, 'data': data, diff --git a/modules/api/xpu_smi.py b/modules/api/xpu_smi.py index 70401b84d..56c614781 100644 --- a/modules/api/xpu_smi.py +++ b/modules/api/xpu_smi.py @@ -29,7 +29,7 @@ def get_xpu_smi(): "VRAM usage": f'{round(100 * load["memory"] / total)}% | {load["memory"]} MB used | {total - load["memory"]} MB free | {total} MB total', "RAM usage": f'{round(100 * ram["used"] / ram["total"])}% | {round(1024 * ram["used"])} MB used | {round(1024 * ram["free"])} MB free | {round(1024 * ram["total"])} MB total', } - chart = [load["memory"], load["gpu"]] + chart = (load["memory"], load["gpu"]) devices.append({ 'name': torch.xpu.get_device_name(), 'data': data,