pyhw 0.13.2__tar.gz → 0.13.4__tar.gz

{pyhw-0.13.2/src/pyhw.egg-info → pyhw-0.13.4}/PKG-INFO

@@ -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 → pyhw-0.13.4}/README.md

@@ -12,6 +12,8 @@
 ![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 → pyhw-0.13.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.13.2"
+version = "0.13.4"
 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 = "BSD-3-Clause"
 requires-python = ">=3.9"
 dependencies = [
-    "pypci-ng>=0.2.5"
+    "pypci-ng>=0.2.6"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

{pyhw-0.13.2 → pyhw-0.13.4}/src/pyhw/__init__.py

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

{pyhw-0.13.2 → pyhw-0.13.4}/src/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-0.13.2 → pyhw-0.13.4}/src/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-0.13.2 → pyhw-0.13.4}/src/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-0.13.2 → pyhw-0.13.4}/src/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-0.13.2 → pyhw-0.13.4}/src/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-0.13.2 → pyhw-0.13.4}/src/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-0.13.4/src/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-0.13.2 → pyhw-0.13.4}/src/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 → pyhw-0.13.4/src/pyhw.egg-info}/PKG-INFO

@@ -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 → pyhw-0.13.4}/src/pyhw.egg-info/SOURCES.txt

@@ -117,6 +117,7 @@ src/pyhw/library/lib/iokitGPULib.dylib
 src/pyhw/library/lib/iokitHostLib.dylib
 src/pyhw/library/lib/nvmlGPULib_amd64.so
 src/pyhw/library/lib/nvmlGPULib_arm64.so
+src/pyhw/library/test/iokitCPULibTest.py
 src/pyhw/library/test/iokitHostLibTest.py
 src/pyhw/library/test/nvmlGPULibTest.py
 src/pyhw/pyhwException/__init__.py

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

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

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

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