feat: improve inspur parsing and pci.ids integration

internal/parser/vendors/inspur/asset.go

@@ -3,12 +3,15 @@ package inspur
 import (
 	"encoding/json"
 	"fmt"
+	"regexp"
 	"strings"
 
 	"git.mchus.pro/mchus/logpile/internal/models"
 	"git.mchus.pro/mchus/logpile/internal/parser/vendors/pciids"
 )
 
+var rawHexPCIDeviceRegex = regexp.MustCompile(`(?i)^0x[0-9a-f]+$`)
+
 // AssetJSON represents the structure of Inspur asset.json file
 type AssetJSON struct {
 	VersionInfo []struct {
@@ -207,8 +210,8 @@ func ParseAssetJSON(content []byte) (*models.HardwareConfig, error) {
 			VendorID:     pcie.VendorId,
 			DeviceID:     pcie.DeviceId,
 			BDF:          formatBDF(pcie.BusNumber, pcie.DeviceNumber, pcie.FunctionNumber),
-			LinkWidth: pcie.NegotiatedLinkWidth,
-			LinkSpeed: pcieLinkSpeedToString(pcie.CurrentLinkSpeed),
+			LinkWidth:    pcie.NegotiatedLinkWidth,
+			LinkSpeed:    pcieLinkSpeedToString(pcie.CurrentLinkSpeed),
 			MaxLinkWidth: pcie.MaxLinkWidth,
 			MaxLinkSpeed: pcieLinkSpeedToString(pcie.MaxLinkSpeed),
 			DeviceClass:  pcieClassToString(pcie.ClassCode, pcie.SubClassCode),
@@ -225,25 +228,22 @@ func ParseAssetJSON(content []byte) (*models.HardwareConfig, error) {
 		}
 		// Use device name from PCI IDs database if available
 		if deviceName != "" {
-			device.DeviceClass = deviceName
+			device.DeviceClass = normalizeModelLabel(deviceName)
 		}
 		config.PCIeDevices = append(config.PCIeDevices, device)
 
 		// Extract GPUs (class 3 = display controller)
 		if pcie.ClassCode == 3 {
-			gpuModel := deviceName
-			if gpuModel == "" {
-				gpuModel = pcieClassToString(pcie.ClassCode, pcie.SubClassCode)
-			}
+			gpuModel := normalizeGPUModel(pcie.VendorId, pcie.DeviceId, deviceName, pcie.ClassCode, pcie.SubClassCode)
 			gpu := models.GPU{
-				Slot:         pcie.LocString,
-				Model:        gpuModel,
-				Manufacturer: vendor,
-				VendorID:     pcie.VendorId,
-				DeviceID:     pcie.DeviceId,
-				BDF:          formatBDF(pcie.BusNumber, pcie.DeviceNumber, pcie.FunctionNumber),
-				CurrentLinkWidth:    pcie.NegotiatedLinkWidth,
-				CurrentLinkSpeed:    pcieLinkSpeedToString(pcie.CurrentLinkSpeed),
+				Slot:             pcie.LocString,
+				Model:            gpuModel,
+				Manufacturer:     vendor,
+				VendorID:         pcie.VendorId,
+				DeviceID:         pcie.DeviceId,
+				BDF:              formatBDF(pcie.BusNumber, pcie.DeviceNumber, pcie.FunctionNumber),
+				CurrentLinkWidth: pcie.NegotiatedLinkWidth,
+				CurrentLinkSpeed: pcieLinkSpeedToString(pcie.CurrentLinkSpeed),
 				MaxLinkWidth:     pcie.MaxLinkWidth,
 				MaxLinkSpeed:     pcieLinkSpeedToString(pcie.MaxLinkSpeed),
 			}
@@ -260,6 +260,45 @@ func ParseAssetJSON(content []byte) (*models.HardwareConfig, error) {
 	return config, nil
 }
 
+func normalizeModelLabel(v string) string {
+	v = strings.TrimSpace(v)
+	if v == "" {
+		return ""
+	}
+	return strings.Join(strings.Fields(v), " ")
+}
+
+func normalizeGPUModel(vendorID, deviceID int, model string, classCode, subClass int) string {
+	model = normalizeModelLabel(model)
+
+	if model == "" || rawHexPCIDeviceRegex.MatchString(model) || isGenericGPUModelLabel(model) {
+		if pciModel := normalizeModelLabel(pciids.DeviceName(vendorID, deviceID)); pciModel != "" {
+			model = pciModel
+		}
+	}
+
+	if model == "" || isGenericGPUModelLabel(model) {
+		model = pcieClassToString(classCode, subClass)
+	}
+
+	// Last fallback for unknown NVIDIA display devices: expose PCI DeviceID
+	// instead of generic "3D Controller".
+	if (model == "" || strings.EqualFold(model, "3D Controller")) && vendorID == 0x10de && deviceID > 0 {
+		return fmt.Sprintf("0x%04X", deviceID)
+	}
+
+	return model
+}
+
+func isGenericGPUModelLabel(model string) bool {
+	switch strings.ToLower(strings.TrimSpace(model)) {
+	case "", "gpu", "display", "display controller", "vga", "3d controller", "other", "unknown":
+		return true
+	default:
+		return false
+	}
+}
+
 func memoryTypeToString(memType int) string {
 	switch memType {
 	case 26: