pyhw 0.8.0__tar.gz → 0.9.0__tar.gz

{pyhw-0.8.0/src/pyhw.egg-info → pyhw-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.8.0
+Version: 0.9.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
@@ -27,6 +27,7 @@ Requires-Dist: pypci-ng>=0.1.2
 
 ![Static Badge](https://img.shields.io/badge/amd64-green)
 ![Static Badge](https://img.shields.io/badge/arm-blue)
+![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only Linux, macOS, FreeBSD and Windows are supported.**
@@ -96,7 +97,7 @@ This is due to the fact that system python is not supposed to be managed by pip.
 
 ## Tested OS
 * macOS arm64, x86_64
-* Linux arm64, x86_64
+* Linux arm64, x86_64, riscv64
 * FreeBSD arm64
 * Windows 10 X86_64
 

{pyhw-0.8.0 → pyhw-0.9.0}/README.md

@@ -10,6 +10,7 @@
 
 ![Static Badge](https://img.shields.io/badge/amd64-green)
 ![Static Badge](https://img.shields.io/badge/arm-blue)
+![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only Linux, macOS, FreeBSD and Windows are supported.**
@@ -79,7 +80,7 @@ This is due to the fact that system python is not supposed to be managed by pip.
 
 ## Tested OS
 * macOS arm64, x86_64
-* Linux arm64, x86_64
+* Linux arm64, x86_64, riscv64
 * FreeBSD arm64
 * Windows 10 X86_64
 

{pyhw-0.8.0 → pyhw-0.9.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.8.0"
+version = "0.9.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 = [

pyhw-0.9.0/src/pyhw/__init__.py

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

{pyhw-0.8.0 → pyhw-0.9.0}/src/pyhw/backend/cpu/linux.py

@@ -73,6 +73,9 @@ class CPUDetectLinux:
                     model = compatible.split(",")[-1]
                     if model.startswith("sun"):
                         self.__cpuInfo.model = f"Allwinner {model.split('-')[-1].upper()} ({model})"
+            elif "cvitek" in compatible:
+                model = compatible.split(",")[-1]
+                self.__cpuInfo.model = f"Cvitek {model}"
         else:
             pass
 

{pyhw-0.8.0 → pyhw-0.9.0}/src/pyhw/backend/gpu/linux.py

@@ -29,7 +29,7 @@ class GPUDetectLinux:
 
     def __handleNonePciDevices(self):
         # if detector can't find any VGA/Display/3D GPUs, assume the host is a sbc device, this function is a placeholder for a more advanced method.
-        if getArch() == "aarch64" or getArch() == "arm32":
+        if getArch() in ["aarch64", "arm32", "riscv64"]:
             self.__gpuInfo.number = 1
             self.__gpuInfo.gpus.append(f"{CPUDetect(os='linux').getCPUInfo().model} [SOC Integrated]")
         else:

{pyhw-0.8.0 → pyhw-0.9.0}/src/pyhw/backend/host/linux.py

@@ -39,7 +39,7 @@ class HostDetectLinux:
                     self._hostInfo.model = self._hostInfo.name + " " + self._hostInfo.version
                 except FileNotFoundError:
                     pass
-            elif self._arch in ["aarch64", "arm32"]:
+            elif self._arch in ["aarch64", "arm32", "riscv64"]:
                 # 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.8.0 → pyhw-0.9.0}/src/pyhw/backend/kernel/windows.py

@@ -15,7 +15,10 @@ class KernelDetectWindows:
         version = platform.version()
         machine = platform.machine()
         display = self.__get_windows_version()
-        self.__kernelInfo.kernel = f"{version} ({display}) {machine}"
+        if display != "":
+            self.__kernelInfo.kernel = f"{version} ({display}) {machine}"
+        else:
+            self.__kernelInfo.kernel = f"{version} {machine}"
         return self.__kernelInfo
 
     @staticmethod
@@ -26,4 +29,10 @@ class KernelDetectWindows:
             winreg.CloseKey(key)
             return str(display_version)
         except:
-            raise BackendException("Unable to determine Windows kernel version.")
+            try:
+                key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
+                release_id, _ = winreg.QueryValueEx(key, "ReleaseId")
+                winreg.CloseKey(key)
+                return str(release_id)
+            except:
+                return ""

{pyhw-0.8.0 → pyhw-0.9.0}/src/pyhw/backend/nic/linux.py

@@ -39,6 +39,8 @@ class NICDetectLinux:
             for interface in interfaces:
                 try:
                     if_ip = subprocess.run(["bash", "-c", f"ip -4 addr show {interface} | grep inet | awk '{{print $2}}'"], capture_output=True, text=True).stdout.strip().split("/")[0]
+                    if if_ip == "":
+                        continue
                     self._nicInfo.nics.append(f"{interface} @ {if_ip}")
                     self._nicInfo.number += 1
                 except:

{pyhw-0.8.0 → pyhw-0.9.0}/src/pyhw/backend/npu/linux.py

@@ -1,5 +1,6 @@
 from .npuInfo import NPUInfo
 import pypci
+import os
 
 
 class NPUDetectLinux:
@@ -25,9 +26,24 @@ class NPUDetectLinux:
                 self._npuInfo.number += 1
 
     def _handleNonePciDevices(self):
+        if os.path.exists("/sys/firmware/devicetree/base/tpu/compatible"):
+            try:
+                with open("/sys/firmware/devicetree/base/tpu/compatible", "r") as f:
+                    compatible = f.read().strip()
+            except FileNotFoundError:
+                compatible = ""
+            if "cvitek" in compatible:
+                model = compatible.split(",")[-1]
+                self._npuInfo.npus.append(f"Cvitek {model}")
+                self._npuInfo.number = 1
+            else:
+                pass
+        else:
+            pass
         # Place Holder for unknown NPU
-        self._npuInfo.number = 1
-        self._npuInfo.npus.append("Not found")
+        if self._npuInfo.number == 0:
+            self._npuInfo.number = 1
+            self._npuInfo.npus.append("Not found")
 
     @staticmethod
     def _npuNameClean(npu_name: str):

{pyhw-0.8.0 → pyhw-0.9.0}/src/pyhw/backend/os/windows.py

@@ -14,7 +14,10 @@ class OSDetectWindows:
         edition = platform.win32_edition()
         machine = platform.machine()
         display = self.__get_windows_version()
-        self._osInfo.prettyName = f"{system} {release} {display} ({edition}) {machine}"
+        if display != "":
+            self._osInfo.prettyName = f"{system} {release} {display} ({edition}) {machine}"
+        else:
+            self._osInfo.prettyName = f"{system} {release} ({edition}) {machine}"
         if release == "10":
             self._osInfo.id = "windows_10"
         elif release == "11":
@@ -31,5 +34,10 @@ class OSDetectWindows:
             winreg.CloseKey(key)
             return str(display_version)
         except:
-            raise BackendException("Unable to determine Windows kernel version.")
-
+            try:
+                key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
+                release_id, _ = winreg.QueryValueEx(key, "ReleaseId")
+                winreg.CloseKey(key)
+                return str(release_id)
+            except:
+                return ""

{pyhw-0.8.0 → pyhw-0.9.0}/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -25,7 +25,7 @@ def getOS():
 def getArch():
     """
     Get the machine architecture.
-    :return: str, value in [x86_64, x86, aarch64, arm32].
+    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64].
     """
     arch = platform.machine()
     if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
@@ -36,6 +36,8 @@ def getArch():
         return "aarch64"
     elif arch.find("arm") != -1:
         return "arm32"
+    elif arch == "riscv64":
+        return "riscv64"
     else:
         return "unknown"
 

{pyhw-0.8.0 → pyhw-0.9.0/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.8.0
+Version: 0.9.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
@@ -27,6 +27,7 @@ Requires-Dist: pypci-ng>=0.1.2
 
 ![Static Badge](https://img.shields.io/badge/amd64-green)
 ![Static Badge](https://img.shields.io/badge/arm-blue)
+![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only Linux, macOS, FreeBSD and Windows are supported.**
@@ -96,7 +97,7 @@ This is due to the fact that system python is not supposed to be managed by pip.
 
 ## Tested OS
 * macOS arm64, x86_64
-* Linux arm64, x86_64
+* Linux arm64, x86_64, riscv64
 * FreeBSD arm64
 * Windows 10 X86_64
 

pyhw-0.8.0/src/pyhw/__init__.py

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