pyhw 0.4.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

pyhw/backend/gpu/macos.py

@@ -2,6 +2,8 @@ from .gpuInfo import GPUInfo
 from ...pyhwUtil import getArch
 import json
 import subprocess
+import ctypes
+from pathlib import Path
 
 
 class GPUDetectMacOS:
@@ -32,24 +34,49 @@ class GPUDetectMacOS:
             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
+        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
+            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
+            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):
@@ -61,3 +88,13 @@ class GPUDetectMacOS:
             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/backend/nic/macos.py

@@ -7,12 +7,21 @@ class NICDetectMacOS:
         self.__nicInfo = NICInfo()
 
     def getNICInfo(self):
-        self.__nicInfo.nics.append("en0")
-        self.__nicInfo.number = 1
+        self.__getNICInfo()
         return self.__nicInfo
 
     def __getNICInfo(self):
         # Placeholder for a more advanced method.
-        interfaces = subprocess.run(["bash", "-c", "route get default | grep interface"], capture_output=True, text=True).stdout.strip()
+        try:
+            interface = subprocess.run(["bash", "-c", "route get default | grep interface"], capture_output=True, text=True).stdout.strip().split(":")[1]
+            if_ip = subprocess.run(["bash", "-c", f"ipconfig getifaddr {interface}"], capture_output=True, text=True).stdout.strip()
+            self.__nicInfo.nics.append(f"{interface} @ {if_ip}")
+            self.__nicInfo.number += 1
+        except:
+            self.__handleError()
+
+    def __handleError(self):
+        self.__nicInfo.nics.append("en0")
+        self.__nicInfo.number = 1
 
 

pyhw/backend/npu/macos.py

@@ -18,7 +18,7 @@ class NPUDetectMacOS:
 
     def __getNPUAppleSilicon(self):
         # Place holder
-        self.__npuInfo.npus.append("Neural Engine [SOC Integrated]")
+        self.__npuInfo.npus.append("Apple Neural Engine [SOC Integrated]")
         self.__npuInfo.number += 1
 
     def __getNPUIntel(self):

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.4.1.dist-info → pyhw-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.4.1
+Version: 0.6.0
 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.4.1.dist-info → pyhw-0.6.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,
 pyhw/backend/gpu/gpuBase.py,sha256=Ge0DX2P8_EB7ovM7glmPUnVsPJL3OUHV2t_1T5mimR0,409
 pyhw/backend/gpu/gpuInfo.py,sha256=d_z_z5DiZAg85wP0VOBQEU0QHdaK3qFqA2Tp9Eq8-Zs,133
 pyhw/backend/gpu/linux.py,sha256=E-evoL-spQbHB8JvbZXSq5ypc2SeePVUPnhEQrSPQpg,1619
-pyhw/backend/gpu/macos.py,sha256=kkTq9_ZJwTQ0Jwep4oYq41STDTplFz83jKRYbvlbMhg,2337
+pyhw/backend/gpu/macos.py,sha256=J6BjGGzsMjwqtw6YbRaYK903s2CC7CefJKcVwyUFNV4,3786
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
 pyhw/backend/host/hostBase.py,sha256=POyDW3f5JSWtEKyCfrVSBEddSwoywe_OBgUExCEuje8,563
 pyhw/backend/host/hostInfo.py,sha256=Xvz0LugPiCSWMkcDsp4p2rrojYFZauL6Q-gCZ6NLz5k,184
@@ -32,12 +32,12 @@ pyhw/backend/memory/memoryInfo.py,sha256=OQF165uEyuapAsi7cKacQYDRnKdrQHeldfyFwzS
 pyhw/backend/metal/t.py,sha256=52yv-JoXNfaIOfcxEEidIg0MoyFtzWvTRm550kQKPZA,391
 pyhw/backend/nic/__init__.py,sha256=eP4eOYIvMF3LcTf954hJa6TnB8R4Qahss2g-UcgypKY,57
 pyhw/backend/nic/linux.py,sha256=2IDhesM77qLt7QK8HzYiMeLyuKWOVVrrDtkLHs7R6lU,1321
-pyhw/backend/nic/macos.py,sha256=Gi-XAf2ZvJcWbwJvTlkpdyKaRDSXXiI2WhISeASxbvc,481
+pyhw/backend/nic/macos.py,sha256=63gZjSmUGwGqfs41IWrEXmSz9O8eQy4G5oql3JLZmoo,855
 pyhw/backend/nic/nicBase.py,sha256=hmVbiPOrDFClQrOBgAUgE8GVkC5nVH280jnlb65CDV4,539
 pyhw/backend/nic/nicInfo.py,sha256=wuBuL-aIzD441IUDPGz5e0xctcZ-opdpgqkVxgbvZLg,133
 pyhw/backend/npu/__init__.py,sha256=PgLKbwpgT5vw9xpa294Zxb94McyxNXW46_vMbT2Iqyc,58
 pyhw/backend/npu/linux.py,sha256=eQLozhGOh3iHoFXdRYp_Fn9OsrmJ7tsyxcOPUvopOSw,1286
-pyhw/backend/npu/macos.py,sha256=-eoZXMcwiYUeO_ba9lLqWyhV8jmBYkgMi7iMlmVsbeY,1031
+pyhw/backend/npu/macos.py,sha256=mNnfvjjPQNlA-mViuhmfeb__uI1be93ZSZvv7PVD52s,1037
 pyhw/backend/npu/npuBase.py,sha256=6lPYmsOGHO-lT-GqaJ2hNXRV_FLYqguuZ_7L6JJCG-g,411
 pyhw/backend/npu/npuInfo.py,sha256=82dK6XvW_XKw4O5-RfR4-qQRR7Plh8qqJLj0YDzISmU,135
 pyhw/backend/os/__init__.py,sha256=rPHQYdQK3qU6ZwwodqVoEWeqBnKffXlJyi4k3-8ViPY,53
@@ -77,14 +77,16 @@ pyhw/frontend/logo/ascii/macOS.pyhw,sha256=HBGROtBb7wrNtRqAQ9ND7zxK0l17BRsmpgc2d
 pyhw/frontend/logo/ascii/raspbian.pyhw,sha256=jEl6WMKF-FGx359ipQ1kzweUJS-NuauYQCFaYime4PQ,159
 pyhw/frontend/logo/ascii/ubuntu.pyhw,sha256=l-Q0PfutxXYMwTojqeiM88063x4V0RBkZUHmi6YdsNc,833
 pyhw/frontend/logo/ascii/ubuntu_small.pyhw,sha256=Xf8LSZdZUu9aEG3efhb1FUlUEuJ-3UztcIOJISpKhPw,229
+pyhw/library/iokitGPULib/te.py,sha256=UbRUT82ckEFWP_r1-52wGFhaVO9bGSsON_NTBeTawCw,294
+pyhw/library/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa7od5Y,154808
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 pyhw/pyhwUtil/__init__.py,sha256=PzeP9fXsIhvr3sUpJ4DxW9_H25DEIasBFfXd_NztfR4,226
 pyhw/pyhwUtil/pyhwUtil.py,sha256=CKXJrt6KGhZCV1J7MjsQ21c_jPmC1I3wZBPCKJfdqbM,2478
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.4.1.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.4.1.dist-info/METADATA,sha256=unr5Vf2YvG3dQfGma2Ahm1BzNwC5lGyJdLNbvdNCFng,4136
-pyhw-0.4.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-pyhw-0.4.1.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.4.1.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.4.1.dist-info/RECORD,,
+pyhw-0.6.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.6.0.dist-info/METADATA,sha256=tc8zhFjdGBZG5sWdem_ABeGpEqe35P6cq2dSDDcXofo,4196
+pyhw-0.6.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+pyhw-0.6.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.6.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.6.0.dist-info/RECORD,,