shepherd-core 2024.7.1__py3-none-any.whl → 2024.7.2__py3-none-any.whl

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/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/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.dist-info → shepherd_core-2024.7.2.dist-info}/METADATA

@@ -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.dist-info → shepherd_core-2024.7.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-shepherd_core/__init__.py,sha256=8FydSimdy6iX5N_ZPoxm2e4AEJLUg0wikCon87iqsj4,1385
+shepherd_core/__init__.py,sha256=18yq3YRDzCrO_xW5GXUgekF_LRg6kK87V2jnxE38d2E,1385
 shepherd_core/calibration_hw_def.py,sha256=m5HDxHJ_blnn-C0Og5v6by1ApJRDT7RhytFbL-P5730,2548
 shepherd_core/commons.py,sha256=vymKXWcy_1bz7ChzzEATUkJ4p3czCzjIdsSehVjJOY8,218
 shepherd_core/logger.py,sha256=4Q4hTI-nccOZ1_A68fo4UEctfu3pJx3IeHfa9VuDDEo,1804
-shepherd_core/reader.py,sha256=dZt_q9PJt6FKBMfesk3wLfYdBp0EjCe_-gGZ-Gvd4tk,26473
+shepherd_core/reader.py,sha256=9BuArqou5pmPKUrJH9oiPYlU1DkMxUScL4nftDJuFIs,26790
 shepherd_core/writer.py,sha256=xcLCw-YokKaN8TrkwD0IjRmn8xZU0Q8wwWp_1K8JFVY,14475
 shepherd_core/data_models/__init__.py,sha256=IVjKbT2Ilz5bev325EvAuuhd9LfQgQ1u7qKo6dhVA2k,1866
 shepherd_core/data_models/readme.md,sha256=1bdfEypY_0NMhXLxOPRnLAsFca0HuHdq7_01yEWxvUs,2470
@@ -57,7 +57,7 @@ shepherd_core/fw_tools/patcher.py,sha256=D6MHaCvKRRVQYSZozODAp_l7UnqxVsvnulPzpkf
 shepherd_core/fw_tools/validation.py,sha256=hBLCKIUumPTA6iuXMVbMYph2jamaxeSTxRqsvl3C4-I,4699
 shepherd_core/inventory/__init__.py,sha256=nRO11HG4eJ_FaXebSkE0dd1H6qvjrX5n3OQHOzKXVvk,3841
 shepherd_core/inventory/python.py,sha256=OWNnyEt0IDPW9XGW-WloU0FExwgZzYNA05VpRj4cZGc,1250
-shepherd_core/inventory/system.py,sha256=GScfYZm0dlWQv4Np6R1JI_XGHVcECAw50Wqef_hW3VU,3121
+shepherd_core/inventory/system.py,sha256=jRzko9QNPLaBiG7urVaeqqvb3GtCEYRwc0DAghRkLVo,3159
 shepherd_core/inventory/target.py,sha256=Lq11j25tWieXheOxIDaQb-lc-2omxYVex5P6uGiLUyk,507
 shepherd_core/testbed_client/__init__.py,sha256=lzi7F5Go-AsbTbiUCf9Rnu6pzmTZqmpIqoS1yCPal_c,175
 shepherd_core/testbed_client/cache_path.py,sha256=tS0er9on5fw8wddMCt1jkc2uyYOdSTvX_UmfmYJf6tY,445
@@ -68,8 +68,8 @@ shepherd_core/vsource/__init__.py,sha256=dS33KYLq5GQ9_D8HfdP8iWSocWTghCi2ZZG2AJW
 shepherd_core/vsource/virtual_converter_model.py,sha256=ZSoWVLfRmFEjeCNoQCg3BctzhdfayINUBDU_AJK1CR0,10404
 shepherd_core/vsource/virtual_harvester_model.py,sha256=wCbFfsqDRC5Rfu8qANkmkP9XGJOPHJY9-iSnI850JI4,7817
 shepherd_core/vsource/virtual_source_model.py,sha256=fjN8myTY3I_LpikF_aGAcxes3RGu1GP23P7XKC_UIyA,2737
-shepherd_core-2024.7.1.dist-info/METADATA,sha256=KtwQxX6iIfqe3mvFb3ZLVZXS6Ovjy9Vh2K6nu5lxvy8,7630
-shepherd_core-2024.7.1.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-shepherd_core-2024.7.1.dist-info/top_level.txt,sha256=wy-t7HRBrKARZxa-Y8_j8d49oVHnulh-95K9ikxVhew,14
-shepherd_core-2024.7.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-shepherd_core-2024.7.1.dist-info/RECORD,,
+shepherd_core-2024.7.2.dist-info/METADATA,sha256=StULIM0aTJCmN4b1RQYkQsC5BniVCv7SEO4BJmuGHcg,7630
+shepherd_core-2024.7.2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+shepherd_core-2024.7.2.dist-info/top_level.txt,sha256=wy-t7HRBrKARZxa-Y8_j8d49oVHnulh-95K9ikxVhew,14
+shepherd_core-2024.7.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+shepherd_core-2024.7.2.dist-info/RECORD,,