shepherd-core 2024.7.1__tar.gz → 2024.7.2__tar.gz

{shepherd_core-2024.7.1 → shepherd_core-2024.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shepherd_core
-Version: 2024.7.1
+Version: 2024.7.2
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Author-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
 Maintainer-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>

{shepherd_core-2024.7.1 → shepherd_core-2024.7.2}/shepherd_core/__init__.py

@@ -23,7 +23,7 @@ from .testbed_client.client import TestbedClient
 from .testbed_client.client import tb_client
 from .writer import Writer
 
-__version__ = "2024.7.1"
+__version__ = "2024.7.2"
 
 __all__ = [
     "Reader",

{shepherd_core-2024.7.1 → shepherd_core-2024.7.2}/shepherd_core/inventory/system.py

@@ -5,6 +5,7 @@ import subprocess
 import time
 from datetime import datetime
 from pathlib import Path
+from typing import List
 from typing import Optional
 
 from typing_extensions import Self
@@ -48,8 +49,8 @@ class SystemInventory(ShpModel):
     #   ip IPvAnyAddress
     #   mac MACStr
 
-    fs_root: Optional[str] = None
-    beagle: Optional[str] = None
+    fs_root: List[str] = None
+    beagle: List[str] = None
 
     model_config = ConfigDict(str_min_length=0)
 
@@ -71,20 +72,20 @@ class SystemInventory(ShpModel):
             uptime = time.time() - psutil.boot_time()
 
         fs_cmd = ["/usr/bin/df", "-h", "/"]
-        fs_out = None
+        fs_out = []
         if Path(fs_cmd[0]).is_file():
             reply = subprocess.run(  # noqa: S603
                 fs_cmd, timeout=30, capture_output=True, check=False
             )
-            fs_out = str(reply.stdout)
+            fs_out = str(reply.stdout).split(r"\n")
 
         beagle_cmd = ["/usr/bin/beagle-version"]
-        beagle_out = None
+        beagle_out = []
         if Path(beagle_cmd[0]).is_file():
             reply = subprocess.run(  # noqa: S603
                 beagle_cmd, timeout=30, capture_output=True, check=False
             )
-            beagle_out = str(reply.stdout)
+            beagle_out = str(reply.stdout).split(r"\n")
 
         ptp_cmd = ["/usr/sbin/ptp4l", "-v"]
         ptp_out = None

{shepherd_core-2024.7.1 → shepherd_core-2024.7.2}/shepherd_core/reader.py

@@ -536,9 +536,9 @@ class Reader:
     def count_errors_in_log(self, group_name: str = "sheep", min_level: int = 40) -> int:
         if group_name not in self.h5file:
             return 0
-        if "level" not in self.h5file["sheep"]:
+        if "level" not in self.h5file[group_name]:
             return 0
-        _lvl = self.h5file["sheep"]["level"]
+        _lvl = self.h5file[group_name]["level"]
         if _lvl.shape[0] < 1:
             return 0
         _items = [1 for _x in _lvl[:] if _x >= min_level]
@@ -688,4 +688,11 @@ class Reader:
         gpio_wf = pin_wf.astype(float)
         gpio_wf[:, 0] = gpio_wf[:, 0] / 1e9
 
-        return Uart(gpio_wf).get_lines()
+        try:
+            return Uart(gpio_wf).get_lines()
+        except TypeError:
+            self._logger.error("TypeError: Extracting UART from GPIO failed - will skip file.")
+            return None
+        except ValueError:
+            self._logger.error("ValueError: Extracting UART from GPIO failed - will skip file.")
+            return None

{shepherd_core-2024.7.1 → shepherd_core-2024.7.2}/shepherd_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shepherd_core
-Version: 2024.7.1
+Version: 2024.7.2
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Author-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
 Maintainer-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>