pyhw 0.14.0__py3-none-any.whl → 0.14.2__py3-none-any.whl

pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.14.0'
+__version__ = '0.14.2'
 __author__ = 'xiaoran007'

pyhw/backend/nic/macos.py

@@ -1,5 +1,8 @@
 from .nicInfo import NICInfo
 import subprocess
+import ctypes
+from ctypes import c_char_p, c_bool, c_int32, c_char, byref, create_string_buffer
+from pathlib import Path
 
 
 class NICDetectMacOS:
@@ -11,15 +14,179 @@ class NICDetectMacOS:
         return self.__nicInfo
 
     def __getNICInfo(self):
-        # Placeholder for a more advanced method.
+        # Try to get NIC info using IOKit first
+        if not self.__getNICInfoIOKit():
+            try:
+                # Get default interface
+                cmd_get_interface = "route get default | grep interface"
+                interface_output = subprocess.run(["bash", "-c", cmd_get_interface],
+                                                  capture_output=True, text=True).stdout.strip()
+                interface = interface_output.split(":")[1].strip()
+
+                # Get IP address
+                if_ip = subprocess.run(["bash", "-c", f"ipconfig getifaddr {interface}"],
+                                       capture_output=True, text=True).stdout.strip()
+
+                # Get interface type and link speed
+                link_info = self.__getLinkInfo(interface)
+
+                # Add all information to nicInfo
+                self.__nicInfo.nics.append(f"{interface} @ {if_ip} - {link_info}")
+                self.__nicInfo.number += 1
+            except Exception as e:
+                self.__handleError()
+        else:
+            pass
+
+    def __getNICInfoIOKit(self):
+        try:
+            package_root = Path(__file__).resolve().parent.parent.parent
+            lib = ctypes.CDLL(f"{package_root}/library/lib/iokitNICLib.dylib")
+
+            lib.getDefaultInterface.argtypes = [c_char_p]
+            lib.getDefaultInterface.restype = c_bool
+
+            lib.getNetworkInfo.argtypes = [c_char_p, ctypes.POINTER(c_bool),
+                                           c_char_p, ctypes.POINTER(c_int32),
+                                           c_char_p, c_char_p, c_char_p, c_char_p]
+            lib.getNetworkInfo.restype = c_bool
+            interface = create_string_buffer(32)
+            if lib.getDefaultInterface(interface):
+                interface_str = interface.value.decode('utf-8')
+
+                is_wifi = c_bool(False)
+                ip_address = create_string_buffer(32)
+                speed = c_int32(0)
+                band = create_string_buffer(16)
+                channel = create_string_buffer(32)
+                conn_type = create_string_buffer(32)
+                wifi_standard = create_string_buffer(16)
+
+                if lib.getNetworkInfo(interface_str.encode('utf-8'),
+                                      byref(is_wifi),
+                                      ip_address,
+                                      byref(speed),
+                                      band,
+                                      channel,
+                                      conn_type,
+                                      wifi_standard):
+
+                    if is_wifi.value:
+                        conn_info = f"{conn_type.value.decode('utf-8')} 802.11{wifi_standard.value.decode('utf-8')} ({band.value.decode('utf-8')} {speed.value} Mbps)"
+                    else:
+                        conn_info = conn_type.value.decode('utf-8')
+
+                    formatted_output = f"{interface_str} @ {ip_address.value.decode('utf-8')} - {conn_info}"
+
+                    self.__nicInfo.nics.append(formatted_output)
+                    self.__nicInfo.number += 1
+
+                    return True
+
+                else:
+                    return False
+            else:
+                return False
+
+        except Exception as e:
+            # print(f"An error occurred while getting NIC info using IOKit: {e}")
+            return False
+
+
+    def __getLinkInfo(self, interface):
         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
+            # Check if interface is wireless
+            is_wifi_cmd = f"networksetup -getairportpower {interface} 2>/dev/null"
+            is_wifi_result = subprocess.run(["bash", "-c", is_wifi_cmd],
+                                            capture_output=True, text=True).returncode
+
+            if is_wifi_result == 0:  # This is a Wi-Fi interface
+                speed, channel, band = self.__getWifiInfo(interface)
+                return f"Wi-Fi {band} ({speed} Mbps)"
+            else:
+                # For wired connections, get link speed using networksetup
+                media_cmd = f"networksetup -getmedia {interface} | grep 'Active'"
+                media_info = subprocess.run(["bash", "-c", media_cmd],
+                                            capture_output=True, text=True).stdout.strip()
+
+                if media_info:
+                    parts = media_info.split(':', 1)
+                    if len(parts) > 1:
+                        # Extract "2500Base-T <full-duplex>" part
+                        media_details = parts[1].strip()
+
+                        # Parse the speed part (e.g., "2500Base-T")
+                        speed_part = media_details.split()[0] if media_details else ""
+
+                        if "2500Base-T" in speed_part:
+                            return "Wired (2.5 Gbps)"
+                        elif "1000Base-T" in speed_part:
+                            return "Wired (1 Gbps)"
+                        elif "100Base-T" in speed_part:
+                            return "Wired (100 Mbps)"
+                        elif "10000Base-T" in speed_part:
+                            return "Wired (10 Gbps)"
+                        elif "Base-T" in speed_part or "base-T" in speed_part:
+                            # Extract the numeric part from formats like "5000Base-T"
+                            import re
+                            speed_match = re.search(r'(\d+)(?:Base-T|base-T)', speed_part)
+                            if speed_match:
+                                speed_value = int(speed_match.group(1))
+                                if speed_value >= 1000:
+                                    return f"Wired ({speed_value / 1000:.1f} Gbps)"
+                                else:
+                                    return f"Wired ({speed_value} Mbps)"
+                            return f"Wired ({speed_part})"
         except:
-            self.__handleError()
+            return "Unknown connection type"
+
+    def __getWifiInfo(self, interface):
+        # 使用 system_profiler 获取 WiFi 信息
+        profiler_cmd = f"system_profiler SPAirPortDataType -json"
+        try:
+            wifi_data = subprocess.run(["bash", "-c", profiler_cmd],
+                                       capture_output=True, text=True, timeout=5).stdout
+
+            import json
+            data = json.loads(wifi_data)
+
+            # 根据实际 JSON 结构提取信息
+            if 'SPAirPortDataType' in data and isinstance(data['SPAirPortDataType'], list):
+                airport_data = data['SPAirPortDataType'][0]
+
+                # 获取接口列表
+                if 'spairport_airport_interfaces' in airport_data:
+                    interfaces = airport_data['spairport_airport_interfaces']
+
+                    # 查找匹配的接口
+                    for iface in interfaces:
+                        if interface == iface.get('_name', ''):
+                            # 获取当前网络信息
+                            current_network = iface.get('spairport_current_network_information', {})
+
+                            # 从当前连接中提取速率
+                            speed = current_network.get('spairport_network_rate', 'Unknown')
+
+                            # 获取信道信息
+                            channel_info = current_network.get('spairport_network_channel', 'Unknown')
+
+                            # 确定频段信息
+                            band = "Unknown"
+                            if isinstance(channel_info, str) and "GHz" in channel_info:
+                                if "2GHz" in channel_info:
+                                    band = "2.4GHz"
+                                elif "5GHz" in channel_info:
+                                    band = "5GHz"
+                                elif "6GHz" in channel_info:
+                                    band = "6GHz"
+
+                            return speed, channel_info, band
+
+            return "Unknown", "Unknown", "Unknown"
+        except Exception as e:
+            # 可以考虑添加日志记录 print(f"WiFi info error: {str(e)}")
+            return "Unknown", "Unknown", "Unknown"
 
     def __handleError(self):
-        self.__nicInfo.nics.append("en0")
+        self.__nicInfo.nics.append("en0 - Unknown connection")
         self.__nicInfo.number = 1

pyhw/backend/npu/macos.py

@@ -44,20 +44,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 Cores (5nm) [SOC Integrated]",
-            "Apple M1 Pro": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
-            "Apple M1 Max": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
-            "Apple M1 Ultra": "Apple Neural Engine 32 Cores (5nm) [SOC Integrated]",
-            "Apple M2": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
-            "Apple M2 Pro": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
-            "Apple M2 Max": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
-            "Apple M2 Ultra": "Apple Neural Engine 32 Cores (5nm) [SOC Integrated]",
-            "Apple M3": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
-            "Apple M3 Pro": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
-            "Apple M3 Max": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
-            "Apple M3 Ultra": "Apple Neural Engine 32 Cores (3nm) [SOC Integrated]",
-            "Apple M4": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
-            "Apple M4 Pro": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
-            "Apple M4 Max": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]"
+            "Apple M1": "Apple Neural Engine 16 Cores (11 TOPS) [SOC Integrated]",
+            "Apple M1 Pro": "Apple Neural Engine 16 Cores (11 TOPS [SOC Integrated]",
+            "Apple M1 Max": "Apple Neural Engine 16 Cores (11 TOPS) [SOC Integrated]",
+            "Apple M1 Ultra": "Apple Neural Engine 32 Cores (22 TOPS) [SOC Integrated]",
+            "Apple M2": "Apple Neural Engine 16 Cores (15.8 TOPS) [SOC Integrated]",
+            "Apple M2 Pro": "Apple Neural Engine 16 Cores (15.8 TOPS) [SOC Integrated]",
+            "Apple M2 Max": "Apple Neural Engine 16 Cores (15.8 TOPS) [SOC Integrated]",
+            "Apple M2 Ultra": "Apple Neural Engine 32 Cores (31.6 TOPS) [SOC Integrated]",
+            "Apple M3": "Apple Neural Engine 16 Cores (18 TOPS) [SOC Integrated]",
+            "Apple M3 Pro": "Apple Neural Engine 16 Cores (18 TOPS) [SOC Integrated]",
+            "Apple M3 Max": "Apple Neural Engine 16 Cores (18 TOPS) [SOC Integrated]",
+            "Apple M3 Ultra": "Apple Neural Engine 32 Cores (36 TOPS) [SOC Integrated]",
+            "Apple M4": "Apple Neural Engine 16 Cores (38 TOPS) [SOC Integrated]",
+            "Apple M4 Pro": "Apple Neural Engine 16 Cores (38 TOPS) [SOC Integrated]",
+            "Apple M4 Max": "Apple Neural Engine 16 Cores (38 TOPS) [SOC Integrated]"
         }
         return npu.get(model_name, "Not Found")

pyhw/library/test/iokitNICLibTest.py

@@ -0,0 +1,76 @@
+import ctypes
+from ctypes import c_char_p, c_bool, c_int32, c_char, byref, create_string_buffer
+import os
+
+
+def main():
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    lib_path = os.path.join(current_dir, "../lib/iokitNICLib.dylib")
+
+    try:
+        lib = ctypes.CDLL(lib_path)
+
+        lib.getDefaultInterface.argtypes = [c_char_p]
+        lib.getDefaultInterface.restype = c_bool
+
+        lib.getNetworkInfo.argtypes = [c_char_p, ctypes.POINTER(c_bool),
+                                       c_char_p, ctypes.POINTER(c_int32),
+                                       c_char_p, c_char_p, c_char_p, c_char_p]
+        lib.getNetworkInfo.restype = c_bool
+
+        interface = create_string_buffer(32)
+        if lib.getDefaultInterface(interface):
+            interface_str = interface.value.decode('utf-8')
+
+            # interface_str = "en1"
+            print(f"默认网络接口: {interface_str}")
+
+            is_wifi = c_bool(False)
+            ip_address = create_string_buffer(32)
+            speed = c_int32(0)
+            band = create_string_buffer(16)
+            channel = create_string_buffer(32)
+            conn_type = create_string_buffer(32)
+            wifi_standard = create_string_buffer(16)
+
+            if lib.getNetworkInfo(interface_str.encode('utf-8'),
+                                  byref(is_wifi),
+                                  ip_address,
+                                  byref(speed),
+                                  band,
+                                  channel,
+                                  conn_type,
+                                  wifi_standard):
+
+                print("=== 网络信息 ===")
+                print(f"接口: {interface_str}")
+                print(f"IP地址: {ip_address.value.decode('utf-8')}")
+                print(f"连接类型: {conn_type.value.decode('utf-8')}")
+                print(f"速度: {speed.value} Mbps")
+
+                if is_wifi.value:
+                    print(f"Wi-Fi频段: {band.value.decode('utf-8')}")
+                    print(f"信道: {channel.value.decode('utf-8')}")
+                    print(f"Wi-Fi标准: {wifi_standard.value.decode('utf-8')}")
+
+                if is_wifi.value:
+                    wifi_info = f"{wifi_standard.value.decode('utf-8')} {band.value.decode('utf-8')}"
+                    conn_info = f"{conn_type.value.decode('utf-8')} ({wifi_info}, {speed.value} Mbps)"
+                else:
+                    conn_info = conn_type.value.decode('utf-8')
+
+                formatted_output = f"{interface_str} @ {ip_address.value.decode('utf-8')} - {conn_info}"
+                print("\n格式化输出:")
+                print(formatted_output)
+            else:
+                print(f"无法获取接口 {interface_str} 的网络信息")
+        else:
+            print("无法获取默认网络接口")
+
+    except Exception as e:
+        print(f"错误: {e}")
+
+
+if __name__ == "__main__":
+    main()
+

{pyhw-0.14.0.dist-info → pyhw-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.14.0
+Version: 0.14.2
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>

{pyhw-0.14.0.dist-info → pyhw-0.14.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=wekZosg4xD4li2TOfMDXcyEbSvONAIkGLEbCumUyDLA,49
+pyhw/__init__.py,sha256=YQSawzjDRCIzy8piPhOd3ggWHVeCQJ6_1EBuDzHeFAY,49
 pyhw/__main__.py,sha256=_8lT1XlZNR71daSu1IWs5befhb8wocCT4xIx2aMp-1Q,7168
 pyhw/backend/__init__.py,sha256=X1D1D28lSojDrUzUolgJvmbuctwBh_UxG3FwUeL8adA,51
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -38,14 +38,14 @@ pyhw/backend/memory/windows.py,sha256=ISihGHBnV8iD4Xj8_kelFSCydPu05CYKxG5q_wM5Zb
 pyhw/backend/nic/__init__.py,sha256=eP4eOYIvMF3LcTf954hJa6TnB8R4Qahss2g-UcgypKY,57
 pyhw/backend/nic/bsd.py,sha256=6nj7XXII5dRz3FGRYAXVgTt0vSgyQo0Re9JA1vlcnuw,134
 pyhw/backend/nic/linux.py,sha256=e6gX58RBE9IDKb0FrzZ7U2EhDNfGJsR6OvXq6qO5ZOc,2003
-pyhw/backend/nic/macos.py,sha256=J1hO7FxpQpi98Kx9EmUf5Q4_GxE8xMvb6R5Ok861V8E,853
+pyhw/backend/nic/macos.py,sha256=AOT6IvgEGvWPIpv8UwlTGbFO7zaDDQn4xC1NL8SKmeo,8566
 pyhw/backend/nic/nicBase.py,sha256=Kng5qoe7FHcnQaf6S-LUe_HyOaBJe0L1SVstdIQ_WJY,962
 pyhw/backend/nic/nicInfo.py,sha256=wuBuL-aIzD441IUDPGz5e0xctcZ-opdpgqkVxgbvZLg,133
 pyhw/backend/nic/windows.py,sha256=4yJ0pmiXokegLEC299WLwqiW9uHAgaiVpkR2vCuzECg,1225
 pyhw/backend/npu/__init__.py,sha256=GP8IxlDyt0NWg70S8w-WWej4uVXY6eQwE0fMWFSVZPU,57
 pyhw/backend/npu/bsd.py,sha256=eKkOWZ4MBybR_KOGGcsWUpzCGgghhvuBy5VNsnEE8cI,134
 pyhw/backend/npu/linux.py,sha256=fLq3tPs1EUtTBYhFrh_10uRR8bouy7Cb0voWwz1GQbw,1842
-pyhw/backend/npu/macos.py,sha256=JBmqZAbGTPzCxpUVmlPBNoluLClXnQDHJwhC2Qqp3v4,2665
+pyhw/backend/npu/macos.py,sha256=mnEMQdAxgUSW-bVg18_SCIVcEeBQgFQBaTv4PxO7Iog,2732
 pyhw/backend/npu/npuBase.py,sha256=1cVWRmr8g-mDXrJAx2cUO4qWZft2TtT7L2-HzRot2nI,748
 pyhw/backend/npu/npuInfo.py,sha256=WCr8y1zVrIk1rVgU6PG509nn0wxxRPV14F9_VRngT3k,133
 pyhw/backend/npu/windows.py,sha256=NRzIdb1akFXh3rhThUaKE-7q3n9wkDIeVd9o2Od_LRw,1230
@@ -106,10 +106,12 @@ pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo
 pyhw/library/lib/iokitCPULib.dylib,sha256=uMDDaijZGvTNkdT0ccQ55SDO4rRrzj8GSbrDMKeLAZ0,34280
 pyhw/library/lib/iokitGPULib.dylib,sha256=6xigd40YGEz9lHUfq_6qpTswz2st-4I9bW6j8ssg29s,155224
 pyhw/library/lib/iokitHostLib.dylib,sha256=MKxyKUkD4IZomP4exATikWx2SxqSDqQx4FEuIkFAEnc,149912
+pyhw/library/lib/iokitNICLib.dylib,sha256=K6Bn6qAzds93S3qvjN6ClNfP_eP4GQh4BWiXa35z750,212360
 pyhw/library/lib/nvmlGPULib_amd64.so,sha256=lrkxeJjChUs8oVhaw_uMeXKbUJp24KroQ_hhcLtHfTg,12784
 pyhw/library/lib/nvmlGPULib_arm64.so,sha256=DFIYqNcuRxiZ8_jrYoaRB3Dx9GrY7UBXscwXQvV4k3I,13528
 pyhw/library/test/iokitCPULibTest.py,sha256=BrhMypgfJTeMectpDc9Tmwzp8gYwYAcowaTFf72LlLE,311
 pyhw/library/test/iokitHostLibTest.py,sha256=oz5x1g4WMdoikU3Eo6zoxcHZ4e-UMRhXg0C0Lflo-ac,272
+pyhw/library/test/iokitNICLibTest.py,sha256=ROjfJf0ocWvRFueIyRBQ4Y0V7stlMNiAADIM3fMy7YY,2947
 pyhw/library/test/nvmlGPULibTest.py,sha256=F4AjQGZDNj29fRtxvy41zCSFi2Eirp0CQSYuxuw0n60,785
 pyhw/pyhwException/__init__.py,sha256=juw4PdgPa-eLy0y678BQ7_Ck-BJa-P0LHyKCGePazb8,221
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
@@ -118,9 +120,9 @@ pyhw/pyhwUtil/cliUtil.py,sha256=IUcWun5nDwQb20Qe8YefS5j3Jji8a-F41Qd9QwCf0h0,2454
 pyhw/pyhwUtil/pciUtil.py,sha256=WAluDRDb-gUbqhvSIusFzPrf6r98EkrNEAwbPyMwrTc,202
 pyhw/pyhwUtil/pyhwUtil.py,sha256=V3M6X9eTirwnwwRiSJaLUWrZKZYMbRihARJVQc879P8,8364
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.14.0.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.14.0.dist-info/METADATA,sha256=co8MwLUl3T4B4RFO1Wy1_OFnqFVC0XL6h80cz2zbNsc,7715
-pyhw-0.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyhw-0.14.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.14.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.14.0.dist-info/RECORD,,
+pyhw-0.14.2.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.14.2.dist-info/METADATA,sha256=r1weeDXKC898D-9W4KYZU2vIaw7RalSipTT_tcgTCog,7715
+pyhw-0.14.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyhw-0.14.2.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.14.2.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.14.2.dist-info/RECORD,,