update system information for new project

Author: guoping.liu

supervisor/http_server.py

@@ -283,7 +283,8 @@ def _handle_system_info(self):
                         # Safely get storage_space
                         storage = system_info.storage_space if isinstance(system_info.storage_space, dict) else {"available": "", "total": ""}
                         result = {
-                            "Device Model": getattr(system_info, "model", "Unknown"),
+                            "Model Name": getattr(system_info, "pretty_name", "Unknown"),
+                            "Model ID": getattr(system_info, "model", "Unknown"),
                             "Device Name": getattr(system_info, "name", "Unknown"),
                             "Version": getattr(system_info, "version", "Unknown"),
                             "Build Number": getattr(system_info, "build_number", "Unknown"),
@@ -295,9 +296,9 @@ def _handle_system_info(self):
                     else:
                         # Default system info (unified style)
                         result = {
-                            "Device Model": "LinuxBox",
+                            "Model Name": "LinuxBox",
                             "Device Name": "3RHUB-Unknown",
-                            "Build Number": "1.0.0",
+                            "Build Number": "v1.0.0",
                             "Zigbee Support": False,
                             "Thread Support": False,
                             "Memory": "",
@@ -329,7 +330,7 @@ def _handle_system_info(self):
                     }
                     selected = []
                     for svc, val in service_map.items():
-                        if util.is_service_running(svc):
+                        if util.is_service_present(svc):
                             selected.append(val)
                     result["Services"] = ",".join(selected)
                 except Exception:

supervisor/sysinfo.py

@@ -64,10 +64,12 @@ class SystemInfo:
     def __init__(self):
         release_info = _get_t3r_release_info()
 
-        self.model = release_info.get("PRETTY_NAME", DEVICE_MODEL_NAME)
+        self.model = release_info.get("MODLE", "3RLB01081MH")
+        self.name = "3RHUB-XXXX"
+        self.pretty_name = release_info.get("PRETTY_NAME", DEVICE_MODEL_NAME)
+                
         self.build_number = DEVICE_BUILD_NUMBER
         self.version = release_info.get("VERSION", "v0.0.1")
-        self.name = "3RHUB-XXXX"
         self.support_zigbee=True
         self.support_thread=True  # Fixed to always support thread        
         self.mode = "homeassistant-core"

supervisor/utils/util.py

@@ -115,6 +115,30 @@ def is_service_running(service_name):
         logging.error(f"Error checking if service {service_name} is running: {e}")
         return False
 
+def is_service_present(service_name):
+    """
+    Return True if the system has this service installed/known to systemd, regardless of running state.
+    """
+    try:
+        # systemctl status returns non-zero for inactive services, so do not check=True
+        result = subprocess.run(["systemctl", "status", service_name], capture_output=True, text=True)
+        # The output contains Loaded: loaded or could be not-found. Use that to determine presence.
+        stdout = (result.stdout or "") + "\n" + (result.stderr or "")
+        lowered = stdout.lower()
+        if "loaded: loaded" in lowered:
+            return True
+        # Some distros show 'could not be found' or 'not-found' when unit does not exist
+        if "not-found" in lowered or "could not be found" in lowered or "no such file" in lowered:
+            return False
+        # Fallback: try list-unit-files which enumerates installed unit files
+        list_result = subprocess.run(["systemctl", "list-unit-files", service_name], capture_output=True, text=True)
+        if list_result.returncode == 0 and service_name in (list_result.stdout or ""):
+            return True
+        return False
+    except Exception as e:
+        logging.error(f"Error checking if service {service_name} is present: {e}")
+        return False
+
 def is_service_enabled(service_name):
     try:
         result = subprocess.run(["systemctl", "is-enabled", service_name], capture_output=True, text=True)