pyhw 0.10.2__py3-none-any.whl → 0.11.1__py3-none-any.whl

pyhw/__init__.py

@@ -1 +1 @@
-__version__ = '0.10.2'
+__version__ = '0.11.1'

pyhw/__main__.py

@@ -13,9 +13,17 @@ from .backend.nic import NICDetect
 from .backend.npu import NPUDetect
 from .pyhwUtil import createDataString
 from .pyhwUtil import getOS, selectOSLogo
+from .pyhwUtil import ReleaseChecker
 import multiprocessing
 
 
+def check_release(release_dict):
+    releaseChecker = ReleaseChecker()
+    release_dict["is_new_release"] = releaseChecker.check_for_updates()
+    release_dict["release"] = releaseChecker.LatestVersion
+    release_dict["current"] = releaseChecker.CurrentVersion
+
+
 def detect_title(os, result_dict):
     result_dict["title"] = TitleDetect(os=os).getTitle().title
 
@@ -76,8 +84,10 @@ def main():
 
     manager = multiprocessing.Manager()
     result_dict = manager.dict()
+    release_dict = manager.dict()
 
     processes = [
+        multiprocessing.Process(target=check_release, args=(release_dict,)),
         multiprocessing.Process(target=detect_title, args=(current_os, result_dict)),
         multiprocessing.Process(target=detect_host, args=(current_os, result_dict)),
         multiprocessing.Process(target=detect_kernel, args=(current_os, result_dict)),
@@ -94,7 +104,7 @@ def main():
     for process in processes:
         process.start()
 
-    for process in processes:
+    for process in processes[1:]:
         process.join()
 
     for key, value in result_dict.items():
@@ -103,32 +113,18 @@ def main():
     logo_os = selectOSLogo(OSDetect(os=current_os).getOSInfo().id)
     Printer(logo_os=logo_os, data=createDataString(data)).cPrint()
 
-
-# def main():
-#     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}")
-#         return
-#     data = Data()
-#     data.title = TitleDetect(os=current_os).getTitle().title
-#     data.Host = HostDetect(os=current_os).getHostInfo().model
-#     data.Kernel = KernelDetect(os=current_os).getKernelInfo().kernel
-#     data.Shell = ShellDetect(os=current_os).getShellInfo().info
-#     data.Uptime = UptimeDetect(os=current_os).getUptime().uptime
-#     data.OS = OSDetect(os=current_os).getOSInfo().prettyName
-#     data.CPU = CPUDetect(os=current_os).getCPUInfo().cpu
-#     gpu_info = GPUDetect(os=current_os).getGPUInfo()
-#     if gpu_info.number > 0:
-#         data.GPU = gpu_info.gpus
-#     data.Memory = MemoryDetect(os=current_os).getMemoryInfo().memory
-#     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()
+    processes[0].join()
+    if release_dict["is_new_release"]:
+        print(f"🔔 Found a newer version: v{release_dict['release']} (current: v{release_dict['current']})")
+        print("👉 You can use the following command to upgrade:")
+        if ReleaseChecker().isInPIPX:
+            print(f"   pipx upgrade pyhw")
+        else:
+            print(f"   pip install -U pyhw")
+    # else:
+    #     # debug
+    #     print("🎉 You are using the latest version of pyhw!")
+    #     print(f"🔔 Release: v{release_dict['release']} (current: v{release_dict['current']})")
 
 
 if __name__ == "__main__":

pyhw/backend/npu/macos.py

@@ -46,20 +46,20 @@ class NPUDetectMacOS:
         # see https://apple.fandom.com/wiki/Neural_Engine for more details.
         model_name = CPUDetect(os=getOS()).getCPUInfo().model
         npu = {
-            "Apple M1": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M1 Pro": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M1 Max": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M1 Ultra": "Apple Neural Engine 32 Core [SOC Integrated]",
-            "Apple M2": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M2 Pro": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M2 Max": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M2 Ultra": "Apple Neural Engine 32 Core [SOC Integrated]",
-            "Apple M3": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M3 Pro": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M3 Max": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M4": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M4 Pro": "Apple Neural Engine 16 Core [SOC Integrated]",
-            "Apple M4 Max": "Apple Neural Engine 16 Core [SOC Integrated]"
+            "Apple M1": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
+            "Apple M1 Pro": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
+            "Apple M1 Max": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
+            "Apple M1 Ultra": "Apple Neural Engine 32 Cores (5 nm) [SOC Integrated]",
+            "Apple M2": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
+            "Apple M2 Pro": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
+            "Apple M2 Max": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
+            "Apple M2 Ultra": "Apple Neural Engine 32 Cores (5 nm) [SOC Integrated]",
+            "Apple M3": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
+            "Apple M3 Pro": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
+            "Apple M3 Max": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
+            "Apple M4": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
+            "Apple M4 Pro": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
+            "Apple M4 Max": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]"
         }
         return npu.get(model_name, "Not Found")
 

pyhw/pyhwUtil/__init__.py

@@ -1,4 +1,5 @@
 from .pyhwUtil import getOS, getArch, getDocker, createDataString, selectOSLogo
 from .sysctlUtil import sysctlGetString, sysctlGetInt
+from .cliUtil import ReleaseChecker
 
-__all__ = ["getOS", "getArch", "getDocker", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt"]
+__all__ = ["getOS", "getArch", "getDocker", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt", "ReleaseChecker"]

pyhw/pyhwUtil/cliUtil.py

@@ -0,0 +1,62 @@
+import sys
+import site
+import os
+import urllib.request
+import json
+import importlib.metadata
+
+
+class ReleaseChecker:
+    PACKAGE_NAME = "pyhw"
+
+    def __init__(self):
+        self.isInPIPX = self.__is_running_in_pipx()
+        self.CurrentVersion = self.__get_installed_version()
+        self.LatestVersion = self.__get_latest_version()
+
+    @staticmethod
+    def __is_running_in_pipx():
+        return (
+            "pipx" in sys.prefix or
+            any("pipx" in path for path in site.getsitepackages()) or
+            "PIPX_BIN_DIR" in os.environ
+        )
+
+    def __get_installed_version(self):
+        try:
+            return importlib.metadata.version(self.PACKAGE_NAME)
+        except importlib.metadata.PackageNotFoundError:
+            return None
+
+    def __get_latest_version(self):
+        url = f"https://pypi.org/pypi/{self.PACKAGE_NAME}/json"
+        try:
+            with urllib.request.urlopen(url, timeout=3) as response:
+                data = json.load(response)
+                return data["info"]["version"]
+        except Exception:
+            return None
+
+    @staticmethod
+    def parse_version(version):
+        return tuple(map(int, version.split(".")))
+
+    def __is_newer_version(self):
+        if self.CurrentVersion is None or self.LatestVersion is None:
+            return False
+        else:
+            return self.parse_version(self.CurrentVersion) < self.parse_version(self.LatestVersion)
+
+    def check_for_updates(self):
+        return self.__is_newer_version()
+
+    def check_for_updates_print(self):
+        if self.__is_newer_version():
+            print(f"🔔 Found newer version: {self.CurrentVersion} (current: {self.LatestVersion})")
+            print("👉 You can use the following command to upgrade:")
+            if self.isInPIPX:
+                print(f"   pipx upgrade {self.PACKAGE_NAME}")
+            else:
+                print(f"   pip install -U {self.PACKAGE_NAME}")
+
+

{pyhw-0.10.2.dist-info → pyhw-0.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.10.2
+Version: 0.11.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
@@ -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.1.3
+Requires-Dist: pypci-ng>=0.1.4
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

{pyhw-0.10.2.dist-info → pyhw-0.11.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pyhw/__init__.py,sha256=KniWsK3VleHLcYbbhl5YHxNYNRusZE0zJco_WyUvAwI,23
-pyhw/__main__.py,sha256=Gp50LaRF9vl_czdLNJRoa0OIzctLKhcZU0XH3EjNVjM,4741
+pyhw/__init__.py,sha256=3TWkE7T0Jt_0JSXR8Em3yqaM443tlkkxCPdXvSdnzBM,23
+pyhw/__main__.py,sha256=Z8PQRp_hZrui2wZuHKW9hRorbYvy6Qc8szYbjj3t2io,4479
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
 pyhw/backend/cpu/__init__.py,sha256=5YfANJVRwNwTRodG0ENOgusrdN592aaSnfq5ok4dKTo,56
@@ -46,7 +46,7 @@ pyhw/backend/nic/windows.py,sha256=c67JwHARtPxNsZ-0_MVKUfc7DwpsRVn7kiHdx_NyDn8,1
 pyhw/backend/npu/__init__.py,sha256=PgLKbwpgT5vw9xpa294Zxb94McyxNXW46_vMbT2Iqyc,58
 pyhw/backend/npu/bsd.py,sha256=eKkOWZ4MBybR_KOGGcsWUpzCGgghhvuBy5VNsnEE8cI,134
 pyhw/backend/npu/linux.py,sha256=fPsaXClSC-Py2kHRi17y4eGWrjwRDmjsIX4lgMxRVPc,1806
-pyhw/backend/npu/macos.py,sha256=c-iSmGfBWYeoh7nXuCFmPlVH6bc6sil_yRsAlabl93k,2513
+pyhw/backend/npu/macos.py,sha256=qOIXfWILnA-sAKH6nq_cep7BlH0rKk4bglc1VgyKp6U,2625
 pyhw/backend/npu/npuBase.py,sha256=1cVWRmr8g-mDXrJAx2cUO4qWZft2TtT7L2-HzRot2nI,748
 pyhw/backend/npu/npuInfo.py,sha256=82dK6XvW_XKw4O5-RfR4-qQRR7Plh8qqJLj0YDzISmU,135
 pyhw/backend/npu/windows.py,sha256=Z2v5CORSa1ap66k48G7uVLbon3zaoT4ug5sX2_rt6vM,1196
@@ -102,12 +102,13 @@ pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo
 pyhw/library/lib/iokitGPULib.dylib,sha256=KAz0VyeRspD3U7WeedUnPvJVUZEKn_Pw0AKk5zm42ZM,154808
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
-pyhw/pyhwUtil/__init__.py,sha256=diIqlNUBfuHu-2VAOJk5nipGLafnWxR3chAAOmX8QRo,250
+pyhw/pyhwUtil/__init__.py,sha256=34ygvVBBqfJ_9OMzHToCcV_BVahixNsa_Z5yh6VsaPQ,304
+pyhw/pyhwUtil/cliUtil.py,sha256=SuXAs-ousXw6h5i8psazJEP5Q9X5VaxZlxhPSFYdM-4,1933
 pyhw/pyhwUtil/pyhwUtil.py,sha256=TxAgsDlrz-AJFyeXnOjL1MVnh1uR9dEqli5dmYPZcog,6915
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.10.2.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.10.2.dist-info/METADATA,sha256=NlYsXDWh6YlpRrkrC0Z4HKu1IsXmxAE0zcLevOMYPqw,6732
-pyhw-0.10.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyhw-0.10.2.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.10.2.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.10.2.dist-info/RECORD,,
+pyhw-0.11.1.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.11.1.dist-info/METADATA,sha256=9ioJk1jICjlBRXiqGga7j1PHyioTisnFddbE7lIAJzU,6732
+pyhw-0.11.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyhw-0.11.1.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.11.1.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.11.1.dist-info/RECORD,,