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

shepherd_core/data_models/content/virtual_harvester.py

@@ -1,29 +1,31 @@
 """Generalized energy harvester data models."""
 
+from collections.abc import Mapping
 from enum import Enum
+from typing import Annotated
+from typing import Any
 from typing import Optional
-from typing import Tuple
 
 from pydantic import Field
 from pydantic import model_validator
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ...commons import samplerate_sps_default
-from ...logger import logger
-from ...testbed_client import tb_client
-from ..base.calibration import CalibrationHarvester
-from ..base.content import ContentModel
-from ..base.shepherd import ShpModel
+from shepherd_core.commons import SAMPLERATE_SPS_DEFAULT
+from shepherd_core.data_models.base.calibration import CalibrationHarvester
+from shepherd_core.data_models.base.content import ContentModel
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.logger import logger
+from shepherd_core.testbed_client import tb_client
+
 from .energy_environment import EnergyDType
 
 
 class AlgorithmDType(str, Enum):
     """Options for choosing a harvesting algorithm."""
 
-    direct = disable = neutral = "neutral"
-    isc_voc = "isc_voc"
-    ivcurve = ivcurves = ("ivcurve",)
+    direct = disable = neutral = "neutral"  # for just using IVTrace / samples
+    isc_voc = "isc_voc"  # only recordable ATM
+    ivcurve = ivcurves = ivsurface = "ivcurve"
     constant = cv = "cv"
     # ci .. constant current -> is this desired?
     mppt_voc = "mppt_voc"
@@ -35,7 +37,7 @@ class VirtualHarvesterConfig(ContentModel, title="Config for the Harvester"):
     """A vHrv makes a source-characterization (i.e. ivcurve) usable for the vSrc.
 
     Mostly used when the file-based energy environment of the virtual source
-    is not already supplied as pre-harvested ivsample-stream.
+    is not already supplied as pre-harvested ivtrace.
     """
 
     # General Metadata & Ownership -> ContentModel
@@ -73,7 +75,7 @@ class VirtualHarvesterConfig(ContentModel, title="Config for the Harvester"):
 
     @model_validator(mode="before")
     @classmethod
-    def query_database(cls, values: dict) -> dict:
+    def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
         values, chain = tb_client.try_completing_model(cls.__name__, values)
         values = tb_client.fill_in_user_data(values)
         if values["name"] == "neutral":
@@ -114,14 +116,14 @@ class VirtualHarvesterConfig(ContentModel, title="Config for the Harvester"):
         return 1 * int(for_emu) + 2 * self.rising + 4 * self.enable_linear_extrapolation
 
     def calc_algorithm_num(self, *, for_emu: bool) -> int:
-        num = algo_to_num.get(self.algorithm)
+        num: int = ALGO_TO_NUM.get(self.algorithm, ALGO_TO_NUM["neutral"])
         if for_emu and self.get_datatype() != EnergyDType.ivsample:
             msg = (
                 f"[{self.name}] Select valid harvest-algorithm for emulator, "
                 f"current usage = {self.algorithm}"
             )
             raise ValueError(msg)
-        if not for_emu and num < algo_to_num["isc_voc"]:
+        if not for_emu and num < ALGO_TO_NUM["isc_voc"]:
             msg = (
                 f"[{self.name}] Select valid harvest-algorithm for harvester, "
                 f"current usage = {self.algorithm}"
@@ -129,12 +131,12 @@ class VirtualHarvesterConfig(ContentModel, title="Config for the Harvester"):
             raise ValueError(msg)
         return num
 
-    def calc_timings_ms(self, *, for_emu: bool) -> Tuple[float, float]:
+    def calc_timings_ms(self, *, for_emu: bool) -> tuple[float, float]:
         """factor-in model-internal timing-constraints."""
         window_length = self.samples_n * (1 + self.wait_cycles)
-        time_min_ms = (1 + self.wait_cycles) * 1_000 / samplerate_sps_default
+        time_min_ms = (1 + self.wait_cycles) * 1_000 / SAMPLERATE_SPS_DEFAULT
         if for_emu:
-            window_ms = window_length * 1_000 / samplerate_sps_default
+            window_ms = window_length * 1_000 / SAMPLERATE_SPS_DEFAULT
             time_min_ms = max(time_min_ms, window_ms)
 
         interval_ms = min(max(self.interval_ms, time_min_ms), 1_000_000)
@@ -149,7 +151,7 @@ class VirtualHarvesterConfig(ContentModel, title="Config for the Harvester"):
         return interval_ms, duration_ms
 
     def get_datatype(self) -> EnergyDType:
-        return algo_to_dtype[self.algorithm]
+        return ALGO_TO_DTYPE[self.algorithm]
 
     def calc_window_size(
         self,
@@ -184,7 +186,7 @@ u32 = Annotated[int, Field(ge=0, lt=2**32)]
 # - harvesting on "neutral" is not possible - direct pass-through
 # - emulation with "ivcurve" or lower is also resulting in Error
 # - "_opt" has its own algo for emulation, but is only a fast mppt_po for harvesting
-algo_to_num = {
+ALGO_TO_NUM: Mapping[str, int] = {
     "neutral": 2**0,
     "isc_voc": 2**3,
     "ivcurve": 2**4,
@@ -195,7 +197,7 @@ algo_to_num = {
     "mppt_opt": 2**14,
 }
 
-algo_to_dtype = {
+ALGO_TO_DTYPE: Mapping[str, EnergyDType] = {
     "neutral": EnergyDType.ivsample,
     "isc_voc": EnergyDType.isc_voc,
     "ivcurve": EnergyDType.ivcurve,
@@ -266,9 +268,15 @@ class HarvesterPRUConfig(ShpModel):
             if window_size is not None
             else data.calc_window_size(dtype_in, for_emu=for_emu)
         )
-        voltage_step_mV = (
-            1e3 * voltage_step_V if voltage_step_V is not None else data.voltage_step_mV
-        )
+        if voltage_step_V is not None:
+            voltage_step_mV = 1e3 * voltage_step_V
+        elif data.voltage_step_mV is not None:
+            voltage_step_mV = data.voltage_step_mV
+        else:
+            raise ValueError(
+                "For correct emulation specify voltage_step used by harvester "
+                "e.g. via file_src.get_voltage_step()"
+            )
 
         return cls(
             algorithm=data.calc_algorithm_num(for_emu=for_emu),
@@ -280,7 +288,7 @@ class HarvesterPRUConfig(ShpModel):
             voltage_step_uV=round(voltage_step_mV * 10**3),
             current_limit_nA=round(data.current_limit_uA * 10**3),
             setpoint_n8=round(min(255, data.setpoint_n * 2**8)),
-            interval_n=round(interval_ms * samplerate_sps_default * 1e-3),
-            duration_n=round(duration_ms * samplerate_sps_default * 1e-3),
+            interval_n=round(interval_ms * SAMPLERATE_SPS_DEFAULT * 1e-3),
+            duration_n=round(duration_ms * SAMPLERATE_SPS_DEFAULT * 1e-3),
             wait_cycles_n=data.wait_cycles,
         )

shepherd_core/data_models/content/virtual_harvester_fixture.yaml

@@ -21,7 +21,7 @@
   parameters:
     id: 1100
     name: ivcurve
-    description: Postpone harvesting by sampling ivcurves (voltage stepped as sawtooth-wave)
+    description: Postpone harvesting by sampling ivsurface / curves (voltage stepped as sawtooth-wave)
     comment: ~110 Hz, Between 50 & 60 Hz line-frequency to avoid standing waves
     inherit_from: neutral
     algorithm: ivcurve
@@ -36,7 +36,7 @@
 - datatype: VirtualHarvesterConfig
   parameters:
     id: 1101
-    name: ivcurves  # synonym
+    name: ivsurface  # synonym
     inherit_from: ivcurve
 
 - datatype: VirtualHarvesterConfig

shepherd_core/data_models/content/virtual_source.py

@@ -1,17 +1,18 @@
 """Generalized virtual source data models."""
 
-from typing import List
+from typing import Annotated
+from typing import Any
 
 from pydantic import Field
 from pydantic import model_validator
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ...commons import samplerate_sps_default
-from ...logger import logger
-from ...testbed_client import tb_client
-from ..base.content import ContentModel
-from ..base.shepherd import ShpModel
+from shepherd_core.commons import SAMPLERATE_SPS_DEFAULT
+from shepherd_core.data_models.base.content import ContentModel
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.logger import logger
+from shepherd_core.testbed_client import tb_client
+
 from .energy_environment import EnergyDType
 from .virtual_harvester import HarvesterPRUConfig
 from .virtual_harvester import VirtualHarvesterConfig
@@ -19,8 +20,8 @@ from .virtual_harvester import VirtualHarvesterConfig
 # Custom Types
 LUT_SIZE: int = 12
 NormedNum = Annotated[float, Field(ge=0.0, le=1.0)]
-LUT1D = Annotated[List[NormedNum], Field(min_length=LUT_SIZE, max_length=LUT_SIZE)]
-LUT2D = Annotated[List[LUT1D], Field(min_length=LUT_SIZE, max_length=LUT_SIZE)]
+LUT1D = Annotated[list[NormedNum], Field(min_length=LUT_SIZE, max_length=LUT_SIZE)]
+LUT2D = Annotated[list[LUT1D], Field(min_length=LUT_SIZE, max_length=LUT_SIZE)]
 
 
 class VirtualSourceConfig(ContentModel, title="Config for the virtual Source"):
@@ -32,7 +33,7 @@ class VirtualSourceConfig(ContentModel, title="Config for the virtual Source"):
     The converter-stage is software defined and offers:
     - buck-boost-combinations,
     - a simple diode + resistor and
-    - an intermediate buffer capacitor.
+    - an intermediate storage capacitor.
     """
 
     # TODO: I,V,R should be in regular unit (V, A, Ohm)
@@ -81,6 +82,8 @@ class VirtualSourceConfig(ContentModel, title="Config for the virtual Source"):
     C_output_uF: Annotated[float, Field(ge=0, le=4.29e6)] = 1.0
     # TODO: C_output is handled internally as delta-V, but should be a I_transient
     #       that makes it visible in simulation as additional i_out_drain
+    # TODO: potential weakness, ACD lowpass is capturing transient,
+    #       but energy is LOST with this model
 
     # Extra
     V_output_log_gpio_threshold_mV: Annotated[float, Field(ge=0, le=4.29e6)] = 1_400
@@ -104,7 +107,7 @@ class VirtualSourceConfig(ContentModel, title="Config for the virtual Source"):
     # Buck Converter
     V_output_mV: Annotated[float, Field(ge=0, le=5_000)] = 2_400
     V_buck_drop_mV: Annotated[float, Field(ge=0, le=5_000)] = 0
-    # ⤷ simulate LDO min voltage differential or output-diode
+    # ⤷ simulate LDO / diode min voltage differential or output-diode
 
     LUT_output_efficiency: LUT1D = 12 * [1.00]
     # ⤷ array[12] depending on output_current
@@ -113,7 +116,7 @@ class VirtualSourceConfig(ContentModel, title="Config for the virtual Source"):
 
     @model_validator(mode="before")
     @classmethod
-    def query_database(cls, values: dict) -> dict:
+    def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
         values, chain = tb_client.try_completing_model(cls.__name__, values)
         values = tb_client.fill_in_user_data(values)
         logger.debug("VSrc-Inheritances: %s", chain)
@@ -238,19 +241,19 @@ class VirtualSourceConfig(ContentModel, title="Config for the virtual Source"):
         dV[uV] = constant[us/nF] * current[nA] = constant[us*V/nAs] * current[nA]
         """
         C_cap_uF = max(self.C_intermediate_uF, 0.001)
-        return int((10**3 * (2**28)) // (C_cap_uF * samplerate_sps_default))
+        return int((10**3 * (2**28)) // (C_cap_uF * SAMPLERATE_SPS_DEFAULT))
 
 
 u32 = Annotated[int, Field(ge=0, lt=2**32)]
 u8 = Annotated[int, Field(ge=0, lt=2**8)]
 lut_i = Annotated[
-    List[Annotated[List[u8], Field(min_length=LUT_SIZE, max_length=LUT_SIZE)]],
+    list[Annotated[list[u8], Field(min_length=LUT_SIZE, max_length=LUT_SIZE)]],
     Field(
         min_length=LUT_SIZE,
         max_length=LUT_SIZE,
     ),
 ]
-lut_o = Annotated[List[u32], Field(min_length=LUT_SIZE, max_length=LUT_SIZE)]
+lut_o = Annotated[list[u32], Field(min_length=LUT_SIZE, max_length=LUT_SIZE)]
 
 
 class ConverterPRUConfig(ShpModel):
@@ -313,7 +316,7 @@ class ConverterPRUConfig(ShpModel):
                 dtype_in, log_intermediate_node=log_intermediate_node
             ),
             interval_startup_delay_drain_n=round(
-                data.interval_startup_delay_drain_ms * samplerate_sps_default * 1e-3
+                data.interval_startup_delay_drain_ms * SAMPLERATE_SPS_DEFAULT * 1e-3
             ),
             V_input_max_uV=round(data.V_input_max_mV * 1e3),
             I_input_max_nA=round(data.I_input_max_mA * 1e6),
@@ -326,7 +329,7 @@ class ConverterPRUConfig(ShpModel):
             V_disable_output_threshold_uV=round(states["V_disable_output_threshold_mV"] * 1e3),
             dV_enable_output_uV=round(states["dV_enable_output_mV"] * 1e3),
             interval_check_thresholds_n=round(
-                data.interval_check_thresholds_ms * samplerate_sps_default * 1e-3
+                data.interval_check_thresholds_ms * SAMPLERATE_SPS_DEFAULT * 1e-3
             ),
             V_pwr_good_enable_threshold_uV=round(data.V_pwr_good_enable_threshold_mV * 1e3),
             V_pwr_good_disable_threshold_uV=round(data.V_pwr_good_disable_threshold_mV * 1e3),

shepherd_core/data_models/content/virtual_source_fixture.yaml

@@ -93,7 +93,7 @@
   parameters:
     id: 1011
     name: diode+capacitor
-    description: Simple Converter based on diode and buffer capacitor
+    description: Simple Converter based on diode and storage capacitor
     inherit_from: neutral
     V_input_drop_mV: 300  # simulate input-diode
     C_intermediate_uF: 47  # primary storage-Cap
@@ -114,7 +114,7 @@
   parameters:
     id: 1013
     name: diode+resistor+capacitor
-    description: Simple Converter based on diode, current limiting resistor and buffer capacitor
+    description: Simple Converter based on diode, current limiting resistor and storage capacitor
     inherit_from: diode+capacitor
     R_input_mOhm: 10000
 
@@ -133,7 +133,7 @@
     enable_boost: true # if false -> v_intermediate = v_input, output-switch-hysteresis is still usable
 
     harvester:
-      name: mppt_bq_solar # harvester only active if input is "ivcurves"
+      name: mppt_bq_solar # harvester only active if input is ivsurface / curves
 
     V_input_max_mV: 3000
     I_input_max_mA: 100

shepherd_core/data_models/experiment/experiment.py

@@ -1,9 +1,9 @@
 """Config for testbed experiments."""
 
+from collections.abc import Iterable
 from datetime import datetime
 from datetime import timedelta
-from typing import Iterable
-from typing import List
+from typing import Annotated
 from typing import Optional
 from typing import Union
 from uuid import uuid4
@@ -11,16 +11,16 @@ from uuid import uuid4
 from pydantic import UUID4
 from pydantic import Field
 from pydantic import model_validator
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ...version import version
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.content import SafeStr
-from ..base.shepherd import ShpModel
-from ..testbed.target import Target
-from ..testbed.testbed import Testbed
+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.data_models.testbed.target import Target
+from shepherd_core.data_models.testbed.testbed import Testbed
+from shepherd_core.version import version
+
 from .observer_features import SystemLogging
 from .target_config import TargetConfig
 
@@ -46,7 +46,7 @@ class Experiment(ShpModel, title="Config of an Experiment"):
     # feedback
     email_results: bool = False
 
-    sys_logging: SystemLogging = SystemLogging(dmesg=True, ptp=True, shepherd=True)
+    sys_logging: SystemLogging = SystemLogging()  # = all active
 
     # schedule
     time_start: Optional[datetime] = None  # = ASAP
@@ -54,9 +54,9 @@ class Experiment(ShpModel, title="Config of an Experiment"):
     abort_on_error: bool = False
 
     # targets
-    target_configs: Annotated[List[TargetConfig], Field(min_length=1, max_length=128)]
+    target_configs: Annotated[list[TargetConfig], Field(min_length=1, max_length=128)]
 
-    # for debug-purposes and later comp-checks
+    # debug
     lib_ver: Optional[str] = version
 
     @model_validator(mode="after")
@@ -70,8 +70,8 @@ class Experiment(ShpModel, title="Config of an Experiment"):
 
     @staticmethod
     def _validate_targets(configs: Iterable[TargetConfig]) -> None:
-        target_ids = []
-        custom_ids = []
+        target_ids: list[int] = []
+        custom_ids: list[int] = []
         for _config in configs:
             for _id in _config.target_IDs:
                 target_ids.append(_id)

shepherd_core/data_models/experiment/observer_features.py

@@ -2,18 +2,18 @@
 
 from datetime import timedelta
 from enum import Enum
-from typing import List
+from typing import Annotated
 from typing import Optional
 
 import numpy as np
 from pydantic import Field
 from pydantic import PositiveFloat
 from pydantic import model_validator
-from typing_extensions import Annotated
 from typing_extensions import Self
+from typing_extensions import deprecated
 
-from ..base.shepherd import ShpModel
-from ..testbed.gpio import GPIO
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.data_models.testbed.gpio import GPIO
 
 
 class PowerTracing(ShpModel, title="Config for Power-Tracing"):
@@ -23,11 +23,11 @@ class PowerTracing(ShpModel, title="Config for Power-Tracing"):
     """
 
     intermediate_voltage: bool = False
-    # ⤷ for EMU: record buffer capacitor instead of output (good for V_out = const)
+    # ⤷ for EMU: record storage capacitor instead of output (good for V_out = const)
     #            this also includes current!
 
     # time
-    delay: timedelta = 0  # seconds
+    delay: timedelta = timedelta(seconds=0)
     duration: Optional[timedelta] = None  # till EOF
 
     # post-processing
@@ -48,7 +48,87 @@ class PowerTracing(ShpModel, title="Config for Power-Tracing"):
         if not self.calculate_power and discard_all:
             raise ValueError("Error in config -> tracing enabled, but output gets discarded")
         if self.calculate_power:
-            raise NotImplementedError("postprocessing not implemented ATM")
+            raise NotImplementedError(
+                "Feature PowerTracing.calculate_power reserved for future use."
+            )
+        if self.samplerate != 100_000:
+            raise NotImplementedError("Feature PowerTracing.samplerate reserved for future use.")
+        if self.discard_current:
+            raise NotImplementedError(
+                "Feature PowerTracing.discard_current reserved for future use."
+            )
+        if self.discard_voltage:
+            raise NotImplementedError(
+                "Feature PowerTracing.discard_voltage reserved for future use."
+            )
+        return self
+
+
+# NOTE: this was taken from pyserial (removes one dependency)
+BAUDRATES = (
+    50,
+    75,
+    110,
+    134,
+    150,
+    200,
+    300,
+    600,
+    1200,
+    1800,
+    2400,
+    4800,
+    9600,
+    19200,
+    38400,
+    57600,
+    115200,
+    230400,
+    460800,
+    500000,
+    576000,
+    921600,
+    1000000,
+    1152000,
+    1500000,
+    2000000,
+    2500000,
+    3000000,
+    3500000,
+    4000000,
+)
+
+PARITY_NONE, PARITY_EVEN, PARITY_ODD, PARITY_MARK, PARITY_SPACE = "N", "E", "O", "M", "S"
+PARITIES = (PARITY_NONE, PARITY_EVEN, PARITY_ODD, PARITY_MARK, PARITY_SPACE)
+
+STOPBITS_ONE, STOPBITS_ONE_POINT_FIVE, STOPBITS_TWO = (1, 1.5, 2)
+STOPBITS = (STOPBITS_ONE, STOPBITS_ONE_POINT_FIVE, STOPBITS_TWO)
+
+
+class UartTracing(ShpModel, title="Config for UART Tracing"):
+    """Configuration for recording UART-Output of the Target Nodes.
+
+    Note that the Communication has to be on a specific port that
+    reaches the hardware-module of the SBC.
+    """
+
+    baudrate: Annotated[int, Field(ge=2_400, le=460_800)] = 115_200
+    # ⤷ TODO: find maximum that the system can handle
+    bytesize: Annotated[int, Field(ge=5, le=8)] = 8
+    stopbits: Annotated[float, Field(ge=1, le=2)] = 1
+    parity: str = PARITY_NONE
+
+    @model_validator(mode="after")
+    def post_validation(self) -> Self:
+        if self.baudrate not in BAUDRATES:
+            msg = f"Error in config -> baud-rate must be one of: {BAUDRATES}"
+            raise ValueError(msg)
+        if self.stopbits not in STOPBITS:
+            msg = f"Error in config -> stop-bits must be one of: {STOPBITS}"
+            raise ValueError(msg)
+        if self.parity not in PARITIES:
+            msg = f"Error in config -> parity must be one of: {PARITIES}"
+            raise ValueError(msg)
         return self
 
 
@@ -61,11 +141,11 @@ class GpioTracing(ShpModel, title="Config for GPIO-Tracing"):
     # initial recording
     mask: Annotated[int, Field(ge=0, lt=2**10)] = 0b11_1111_1111  # all
     # ⤷ TODO: custom mask not implemented in PRU, ATM
-    gpios: Optional[Annotated[List[GPIO], Field(min_length=1, max_length=10)]] = None  # = all
+    gpios: Optional[Annotated[list[GPIO], Field(min_length=1, max_length=10)]] = None  # = all
     # ⤷ TODO: list of GPIO to build mask, one of both should be internal / computed field
 
     # time
-    delay: timedelta = 0  # seconds
+    delay: timedelta = timedelta(seconds=0)
     duration: Optional[timedelta] = None  # till EOF
 
     # post-processing,
@@ -73,7 +153,7 @@ class GpioTracing(ShpModel, title="Config for GPIO-Tracing"):
     # TODO: quickfix - uart-log currently done online in userspace
     # NOTE: gpio-tracing currently shows rather big - but rare - "blind" windows (~1-4us)
     uart_pin: GPIO = GPIO(name="GPIO8")
-    uart_baudrate: Annotated[int, Field(ge=2_400, le=921_600)] = 115_200
+    uart_baudrate: Annotated[int, Field(ge=2_400, le=1_152_000)] = 115_200
     # TODO: add a "discard_gpio" (if only uart is wanted)
 
     @model_validator(mode="after")
@@ -84,6 +164,15 @@ class GpioTracing(ShpModel, title="Config for GPIO-Tracing"):
             raise ValueError("Delay can't be negative.")
         if self.duration and self.duration.total_seconds() < 0:
             raise ValueError("Duration can't be negative.")
+        if self.mask != 0b11_1111_1111:  # GpioTracing.mask
+            raise NotImplementedError("Feature GpioTracing.mask reserved for future use.")
+        if self.gpios is not None:
+            raise NotImplementedError("Feature GpioTracing.gpios reserved for future use.")
+        if self.uart_decode:
+            raise NotImplementedError(
+                "Feature GpioTracing.uart_decode reserved for future use. "
+                "Use UartTracing or manually decode serial with the provided waveform decoder."
+            )
         return self
 
 
@@ -125,7 +214,7 @@ class GpioActuation(ShpModel, title="Config for GPIO-Actuation"):
     # TODO: not implemented ATM - decide if pru control sys-gpio or
     # TODO: not implemented ATM - reverses pru-gpio (preferred if possible)
 
-    events: Annotated[List[GpioEvent], Field(min_length=1, max_length=1024)]
+    events: Annotated[list[GpioEvent], Field(min_length=1, max_length=1024)]
 
     def get_gpios(self) -> set:
         return {_ev.gpio for _ev in self.events}
@@ -134,11 +223,15 @@ class GpioActuation(ShpModel, title="Config for GPIO-Actuation"):
 class SystemLogging(ShpModel, title="Config for System-Logging"):
     """Configuration for recording Debug-Output of the Observers System-Services."""
 
-    dmesg: bool = True
-    ptp: bool = True
-    shepherd: bool = True
-    # TODO: rename to kernel, timesync, sheep
-    # TODO: add utilization as option
+    kernel: bool = True
+    time_sync: bool = True
+    sheep: bool = True
+    sys_util: bool = True
+
+    # TODO: remove lines below in 2026
+    dmesg: Annotated[bool, deprecated("for sheep v0.9.0+, use 'kernel' instead")] = True
+    ptp: Annotated[bool, deprecated("for sheep v0.9.0+, use 'time_sync' instead")] = True
+    shepherd: Annotated[bool, deprecated("for sheep v0.9.0+, use 'sheep' instead")] = True
 
 
 # TODO: some more interaction would be good

shepherd_core/data_models/experiment/target_config.py

@@ -1,46 +1,49 @@
 """Configuration related to Target Nodes (DuT)."""
 
-from typing import List
+from typing import Annotated
 from typing import Optional
 
 from pydantic import Field
 from pydantic import model_validator
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ..base.content import IdInt
-from ..base.shepherd import ShpModel
-from ..content.energy_environment import EnergyEnvironment
-from ..content.firmware import Firmware
-from ..content.virtual_source import VirtualSourceConfig
-from ..testbed.target import IdInt16
-from ..testbed.target import Target
+from shepherd_core.data_models.base.content import IdInt
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.data_models.content.energy_environment import EnergyEnvironment
+from shepherd_core.data_models.content.firmware import Firmware
+from shepherd_core.data_models.content.virtual_source import VirtualSourceConfig
+from shepherd_core.data_models.testbed.target import IdInt16
+from shepherd_core.data_models.testbed.target import Target
+
 from .observer_features import GpioActuation
 from .observer_features import GpioTracing
 from .observer_features import PowerTracing
+from .observer_features import UartTracing
 
 
 class TargetConfig(ShpModel, title="Target Config"):
     """Configuration related to Target Nodes (DuT)."""
 
-    target_IDs: Annotated[List[IdInt], Field(min_length=1, max_length=128)]
-    custom_IDs: Optional[Annotated[List[IdInt16], Field(min_length=1, max_length=128)]] = None
+    target_IDs: Annotated[list[IdInt], Field(min_length=1, max_length=128)]
+    custom_IDs: Optional[Annotated[list[IdInt16], Field(min_length=1, max_length=128)]] = None
     # ⤷ will replace 'const uint16_t SHEPHERD_NODE_ID' in firmware
     #   if no custom ID is provided, the original ID of target is used
 
     energy_env: EnergyEnvironment  # alias: input
     virtual_source: VirtualSourceConfig = VirtualSourceConfig(name="neutral")
     target_delays: Optional[
-        Annotated[List[Annotated[int, Field(ge=0)]], Field(min_length=1, max_length=128)]
+        Annotated[list[Annotated[int, Field(ge=0)]], Field(min_length=1, max_length=128)]
     ] = None
     # ⤷ individual starting times -> allows to use the same environment
     # TODO: delays not used ATM
 
     firmware1: Firmware
     firmware2: Optional[Firmware] = None
+    # ⤷ omitted FW gets set to neutral deep-sleep
 
     power_tracing: Optional[PowerTracing] = None
     gpio_tracing: Optional[GpioTracing] = None
+    uart_tracing: Optional[UartTracing] = None
     gpio_actuation: Optional[GpioActuation] = None
 
     @model_validator(mode="after")
@@ -79,6 +82,8 @@ class TargetConfig(ShpModel, title="Target Config"):
             msg = f"Provided custom IDs {c_ids} not enough to cover target range {t_ids}"
             raise ValueError(msg)
         # TODO: if custom ids present, firmware must be ELF
+        if self.gpio_actuation is not None:
+            raise NotImplementedError("Feature GpioActuation reserved for future use.")
         return self
 
     def get_custom_id(self, target_id: int) -> Optional[int]: