pyhw 0.4.0__tar.gz → 0.5.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.4.0
+Version: 0.5.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
@@ -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.0.1
+Requires-Dist: pypci-ng>=0.0.3
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.4.0"
+version = "0.5.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 = [
@@ -14,7 +14,7 @@ readme = "README.md"
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.9"
 dependencies = [
-    "pypci-ng>=0.0.1"
+    "pypci-ng>=0.0.3"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

{pyhw-0.4.0 → pyhw-0.5.0}/src/pyhw/__main__.py

@@ -10,6 +10,7 @@ from .backend.cpu import CPUDetect
 from .backend.gpu import GPUDetect
 from .backend.memory import MemoryDetect
 from .backend.nic import NICDetect
+from .backend.npu import NPUDetect
 from .pyhwUtil import createDataString
 from .pyhwUtil import getOS, selectOSLogo
 
@@ -34,6 +35,9 @@ def main():
     nic_info = NICDetect(os=current_os).getNICInfo()
     if nic_info.number > 0:
         data.NIC = nic_info.nics
+    npu_info = NPUDetect(os=current_os).getNPUInfo()
+    if npu_info.number > 0:
+        data.NPU = npu_info.npus
 
     Printer(logo_os=selectOSLogo(OSDetect(os=current_os).getOSInfo().id), data=createDataString(data)).cPrint()
 

{pyhw-0.4.0 → pyhw-0.5.0}/src/pyhw/backend/backendBase.py

@@ -20,3 +20,4 @@ class Data:
     GPU = ["Default Value"]
     Memory = "Default Value"
     NIC = ["Default Value"]
+    NPU = ["Default Value"]

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

@@ -0,0 +1,27 @@
+from .nicInfo import NICInfo
+import subprocess
+
+
+class NICDetectMacOS:
+    def __init__(self):
+        self.__nicInfo = NICInfo()
+
+    def getNICInfo(self):
+        self.__getNICInfo()
+        return self.__nicInfo
+
+    def __getNICInfo(self):
+        # Placeholder for a more advanced method.
+        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-0.5.0/src/pyhw/backend/npu/__init__.py

@@ -0,0 +1,5 @@
+from .npuBase import NPUDetect
+
+__all__ = ['NPUDetect']
+
+

pyhw-0.5.0/src/pyhw/backend/npu/linux.py

@@ -0,0 +1,42 @@
+import subprocess
+from .npuInfo import NPUInfo
+from ..cpu import CPUDetect
+from ...pyhwUtil import getArch
+import pypci
+
+
+class NPUDetectLinux:
+    def __init__(self):
+        self.__npuInfo = NPUInfo()
+
+    def getNPUInfo(self):
+        self.__getNPUInfo()
+        self.__sortNPUList()
+        return self.__npuInfo
+
+    def __getNPUInfo(self):
+        npu_devices = pypci.PCI().FindAllNPU()
+        if len(npu_devices) == 0:
+            self.__handleNonePciDevices()
+        else:
+            for device in npu_devices:
+                if device.subsystem_device_name != "":
+                    device_name = f"{device.vendor_name} {device.device_name} ({device.subsystem_device_name})"
+                else:
+                    device_name = f"{device.vendor_name} {device.device_name}"
+                self.__npuInfo.npus.append(self.__npuNameClean(device_name))
+                self.__npuInfo.number += 1
+
+    def __handleNonePciDevices(self):
+        # Place Holder for unknown NPU
+        self.__npuInfo.number = 1
+        self.__npuInfo.npus.append("Not found")
+
+    @staticmethod
+    def __npuNameClean(npu_name: str):
+        npu_name_clean = npu_name.replace("Corporation ", "")
+        return npu_name_clean
+
+    def __sortNPUList(self):
+        self.__npuInfo.npus.sort()
+

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

@@ -0,0 +1,39 @@
+from .npuInfo import NPUInfo
+from ...pyhwUtil import getArch
+import json
+import subprocess
+
+
+class NPUDetectMacOS:
+    def __init__(self):
+        self.__npuInfo = NPUInfo()
+        self.__arch = getArch()
+
+    def getNPUInfo(self):
+        if self.__arch == "aarch64":
+            self.__getNPUAppleSilicon()
+        else:   # Does not consider powerPC based Macs.
+            self.__getNPUIntel()
+        return self.__npuInfo
+
+    def __getNPUAppleSilicon(self):
+        # Place holder
+        self.__npuInfo.npus.append("Apple Neural Engine [SOC Integrated]")
+        self.__npuInfo.number += 1
+
+    def __getNPUIntel(self):
+        # Place holder
+        self.__npuInfo.npus.append("Not Found")
+        self.__npuInfo.number += 1
+
+    @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
+

pyhw-0.5.0/src/pyhw/backend/npu/npuBase.py

@@ -0,0 +1,17 @@
+from .linux import NPUDetectLinux
+from .macos import NPUDetectMacOS
+
+
+class NPUDetect:
+    def __init__(self, os):
+        self.OS = os
+
+    def getNPUInfo(self):
+        if self.OS == "linux":
+            return NPUDetectLinux().getNPUInfo()
+        elif self.OS == "macos":
+            return NPUDetectMacOS().getNPUInfo()
+        else:
+            raise NotImplementedError("Unsupported operating system")
+
+

pyhw-0.5.0/src/pyhw/backend/npu/npuInfo.py

@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class NPUInfo:
+    def __init__(self):
+        self.number = 0
+        self.npus = []
+
+

{pyhw-0.4.0 → pyhw-0.5.0}/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -53,6 +53,8 @@ def createDataString(data: Data):
     data_string += f" Memory: {data.Memory}\n"
     for nic in data.NIC:
         data_string += f" NIC: {nic}\n"
+    for npu in data.NPU:
+        data_string += f" NPU: {npu}\n"
     return data_string
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.4.0
+Version: 0.5.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
@@ -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.0.1
+Requires-Dist: pypci-ng>=0.0.3
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

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

@@ -45,6 +45,11 @@ src/pyhw/backend/nic/linux.py
 src/pyhw/backend/nic/macos.py
 src/pyhw/backend/nic/nicBase.py
 src/pyhw/backend/nic/nicInfo.py
+src/pyhw/backend/npu/__init__.py
+src/pyhw/backend/npu/linux.py
+src/pyhw/backend/npu/macos.py
+src/pyhw/backend/npu/npuBase.py
+src/pyhw/backend/npu/npuInfo.py
 src/pyhw/backend/os/__init__.py
 src/pyhw/backend/os/linux.py
 src/pyhw/backend/os/macos.py

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

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

pyhw-0.4.0/src/pyhw/backend/nic/macos.py

@@ -1,18 +0,0 @@
-from .nicInfo import NICInfo
-import subprocess
-
-
-class NICDetectMacOS:
-    def __init__(self):
-        self.__nicInfo = NICInfo()
-
-    def getNICInfo(self):
-        self.__nicInfo.nics.append("en0")
-        self.__nicInfo.number = 1
-        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()
-
-

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

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