From 35ad1c9d73c656af741f9e07a039e389a542acdd Mon Sep 17 00:00:00 2001 From: Khaleel Al-Adhami Date: Sat, 22 Feb 2025 09:55:02 -0800 Subject: [PATCH 1/2] opt for powershell as opposed to wmic --- reflex/utils/prerequisites.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/reflex/utils/prerequisites.py b/reflex/utils/prerequisites.py index 8afa706be..2486d0dfe 100644 --- a/reflex/utils/prerequisites.py +++ b/reflex/utils/prerequisites.py @@ -1936,13 +1936,13 @@ def get_cpu_info() -> CpuInfo | None: cpuinfo = {} try: if platform_os == "Windows": - cmd = "wmic cpu get addresswidth,caption,manufacturer /FORMAT:csv" + cmd = 'powershell -Command "Get-CimInstance Win32_Processor | Select-Object AddressWidth,Manufacturer,Name | ConvertTo-Json"' output = processes.execute_command_and_return_output(cmd) if output: - val = output.splitlines()[-1].split(",")[1:] - cpuinfo["manufacturer_id"] = val[2] - cpuinfo["model_name"] = val[1].split("Family")[0].strip() - cpuinfo["address_width"] = format_address_width(val[0]) + cpu_data = json.loads(output) + cpuinfo["address_width"] = cpu_data["AddressWidth"] + cpuinfo["manufacturer_id"] = cpu_data["Manufacturer"] + cpuinfo["model_name"] = cpu_data["Name"] elif platform_os == "Linux": output = processes.execute_command_and_return_output("lscpu") if output: @@ -1968,6 +1968,7 @@ def get_cpu_info() -> CpuInfo | None: ) except Exception as err: console.error(f"Failed to retrieve CPU info. {err}") + raise typer.Exit(1) from err # TODO: REMOVE THIS AFTER MAKING SURE IT WORKS return None return ( From 9179cbe7c814c2ad6f419daa8695bb3dcf5666ce Mon Sep 17 00:00:00 2001 From: Khaleel Al-Adhami Date: Sat, 22 Feb 2025 10:21:04 -0800 Subject: [PATCH 2/2] remove that line --- reflex/utils/prerequisites.py | 1 - 1 file changed, 1 deletion(-) diff --git a/reflex/utils/prerequisites.py b/reflex/utils/prerequisites.py index 2486d0dfe..fc16ba39e 100644 --- a/reflex/utils/prerequisites.py +++ b/reflex/utils/prerequisites.py @@ -1968,7 +1968,6 @@ def get_cpu_info() -> CpuInfo | None: ) except Exception as err: console.error(f"Failed to retrieve CPU info. {err}") - raise typer.Exit(1) from err # TODO: REMOVE THIS AFTER MAKING SURE IT WORKS return None return (