pyhw 0.5.0__tar.gz → 0.6.1__tar.gz

{pyhw-0.5.0/src/pyhw.egg-info → pyhw-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.5.0
+Version: 0.6.1
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
@@ -19,7 +19,8 @@ Requires-Dist: pypci-ng>=0.0.3
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
 ![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
 
-![Static Badge](https://img.shields.io/badge/macOS-brightgreen)
+![Static Badge](https://img.shields.io/badge/macOS-11%2B-green
+)
 ![Static Badge](https://img.shields.io/badge/Linux-blue)
 
 
@@ -42,6 +43,8 @@ pip install pyhw
 ```
 To upgrade pyhw:
 ```shell
+pip install pyhw -U
+# or
 pip install pyhw --upgrade
 ```
 You can then use this tool directly from the command line with the following command, just like neofetch.
@@ -74,7 +77,7 @@ This is due to the fact that system python is not supposed to be managed by pip.
 
 ## Supported (Tested) OS
 * macOS arm64, x86_64
-* debian-based distro x86_64
+* debian-based distro arm64, x86_64
 * RaspberryPi OS arm64
 
 
@@ -90,8 +93,7 @@ clone the project, and run:
 ```shell
 python -m build
 ```
-or you can use the old setup.py style command:
+After the build process, the source package and the binary whl package can be found in the dist folder. Then you can use the following command to install the new package.
 ```shell
-python setup.py sdist bdist_wheel
+pip install dist/*.whl --force-reinstall
 ```
-After the build process, the source package and the binary whl package can be found in the dist folder.

{pyhw-0.5.0 → pyhw-0.6.1}/README.md

@@ -2,7 +2,8 @@
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
 ![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
 
-![Static Badge](https://img.shields.io/badge/macOS-brightgreen)
+![Static Badge](https://img.shields.io/badge/macOS-11%2B-green
+)
 ![Static Badge](https://img.shields.io/badge/Linux-blue)
 
 
@@ -25,6 +26,8 @@ pip install pyhw
 ```
 To upgrade pyhw:
 ```shell
+pip install pyhw -U
+# or
 pip install pyhw --upgrade
 ```
 You can then use this tool directly from the command line with the following command, just like neofetch.
@@ -57,7 +60,7 @@ This is due to the fact that system python is not supposed to be managed by pip.
 
 ## Supported (Tested) OS
 * macOS arm64, x86_64
-* debian-based distro x86_64
+* debian-based distro arm64, x86_64
 * RaspberryPi OS arm64
 
 
@@ -73,8 +76,7 @@ clone the project, and run:
 ```shell
 python -m build
 ```
-or you can use the old setup.py style command:
+After the build process, the source package and the binary whl package can be found in the dist folder. Then you can use the following command to install the new package.
 ```shell
-python setup.py sdist bdist_wheel
+pip install dist/*.whl --force-reinstall
 ```
-After the build process, the source package and the binary whl package can be found in the dist folder.

{pyhw-0.5.0 → pyhw-0.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.5.0"
+version = "0.6.1"
 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 = [
@@ -30,7 +30,7 @@ package-dir = {"" = "src"}
 include-package-data = true
 
 [tool.setuptools.package-data]
-"pyhw" = ["frontend/logo/ascii/*.pyhw"]
+"pyhw" = ["frontend/logo/ascii/*.pyhw", "library/lib/*.dylib"]
 
 [project.scripts]
 pyhw = "pyhw.__main__:main"

pyhw-0.6.1/src/pyhw/backend/gpu/macos.py

@@ -0,0 +1,100 @@
+from .gpuInfo import GPUInfo
+from ...pyhwUtil import getArch
+import json
+import subprocess
+import ctypes
+from pathlib import Path
+
+
+class GPUDetectMacOS:
+    def __init__(self):
+        self.__gpuInfo = GPUInfo()
+        self.__arch = getArch()
+
+    def getGPUInfo(self):
+        if self.__arch == "aarch64":
+            self.__getGPUAppleSilicon()
+        else:   # Does not consider powerPC based Macs.
+            self.__getGPUIntel()
+        return self.__gpuInfo
+
+    def __getGPUAppleSilicon(self):
+        gpus = list()
+        try:
+            gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
+            if 'SPDisplaysDataType' in gpu_info_dict:
+                gpus = gpu_info_dict['SPDisplaysDataType']
+                self.__gpuInfo.number = len(gpus)
+            else:
+                pass
+        except Exception:
+            return
+
+        for gpu in gpus:
+            self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} ({gpu.get("sppci_cores")} cores) [SOC Integrated]')
+
+    def __getGPUIntel(self):
+        if self.__getGPUIOKit():
+            pass
+        else:
+            gpus = list()
+            try:
+                gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
+                if 'SPDisplaysDataType' in gpu_info_dict:
+                    gpus = gpu_info_dict['SPDisplaysDataType']
+                    self.__gpuInfo.number = len(gpus)
+                else:
+                    pass
+            except Exception:
+                return
+
+            for gpu in gpus:
+                if self.__handleVendor(gpu.get("spdisplays_vendor")) == "Intel":    # Integrated GPU
+                    self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} [CPU Integrated]')
+                elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "AMD":    # dGPU
+                    self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} {gpu.get("spdisplays_vram")} [Discrete]')
+                elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "Nvidia":    # Since current macOS does not support NVIDIA GPUs, this condition is not applicable
+                    pass
+
+    def __getGPUIOKit(self):
+        try:
+            package_root = Path(__file__).resolve().parent.parent.parent
+            lib = ctypes.CDLL(f"{package_root}/library/lib/iokitGPULib.dylib")
+            lib.getGPUInfo.restype = ctypes.c_char_p
+            gpu_info = lib.getGPUInfo()
+            gpus = gpu_info.decode('utf-8').split("; ")
+            self.__gpuInfo.number = len(gpus)
+            for gpu in gpus:
+                info_list = gpu.split(", ")
+                model = info_list[0]
+                vendor_id = info_list[1]
+                vram = int(info_list[2]) / 1024
+                if self.__handleVendorID(vendor_id) == "Intel":    # Integrated GPU
+                    self.__gpuInfo.gpus.append(f'{model} [CPU Integrated]')
+                elif self.__handleVendorID(vendor_id) == "AMD":    # dGPU
+                    self.__gpuInfo.gpus.append(f'{model} {vram} GB [Discrete]')
+            return True
+        except Exception as e:
+            print(f"An error occurred while getting GPU info using IOKit: {e}")
+            return False
+
+    @staticmethod
+    def __handleVendor(vendor):
+        if vendor == "sppci_vendor_Apple":
+            return "Apple"
+        elif vendor == "sppci_vendor_intel":
+            return "Intel"
+        elif vendor == "sppci_vendor_amd":
+            return "AMD"
+        else:
+            return vendor
+
+    @staticmethod
+    def __handleVendorID(vendor_id):
+        if vendor_id == "0x8086":
+            return "Intel"
+        elif vendor_id == "0x1002":
+            return "AMD"
+        else:
+            return vendor_id
+

pyhw-0.6.1/src/pyhw/library/iokitGPULib/te.py

@@ -0,0 +1,12 @@
+import ctypes
+
+# Load the dynamic library
+lib = ctypes.CDLL('./iokitGPULib.dylib')
+
+# Define the function return type as c_char_p (pointer to C char)
+lib.getGPUInfo.restype = ctypes.c_char_p
+
+# Call the function and get the result
+gpu_info = lib.getGPUInfo()
+print("Detected GPUs:", gpu_info)
+

{pyhw-0.5.0 → pyhw-0.6.1/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.5.0
+Version: 0.6.1
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
@@ -19,7 +19,8 @@ Requires-Dist: pypci-ng>=0.0.3
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
 ![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
 
-![Static Badge](https://img.shields.io/badge/macOS-brightgreen)
+![Static Badge](https://img.shields.io/badge/macOS-11%2B-green
+)
 ![Static Badge](https://img.shields.io/badge/Linux-blue)
 
 
@@ -42,6 +43,8 @@ pip install pyhw
 ```
 To upgrade pyhw:
 ```shell
+pip install pyhw -U
+# or
 pip install pyhw --upgrade
 ```
 You can then use this tool directly from the command line with the following command, just like neofetch.
@@ -74,7 +77,7 @@ This is due to the fact that system python is not supposed to be managed by pip.
 
 ## Supported (Tested) OS
 * macOS arm64, x86_64
-* debian-based distro x86_64
+* debian-based distro arm64, x86_64
 * RaspberryPi OS arm64
 
 
@@ -90,8 +93,7 @@ clone the project, and run:
 ```shell
 python -m build
 ```
-or you can use the old setup.py style command:
+After the build process, the source package and the binary whl package can be found in the dist folder. Then you can use the following command to install the new package.
 ```shell
-python setup.py sdist bdist_wheel
+pip install dist/*.whl --force-reinstall
 ```
-After the build process, the source package and the binary whl package can be found in the dist folder.

{pyhw-0.5.0 → pyhw-0.6.1}/src/pyhw.egg-info/SOURCES.txt

@@ -1,5 +1,4 @@
 LICENSE
-MANIFEST.in
 README.md
 pyproject.toml
 src/pyhw/__init__.py
@@ -87,6 +86,8 @@ src/pyhw/frontend/logo/ascii/macOS.pyhw
 src/pyhw/frontend/logo/ascii/raspbian.pyhw
 src/pyhw/frontend/logo/ascii/ubuntu.pyhw
 src/pyhw/frontend/logo/ascii/ubuntu_small.pyhw
+src/pyhw/library/iokitGPULib/te.py
+src/pyhw/library/lib/iokitGPULib.dylib
 src/pyhw/pyhwException/__init__.py
 src/pyhw/pyhwException/pyhwException.py
 src/pyhw/pyhwUtil/__init__.py

pyhw-0.5.0/MANIFEST.in

@@ -1 +0,0 @@
-include src/pyhw/frontend/logo/ascii/*.pyhw

pyhw-0.5.0/src/pyhw/backend/gpu/macos.py

@@ -1,63 +0,0 @@
-from .gpuInfo import GPUInfo
-from ...pyhwUtil import getArch
-import json
-import subprocess
-
-
-class GPUDetectMacOS:
-    def __init__(self):
-        self.__gpuInfo = GPUInfo()
-        self.__arch = getArch()
-
-    def getGPUInfo(self):
-        if self.__arch == "aarch64":
-            self.__getGPUAppleSilicon()
-        else:   # Does not consider powerPC based Macs.
-            self.__getGPUIntel()
-        return self.__gpuInfo
-
-    def __getGPUAppleSilicon(self):
-        gpus = list()
-        try:
-            gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
-            if 'SPDisplaysDataType' in gpu_info_dict:
-                gpus = gpu_info_dict['SPDisplaysDataType']
-                self.__gpuInfo.number = len(gpus)
-            else:
-                pass
-        except Exception:
-            return
-
-        for gpu in gpus:
-            self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} ({gpu.get("sppci_cores")} cores) [SOC Integrated]')
-
-    def __getGPUIntel(self):
-        gpus = list()
-        try:
-            gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
-            if 'SPDisplaysDataType' in gpu_info_dict:
-                gpus = gpu_info_dict['SPDisplaysDataType']
-                self.__gpuInfo.number = len(gpus)
-            else:
-                pass
-        except Exception:
-            return
-
-        for gpu in gpus:
-            if self.__handleVendor(gpu.get("spdisplays_vendor")) == "Intel":    # Integrated GPU
-                self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} [CPU Integrated]')
-            elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "AMD":    # dGPU
-                self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} {gpu.get("spdisplays_vram")} [Discrete]')
-            elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "Nvidia":    # Since current macOS does not support NVIDIA GPUs, this condition is not applicable
-                pass
-
-    @staticmethod
-    def __handleVendor(vendor):
-        if vendor == "sppci_vendor_Apple":
-            return "Apple"
-        elif vendor == "sppci_vendor_intel":
-            return "Intel"
-        elif vendor == "sppci_vendor_amd":
-            return "AMD"
-        else:
-            return vendor