added clock and fixed try for API that doesnt exist in this version

Author: alexandraBara

nodescraper/plugins/inband/amdsmi/amdsmi_collector.py

@@ -49,7 +49,9 @@
     StaticBoard,
     StaticBus,
     StaticCacheInfoItem,
+    StaticClockData,
     StaticDriver,
+    StaticFrequencyLevels,
     StaticNuma,
     StaticPolicy,
     StaticSocPstate,
@@ -111,7 +113,7 @@ def _get_amdsmi_data(self) -> AmdSmiDataModel | None:
         try:
             version = self._get_amdsmi_version()
             processes = self.get_process()
-            partition = self.get_partition()
+            partition = self._get_partition()
             firmware = self.get_firmware()
             gpu_list = self.get_gpu_list()
             statics = self.get_static()
@@ -296,7 +298,7 @@ def get_process(self) -> list[Processes] | None:
                 )
         return out
 
-    def get_partition(self) -> Partition | None:
+    def _get_partition(self) -> Partition | None:
         devices = self._get_handles()
         current: list[PartitionCurrent] = []
         memparts: list[PartitionMemory] = []
@@ -608,6 +610,7 @@ def _vu(val: object, unit: str) -> ValueUnit | None:
             soc_pstate_model = self._get_soc_pstate(h)
             xgmi_plpd_model = self._get_xgmi_plpd(h)
             cache_info_model = self._get_cache_info(h)
+            clock_model = self._get_clock(h)
 
             try:
                 out.append(
@@ -626,10 +629,11 @@ def _vu(val: object, unit: str) -> ValueUnit | None:
                         vram=vram_model,
                         cache_info=cache_info_model,
                         partition=None,
-                        clock=None,  # TODO amdsmi_get_clk_freq??
+                        clock=clock_model,
                     )
                 )
             except ValidationError as e:
+                self.logger.error(e)
                 self._log_event(
                     category=EventCategory.APPLICATION,
                     description="Failed to build AmdSmiStatic",
@@ -640,7 +644,16 @@ def _vu(val: object, unit: str) -> ValueUnit | None:
         return out
 
     def _get_soc_pstate(self, h) -> StaticSocPstate | None:
-        data = self._smi_try(self._amdsmi.amdsmi_get_soc_pstate, h, default=None)
+        fn = getattr(self._amdsmi, "amdsmi_get_soc_pstate", None)
+        if not callable(fn):
+            self._log_event(
+                category=EventCategory.APPLICATION,
+                description="amdsmi_get_soc_pstate not exposed by amdsmi build",
+                priority=EventPriority.INFO,
+            )
+            return None
+
+        data = self._smi_try(fn, h, default=None)
         if not isinstance(data, dict):
             return None
 
@@ -684,7 +697,16 @@ def _get_soc_pstate(self, h) -> StaticSocPstate | None:
             return None
 
     def _get_xgmi_plpd(self, h) -> StaticXgmiPlpd | None:
-        data = self._smi_try(self._amdsmi.amdsmi_get_xgmi_plpd, h, default=None)
+        fn = getattr(self._amdsmi, "amdsmi_get_xgmi_plpd", None)
+        if not callable(fn):
+            self._log_event(
+                category=EventCategory.APPLICATION,
+                description="XGMI PLPD not exposed by this amdsmi build",
+                priority=EventPriority.INFO,
+            )
+            return None
+
+        data = self._smi_try(fn, h, default=None)
         if not isinstance(data, dict):
             return None
 
@@ -802,6 +824,52 @@ def _as_list_str(v) -> list[str]:
 
         return out
 
+
+    def _get_clock(self, h) -> StaticClockData | None:
+        """
+        """
+        fn = getattr(self._amdsmi, "amdsmi_get_clk_freq", None)
+        clk_type = getattr(self._amdsmi, "AmdSmiClkType", None)
+        if not callable(fn) or clk_type is None or not hasattr(clk_type, "SYS"):
+            return None
+
+        data = self._smi_try(fn, h, clk_type.SYS, default=None)
+        if not isinstance(data, dict):
+            return None
+
+        freqs_raw = data.get("frequency")
+        if not isinstance(freqs_raw, list):
+            return None
+
+        freqs_mhz: list[int] = []
+        for v in freqs_raw:
+            if isinstance(v, (int, float)):
+                freqs_mhz.append(int(round(float(v) / 1_000_000.0)))
+
+        if not freqs_mhz:
+            return None
+
+        def _fmt(n: int | None) -> str | None:
+            return None if n is None else f"{n} MHz"
+
+        level0: str = _fmt(freqs_mhz[0]) or "0 MHz"
+        level1: str | None = _fmt(freqs_mhz[1]) if len(freqs_mhz) > 1 else None
+        level2: str | None = _fmt(freqs_mhz[2]) if len(freqs_mhz) > 2 else None
+
+        cur_raw = data.get("current")
+        try:
+            current: int | None = None if cur_raw in (None, "", "N/A") else int(cur_raw)
+        except Exception:
+            current = None
+
+        try:
+            levels = StaticFrequencyLevels(Level_0=level0, Level_1=level1, Level_2=level2)
+            return StaticClockData(frequency=levels, current=current)
+        except ValidationError:
+            return None
+
+
+
     def collect_data(
         self,
         args=None,

nodescraper/plugins/inband/amdsmi/amdsmidata.py

@@ -460,10 +460,10 @@ class StaticClockData(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
-    frequency_levels: StaticFrequencyLevels
+    frequency: StaticFrequencyLevels
 
-    current_level: int | None = Field(..., alias="current level")
-    na_validator = field_validator("current_level", mode="before")(na_to_none)
+    current: int | None = Field(..., alias="current")
+    na_validator = field_validator("current", mode="before")(na_to_none)
 
 
 class AmdSmiStatic(BaseModel):
@@ -481,8 +481,8 @@ class AmdSmiStatic(BaseModel):
     numa: StaticNuma
     vram: StaticVram
     cache_info: List[StaticCacheInfoItem]
-    partition: StaticPartition | None = None  # This has been removed in Amd-smi 26.0.0+d30a0afe+
-    clock: dict[str, StaticClockData | None] | None = None
+    partition: StaticPartition | None = None
+    clock: StaticClockData | None = None
     na_validator_dict = field_validator("clock", mode="before")(na_to_none_dict)
     na_validator = field_validator("soc_pstate", "xgmi_plpd", "vbios", "limit", mode="before")(
         na_to_none