pyhw 0.11.9__tar.gz → 0.12.0__tar.gz

{pyhw-0.11.9/src/pyhw.egg-info → pyhw-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.11.9
+Version: 0.12.0
 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.0
+Requires-Dist: pypci-ng>=0.2.2
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

{pyhw-0.11.9 → pyhw-0.12.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.11.9"
+version = "0.12.0"
 description = "PyHw, a neofetch-like command line tool for fetching system information but written mostly in python."
 keywords = ["neofetch", "system information", "command line tool", "python", "hardware information", "fastfetch", "fetching"]
 authors = [
@@ -17,7 +17,7 @@ readme = "README.md"
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.9"
 dependencies = [
-    "pypci-ng>=0.2.0"
+    "pypci-ng>=0.2.2"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

pyhw-0.12.0/src/pyhw/__init__.py

@@ -0,0 +1,2 @@
+__version__ = '0.12.0'
+__author__ = 'xiaoran007'

{pyhw-0.11.9 → pyhw-0.12.0}/src/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-0.11.9 → pyhw-0.12.0}/src/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():

{pyhw-0.11.9 → pyhw-0.12.0}/src/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,25 @@ 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("; ")
+            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-0.12.0/src/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.9 → pyhw-0.12.0/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.11.9
+Version: 0.12.0
 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.0
+Requires-Dist: pypci-ng>=0.2.2
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

{pyhw-0.11.9 → pyhw-0.12.0}/src/pyhw.egg-info/SOURCES.txt

@@ -115,6 +115,7 @@ src/pyhw/frontend/logo/ascii/windows_2025.pyhw
 src/pyhw/frontend/logo/ascii/windows_old.pyhw
 src/pyhw/library/lib/iokitGPULib.dylib
 src/pyhw/library/lib/iokitHostLib.dylib
+src/pyhw/library/test/iokitHostLibTest.py
 src/pyhw/pyhwException/__init__.py
 src/pyhw/pyhwException/pyhwException.py
 src/pyhw/pyhwUtil/__init__.py

pyhw-0.12.0/src/pyhw.egg-info/requires.txt

@@ -0,0 +1 @@
+pypci-ng>=0.2.2

pyhw-0.11.9/src/pyhw/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.11.9'

pyhw-0.11.9/src/pyhw.egg-info/requires.txt

@@ -1 +0,0 @@
-pypci-ng>=0.2.0