shepherd-core 2025.2.1__tar.gz → 2025.4.1__tar.gz

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: shepherd_core
-Version: 2025.2.1
+Version: 2025.4.1
 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-2025.2.1 → shepherd_core-2025.4.1}/pyproject.toml

@@ -113,3 +113,4 @@ omit = ["*/shepherd_data/*"]
 [tool.mypy]
 python_version = 3.8
 ignore_missing_imports = true
+disable_error_code = ["call-arg", ]

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/data_models/base/calibration.py

@@ -3,7 +3,9 @@
 import struct
 from typing import Callable
 from typing import Generator
+from typing import Mapping
 from typing import Optional
+from typing import Sequence
 from typing import TypeVar
 from typing import Union
 
@@ -26,18 +28,18 @@ Calc_t = TypeVar("Calc_t", NDArray[np.float64], float)
 
 
 def dict_generator(
-    in_dict: Union[dict, list], pre: Optional[list] = None
+    in_dict: Union[Mapping, Sequence], pre: Optional[list] = None
 ) -> Generator[list, None, None]:
     """Recursive helper-function to generate a 1D-List(or not?).
 
     TODO: isn't that a 1D-List generator?
     """
     pre = pre[:] if pre else []
-    if isinstance(in_dict, dict):
+    if isinstance(in_dict, Mapping):
         for key, value in in_dict.items():
-            if isinstance(value, dict):
+            if isinstance(value, Mapping):
                 yield from dict_generator(value, [*pre, key])
-            elif isinstance(value, (list, tuple)):
+            elif isinstance(value, Sequence):
                 for v in value:
                     yield from dict_generator(v, [*pre, key])
             else:

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/data_models/content/firmware.py

@@ -127,8 +127,9 @@ class Firmware(ContentModel, title="Firmware of Target"):
             arch = fw_tools.read_arch(file)
             if "msp430" in arch and not fw_tools.is_elf_msp430(file):
                 raise ValueError("File is not a ELF for msp430")
-            if "nrf52" in arch and not fw_tools.is_elf_nrf52(file):
+            if ("nrf52" in arch or "arm" in arch) and not fw_tools.is_elf_nrf52(file):
                 raise ValueError("File is not a ELF for nRF52")
+            logger.debug("ELF-File '%s' has arch: %s", file.name, arch)
             if "mcu" not in kwargs:
                 kwargs["mcu"] = arch_to_mcu[arch]
 

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/data_models/content/virtual_source.py

@@ -346,7 +346,7 @@ class ConverterPRUConfig(ShpModel):
                 [min(255, round(256 * ival)) for ival in il] for il in data.LUT_input_efficiency
             ],
             LUT_out_inv_efficiency_n4=[
-                min((2**14), round((2**4) / value)) if (value > 0) else int(2**14)
+                min((2**14), round((2**4) / value)) if (value > 0) else (2**14)
                 for value in data.LUT_output_efficiency
             ],
         )

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/data_models/experiment/experiment.py

@@ -2,6 +2,7 @@
 
 from datetime import datetime
 from datetime import timedelta
+from typing import Iterable
 from typing import List
 from typing import Optional
 from typing import Union
@@ -68,7 +69,7 @@ class Experiment(ShpModel, title="Config of an Experiment"):
         return self
 
     @staticmethod
-    def _validate_targets(configs: List[TargetConfig]) -> None:
+    def _validate_targets(configs: Iterable[TargetConfig]) -> None:
         target_ids = []
         custom_ids = []
         for _config in configs:
@@ -86,7 +87,7 @@ class Experiment(ShpModel, title="Config of an Experiment"):
             raise ValueError("Custom Target-ID are faulty (some form of id-collisions)!")
 
     @staticmethod
-    def _validate_observers(configs: List[TargetConfig], testbed: Testbed) -> None:
+    def _validate_observers(configs: Iterable[TargetConfig], testbed: Testbed) -> None:
         target_ids = [_id for _config in configs for _id in _config.target_IDs]
         obs_ids = [testbed.get_observer(_id).id for _id in target_ids]
         if len(target_ids) > len(set(obs_ids)):

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/data_models/readme.md

@@ -46,6 +46,7 @@
 - these do not work
 
 ```Python
+from typing import Dict
 from pydantic import Field
 from shepherd_core.data_models import ShpModel
 
@@ -54,7 +55,7 @@ class Experiment(ShpModel, title="Config of an Experiment"):
         super().__init__()
         self.Config.fields["output_path"].description = "test description"
     class Config:
-        fields: dict[str, Field] = {}
+        fields: Dict[str, Field] = {}
         fields["output_path"] = Field(description="test description")
 ```
 

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/data_models/task/programming.py

@@ -31,7 +31,7 @@ class ProgrammingTask(ShpModel):
     mcu_type: SafeStr
     # ⤷ must be either "nrf52" or "msp430" ATM, TODO: clean xp to tasks
     voltage: Annotated[float, Field(ge=1, lt=5)] = 3
-    datarate: Annotated[int, Field(gt=0, le=1_000_000)] = 500_000
+    datarate: Annotated[int, Field(gt=0, le=1_000_000)] = 200_000
     protocol: ProgrammerProtocol
 
     simulate: bool = False

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/fw_tools/validation.py

@@ -66,16 +66,14 @@ def is_hex_nrf52(file: Path) -> bool:
     """Try to detect specifics for that MCU.
 
     Observations:
-    - addresses begin at 0x0
+    - addresses begin mostly at 0x0 (no must)
     - only one segment (.get_segments), todo
     """
     if is_hex(file):
         ih = IntelHex(file.as_posix())
-        if ih.minaddr() != 0x0000:
-            return False
-
-        # conservative test for now - should be well below 1 MB + 256 kB
-        return ih.get_memory_size() < 1310720
+        # conservative test for now - should be between 0 and 1 MB + 256 kB,
+        # but lately showed much higher values > 4 MB
+        return ih.get_memory_size() > 0
     return False
 
 
@@ -145,15 +143,15 @@ def determine_arch(file: Path) -> str:
     """Figure out arch (msp430 or nrf52)."""
     file_t = determine_type(file)
     if file_t == FirmwareDType.path_elf:
-        if is_elf_nrf52(file):
-            return "nrf52"
         if is_elf_msp430(file):
             return "msp430"
+        if is_elf_nrf52(file):
+            return "nrf52"
         raise ValueError("Arch of ELF '%s' could not be determined", file.name)
     if file_t == FirmwareDType.path_hex:
-        if is_hex_nrf52(file):
-            return "nrf52"
         if is_hex_msp430(file):
             return "msp430"
+        if is_hex_nrf52(file):
+            return "nrf52"
         raise ValueError("Arch of HEX '%s' could not be determined", file.name)
     raise ValueError("Arch of file '%s' could not be determined", file.name)

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/inventory/__init__.py

@@ -82,8 +82,8 @@ class InventoryList(ShpModel):
             if (_e.created.timestamp() - ts_earl) > 10:
                 warnings["time_delta"] = f"[{self.hostname}] time-sync has failed"
 
-        # turn  dict[hostname][type] = val
-        # to    dict[type][val] = list[hostnames]
+        # turn  Dict[hostname][type] = val
+        # to    Dict[type][val] = List[hostnames]
         _inp = {
             _e.hostname: _e.model_dump(exclude_unset=True, exclude_defaults=True)
             for _e in self.elements

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/reader.py

@@ -194,6 +194,7 @@ class Reader:
         self,
         start_n: int = 0,
         end_n: Optional[int] = None,
+        n_samples_per_buffer: Optional[int] = None,
         *,
         is_raw: bool = False,
         omit_ts: bool = False,
@@ -201,27 +202,28 @@ class Reader:
         """Read the specified range of buffers from the hdf5 file.
 
         Generator - can be configured on first call
-        TODO: reconstruct - start/end mark samples &
-         each call can request a certain number of samples.
 
         Args:
         ----
             :param start_n: (int) Index of first buffer to be read
             :param end_n: (int) Index of last buffer to be read
+            :param n_samples_per_buffer: (int) allows changing
             :param is_raw: (bool) output original data, not transformed to SI-Units
             :param omit_ts: (bool) optimize reading if timestamp is never used
         Yields: Buffers between start and end (tuple with time, voltage, current)
 
         """
-        if end_n is None:
-            end_n = int(self.ds_voltage.shape[0] // self.samples_per_buffer)
+        if n_samples_per_buffer is None:
+            n_samples_per_buffer = self.samples_per_buffer
+        end_max = int(self.ds_voltage.shape[0] // n_samples_per_buffer)
+        end_n = end_max if end_n is None else min(end_n, end_max)
         self._logger.debug("Reading blocks %d to %d from source-file", start_n, end_n)
         _raw = is_raw
         _wts = not omit_ts
 
         for i in range(start_n, end_n):
-            idx_start = i * self.samples_per_buffer
-            idx_end = idx_start + self.samples_per_buffer
+            idx_start = i * n_samples_per_buffer
+            idx_end = idx_start + n_samples_per_buffer
             if _raw:
                 yield (
                     self.ds_time[idx_start:idx_end] if _wts else None,
@@ -673,7 +675,7 @@ class Reader:
         return data != data_1
 
     def gpio_to_waveforms(self, name: Optional[str] = None) -> dict:
-        waveforms: dict[str, np.ndarray] = {}
+        waveforms: Dict[str, np.ndarray] = {}
         if "gpio" not in self.h5file:
             return waveforms
 

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/testbed_client/fixtures.py

@@ -1,14 +1,13 @@
 """Current implementation of a file-based database."""
 
 import copy
-import os
 import pickle
 from datetime import datetime
 from datetime import timedelta
 from pathlib import Path
 from typing import Any
 from typing import Dict
-from typing import List
+from typing import Mapping
 from typing import Optional
 from typing import Union
 
@@ -144,7 +143,7 @@ class Fixture:
         return values, chain
 
     @staticmethod
-    def fill_model(model: dict, base: dict) -> dict:
+    def fill_model(model: Mapping, base: dict) -> dict:
         base = copy.copy(base)
         for key, value in model.items():
             # keep previous entries
@@ -201,7 +200,10 @@ class Fixtures:
             if self.file_path.is_file():
                 files = [self.file_path]
             elif self.file_path.is_dir():
-                files = get_files(self.file_path, self.suffix)
+                files = list(
+                    self.file_path.glob("**/*" + self.suffix)
+                )  # for py>=3.12: case_sensitive=False
+                logger.debug(" -> got %s %s-files", len(files), self.suffix)
             else:
                 raise ValueError("Path must either be file or directory (or empty)")
 
@@ -245,28 +247,3 @@ class Fixtures:
     def to_file(file: Path) -> None:
         msg = f"TODO (val={file})"
         raise NotImplementedError(msg)
-
-
-def get_files(start_path: Path, suffix: str, recursion_depth: int = 0) -> List[Path]:
-    """Generate a recursive list of all files in a directory."""
-    if recursion_depth == 0:
-        suffix = suffix.lower().split(".")[-1]
-    dir_items = os.scandir(start_path)
-    recursion_depth += 1
-    files = []
-
-    for item in dir_items:
-        if item.is_dir():
-            files += get_files(Path(item.path), suffix, recursion_depth)
-            continue
-
-        item_name = str(item.name).lower()
-        item_ext = item_name.split(".")[-1]
-        if item_ext == suffix and item_ext != item_name:
-            files.append(Path(item.path))
-        if not suffix and item_ext == item_name:
-            files.append(Path(item.path))
-
-    if recursion_depth == 1 and len(files) > 0:
-        logger.debug(" -> got %s files with the suffix '%s'", len(files), suffix)
-    return files

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/version.py

@@ -1,3 +1,3 @@
 """Separated string avoids circular imports."""
 
-version: str = "2025.02.1"
+version: str = "2025.04.1"

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core/writer.py

@@ -8,6 +8,7 @@ from itertools import product
 from pathlib import Path
 from types import TracebackType
 from typing import Any
+from typing import Mapping
 from typing import Optional
 from typing import Type
 from typing import Union
@@ -364,7 +365,7 @@ class Writer(Reader):
         """Conveniently store relevant key-value data (attribute) in H5-structure."""
         self.h5file.attrs.__setitem__(key, item)
 
-    def store_config(self, data: dict) -> None:
+    def store_config(self, data: Mapping) -> None:
         """Get a better self-describing Output-File.
 
         TODO: use data-model?

{shepherd_core-2025.2.1 → shepherd_core-2025.4.1}/shepherd_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: shepherd_core
-Version: 2025.2.1
+Version: 2025.4.1
 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>