shepherd-data 2025.6.4__py3-none-any.whl → 2025.8.1__py3-none-any.whl

shepherd_data/__init__.py

@@ -11,7 +11,7 @@ from shepherd_core import Writer
 
 from .reader import Reader
 
-__version__ = "2025.06.4"
+__version__ = "2025.08.1"
 
 __all__ = [
     "Reader",

shepherd_data/cli.py

@@ -7,13 +7,11 @@ from datetime import datetime
 from pathlib import Path
 
 import click
-import pydantic
 
 from shepherd_core import get_verbose_level
 from shepherd_core import local_tz
 from shepherd_core.logger import set_log_verbose_level
 
-from . import __version__
 from .reader import Reader
 
 logger = logging.getLogger("SHPData.cli")
@@ -57,17 +55,22 @@ def cli(ctx: click.Context, *, verbose: bool) -> None:
 @cli.command(short_help="Print version-info (combine with -v for more)")
 def version() -> None:
     """Print version-info (combine with -v for more)."""
-    logger.info("Shepherd-Data v%s", __version__)
+    from importlib import metadata  # noqa: PLC0415
+
     logger.debug("Python v%s", sys.version)
-    logger.debug("Click v%s", click.__version__)
-    logger.debug("Pydantic v%s", pydantic.__version__)
+    logger.info("Shepherd-Data v%s", metadata.version("shepherd_data"))
+    logger.debug("Shepherd-Core v%s", metadata.version("shepherd_core"))
+    logger.debug("h5py v%s", metadata.version("h5py"))
+    logger.debug("numpy v%s", metadata.version("numpy"))
+    logger.debug("Click v%s", metadata.version("click"))
+    logger.debug("Pydantic v%s", metadata.version("pydantic"))
 
 
 @cli.command(short_help="Validates a file or directory containing shepherd-recordings")
 @click.argument("in_data", type=click.Path(exists=True, resolve_path=True))
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -128,7 +131,7 @@ def validate(in_data: Path, *, recurse: bool = False) -> None:
 )
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -172,7 +175,7 @@ def extract(
 )
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -222,7 +225,7 @@ def extract_meta(
 @click.argument("in_data", type=click.Path(exists=True, resolve_path=True))
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -247,7 +250,7 @@ def extract_uart(in_data: Path, *, recurse: bool = False) -> None:
 @click.argument("in_data", type=click.Path(exists=True, resolve_path=True))
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -293,7 +296,7 @@ def decode_uart(in_data: Path, *, recurse: bool = False) -> None:
 )  # TODO: also configure decimal point
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -346,7 +349,7 @@ def extract_gpio(in_data: Path, separator: str, *, recurse: bool = False) -> Non
 )
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -424,10 +427,11 @@ def downsample(
 )
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
+# TODO: allow SVG-output
 def plot(
     in_data: Path,
     start: float | None,

shepherd_data/reader.py

@@ -185,19 +185,23 @@ class Reader(CoreReader):
         :param is_time: time is not really down-sampled, but decimated
         :return: resampled h5-dataset or numpy-array
         """
-        from scipy import signal  # here due to massive delay
+        # import only when needed, due to massive delay
+        from scipy import signal  # noqa: PLC0415
 
         if self.get_datatype() == EnergyDType.ivsurface:
             self._logger.warning("Downsampling-Function was not written for IVSurfaces")
         ds_factor = max(1, math.floor(ds_factor))
-
-        if isinstance(end_n, (int, float)):
-            _end_n = min(data_src.shape[0], round(end_n))
+        if not isinstance(start_n, int):
+            raise TypeError("start_n must be an integer")
+        if isinstance(end_n, int):
+            end_n = min(data_src.shape[0], end_n)
+        elif isinstance(end_n, float):
+            raise TypeError("end_n must be an integer")
         else:
-            _end_n = data_src.shape[0]
+            end_n = data_src.shape[0]
 
-        start_n = min(_end_n, round(start_n))
-        data_len = _end_n - start_n  # TODO: one-off to calculation below ?
+        start_n = min(end_n, start_n)
+        data_len = end_n - start_n  # TODO: one-off to calculation below ?
         if data_len == 0:
             self._logger.warning("downsampling failed because of data_len = 0")
             return data_dst
@@ -380,13 +384,17 @@ class Reader(CoreReader):
         if self.get_datatype() == EnergyDType.ivsurface:
             self._logger.warning("Resampling-Function was not written for IVSurfaces")
             return data_dst
-        if isinstance(end_n, (int, float)):
-            _end_n = min(data_src.shape[0], round(end_n))
+        if not isinstance(start_n, int):
+            raise TypeError("start_n must be an integer")
+        if isinstance(end_n, int):
+            end_n = min(data_src.shape[0], end_n)
+        elif isinstance(end_n, float):
+            raise TypeError("end_n must be an integer")
         else:
-            _end_n = data_src.shape[0]
+            end_n = data_src.shape[0]
 
-        start_n = min(_end_n, round(start_n))
-        data_len = _end_n - start_n
+        start_n = min(end_n, start_n)
+        data_len = end_n - start_n
         if data_len == 0:
             self._logger.warning("resampling failed because of data_len = 0")
             return data_dst

{shepherd_data-2025.6.4.dist-info → shepherd_data-2025.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shepherd_data
-Version: 2025.6.4
+Version: 2025.8.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>
@@ -34,7 +34,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: pyYAML
 Requires-Dist: scipy
-Requires-Dist: shepherd-core[inventory]>=2025.06.4
+Requires-Dist: shepherd-core[inventory]>=2025.08.1
 Requires-Dist: tqdm
 Provides-Extra: elf
 Requires-Dist: shepherd-core[elf]; extra == "elf"
@@ -46,6 +46,8 @@ Requires-Dist: shepherd-core[test]; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-click; extra == "test"
 Requires-Dist: coverage; extra == "test"
+Provides-Extra: all
+Requires-Dist: shepherd-data[dev,elf,test]; extra == "all"
 
 # Shepherd-Data-Tool
 

shepherd_data-2025.8.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+shepherd_data/__init__.py,sha256=oEhjHkoauQ5UG6iosVocZ1DpmjIp_MfNtgAvVuj5L4c,353
+shepherd_data/cli.py,sha256=CHlOIYMx1hcOukYUpK1LWrjj_7ESL0FKxJascVqnrqM,16118
+shepherd_data/ivonne.py,sha256=vh0XyMoSjbanzy4sqpNfVo6DEnbWNJPRUgNKPfHP2Yc,11875
+shepherd_data/mppt.py,sha256=y9gVIhMs-ZG3ScL9UQTc5n8T146B13Q5dA5sfqqfjg0,3999
+shepherd_data/reader.py,sha256=jHDPmLCZ-wDiIAlpLkyjguMdcueJ-TbqL6Nq7AxzPu0,25997
+shepherd_data-2025.8.1.dist-info/METADATA,sha256=BleD3ZIR6dUuFPPVPi9sgQkfZTyHT_gGj-6-ABuXhSw,3434
+shepherd_data-2025.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shepherd_data-2025.8.1.dist-info/entry_points.txt,sha256=6PBfY36A1xNOdzLiz-Qoukya_UzFZAwOapwmRNnPeZ8,56
+shepherd_data-2025.8.1.dist-info/top_level.txt,sha256=7-SCTY-TG1mLY72OVKCaqte1hy-X8woxknIUAD3OIxs,14
+shepherd_data-2025.8.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+shepherd_data-2025.8.1.dist-info/RECORD,,

shepherd_data-2025.6.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-shepherd_data/__init__.py,sha256=0HoU3_Q8b3XcNieFrTsUETlr214rYk6k_t2HIqbwaIk,353
-shepherd_data/cli.py,sha256=GjPkETMwZXHAxJETgDu6REsRAQPFe_gJVU-W-YPEWKI,15859
-shepherd_data/ivonne.py,sha256=vh0XyMoSjbanzy4sqpNfVo6DEnbWNJPRUgNKPfHP2Yc,11875
-shepherd_data/mppt.py,sha256=y9gVIhMs-ZG3ScL9UQTc5n8T146B13Q5dA5sfqqfjg0,3999
-shepherd_data/reader.py,sha256=5uemJBos3QI1BE48Q4xSG_sPD-V0Pc4Y5SpaWmObLfU,25620
-shepherd_data-2025.6.4.dist-info/METADATA,sha256=HHmW87by721iBs5czK6m3teisTXH5suTgJzFwOGRoDw,3355
-shepherd_data-2025.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shepherd_data-2025.6.4.dist-info/entry_points.txt,sha256=6PBfY36A1xNOdzLiz-Qoukya_UzFZAwOapwmRNnPeZ8,56
-shepherd_data-2025.6.4.dist-info/top_level.txt,sha256=7-SCTY-TG1mLY72OVKCaqte1hy-X8woxknIUAD3OIxs,14
-shepherd_data-2025.6.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-shepherd_data-2025.6.4.dist-info/RECORD,,