shepherd-core 2025.2.2__py3-none-any.whl → 2025.4.1__py3-none-any.whl

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/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/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/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/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/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/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/version.py

@@ -1,3 +1,3 @@
 """Separated string avoids circular imports."""
 
-version: str = "2025.02.2"
+version: str = "2025.04.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.2.dist-info → shepherd_core-2025.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: shepherd_core
-Version: 2025.2.2
+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.2.dist-info → shepherd_core-2025.4.1.dist-info}/RECORD

@@ -2,15 +2,15 @@ shepherd_core/__init__.py,sha256=fCld2mcl0y0h6kRyPal3DP-sWXnKl_0aYWYBdg4QuUk,127
 shepherd_core/calibration_hw_def.py,sha256=_nMzgNzSnYyqcLnVCGd4tfA2e0avUXbccjmNpFhiDgo,2830
 shepherd_core/commons.py,sha256=vymKXWcy_1bz7ChzzEATUkJ4p3czCzjIdsSehVjJOY8,218
 shepherd_core/logger.py,sha256=4Q4hTI-nccOZ1_A68fo4UEctfu3pJx3IeHfa9VuDDEo,1804
-shepherd_core/reader.py,sha256=BxVWE-4BfDUjVh03l0SZHT5PwVN0xPEy4aP8Kr858kI,28270
-shepherd_core/version.py,sha256=nTwMv1ayLMflxtnNktXAuPy5XKPBgwQv7w-EtHuCMtI,76
-shepherd_core/writer.py,sha256=GMR-7vkOgpTNPoknBWsRsC7-b7iGMtT60-KtSKunNe8,14636
+shepherd_core/reader.py,sha256=tgETZPFSPzBk2BYHZ3NyWpY9j6j23FUWv1e3oCQhc6A,28401
+shepherd_core/version.py,sha256=Tb2EjULatpKtVFMAniZ_AGEWDFfyFO0ffsW-t24FgFU,76
+shepherd_core/writer.py,sha256=TD5oXuOFz_PUMWYeXfePz9x2O01DLRBVNMaLcngNjFc,14666
 shepherd_core/data_models/__init__.py,sha256=bnHSP_HBOYm4WuoiHs_vyiRsWlvkyDjsarMNfKedN-Q,1836
-shepherd_core/data_models/readme.md,sha256=1bdfEypY_0NMhXLxOPRnLAsFca0HuHdq7_01yEWxvUs,2470
+shepherd_core/data_models/readme.md,sha256=DHPVmkWqDksWomRHRTVWVHy9wXF9oMJrITgKs4Pnz2g,2494
 shepherd_core/data_models/virtual_source_doc.txt,sha256=KizMcfGKj7BnHIbaJHT7KeTF01SV__UXv01qV_DGHSs,6057
 shepherd_core/data_models/base/__init__.py,sha256=PSJ6acWViqBm0Eiom8DIgKfFVrp5lzYr8OsDvP79vwI,94
 shepherd_core/data_models/base/cal_measurement.py,sha256=YScPG7QLynbUHdjcznYqU8O5KRh0XiROGxGSk9BETMk,3357
-shepherd_core/data_models/base/calibration.py,sha256=k5VwAK_cwr0a6QY82Lw-9uHth5KUReFOakuOTzghoso,10725
+shepherd_core/data_models/base/calibration.py,sha256=-eiN9QbuZhw1CLzmyijeMgMVzzDE85p-Q5KryFoo5x8,10788
 shepherd_core/data_models/base/content.py,sha256=13j7GSgT73xn27jgDP508thUEJR4U-nCb5n7CJ50c9Y,2463
 shepherd_core/data_models/base/shepherd.py,sha256=DNrx59o1VBuy_liJuUzZRzmTTYB73D_pUWiNyMQyjYY,6112
 shepherd_core/data_models/base/timezone.py,sha256=2T6E46hJ1DAvmqKfu6uIgCK3RSoAKjGXRyzYNaqKyjY,665
@@ -23,10 +23,10 @@ shepherd_core/data_models/content/firmware.py,sha256=rH74sJPAjUUheVv0y2Y93BeT63C
 shepherd_core/data_models/content/firmware_datatype.py,sha256=XPU9LOoT3h5qFOlE8WU0vAkw-vymNxzor9kVFyEqsWg,255
 shepherd_core/data_models/content/virtual_harvester.py,sha256=cf-DrSacZsct9e8eGoR4PX7S7RXlbxQfJHVsLR9njlM,10749
 shepherd_core/data_models/content/virtual_harvester_fixture.yaml,sha256=LZe5ue1xYhXZwB3a32sva-L4uKhkQA5AtG9JzW4B2hQ,4564
-shepherd_core/data_models/content/virtual_source.py,sha256=PPAphxEXvgMM7OVZ2dBkYAvJQkmj5Kb2BYFogVUs7B8,15354
+shepherd_core/data_models/content/virtual_source.py,sha256=EnkjLlh14YBUnoS4yILXraLN0qdnVoEzddJY0N1w3xk,15351
 shepherd_core/data_models/content/virtual_source_fixture.yaml,sha256=1o-31mGgn7eyCNidKoOUp9vZh3K4Al0kJgmz54Q2DAE,11191
 shepherd_core/data_models/experiment/__init__.py,sha256=lorsx0M-JWPIrt_UZfexsLwaITv5slFb3krBOt0idm8,618
-shepherd_core/data_models/experiment/experiment.py,sha256=wnn6T3czuh4rz6OSYtMltCTbRpPX55TLVAtQcKO7Uhg,4044
+shepherd_core/data_models/experiment/experiment.py,sha256=79iHh2Dr_w4N4Bfq_g0KDr6wMpS_T7x-JIGHZCagEGo,4080
 shepherd_core/data_models/experiment/observer_features.py,sha256=qxnb7anuQz9ZW5IUlPdUXYPIl5U7O9uXkJqZtMnAb0Y,5156
 shepherd_core/data_models/experiment/target_config.py,sha256=XIsjbbo7yn_A4q3GMxWbiNzEGA0Kk5gH7-XfQQ7Kg0E,3674
 shepherd_core/data_models/task/__init__.py,sha256=vOsSeB5IBYYwzOLKom8-XuZyjF86m_svtCsw-agiV7o,3295
@@ -57,7 +57,7 @@ shepherd_core/fw_tools/converter.py,sha256=3igRT33tghrBCao5njuPmePS-Y_lSa6EUHvwC
 shepherd_core/fw_tools/converter_elf.py,sha256=GQDVqIqMW4twNMvZIV3sowFMezhs2TN-IYREjRP7Xt4,1089
 shepherd_core/fw_tools/patcher.py,sha256=D6MHaCvKRRVQYSZozODAp_l7UnqxVsvnulPzpkfXWW8,4108
 shepherd_core/fw_tools/validation.py,sha256=dOweyWwVMq0b4Liha39mGUOiblD7Nz5kSFVrlxUx41o,4707
-shepherd_core/inventory/__init__.py,sha256=nRO11HG4eJ_FaXebSkE0dd1H6qvjrX5n3OQHOzKXVvk,3841
+shepherd_core/inventory/__init__.py,sha256=nyDBAE7kdDeh1McyavMWH1cY0WqphjFS1NL4XRAyzUw,3841
 shepherd_core/inventory/python.py,sha256=OWNnyEt0IDPW9XGW-WloU0FExwgZzYNA05VpRj4cZGc,1250
 shepherd_core/inventory/system.py,sha256=Q_mtM2zhUsTvzELgpEVxSxL9aFS1RSGcCX6RFpyZ-r8,3155
 shepherd_core/inventory/target.py,sha256=Lq11j25tWieXheOxIDaQb-lc-2omxYVex5P6uGiLUyk,507
@@ -65,7 +65,7 @@ shepherd_core/testbed_client/__init__.py,sha256=QtbsBUzHwOoM6rk0qa21ywuz63YV7af1
 shepherd_core/testbed_client/cache_path.py,sha256=tS0er9on5fw8wddMCt1jkc2uyYOdSTvX_UmfmYJf6tY,445
 shepherd_core/testbed_client/client_abc_fix.py,sha256=BsSkpvJHURRejlS-YPF1f6QRPC_X0fYEsJpinzsx6Jc,4079
 shepherd_core/testbed_client/client_web.py,sha256=rOg0Gf-s3S8U0z2ssh9_bNnq4aRQINfuuVHionPf38M,5788
-shepherd_core/testbed_client/fixtures.py,sha256=4Uk583R4r6I5IB78HxOn-9UNH3sbFha7OPEdcSXvMCU,9939
+shepherd_core/testbed_client/fixtures.py,sha256=W8trHZXyuD0xzb28ZW-2BQ3ZDU2tI3LC4mjrbOUX57E,9215
 shepherd_core/testbed_client/user_model.py,sha256=5M3vWkAGBwdGDUYAanAjrZwpzMBlh3XLOVvNYWiLmms,2107
 shepherd_core/vsource/__init__.py,sha256=vTvFWuJn4eurPNzEiMd15c1Rd6o3DTWzCfbhOomflZU,771
 shepherd_core/vsource/target_model.py,sha256=LaB5ppi2-IIpIepDqDvOliR-BupzccJl44yRxjlF-ms,5113
@@ -74,8 +74,8 @@ shepherd_core/vsource/virtual_harvester_model.py,sha256=GyA0uGl3r42t5c4roYtEaj22
 shepherd_core/vsource/virtual_harvester_simulation.py,sha256=MFT583s73BJZYyhcqgnDUGTPr9s_lN_lKafzJG6kueE,2457
 shepherd_core/vsource/virtual_source_model.py,sha256=9tiOzgrEgdEH5Uuhd8hjmmIkquNDuaNjLlblvInIlzg,3036
 shepherd_core/vsource/virtual_source_simulation.py,sha256=ZOnFd2uPawY2G1salCiLGx9o1OBG99_-EHBtDjx4ZUo,5140
-shepherd_core-2025.2.2.dist-info/METADATA,sha256=r7kp-hqRWNI4HjNtagcpvXtUmZLcmrpj4iRTZo34g2Q,7806
-shepherd_core-2025.2.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-shepherd_core-2025.2.2.dist-info/top_level.txt,sha256=wy-t7HRBrKARZxa-Y8_j8d49oVHnulh-95K9ikxVhew,14
-shepherd_core-2025.2.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-shepherd_core-2025.2.2.dist-info/RECORD,,
+shepherd_core-2025.4.1.dist-info/METADATA,sha256=3IZbuK5skDrSs1QRlY9uA8MJLsUx0NSYALft4GwVfeQ,7806
+shepherd_core-2025.4.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+shepherd_core-2025.4.1.dist-info/top_level.txt,sha256=wy-t7HRBrKARZxa-Y8_j8d49oVHnulh-95K9ikxVhew,14
+shepherd_core-2025.4.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+shepherd_core-2025.4.1.dist-info/RECORD,,

{shepherd_core-2025.2.2.dist-info → shepherd_core-2025.4.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any