pyhw 0.13.2__py3-none-any.whl → 0.13.4__py3-none-any.whl

pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.13.2'
+__version__ = '0.13.4'
 __author__ = 'xiaoran007'

pyhw/__main__.py

@@ -16,6 +16,7 @@ from .pyhwUtil import getOS, selectOSLogo
 from .pyhwUtil import ReleaseChecker
 from .frontend.color import colorPrefix, colorSuffix, ColorSet
 import multiprocessing
+import argparse
 
 
 def check_release(release_dict):
@@ -76,7 +77,21 @@ def detect_npu(os, result_dict):
         result_dict["NPU"] = npu_info.npus
 
 
+def print_version():
+    releaseChecker = ReleaseChecker()
+    print(f"pyhw v{releaseChecker.CurrentVersion}")
+
+
 def main():
+    parser = argparse.ArgumentParser(description='PyHw, a neofetch-like command line tool for fetching system information')
+    parser.add_argument('-v', '--version', action='store_true', help='Print version information and exit')
+
+    args = parser.parse_args()
+
+    if args.version:
+        print_version()
+        return
+
     current_os = getOS()
     if current_os not in ["linux", "macos", "freebsd", "windows"]:
         print(f"Only Linux, macOS, FreeBSD, and Windows are supported for now. Current OS: {current_os}")

pyhw/backend/cpu/linux.py

@@ -48,7 +48,20 @@ class CPUDetectLinux:
             else:
                 for line in cpu_info.split("\n"):
                     if line.startswith("cpu MHz") or line.startswith("clock"):
-                        self.__cpuInfo.frequency = f"{round(float(line.split(':')[1].strip()) / 1000, 2)} Ghz"  # Ghz
+                        value_str = line.split(':')[1].strip()
+                        try:
+                            freq_value = float(value_str)
+                            self.__cpuInfo.frequency = f"{round(freq_value / 1000, 2)} Ghz"
+                        except ValueError:
+                            match = re.search(r'(\d+(?:\.\d+)?)', value_str)
+                            if match:
+                                freq_value = float(match.group(1))
+                                if 'MHz' in value_str:
+                                    self.__cpuInfo.frequency = f"{round(freq_value / 1000, 2)} Ghz"
+                                elif 'GHz' in value_str:
+                                    self.__cpuInfo.frequency = f"{round(freq_value, 2)} Ghz"
+                                else:
+                                    self.__cpuInfo.frequency = f"{round(freq_value / 1000, 2)} Ghz"
                         break
 
     def __modelClean(self):

pyhw/backend/cpu/macos.py

@@ -1,5 +1,7 @@
 from .cpuInfo import CPUInfo
 from ...pyhwUtil import sysctlGetString, sysctlGetInt, getArch
+import ctypes
+from pathlib import Path
 
 
 class CPUDetectMacOS:
@@ -11,11 +13,13 @@ class CPUDetectMacOS:
 
     def getCPUInfo(self):
         if self.__arch == "aarch64":
+            # For Apple Silicon Macs, we need to handle the CPU differently.
             self.__getCPUModel()
-            self.__AppleSiliconBaseFrequency()
+            self.__AppleSiliconIOKitFrequency()
             self.__handleAppleSilicon()
             self.__cpuInfo.cpu = f"{self.__cpuInfo.model} ({self.__pCore}P, {self.__eCore}E) @ {self.__cpuInfo.frequency}"
         else:
+            # For Intel Macs, we can use sysctl to get the CPU information.
             self.__getCPUModel()
             self.__getCPUCores()
             self.__getCPUFrequency()
@@ -50,6 +54,21 @@ class CPUDetectMacOS:
                 self.__pCore = pcore
                 self.__eCore = ecore
 
+    def __AppleSiliconIOKitFrequency(self):
+        try:
+            package_root = Path(__file__).resolve().parent.parent.parent
+            lib = ctypes.CDLL(f"{package_root}/library/lib/iokitCPULib.dylib")
+            lib.get_apple_silicon_max_frequency.restype = ctypes.c_double
+            max_freq = lib.get_apple_silicon_max_frequency()
+            if max_freq != 0:
+                self.__cpuInfo.frequency = f"{max_freq:.2f} GHz"
+            else:
+                # If the IOKit library fails, we can fallback to the base frequency.
+                self.__AppleSiliconBaseFrequency()
+        except Exception as e:
+            # If the IOKit library fails, we can fallback to the base frequency.
+            self.__AppleSiliconBaseFrequency()
+
     def __AppleSiliconBaseFrequency(self):
         # see https://en.wikipedia.org/wiki/Apple_silicon#M_series for more details.
         # https://eclecticlight.co/2025/01/20/what-are-cpu-core-frequencies-in-apple-silicon-macs/
@@ -66,7 +85,7 @@ class CPUDetectMacOS:
             "Apple M3 Pro": "4.05 GHz",
             "Apple M3 Max": "4.05 GHz",
             "Apple M3 Ultra": "4.05 GHz",  # Need more info
-            "Apple M4": "4.40 GHz",
+            "Apple M4": "4.46 GHz",
             "Apple M4 Pro": "4.51 GHz",
             "Apple M4 Max": "4.51 GHz"
         }

pyhw/backend/gpu/linux.py

@@ -39,6 +39,10 @@ class GPUDetectLinux:
                     device_name = f"{device.vendor_name} {device.device_name} [{device.subsystem_device_name}] {core_print}"
                 else:
                     device_name = f"{device.vendor_name} {device.device_name} {core_print}"
+
+                if not device_name.strip():
+                    device_name = f"{device.class_name}"
+
                 self.__gpuInfo.gpus.append(self.__gpuNameClean(device_name))
                 self.__gpuInfo.number += 1
 

pyhw/backend/host/linux.py

@@ -41,7 +41,7 @@ class HostDetectLinux:
                     self._hostInfo.model = self._hostInfo.name + " " + self._hostInfo.version
                 except FileNotFoundError:
                     pass
-            elif self._arch in ["aarch64", "arm32", "riscv64"]:
+            elif self._arch in ["aarch64", "arm32", "riscv64", "ppc64le", "mips64"]:
                 # try to find dmi folder since some arm based desktops and servers may have same structure as x86_64 machines.
                 if os.path.exists("/sys/devices/virtual/dmi/id"):
                     try:

pyhw/backend/os/macos.py

@@ -10,14 +10,15 @@ class OSDetectMacOS:
         self.__ProductVersion = ""
         self.__BuildVersion = ""
         self.__VersionName = ""
+        self.__Arch = self.__handleOSArch()
 
     def getOSInfo(self):
         self.__getOS()
         self.__handelOSName()
         if self.__VersionName != "":
-            self.__osInfo.prettyName = f"{self.__ProductName} {self.__VersionName} {self.__ProductVersion} {self.__BuildVersion} {getArch()}"
+            self.__osInfo.prettyName = f"{self.__ProductName} {self.__VersionName} {self.__ProductVersion} {self.__BuildVersion} {self.__Arch}"
         else:
-            self.__osInfo.prettyName = f"{self.__ProductName} {self.__ProductVersion} {self.__BuildVersion} {getArch()}"
+            self.__osInfo.prettyName = f"{self.__ProductName} {self.__ProductVersion} {self.__BuildVersion} {self.__Arch}"
         self.__osInfo.id = "macOS"
         return self.__osInfo
 
@@ -51,3 +52,11 @@ class OSDetectMacOS:
         version_name = macOSVersionMap.get(major, "")
         if version_name != "":
             self.__VersionName = version_name
+
+    @staticmethod
+    def __handleOSArch():
+        arch = getArch()
+        if arch == "aarch64":
+            return "arm64"
+        else:
+            return arch

pyhw/library/test/iokitCPULibTest.py

@@ -0,0 +1,15 @@
+import ctypes
+
+
+def main():
+    lib = ctypes.CDLL(f"../lib/iokitCPULib.dylib")
+    lib.get_apple_silicon_max_frequency.restype = ctypes.c_double
+    max_freq = lib.get_apple_silicon_max_frequency()
+    print(max_freq)
+    # gpus = host_info.decode('utf-8').split("; ")
+
+
+if __name__ == "__main__":
+    main()
+
+

pyhw/pyhwUtil/pyhwUtil.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass
 import subprocess
 
 
-def getOS():
+def getOS() -> str:
     """
     Get the os type in lower case.
     :return: str, os type, value in [windows, linux, macos, freebsd, unknown].
@@ -23,10 +23,10 @@ def getOS():
         return "unknown"
 
 
-def getArch():
+def getArch() -> str:
     """
     Get the machine architecture.
-    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64, s390x, ppc64le].
+    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64, s390x, ppc64le, mips64].
     """
     arch = platform.machine()
     if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
@@ -43,6 +43,8 @@ def getArch():
         return "s390x"
     elif arch == "ppc64le":
         return "ppc64le"
+    elif arch == "mips64":
+        return "mips64"
     else:
         return "unknown"
 
@@ -157,7 +159,7 @@ class DataStringProcessor:
         return ret_str
 
 
-def createDataString(data: Data):
+def createDataString(data: Data) -> str:
     data_string_processor = DataStringProcessor(data)
     data_string = ""
     data_string += data_string_processor.getTitle()
@@ -175,7 +177,7 @@ def createDataString(data: Data):
     return data_string
 
 
-def createDataStringOld(data: Data):
+def createDataStringOld(data: Data) -> str:
     data_string = ""
     data_string += f" {data.title}\n"
     data_string += f" {'-'*len(data.title)}\n"
@@ -195,7 +197,7 @@ def createDataStringOld(data: Data):
     return data_string
 
 
-def selectOSLogo(os_id: str):
+def selectOSLogo(os_id: str) -> str:
     """
     Select the logo based on the os id and terminal size.
     :param os_id: str, os id.

{pyhw-0.13.2.dist-info → pyhw-0.13.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.13.2
+Version: 0.13.4
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.2.5
+Requires-Dist: pypci-ng>=0.2.6
 Dynamic: license-file
 
 # PyHw, a neofetch-like system information fetching tool
@@ -30,6 +30,8 @@ Dynamic: license-file
 ![Static Badge](https://img.shields.io/badge/aarch64-blue)
 ![Static Badge](https://img.shields.io/badge/arm32-yellow)
 ![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
+![Static Badge](https://img.shields.io/badge/ppc64-orange)
+![Static Badge](https://img.shields.io/badge/s390x-red)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python.

{pyhw-0.13.2.dist-info → pyhw-0.13.4.dist-info}/RECORD

@@ -1,26 +1,26 @@
-pyhw/__init__.py,sha256=lkC619ezbIHQYm9kYLwX2NkXYhmeQLX1Xqaf1Wb5wPw,49
-pyhw/__main__.py,sha256=oZpFtvSyYTM8cMsulvi51zJV0gtmw3OCQVdgoaHbtxc,4977
+pyhw/__init__.py,sha256=xxFswf8enN7kuEArYcxekQu970GRlfaYc-8QMH6xuEk,49
+pyhw/__main__.py,sha256=iy1nzJ7Z4wB_bMyDGOZgTUZZmOoAru7CxSzpm9SMNbs,5431
 pyhw/backend/__init__.py,sha256=X1D1D28lSojDrUzUolgJvmbuctwBh_UxG3FwUeL8adA,51
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
 pyhw/backend/cpu/__init__.py,sha256=5YfANJVRwNwTRodG0ENOgusrdN592aaSnfq5ok4dKTo,56
 pyhw/backend/cpu/bsd.py,sha256=Ls97NAsvZGVJj3_fBUcYXjY2gsZvFKhXYtkTHxVVXSs,288
 pyhw/backend/cpu/cpuBase.py,sha256=2YAOz1K8VLKtLY7iYBxUV9Ikuf4I4d4YivocvZDrdUU,748
 pyhw/backend/cpu/cpuInfo.py,sha256=A_nNGElq9W7oZ5DFJowLdFBE0ZvXKr5h29E6TGAvbRc,251
-pyhw/backend/cpu/linux.py,sha256=6xvRASlykSA3KzlK3CLK8JPT9NS6XMWj1gxIgVItkRE,3492
-pyhw/backend/cpu/macos.py,sha256=Mzo-4xBebu-o0p92CYCfdu_k93oLafvs6QExhosywko,3112
+pyhw/backend/cpu/linux.py,sha256=GrSeBqa25Br4GVXiqhlLS0OuWyNEVPvfNJbIgSPMonQ,4284
+pyhw/backend/cpu/macos.py,sha256=6t8OMvBJsOennwg_0F1zqWY5tzvavflvCou2q6NyPkI,4058
 pyhw/backend/cpu/windows.py,sha256=j9lkOL_zrnOAzr--GoFwMHEVqlE_vuO_wKnE0CgISdw,1702
 pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,56
 pyhw/backend/gpu/bsd.py,sha256=ladMMIlTwb6Z1ETCLFII--lkeLCp50Wb7WFrlOXa5DQ,123
 pyhw/backend/gpu/gpuBase.py,sha256=ZPT9o7PhYpzlwign0GsCT519F9DGx-1UEMVVOM8MV_k,748
 pyhw/backend/gpu/gpuInfo.py,sha256=d_z_z5DiZAg85wP0VOBQEU0QHdaK3qFqA2Tp9Eq8-Zs,133
-pyhw/backend/gpu/linux.py,sha256=DQMayZINcQLJe4_Gm_SYWhG8gL1T0YcyP97TfEwYVis,3010
+pyhw/backend/gpu/linux.py,sha256=2UaTih2JrUKA5K-ZYZdx6oXdBHW3zkt1bnD9ZV5PKcg,3113
 pyhw/backend/gpu/macos.py,sha256=s-GZk_Q7K58nSOYuOIAYLRvLafwHyQtsWrPVe3CuXac,4068
 pyhw/backend/gpu/windows.py,sha256=9VlObAdcOXJyFFxHKHSnFdL07xiGZHNHwn6C843TfNg,1170
 pyhw/backend/host/__init__.py,sha256=OmlSGjg3crlFcGz2FhBDyd35R7H0rriy3eq57y8h0_s,59
 pyhw/backend/host/bsd.py,sha256=xePlHfVYv7PSWMU1a7mTbMK3mzl2ssttkI13Xi5s00w,381
 pyhw/backend/host/hostBase.py,sha256=gM49SY6rEaxec_0bUOMk7QlEfR7vjfWp3BXEUqgdncc,762
 pyhw/backend/host/hostInfo.py,sha256=YUISVT-tumsU4M_b6tmeAq5-RBrW0K0c4_WoyR7xTeA,451
-pyhw/backend/host/linux.py,sha256=xvbZrwlKN--tKMf4_YyN20cGTSIcV5yLG3Gez7M15Pk,3157
+pyhw/backend/host/linux.py,sha256=_vzNTkmY3Vo3jZZmnYZ4iwTbuW_Hlp-C0EjKmm8A4yk,3178
 pyhw/backend/host/macos.py,sha256=VYuO6zpEmBfII9FGLtqa10m-YwxrdCCSSsYp9G9AtWw,16275
 pyhw/backend/host/windows.py,sha256=RRsR8Ejlym66uJ3FopOCcPzZAkDKQu3Inq4KJ8kl0SI,1165
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
@@ -52,7 +52,7 @@ pyhw/backend/npu/windows.py,sha256=jyTZiSqKzfyKRbzS-SgGxx0dKoHwo8gr8BlwBlxR58o,1
 pyhw/backend/os/__init__.py,sha256=RMKN332tsAhn_EiReoCq9NOmp4po5uZyaGNzpKS_ZZs,54
 pyhw/backend/os/bsd.py,sha256=RtRh_8tKHCVikGwhKGXSDqM9sqbCJJQehJMEmZ9kJOs,130
 pyhw/backend/os/linux.py,sha256=SbwNLMAUr3exJY54nmSuVkZAtOxWDVFNsS55pAO8x4k,1937
-pyhw/backend/os/macos.py,sha256=WsB0y1Q5cmT4RMLyMGffJFoHHIkdQ6ZKZM09_rMC854,1905
+pyhw/backend/os/macos.py,sha256=zlqXhX8Hjh7rkeFwgcT8ekXzTGa_1R6nYjgFkQrpcTk,2118
 pyhw/backend/os/osBase.py,sha256=2zaOGhaXLrNJS9-9qR4hH9_uFTgA2Sv4ab7YZvNVFaE,744
 pyhw/backend/os/osInfo.py,sha256=NEr76aicI9N3SFrwi1skcpUEjzsyCryTjdE9X1nBjBM,536
 pyhw/backend/os/windows.py,sha256=4qTYaQY19BiCIpmtHkp53yvChuYzlDmynbgICwHyfl8,1468
@@ -103,22 +103,23 @@ pyhw/frontend/logo/ascii/windows_10.pyhw,sha256=jv5pzZs_CdOzpeTjyXfXJWcTQwK-J0LN
 pyhw/frontend/logo/ascii/windows_11.pyhw,sha256=VuQTzbBabaEQhm2JBVhy6Ja6lClUGacQsaiNUih9nhU,656
 pyhw/frontend/logo/ascii/windows_2025.pyhw,sha256=o8eWsiyhNpDoEjiWFiBMfkd-8MdIslGc1Jpm85LU4P8,643
 pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo9qLY_VRKrciY,580
-pyhw/library/lib/iokitCPULib.dylib,sha256=gLi_HpkmNrzfOnyDxtzzmy65PxlC56g2LcS1l056PHQ,173320
+pyhw/library/lib/iokitCPULib.dylib,sha256=uMDDaijZGvTNkdT0ccQ55SDO4rRrzj8GSbrDMKeLAZ0,34280
 pyhw/library/lib/iokitGPULib.dylib,sha256=6xigd40YGEz9lHUfq_6qpTswz2st-4I9bW6j8ssg29s,155224
 pyhw/library/lib/iokitHostLib.dylib,sha256=MKxyKUkD4IZomP4exATikWx2SxqSDqQx4FEuIkFAEnc,149912
 pyhw/library/lib/nvmlGPULib_amd64.so,sha256=lrkxeJjChUs8oVhaw_uMeXKbUJp24KroQ_hhcLtHfTg,12784
 pyhw/library/lib/nvmlGPULib_arm64.so,sha256=DFIYqNcuRxiZ8_jrYoaRB3Dx9GrY7UBXscwXQvV4k3I,13528
+pyhw/library/test/iokitCPULibTest.py,sha256=BrhMypgfJTeMectpDc9Tmwzp8gYwYAcowaTFf72LlLE,311
 pyhw/library/test/iokitHostLibTest.py,sha256=oz5x1g4WMdoikU3Eo6zoxcHZ4e-UMRhXg0C0Lflo-ac,272
 pyhw/library/test/nvmlGPULibTest.py,sha256=F4AjQGZDNj29fRtxvy41zCSFi2Eirp0CQSYuxuw0n60,785
 pyhw/pyhwException/__init__.py,sha256=juw4PdgPa-eLy0y678BQ7_Ck-BJa-P0LHyKCGePazb8,221
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 pyhw/pyhwUtil/__init__.py,sha256=n3jWo-q-jSouXvUHMg45DOHS5xLRG64E02A9rDQb44M,323
 pyhw/pyhwUtil/cliUtil.py,sha256=_zNrhzQvrtqUp6xyZ0JTs_KyL1wvLji-nBmU65XA1aI,2342
-pyhw/pyhwUtil/pyhwUtil.py,sha256=_eUOHcuUqPHYuecDf0nEdF2GRuRJhW99MqYSJyZ4KUA,8270
+pyhw/pyhwUtil/pyhwUtil.py,sha256=V3M6X9eTirwnwwRiSJaLUWrZKZYMbRihARJVQc879P8,8364
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.13.2.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.13.2.dist-info/METADATA,sha256=cAE_w8oLoPkVi2nHwVzuwivcaDcdORqED8y5u8NS7D0,7600
-pyhw-0.13.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyhw-0.13.2.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.13.2.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.13.2.dist-info/RECORD,,
+pyhw-0.13.4.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.13.4.dist-info/METADATA,sha256=BSaBljX207vWEU7JcnZVurvQDGfaA7hALkbUfRk5j94,7715
+pyhw-0.13.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyhw-0.13.4.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.13.4.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.13.4.dist-info/RECORD,,