pyhw 0.11.10__py3-none-any.whl → 0.12.1__py3-none-any.whl

pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.11.10'
+__version__ = '0.12.1'
 __author__ = 'xiaoran007'

pyhw/backend/cpu/macos.py

@@ -52,11 +52,12 @@ class CPUDetectMacOS:
 
     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/
         freq = {
-            "Apple M1": "2.30 GHz",
-            "Apple M1 Pro": "2.32 GHz",
-            "Apple M1 Max": "2.32 GHz",
-            "Apple M1 Ultra": "2.32 GHz",
+            "Apple M1": "3.20 GHz",
+            "Apple M1 Pro": "3.23 GHz",
+            "Apple M1 Max": "3.23 GHz",
+            "Apple M1 Ultra": "3.23 GHz",
             "Apple M2": "3.50 GHz",
             "Apple M2 Pro": "3.50 GHz",
             "Apple M2 Max": "3.69 GHz",
@@ -64,8 +65,9 @@ class CPUDetectMacOS:
             "Apple M3": "4.05 GHz",
             "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 Pro": "4.40 GHz",
-            "Apple M4 Max": "4.40 GHz"
+            "Apple M4 Pro": "4.51 GHz",
+            "Apple M4 Max": "4.51 GHz"
         }
         self.__cpuInfo.frequency = freq.get(self.__cpuInfo.model, "Unknown")

pyhw/backend/gpu/macos.py

@@ -31,7 +31,7 @@ class GPUDetectMacOS:
             return
 
         for gpu in gpus:
-            self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} ({gpu.get("sppci_cores")} cores) [SOC Integrated]')
+            self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} ({gpu.get("sppci_cores")} Cores) [SOC Integrated]')
 
     def __getGPUIntel(self):
         if self.__getGPUIOKit():
@@ -63,6 +63,10 @@ class GPUDetectMacOS:
             lib.getGPUInfo.restype = ctypes.c_char_p
             gpu_info = lib.getGPUInfo()
             gpus = gpu_info.decode('utf-8').split("; ")
+            # if the first element is "Error", it means that the library failed to get the GPU info
+            # Fall back to the default implementation
+            if gpus[0] == "Error":
+                return False
             self.__gpuInfo.number = len(gpus)
             for gpu in gpus:
                 info_list = gpu.split(", ")

pyhw/backend/host/macos.py

@@ -3,6 +3,8 @@
 """
 from .hostInfo import HostInfo
 from ...pyhwUtil import sysctlGetString
+import ctypes
+from pathlib import Path
 
 
 class HostDetectMacOS:
@@ -11,10 +13,29 @@ class HostDetectMacOS:
         self.__HWModel = ""
 
     def getHostInfo(self):
-        self.__getHWModel()
-        self.__hostInfo.model = self.__handleMacName(self.__HWModel)
+        if not self.__getHostInfoIOKit():
+            # if IOKit fails, fallback to sysctl
+            self.__getHWModel()
+            self.__hostInfo.model = self.__handleMacName(self.__HWModel)
         return self.__hostInfo
 
+    def __getHostInfoIOKit(self):
+        try:
+            package_root = Path(__file__).resolve().parent.parent.parent
+            lib = ctypes.CDLL(f"{package_root}/library/lib/iokitHostLib.dylib")
+            lib.getHostInfo.restype = ctypes.c_char_p
+            host_info = lib.getHostInfo()
+            product_name = host_info.decode('utf-8').split("; ")
+            # If the first element is "Error", it means that the library failed to get the product name.
+            # Fall back to sysctl.
+            if product_name[0] == "Error":
+                return False
+            self.__hostInfo.model = product_name[0]
+            return True
+        except Exception as e:
+            # print(f"An error occurred while getting GPU info using IOKit: {e}")
+            return False
+
     def __getHWModel(self):
         self.__HWModel = sysctlGetString("hw.model")
 

pyhw/library/test/iokitHostLibTest.py

@@ -0,0 +1,13 @@
+import ctypes
+
+
+def main():
+    lib = ctypes.CDLL(f"../lib/iokitHostLib.dylib")
+    lib.getHostInfo.restype = ctypes.c_char_p
+    host_info = lib.getHostInfo()
+    print(host_info)
+    # gpus = host_info.decode('utf-8').split("; ")
+
+
+if __name__ == "__main__":
+    main()

{pyhw-0.11.10.dist-info → pyhw-0.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.11.10
+Version: 0.12.1
 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>
@@ -14,7 +14,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.2.1
+Requires-Dist: pypci-ng>=0.2.2
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

{pyhw-0.11.10.dist-info → pyhw-0.12.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=51EhxNmqRbY7RGnf2x4Cq6QrC2M2HrqJJRwsZUMmn8I,50
+pyhw/__init__.py,sha256=7b2iToyIYELNXr7Y8tzbP1ltLj_gLux9vH4rYFqXtfU,49
 pyhw/__main__.py,sha256=oZpFtvSyYTM8cMsulvi51zJV0gtmw3OCQVdgoaHbtxc,4977
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -7,21 +7,21 @@ 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=TAHTi3hKt9uVyaVS1BP4BtpTHOcmH_6NslnbIAp3afo,3494
-pyhw/backend/cpu/macos.py,sha256=pacU-yT7q-HKerkh2Q0BSdzSY6dKzHfSnRZBmimqqXk,2953
+pyhw/backend/cpu/macos.py,sha256=Mzo-4xBebu-o0p92CYCfdu_k93oLafvs6QExhosywko,3112
 pyhw/backend/cpu/windows.py,sha256=A3oIvVUVMGPEqiM9QBiK0OwElcEf1LDhNi_23AimooQ,1723
 pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,56
 pyhw/backend/gpu/bsd.py,sha256=hNFiCek770CXOh3DK3I3-g272-a1S5D7LolGJBsLXaU,124
 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=M6pRlu3GREMw1Gm7MA-dY_yYI94MliHW3tyS8JjMw5Q,1617
-pyhw/backend/gpu/macos.py,sha256=SmTqqTrIMRW-GVPmDs8xAiOX7HsCjrGh9qkxLQCdvO8,3850
+pyhw/backend/gpu/macos.py,sha256=s-GZk_Q7K58nSOYuOIAYLRvLafwHyQtsWrPVe3CuXac,4068
 pyhw/backend/gpu/windows.py,sha256=Hv-vtWQGKv6_Nxc8raEBq7NNm5TR6xg6x6BK3Aa2uP4,1249
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
 pyhw/backend/host/bsd.py,sha256=9gKnM6yysHBKwS3EQvb0pCeylh3dzHvoEuPe14zo9wQ,382
 pyhw/backend/host/hostBase.py,sha256=gM49SY6rEaxec_0bUOMk7QlEfR7vjfWp3BXEUqgdncc,762
 pyhw/backend/host/hostInfo.py,sha256=grz15M2t3f_enqQvc7Qn6HlEfYwa66bu2NYvm8VpJ-g,452
 pyhw/backend/host/linux.py,sha256=aU-tWTI2Wjg1HCx2lGFenoaiM94axutXmL7Auu8ilhM,2925
-pyhw/backend/host/macos.py,sha256=KW-EJK9g1xHNrFsVxJv5GPLpc_ZevX0Zv1WjZUzRkzo,15369
+pyhw/backend/host/macos.py,sha256=RgDjvi8RsAs9i-bHkcSdK--TaeyaxYzLXFZFMl8T6Eo,16295
 pyhw/backend/host/windows.py,sha256=qn2QiTK2wIijyyw_QKdiSizY3teyS-9RNBu5RxEPRSw,1185
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
 pyhw/backend/kernel/kernelBase.py,sha256=3ZmkRkvwoWk3R-by2cgBlZnMSQzVjTC8Owmv53Pm4II,539
@@ -104,16 +104,18 @@ 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/iokitGPULib.dylib,sha256=KAz0VyeRspD3U7WeedUnPvJVUZEKn_Pw0AKk5zm42ZM,154808
+pyhw/library/lib/iokitGPULib.dylib,sha256=1T6nWbzwmDwH4Tu7U2Pka_7ikjIz6xfGBBvC5ejv0SQ,154552
+pyhw/library/lib/iokitHostLib.dylib,sha256=0sdPRA-dtogsgPEgb-VN32on6oIJMT9PmRZ0whRpQE0,149256
+pyhw/library/test/iokitHostLibTest.py,sha256=oz5x1g4WMdoikU3Eo6zoxcHZ4e-UMRhXg0C0Lflo-ac,272
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 pyhw/pyhwUtil/__init__.py,sha256=34ygvVBBqfJ_9OMzHToCcV_BVahixNsa_Z5yh6VsaPQ,304
 pyhw/pyhwUtil/cliUtil.py,sha256=42Gdi9wTg5XOYuEvGHEgOaZJ6dJk1qSuHIprR8pCA-g,2344
 pyhw/pyhwUtil/pyhwUtil.py,sha256=RokrE7X99pkS0LtN4wyJS_ZQmjtMwiNxA7MwXMoO96c,7664
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.11.10.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.11.10.dist-info/METADATA,sha256=nYeHe8DmO9ZjgNcUzearCGdJCDz_3xOEFoofWWzjXq8,6754
-pyhw-0.11.10.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-pyhw-0.11.10.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.11.10.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.11.10.dist-info/RECORD,,
+pyhw-0.12.1.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.12.1.dist-info/METADATA,sha256=ST9mK338vzRH0CI9mX31UerZPsGYiIYSN9tkYKNe2ww,6753
+pyhw-0.12.1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+pyhw-0.12.1.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.12.1.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.12.1.dist-info/RECORD,,

{pyhw-0.11.10.dist-info → pyhw-0.12.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any