shepherd-core 2025.5.3__py3-none-any.whl → 2025.6.2__py3-none-any.whl

shepherd_core/data_models/task/testbed_tasks.py

@@ -1,12 +1,15 @@
 """Collection of tasks for all observers included in experiment."""
 
 from pathlib import Path
+from pathlib import PurePosixPath
+from typing import TYPE_CHECKING
 from typing import Annotated
 from typing import Optional
 
 from pydantic import Field
 from pydantic import validate_call
 from typing_extensions import Self
+from typing_extensions import deprecated
 
 from shepherd_core.data_models.base.content import IdInt
 from shepherd_core.data_models.base.content import NameStr
@@ -16,6 +19,9 @@ from shepherd_core.data_models.testbed.testbed import Testbed
 
 from .observer_tasks import ObserverTasks
 
+if TYPE_CHECKING:
+    from collections.abc import Set as AbstractSet
+
 
 class TestbedTasks(ShpModel):
     """Collection of tasks for all observers included in experiment."""
@@ -23,11 +29,9 @@ class TestbedTasks(ShpModel):
     name: NameStr
     observer_tasks: Annotated[list[ObserverTasks], Field(min_length=1, max_length=128)]
 
-    # POST PROCESS
-    email_results: bool = False
-    owner_id: Optional[IdInt]
-    # TODO: had real email previously, does it really need these at all?
-    #  DB stores experiment and knows when to email
+    # deprecated, TODO: remove before public release
+    email_results: Annotated[Optional[bool], deprecated("not needed anymore")] = False
+    owner_id: Annotated[Optional[IdInt], deprecated("not needed anymore")] = None
 
     @classmethod
     @validate_call
@@ -41,8 +45,6 @@ class TestbedTasks(ShpModel):
         return cls(
             name=xp.name,
             observer_tasks=obs_tasks,
-            email_results=xp.email_results,
-            owner_id=xp.owner_id,
         )
 
     def get_observer_tasks(self, observer: str) -> Optional[ObserverTasks]:
@@ -59,3 +61,10 @@ class TestbedTasks(ShpModel):
         for obt in self.observer_tasks:
             values = {**values, **obt.get_output_paths()}
         return values
+
+    def is_contained(self) -> bool:
+        paths_allowed: AbstractSet[PurePosixPath] = {
+            PurePosixPath("/var/shepherd/"),
+            PurePosixPath("/tmp/"),  # noqa: S108
+        }
+        return all(obt.is_contained(paths_allowed) for obt in self.observer_tasks)

shepherd_core/data_models/testbed/cape_fixture.yaml

@@ -1,7 +1,7 @@
 ---
 
 # more human-readable test-protocol @
-# https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/Cape_pre-deployment-tests.xlsx
+# https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/Cape_pre-deployment-tests.xlsx
 - datatype: cape
   parameters:
     id: 1270051

shepherd_core/data_models/testbed/observer.py

@@ -43,7 +43,7 @@ class Observer(ShpModel, title="Shepherd-Sheep"):
 
     latitude: Annotated[float, Field(ge=-90, le=90)] = 51.026573
     longitude: Annotated[float, Field(ge=-180, le=180)] = 13.723291
-    # ⤷ cfaed-floor
+    """ ⤷ cfaed-floor"""
 
     active: bool = True
     cape: Optional[Cape] = None

shepherd_core/data_models/testbed/observer_fixture.yaml

@@ -1,6 +1,6 @@
 ---
-# observer-cape-target-relation: https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/Cape_pre-deployment-tests.xlsx
-# network data: https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/ethernet_MAC_addresses_bbones.ods
+# observer-cape-target-relation: https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/Cape_pre-deployment-tests.xlsx
+# network data: https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/ethernet_MAC_addresses_bbones.ods
 - datatype: observer
   parameters:
     id: 0

shepherd_core/data_models/testbed/target.py

@@ -36,7 +36,7 @@ class Target(ShpModel, title="Target Node (DuT)"):
     created: datetime = Field(default_factory=datetime.now)
 
     testbed_id: Optional[IdInt16] = None
-    # ⤷ is derived from ID (targets are still selected by id!)
+    """ ⤷ is derived from ID (targets are still selected by id!)"""
     mcu1: Union[MCU, NameStr]
     mcu2: Union[MCU, NameStr, None] = None
 

shepherd_core/data_models/testbed/target_fixture.old1

@@ -1,6 +1,6 @@
 ---
 # more human-readable test-protocol @
-# https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/Target_pre-deployment-tests.xlsx
+# https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/Target_pre-deployment-tests.xlsx
 - datatype: target
   parameters:
     id: 6  # Outer ID - selected by user for XP - can be rearranged

shepherd_core/data_models/testbed/target_fixture.yaml

@@ -1,6 +1,6 @@
 ---
 # more human-readable test-protocol @
-# https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/Target_pre-deployment-tests.xlsx
+# https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/Target_pre-deployment-tests.xlsx
 - datatype: target
   parameters:
     id: 2  # Outer ID - selected by user for XP - can be rearranged

shepherd_core/data_models/testbed/testbed.py

@@ -11,15 +11,17 @@ from pydantic import HttpUrl
 from pydantic import model_validator
 from typing_extensions import Self
 
+from shepherd_core.config import config
 from shepherd_core.data_models.base.content import IdInt
 from shepherd_core.data_models.base.content import NameStr
 from shepherd_core.data_models.base.content import SafeStr
 from shepherd_core.data_models.base.shepherd import ShpModel
-from shepherd_core.logger import logger
 from shepherd_core.testbed_client import tb_client
 
 from .observer import Observer
 
+duration_5min = timedelta(minutes=5)
+
 
 class Testbed(ShpModel):
     """meta-data representation of a testbed-component (physical object)."""
@@ -36,21 +38,18 @@ class Testbed(ShpModel):
     shared_storage: bool = True
     data_on_server: Path
     data_on_observer: Path
-    # ⤷ storage layout: root_path/content_type/group/owner/[object]
+    """ ⤷ storage layout: root_path/content_type/group/owner/[object]"""
+    # TODO: we might need individual paths for experiments & content
 
-    prep_duration: timedelta = timedelta(minutes=5)
+    prep_duration: timedelta = duration_5min
     # TODO: one BBone is currently time-keeper
 
     @model_validator(mode="before")
     @classmethod
     def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
-        # allow instantiating an empty Testbed
-        #   -> query the first (and only) entry of client
+        # allow instantiating an empty Testbed, take default in config
         if len(values) == 0:
-            ids = tb_client.query_ids(cls.__name__)
-            if len(ids) > 1:
-                logger.warning("More than one testbed defined?!?")
-            values = {"id": ids[0]}
+            values = {"name": config.TESTBED}
 
         values, _ = tb_client.try_completing_model(cls.__name__, values)
         return values

shepherd_core/decoder_waveform/uart.py

@@ -28,7 +28,7 @@ from typing import Union
 
 import numpy as np
 
-from shepherd_core.logger import logger
+from shepherd_core.logger import log
 
 
 class Parity(str, Enum):
@@ -109,10 +109,10 @@ class Uart:
             raise ValueError("Only bit-order LSB-first is supported ATM")
 
         if self.inversion:
-            logger.debug("inversion was detected / issued -> will invert signal")
+            log.debug("inversion was detected / issued -> will invert signal")
             self._convert_analog2digital(invert=True)
         if self.detect_inversion():
-            logger.error("Signal still inverted?!? Check parameters and input")
+            log.error("Signal still inverted?!? Check parameters and input")
 
         # results
         self.events_symbols: Optional[np.ndarray] = None
@@ -136,7 +136,7 @@ class Uart:
         self.events_sig = self.events_sig[data_f == 1]
 
         if len(data_0) > len(self.events_sig):
-            logger.debug(
+            log.debug(
                 "filtered out %d/%d events (redundant)",
                 len(data_0) - len(self.events_sig),
                 len(data_0),
@@ -145,7 +145,7 @@ class Uart:
     def _add_duration(self) -> None:
         """Calculate third column -> duration of state in [baud-ticks]."""
         if self.events_sig.shape[1] > 2:
-            logger.warning("Tried to add state-duration, but it seems already present")
+            log.warning("Tried to add state-duration, but it seems already present")
             return
         if not hasattr(self, "dur_tick"):
             raise ValueError("Make sure that baud-rate was calculated before running add_dur()")
@@ -223,7 +223,7 @@ class Uart:
                         symbol = 0
                     pos_df = None
                 else:
-                    logger.debug("Error - Long pause - but SigLow (@%d)", time)
+                    log.debug("Error - Long pause - but SigLow (@%d)", time)
                 continue
             if pos_df is None and value == 0:
                 # Start of frame (first low after pause / EOF)
@@ -245,7 +245,7 @@ class Uart:
                         symbol = 0
                     pos_df = None
                     if off_tick and value == 0:
-                        logger.debug("Error - Off-sized step - but SigLow (@%d)", time)
+                        log.debug("Error - Off-sized step - but SigLow (@%d)", time)
         self.events_symbols = np.concatenate(content).reshape((len(content), 2))
         # TODO: numpy is converting timestamp to string -> must be added as tuple (ts, symbol)
         # symbol_events[:, 0] = symbol_events[:, 0].astype(float)  # noqa: ERA001

shepherd_core/fw_tools/patcher.py

@@ -7,9 +7,8 @@ from typing import Optional
 from pydantic import Field
 from pydantic import validate_call
 
-from shepherd_core.commons import UID_NAME
-from shepherd_core.commons import UID_SIZE
-from shepherd_core.logger import logger
+from shepherd_core.config import config
+from shepherd_core.logger import log
 
 from .validation import is_elf
 
@@ -36,9 +35,9 @@ def find_symbol(file_elf: Path, symbol: str) -> bool:
     except KeyError:
         addr = None
     if addr is None:
-        logger.debug("Symbol '%s' not found in ELF-File %s", symbol, file_elf.name)
+        log.debug("Symbol '%s' not found in ELF-File %s", symbol, file_elf.name)
         return False
-    logger.debug(
+    log.debug(
         "Symbol '%s' found in ELF-File %s, arch=%s, order=%s",
         symbol,
         file_elf.name,
@@ -50,7 +49,7 @@ def find_symbol(file_elf: Path, symbol: str) -> bool:
 
 
 @validate_call
-def read_symbol(file_elf: Path, symbol: str, length: int = UID_SIZE) -> Optional[int]:
+def read_symbol(file_elf: Path, symbol: str, length: int) -> Optional[int]:
     """Read value of symbol in ELF-File.
 
     Will be interpreted as int.
@@ -68,7 +67,7 @@ def read_symbol(file_elf: Path, symbol: str, length: int = UID_SIZE) -> Optional
 
 def read_uid(file_elf: Path) -> Optional[int]:
     """Read value of UID-symbol for shepherd testbed."""
-    return read_symbol(file_elf, symbol=UID_NAME, length=UID_SIZE)
+    return read_symbol(file_elf, symbol=config.UID_NAME, length=config.UID_SIZE)
 
 
 def read_arch(file_elf: Path) -> Optional[str]:
@@ -80,7 +79,7 @@ def read_arch(file_elf: Path) -> Optional[str]:
     elf = ELF(path=file_elf)
     if "exec" in elf.elftype.lower():
         return elf.arch.lower()
-    logger.error("ELF is not Executable")
+    log.error("ELF is not Executable")
     return None
 
 
@@ -88,7 +87,7 @@ def read_arch(file_elf: Path) -> Optional[str]:
 def modify_symbol_value(
     file_elf: Path,
     symbol: str,
-    value: Annotated[int, Field(ge=0, lt=2 ** (8 * UID_SIZE))],
+    value: Annotated[int, Field(ge=0, lt=2 ** (8 * config.UID_SIZE))],
     *,
     overwrite: bool = False,
 ) -> Optional[Path]:
@@ -106,21 +105,21 @@ def modify_symbol_value(
         raise RuntimeError(elf_error_text)
     elf = ELF(path=file_elf)
     addr = elf.symbols[symbol]
-    value_raw = elf.read(address=addr, count=UID_SIZE)[-UID_SIZE:]
+    value_raw = elf.read(address=addr, count=config.UID_SIZE)[-config.UID_SIZE :]
     # ⤷ cutting needed -> msp produces 4b instead of 2
     value_old = int.from_bytes(bytes=value_raw, byteorder=elf.endian, signed=False)
-    value_raw = value.to_bytes(length=UID_SIZE, byteorder=elf.endian, signed=False)
+    value_raw = value.to_bytes(length=config.UID_SIZE, byteorder=elf.endian, signed=False)
 
     try:
         elf.write(address=addr, data=value_raw)
     except AttributeError:
-        logger.warning("ELF-Modifier failed @%s for symbol '%s'", f"0x{addr:X}", symbol)
+        log.warning("ELF-Modifier failed @%s for symbol '%s'", f"0x{addr:X}", symbol)
         return None
 
     file_new = file_elf if overwrite else file_elf.with_stem(file_elf.stem + "_" + str(value))
     elf.save(path=file_new)
     elf.close()
-    logger.debug(
+    log.debug(
         "Value of Symbol '%s' modified: %s -> %s @%s",
         symbol,
         hex(value_old),
@@ -132,4 +131,4 @@ def modify_symbol_value(
 
 def modify_uid(file_elf: Path, value: int) -> Optional[Path]:
     """Replace value of UID-symbol for shepherd testbed."""
-    return modify_symbol_value(file_elf, symbol=UID_NAME, value=value, overwrite=True)
+    return modify_symbol_value(file_elf, symbol=config.UID_NAME, value=value, overwrite=True)

shepherd_core/fw_tools/validation.py

@@ -13,7 +13,7 @@ from intelhex import IntelHexError
 from pydantic import validate_call
 
 from shepherd_core.data_models.content.firmware_datatype import FirmwareDType
-from shepherd_core.logger import logger
+from shepherd_core.logger import log
 
 from .converter_elf import elf_to_hex
 
@@ -94,7 +94,7 @@ def is_elf(file: Path) -> bool:
     try:
         _ = ELF(path=file)
     except ELFError:
-        logger.debug("File %s is not ELF - Magic number does not match", file.name)
+        log.debug("File %s is not ELF - Magic number does not match", file.name)
         return False
     return True
 

shepherd_core/inventory/system.py

@@ -14,7 +14,7 @@ from typing import Optional
 from typing_extensions import Self
 
 from shepherd_core.data_models.base.timezone import local_now
-from shepherd_core.logger import logger
+from shepherd_core.logger import log
 
 try:
     import psutil
@@ -31,10 +31,8 @@ class SystemInventory(ShpModel):
     """System / OS related inventory model."""
 
     uptime: PositiveInt
-    # ⤷ seconds
+    """ ⤷ seconds"""
     timestamp: datetime
-    # time_delta: timedelta = timedelta(seconds=0)  # noqa: ERA001
-    # ⤷ lag behind earliest observer, TODO: wrong place
 
     system: str
     release: str
@@ -64,7 +62,7 @@ class SystemInventory(ShpModel):
         if psutil is None:
             ifs2 = {}
             uptime = 0
-            logger.warning(
+            log.warning(
                 "Inventory-Parameters will be missing. "
                 "Please install functionality with "
                 "'pip install shepherd_core[inventory] -U' first"

shepherd_core/logger.py

@@ -7,8 +7,8 @@ from typing import Union
 import chromalog
 
 chromalog.basicConfig(format="%(message)s")
-logger = logging.getLogger("SHPCore")
-logger.addHandler(logging.NullHandler())
+log = logging.getLogger("SHPCore")
+log.addHandler(logging.NullHandler())
 
 verbose_level: int = 2
 
@@ -47,7 +47,7 @@ def increase_verbose_level(verbose: int) -> None:
     global verbose_level  # noqa: PLW0603
     if verbose >= verbose_level:
         verbose_level = min(max(verbose, 0), 3)
-        set_log_verbose_level(logger, verbose_level)
+        set_log_verbose_level(log, verbose_level)
 
 
 increase_verbose_level(2)

shepherd_core/reader.py

@@ -7,6 +7,7 @@ import errno
 import logging
 import math
 import os
+from datetime import datetime
 from itertools import product
 from pathlib import Path
 from types import MappingProxyType
@@ -24,9 +25,10 @@ from tqdm import trange
 from typing_extensions import Self
 from typing_extensions import deprecated
 
-from .commons import SAMPLERATE_SPS_DEFAULT
+from .config import config
 from .data_models.base.calibration import CalibrationPair
 from .data_models.base.calibration import CalibrationSeries
+from .data_models.base.timezone import local_tz
 from .data_models.content.energy_environment import EnergyDType
 from .decoder_waveform import Uart
 
@@ -75,7 +77,7 @@ class Reader:
             self._logger.setLevel(logging.DEBUG if verbose else logging.INFO)
 
         if not hasattr(self, "samplerate_sps"):
-            self.samplerate_sps: int = SAMPLERATE_SPS_DEFAULT
+            self.samplerate_sps: int = config.SAMPLERATE_SPS
         self.sample_interval_ns: int = round(10**9 // self.samplerate_sps)
         self.sample_interval_s: float = 1 / self.samplerate_sps
 
@@ -263,6 +265,11 @@ class Reader:
             omit_timestamps=omit_ts,
         )
 
+    def get_time_start(self) -> Optional[datetime]:
+        if self.samples_n < 1:
+            return None
+        return datetime.fromtimestamp(self._cal.time.raw_to_si(self.ds_time[0]), tz=local_tz())
+
     def get_calibration_data(self) -> CalibrationSeries:
         """Read calibration-data from hdf5 file.
 

shepherd_core/testbed_client/cache_path.py

@@ -14,4 +14,4 @@ def _get_xdg_path(variable_name: str, default_path: Path) -> Path:
 user_path = Path("~").expanduser()
 
 cache_xdg_path = _get_xdg_path("XDG_CACHE_HOME", user_path / ".cache")
-cache_user_path = cache_xdg_path / "shepherd_datalib"
+cache_user_path = cache_xdg_path / "shepherd"

shepherd_core/testbed_client/client_web.py

@@ -8,7 +8,7 @@ from typing import Union
 
 from pydantic import validate_call
 
-from shepherd_core.commons import TESTBED_SERVER_URI
+from shepherd_core.config import config
 from shepherd_core.data_models.base.shepherd import ShpModel
 from shepherd_core.data_models.base.wrapper import Wrapper
 
@@ -38,7 +38,7 @@ class WebClient(AbcClient):
         if not hasattr(self, "_token"):
             # add default values
             self._token: str = "basic_public_access"  # noqa: S105
-            self._server: str = TESTBED_SERVER_URI
+            self._server: str = config.TESTBED_SERVER
             self._user: Optional[User] = None
             self._key: Optional[str] = None
             self._connected: bool = False

shepherd_core/testbed_client/fixtures.py

@@ -18,7 +18,7 @@ from typing_extensions import Self
 from shepherd_core.data_models.base.timezone import local_now
 from shepherd_core.data_models.base.timezone import local_tz
 from shepherd_core.data_models.base.wrapper import Wrapper
-from shepherd_core.logger import logger
+from shepherd_core.logger import log
 
 from .cache_path import cache_user_path
 
@@ -109,7 +109,7 @@ class Fixture:
                     raise ValueError(msg)
                 chain.append(base_name)
             fixture_base = copy.copy(self[fixture_name])
-            logger.debug("'%s' will inherit from '%s'", self.model_type, fixture_name)
+            log.debug("'%s' will inherit from '%s'", self.model_type, fixture_name)
             fixture_base["name"] = fixture_name
             chain.append(fixture_name)
             base_dict, chain = self.inheritance(values=fixture_base, chain=chain)
@@ -196,7 +196,7 @@ class Fixtures:
             # TODO: also add version as criterion
             with cache_file.open("rb", buffering=-1) as fd:
                 self.components = pickle.load(fd)  # noqa: S301
-            logger.debug(" -> found & used pickled fixtures")
+            log.debug(" -> found & used pickled fixtures")
         else:
             if self.file_path.is_file():
                 files = [self.file_path]
@@ -204,7 +204,7 @@ class Fixtures:
                 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)
+                log.debug(" -> got %s %s-files", len(files), self.suffix)
             else:
                 raise ValueError("Path must either be file or directory (or empty)")
 
@@ -212,7 +212,7 @@ class Fixtures:
                 self.insert_file(file)
 
             if len(self.components) < 1:
-                logger.error(f"No fixture-components found at {self.file_path.as_posix()}")
+                log.error(f"No fixture-components found at {self.file_path.as_posix()}")
             elif sheep_detect:
                 cache_file.parent.mkdir(parents=True, exist_ok=True)
                 with cache_file.open("wb", buffering=-1) as fd:

shepherd_core/version.py

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

shepherd_core/vsource/virtual_harvester_model.py

@@ -17,7 +17,7 @@ Compromises:
 """
 
 from shepherd_core.data_models.content.virtual_harvester import HarvesterPRUConfig
-from shepherd_core.logger import logger
+from shepherd_core.logger import log
 
 
 class VirtualHarvesterModel:
@@ -37,7 +37,7 @@ class VirtualHarvesterModel:
 
         self.is_emu: bool = bool(self._cfg.hrv_mode & (2**0))
         if not self.is_emu:
-            logger.warning(
+            log.warning(
                 "This VSrc-config is not meant for emulation-mode -> activate 'is_emu' flag."
             )
 

shepherd_core/vsource/virtual_source_simulation.py

@@ -16,7 +16,7 @@ from tqdm import tqdm
 
 from shepherd_core.data_models.base.calibration import CalibrationEmulator
 from shepherd_core.data_models.content.virtual_source import VirtualSourceConfig
-from shepherd_core.logger import logger
+from shepherd_core.logger import log
 from shepherd_core.reader import Reader
 from shepherd_core.writer import Writer
 
@@ -68,7 +68,7 @@ def simulate_source(
             # keep dependencies low
             from matplotlib import pyplot as plt
         except ImportError:
-            logger.warning("Matplotlib not installed, plotting of internals disabled")
+            log.warning("Matplotlib not installed, plotting of internals disabled")
             stats_internal = None
     else:
         stats_internal = None

shepherd_core/writer.py

@@ -20,7 +20,7 @@ from typing_extensions import Self
 from yaml import Node
 from yaml import SafeDumper
 
-from .commons import SAMPLERATE_SPS_DEFAULT
+from .config import config
 from .data_models.base.calibration import CalibrationEmulator as CalEmu
 from .data_models.base.calibration import CalibrationHarvester as CalHrv
 from .data_models.base.calibration import CalibrationSeries as CalSeries
@@ -348,7 +348,7 @@ class Writer(Reader):
         chunks_n = self.ds_voltage.size / self.CHUNK_SAMPLES_N
         size_new = int(math.floor(chunks_n) * self.CHUNK_SAMPLES_N)
         if size_new < self.ds_voltage.size:
-            if self.samplerate_sps != SAMPLERATE_SPS_DEFAULT:
+            if self.samplerate_sps != config.SAMPLERATE_SPS:
                 self._logger.debug("skipped alignment due to altered samplerate")
                 return
             self._logger.info(

{shepherd_core-2025.5.3.dist-info → shepherd_core-2025.6.2.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: shepherd_core
-Version: 2025.5.3
+Version: 2025.6.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>
-Project-URL: Documentation, https://github.com/orgua/shepherd-datalib/blob/main/README.md
-Project-URL: Issues, https://github.com/orgua/shepherd-datalib/issues
+Project-URL: Documentation, https://github.com/nes-lab/shepherd-tools/blob/main/README.md
+Project-URL: Issues, https://github.com/nes-lab/shepherd-tools/issues
 Project-URL: Source, https://pypi.org/project/shepherd-core/
 Keywords: testbed,beaglebone,pru,batteryless,energyharvesting,solar
 Platform: unix
@@ -56,16 +56,16 @@ Requires-Dist: coverage; extra == "test"
 
 # Core Library
 
-[![PyPiVersion](https://img.shields.io/pypi/v/shepherd_core.svg)](https://pypi.org/project/shepherd_core)
+[![PyPIVersion](https://img.shields.io/pypi/v/shepherd_core.svg)](https://pypi.org/project/shepherd_core)
 [![image](https://img.shields.io/pypi/pyversions/shepherd_core.svg)](https://pypi.python.org/pypi/shepherd-core)
-[![Pytest](https://github.com/orgua/shepherd-datalib/actions/workflows/py_unittest.yml/badge.svg)](https://github.com/orgua/shepherd-datalib/actions/workflows/py_unittest.yml)
+[![QA-Tests](https://github.com/nes-lab/shepherd-tools/actions/workflows/quality_assurance.yaml/badge.svg)](https://github.com/nes-lab/shepherd-tools/actions/workflows/quality_assurance.yaml)
 [![CodeStyle](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
-**Main Documentation**: <https://orgua.github.io/shepherd>
+**Main Documentation**: <https://nes-lab.github.io/shepherd>
 
-**Source Code**: <https://github.com/orgua/shepherd-datalib>
+**Source Code**: <https://github.com/nes-lab/shepherd-tools>
 
-**Main Project**: <https://github.com/orgua/shepherd>
+**Main Project**: <https://github.com/nes-lab/shepherd>
 
 ---
 
@@ -87,7 +87,7 @@ For postprocessing shepherds .h5-files usage of [shepherd_data](https://pypi.org
 - decode waveforms (gpio-state & timestamp) to UART
 - create an inventory (for deployed versions of software, hardware)
 
-See [official documentation](https://orgua.github.io/shepherd) or [example scripts](https://github.com/orgua/shepherd-datalib/tree/main/shepherd_core/examples) for more details and usage. Most functionality is showcased in both. The [extra](https://github.com/orgua/shepherd-datalib/tree/main/shepherd_core/extra)-directory holds data-generators relevant for the testbed. Notably is a [trafficbench](https://github.com/orgua/TrafficBench)-experiment that's used to derive the link-matrix of the testbed-nodes.
+See [official documentation](https://nes-lab.github.io/shepherd) or [example scripts](https://github.com/nes-lab/shepherd-tools/tree/main/shepherd_core/examples) for more details and usage. Most functionality is showcased in both. The [extra](https://github.com/nes-lab/shepherd-tools/tree/main/shepherd_core/extra)-directory holds data-generators relevant for the testbed. Notably is a [trafficbench](https://github.com/nes-lab/TrafficBench)-experiment that's used to derive the link-matrix of the testbed-nodes.
 
 ## Config-Models in Detail
 
@@ -145,9 +145,9 @@ pip install shepherd-data -U
 For bleeding-edge-features or dev-work it is possible to install directly from GitHub-Sources (here `dev`-branch):
 
 ```Shell
-pip install git+https://github.com/orgua/shepherd-datalib.git@dev#subdirectory=shepherd_core -U
+pip install git+https://github.com/nes-lab/shepherd-tools.git@dev#subdirectory=shepherd_core -U
 # and on sheep with newer debian
-sudo pip install git+https://github.com/orgua/shepherd-datalib.git@dev#subdirectory=shepherd_core -U --break-system-packages
+sudo pip install git+https://github.com/nes-lab/shepherd-tools.git@dev#subdirectory=shepherd_core -U --break-system-packages
 ```
 
 If you are working with ``.elf``-files (embedding into experiments) you make "objcopy" accessible to python. In Ubuntu, you can either install ``build-essential`` or ``binutils-$ARCH`` with arch being ``msp430`` or ``arm-none-eabi`` for the nRF52.
@@ -179,7 +179,7 @@ To run the testbench, follow these steps:
 3. run the testbench (~ 320 tests):
 
 ```Shell
-cd shepherd-datalib/shepherd_core
+cd shepherd-tools/shepherd_core
 pip3 install ./[tests]
 pytest
 ```