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

shepherd_core/data_models/task/__init__.py

@@ -4,15 +4,15 @@ These models import externally from all other model-modules!
 """
 
 from pathlib import Path
-from typing import List
 from typing import Optional
 from typing import Union
 
 import yaml
 
-from ...logger import logger
-from ..base.shepherd import ShpModel
-from ..base.wrapper import Wrapper
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.data_models.base.wrapper import Wrapper
+from shepherd_core.logger import logger
+
 from .emulation import Compression
 from .emulation import EmulationTask
 from .firmware_mod import FirmwareModTask
@@ -54,7 +54,8 @@ def prepare_task(config: Union[ShpModel, Path, str], observer: Optional[str] = N
             parameters=config.model_dump(),
         )
     else:
-        raise TypeError("had unknown input: %s", type(config))
+        msg = f"had unknown input: {type(config)}"
+        raise TypeError(msg)
 
     if shp_wrap.datatype == TestbedTasks.__name__:
         if observer is None:
@@ -66,7 +67,8 @@ def prepare_task(config: Union[ShpModel, Path, str], observer: Optional[str] = N
         logger.debug("Loading Testbed-Tasks %s for %s", tbt.name, observer)
         obt = tbt.get_observer_tasks(observer)
         if obt is None:
-            raise ValueError("Observer '%s' is not in TestbedTask-Set", observer)
+            msg = f"Observer '{observer}' is not in TestbedTask-Set"
+            raise ValueError(msg)
         shp_wrap = Wrapper(
             datatype=type(obt).__name__,
             parameters=obt.model_dump(),
@@ -74,7 +76,7 @@ def prepare_task(config: Union[ShpModel, Path, str], observer: Optional[str] = N
     return shp_wrap
 
 
-def extract_tasks(shp_wrap: Wrapper, *, no_task_sets: bool = True) -> List[ShpModel]:
+def extract_tasks(shp_wrap: Wrapper, *, no_task_sets: bool = True) -> list[ShpModel]:
     """Make the individual task-sets usable for each observer."""
     if shp_wrap.datatype == ObserverTasks.__name__:
         obt = ObserverTasks(**shp_wrap.parameters)
@@ -92,6 +94,7 @@ def extract_tasks(shp_wrap: Wrapper, *, no_task_sets: bool = True) -> List[ShpMo
             raise ValueError("Model in Wrapper was TestbedTasks -> Task-Sets not allowed!")
         content = [TestbedTasks(**shp_wrap.parameters)]
     else:
-        raise ValueError("Extractor had unknown task: %s", shp_wrap.datatype)
+        msg = f"Extractor had unknown task: {shp_wrap.datatype}"
+        raise ValueError(msg)
 
     return content

shepherd_core/data_models/task/emulation.py

@@ -5,26 +5,28 @@ from datetime import datetime
 from datetime import timedelta
 from enum import Enum
 from pathlib import Path
+from typing import Annotated
 from typing import Optional
 from typing import Union
 
 from pydantic import Field
 from pydantic import model_validator
 from pydantic import validate_call
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ..base.content import IdInt
-from ..base.shepherd import ShpModel
-from ..base.timezone import local_tz
-from ..content.virtual_source import VirtualSourceConfig
-from ..experiment.experiment import Experiment
-from ..experiment.observer_features import GpioActuation
-from ..experiment.observer_features import GpioTracing
-from ..experiment.observer_features import PowerTracing
-from ..experiment.observer_features import SystemLogging
-from ..testbed import Testbed
-from ..testbed.cape import TargetPort
+from shepherd_core.data_models.base.content import IdInt
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.data_models.base.timezone import local_tz
+from shepherd_core.data_models.content.virtual_source import VirtualSourceConfig
+from shepherd_core.data_models.experiment.experiment import Experiment
+from shepherd_core.data_models.experiment.observer_features import GpioActuation
+from shepherd_core.data_models.experiment.observer_features import GpioTracing
+from shepherd_core.data_models.experiment.observer_features import PowerTracing
+from shepherd_core.data_models.experiment.observer_features import SystemLogging
+from shepherd_core.data_models.experiment.observer_features import UartTracing
+from shepherd_core.data_models.testbed import Testbed
+from shepherd_core.data_models.testbed.cape import TargetPort
+from shepherd_core.logger import logger
 
 
 class Compression(str, Enum):
@@ -67,10 +69,10 @@ class EmulationTask(ShpModel):
     use_cal_default: bool = False
     # ⤷ Use default calibration values, skip loading from EEPROM
 
-    enable_io: bool = False
+    enable_io: bool = True
     # TODO: add direction of pins! also it seems error-prone when only setting _tracing
     # ⤷ Switch the GPIO level converter to targets on/off
-    #   pre-req for sampling gpio,
+    #   pre-req for sampling gpio / uart,
     io_port: TargetPort = TargetPort.A
     # ⤷ Either Port A or B that gets connected to IO
     pwr_port: TargetPort = TargetPort.A
@@ -89,6 +91,7 @@ class EmulationTask(ShpModel):
 
     power_tracing: Optional[PowerTracing] = PowerTracing()
     gpio_tracing: Optional[GpioTracing] = GpioTracing()
+    uart_tracing: Optional[UartTracing] = UartTracing()
     gpio_actuation: Optional[GpioActuation] = None
     sys_logging: Optional[SystemLogging] = SystemLogging()
 
@@ -111,9 +114,8 @@ class EmulationTask(ShpModel):
     @model_validator(mode="after")
     def post_validation(self) -> Self:
         # TODO: limit paths
-        has_time = self.time_start is not None
         time_now = datetime.now().astimezone()
-        if has_time and self.time_start < time_now:
+        if self.time_start is not None and self.time_start < time_now:
             msg = (
                 "Start-Time for Emulation can't be in the past "
                 f"('{self.time_start}' vs '{time_now}'."
@@ -128,6 +130,14 @@ class EmulationTask(ShpModel):
             raise ValueError("Voltage Aux must be in float (0 - 4.5) or string 'main' / 'mid'.")
         if self.gpio_actuation is not None:
             raise ValueError("GPIO Actuation not yet implemented!")
+
+        io_requested = any(
+            _io is not None for _io in (self.gpio_actuation, self.gpio_tracing, self.uart_tracing)
+        )
+        if self.enable_io and not io_requested:
+            logger.warning("Target IO enabled, but no feature requested IO")
+        if not self.enable_io and io_requested:
+            logger.warning("Target IO not enabled, but a feature requested IO")
         return self
 
     @classmethod
@@ -135,6 +145,10 @@ class EmulationTask(ShpModel):
     def from_xp(cls, xp: Experiment, tb: Testbed, tgt_id: IdInt, root_path: Path) -> Self:
         obs = tb.get_observer(tgt_id)
         tgt_cfg = xp.get_target_config(tgt_id)
+        io_requested = any(
+            _io is not None
+            for _io in (tgt_cfg.gpio_actuation, tgt_cfg.gpio_tracing, tgt_cfg.uart_tracing)
+        )
 
         return cls(
             input_path=tgt_cfg.energy_env.data_path,
@@ -142,12 +156,13 @@ class EmulationTask(ShpModel):
             time_start=copy.copy(xp.time_start),
             duration=xp.duration,
             abort_on_error=xp.abort_on_error,
-            enable_io=(tgt_cfg.gpio_tracing is not None) or (tgt_cfg.gpio_actuation is not None),
+            enable_io=io_requested,
             io_port=obs.get_target_port(tgt_id),
             pwr_port=obs.get_target_port(tgt_id),
             virtual_source=tgt_cfg.virtual_source,
             power_tracing=tgt_cfg.power_tracing,
             gpio_tracing=tgt_cfg.gpio_tracing,
+            uart_tracing=tgt_cfg.uart_tracing,
             gpio_actuation=tgt_cfg.gpio_actuation,
             sys_logging=xp.sys_logging,
         )

shepherd_core/data_models/task/firmware_mod.py

@@ -2,6 +2,7 @@
 
 import copy
 from pathlib import Path
+from typing import Annotated
 from typing import Optional
 from typing import TypedDict
 from typing import Union
@@ -9,20 +10,19 @@ from typing import Union
 from pydantic import Field
 from pydantic import model_validator
 from pydantic import validate_call
-from typing_extensions import Annotated
 from typing_extensions import Self
 from typing_extensions import Unpack
 
-from ...logger import logger
-from ..base.content import IdInt
-from ..base.shepherd import ShpModel
-from ..content.firmware import Firmware
-from ..content.firmware import FirmwareDType
-from ..content.firmware import FirmwareStr
-from ..experiment.experiment import Experiment
-from ..testbed import Testbed
-from ..testbed.target import IdInt16
-from ..testbed.target import MCUPort
+from shepherd_core.data_models.base.content import IdInt
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.data_models.content.firmware import Firmware
+from shepherd_core.data_models.content.firmware import FirmwareDType
+from shepherd_core.data_models.content.firmware import FirmwareStr
+from shepherd_core.data_models.experiment.experiment import Experiment
+from shepherd_core.data_models.testbed import Testbed
+from shepherd_core.data_models.testbed.target import IdInt16
+from shepherd_core.data_models.testbed.target import MCUPort
+from shepherd_core.logger import logger
 
 
 class FirmwareModTask(ShpModel):

shepherd_core/data_models/task/harvest.py

@@ -3,18 +3,19 @@
 from datetime import datetime
 from datetime import timedelta
 from pathlib import Path
+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.shepherd import ShpModel
-from ..base.timezone import local_tz
-from ..content.virtual_harvester import VirtualHarvesterConfig
-from ..experiment.observer_features import PowerTracing
-from ..experiment.observer_features import SystemLogging
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.data_models.base.timezone import local_tz
+from shepherd_core.data_models.content.virtual_harvester import VirtualHarvesterConfig
+from shepherd_core.data_models.experiment.observer_features import PowerTracing
+from shepherd_core.data_models.experiment.observer_features import SystemLogging
+
 from .emulation import Compression
 
 

shepherd_core/data_models/task/observer_tasks.py

@@ -3,17 +3,17 @@
 from datetime import datetime
 from datetime import timedelta
 from pathlib import Path
-from typing import List
 from typing import Optional
 
 from pydantic import validate_call
 from typing_extensions import Self
 
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.shepherd import ShpModel
-from ..experiment.experiment import Experiment
-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.shepherd import ShpModel
+from shepherd_core.data_models.experiment.experiment import Experiment
+from shepherd_core.data_models.testbed.testbed import Testbed
+
 from .emulation import EmulationTask
 from .firmware_mod import FirmwareModTask
 from .programming import ProgrammingTask
@@ -78,7 +78,7 @@ class ObserverTasks(ShpModel):
             emulation=EmulationTask.from_xp(xp, tb, tgt_id, root_path),
         )
 
-    def get_tasks(self) -> List[ShpModel]:
+    def get_tasks(self) -> list[ShpModel]:
         task_names = ["fw1_mod", "fw2_mod", "fw1_prog", "fw2_prog", "emulation"]
         tasks = []
 

shepherd_core/data_models/task/programming.py

@@ -2,24 +2,24 @@
 
 import copy
 from pathlib import Path
+from typing import Annotated
 from typing import Optional
 
 from pydantic import Field
 from pydantic import model_validator
 from pydantic import validate_call
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ..base.content import IdInt
-from ..base.content import SafeStr
-from ..base.shepherd import ShpModel
-from ..content.firmware import suffix_to_DType
-from ..content.firmware_datatype import FirmwareDType
-from ..experiment.experiment import Experiment
-from ..testbed.cape import TargetPort
-from ..testbed.mcu import ProgrammerProtocol
-from ..testbed.target import MCUPort
-from ..testbed.testbed import Testbed
+from shepherd_core.data_models.base.content import IdInt
+from shepherd_core.data_models.base.content import SafeStr
+from shepherd_core.data_models.base.shepherd import ShpModel
+from shepherd_core.data_models.content.firmware import suffix_to_DType
+from shepherd_core.data_models.content.firmware_datatype import FirmwareDType
+from shepherd_core.data_models.experiment.experiment import Experiment
+from shepherd_core.data_models.testbed.cape import TargetPort
+from shepherd_core.data_models.testbed.mcu import ProgrammerProtocol
+from shepherd_core.data_models.testbed.target import MCUPort
+from shepherd_core.data_models.testbed.testbed import Testbed
 
 
 class ProgrammingTask(ShpModel):
@@ -43,7 +43,8 @@ class ProgrammingTask(ShpModel):
     def post_validation(self) -> Self:
         d_type = suffix_to_DType.get(self.firmware_file.suffix.lower())
         if d_type != FirmwareDType.base64_hex:
-            raise ValueError("Firmware is not intel-.hex ('%s')", self.firmware_file.as_posix())
+            msg = (f"Firmware is not intel-hex ({self.firmware_file.as_posix()})",)
+            raise ValueError(msg)
         return self
 
     @classmethod

shepherd_core/data_models/task/testbed_tasks.py

@@ -1,18 +1,18 @@
 """Collection of tasks for all observers included in experiment."""
 
-from typing import List
+from typing import Annotated
 from typing import Optional
 
 from pydantic import Field
 from pydantic import validate_call
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.shepherd import ShpModel
-from ..experiment.experiment import Experiment
-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.shepherd import ShpModel
+from shepherd_core.data_models.experiment.experiment import Experiment
+from shepherd_core.data_models.testbed.testbed import Testbed
+
 from .observer_tasks import ObserverTasks
 
 
@@ -20,7 +20,7 @@ class TestbedTasks(ShpModel):
     """Collection of tasks for all observers included in experiment."""
 
     name: NameStr
-    observer_tasks: Annotated[List[ObserverTasks], Field(min_length=1, max_length=128)]
+    observer_tasks: Annotated[list[ObserverTasks], Field(min_length=1, max_length=128)]
 
     # POST PROCESS
     email_results: bool = False

shepherd_core/data_models/testbed/cape.py

@@ -3,17 +3,18 @@
 from datetime import date
 from datetime import datetime
 from enum import Enum
+from typing import Any
 from typing import Optional
 from typing import Union
 
 from pydantic import Field
 from pydantic import model_validator
 
-from ...testbed_client import tb_client
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.content import SafeStr
-from ..base.shepherd import ShpModel
+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.testbed_client import tb_client
 
 
 class TargetPort(str, Enum):
@@ -42,6 +43,6 @@ class Cape(ShpModel, title="Shepherd-Cape"):
 
     @model_validator(mode="before")
     @classmethod
-    def query_database(cls, values: dict) -> dict:
+    def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
         values, _ = tb_client.try_completing_model(cls.__name__, values)
         return values

shepherd_core/data_models/testbed/gpio.py

@@ -1,19 +1,20 @@
 """meta-data representation of a testbed-component (physical object)."""
 
 from enum import Enum
+from typing import Annotated
+from typing import Any
 from typing import Optional
 
 from pydantic import Field
 from pydantic import StringConstraints
 from pydantic import model_validator
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ...testbed_client import tb_client
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.content import SafeStr
-from ..base.shepherd import ShpModel
+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.testbed_client import tb_client
 
 
 class Direction(str, Enum):
@@ -45,7 +46,7 @@ class GPIO(ShpModel, title="GPIO of Observer Node"):
 
     @model_validator(mode="before")
     @classmethod
-    def query_database(cls, values: dict) -> dict:
+    def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
         values, _ = tb_client.try_completing_model(cls.__name__, values)
         return values
 

shepherd_core/data_models/testbed/mcu.py

@@ -1,17 +1,18 @@
 """meta-data representation of a testbed-component (physical object)."""
 
 from enum import Enum
+from typing import Annotated
+from typing import Any
 from typing import Optional
 
 from pydantic import Field
 from pydantic import model_validator
-from typing_extensions import Annotated
 
-from ...testbed_client import tb_client
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.content import SafeStr
-from ..base.shepherd import ShpModel
+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.testbed_client import tb_client
 
 
 class ProgrammerProtocol(str, Enum):
@@ -45,6 +46,6 @@ class MCU(ShpModel, title="Microcontroller of the Target Node"):
 
     @model_validator(mode="before")
     @classmethod
-    def query_database(cls, values: dict) -> dict:
+    def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
         values, _ = tb_client.try_completing_model(cls.__name__, values)
         return values

shepherd_core/data_models/testbed/mcu_fixture.yaml

@@ -3,17 +3,17 @@
   parameters:
     id: 1001
     name: nRF52
-    description: Panasonic PAN1780, ENW-89854A1KF, Bluetooth 5 Low Energy Module
+    description: MCU with RF, 802.15.4, Bluetooth v5.0, 2.4GHz
     platform: nRF52
     core: nRF52840
     prog_protocol: SWD
-    fw_name_default: nrf52_demo_rf
+    fw_name_default: nrf52_deep_sleep
 - datatype: mcu
   parameters:
     id: 1002
     name: MSP430FR
-    description: 16MHz Ultra-Low-Pwr MCU with 128 KB FRAM
+    description: 16MHz Ultra-Low-Pwr MCU with 256 KB FRAM
     platform: MSP430
-    core: MSP430FR5962
+    core: MSP430FR5994
     prog_protocol: SBW
     fw_name_default: msp430_deep_sleep

shepherd_core/data_models/testbed/observer.py

@@ -1,20 +1,22 @@
 """meta-data representation of a testbed-component (physical object)."""
 
 from datetime import datetime
+from typing import Annotated
+from typing import Any
 from typing import Optional
 
 from pydantic import Field
 from pydantic import IPvAnyAddress
 from pydantic import StringConstraints
 from pydantic import model_validator
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ...testbed_client import tb_client
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.content import SafeStr
-from ..base.shepherd import ShpModel
+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.testbed_client import tb_client
+
 from .cape import Cape
 from .cape import TargetPort
 from .target import Target
@@ -56,7 +58,7 @@ class Observer(ShpModel, title="Shepherd-Sheep"):
 
     @model_validator(mode="before")
     @classmethod
-    def query_database(cls, values: dict) -> dict:
+    def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
         values, _ = tb_client.try_completing_model(cls.__name__, values)
         return values
 

shepherd_core/data_models/testbed/target.py

@@ -1,18 +1,20 @@
 """meta-data representation of a testbed-component (physical object)."""
 
 from datetime import datetime
+from typing import Annotated
+from typing import Any
 from typing import Optional
 from typing import Union
 
 from pydantic import Field
 from pydantic import model_validator
-from typing_extensions import Annotated
 
-from ...testbed_client import tb_client
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.content import SafeStr
-from ..base.shepherd import ShpModel
+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.testbed_client import tb_client
+
 from .mcu import MCU
 
 IdInt16 = Annotated[int, Field(ge=0, lt=2**16)]
@@ -45,7 +47,7 @@ class Target(ShpModel, title="Target Node (DuT)"):
 
     @model_validator(mode="before")
     @classmethod
-    def query_database(cls, values: dict) -> dict:
+    def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
         values, _ = tb_client.try_completing_model(cls.__name__, values)
 
         # post correction

shepherd_core/data_models/testbed/testbed.py

@@ -2,21 +2,22 @@
 
 from datetime import timedelta
 from pathlib import Path
-from typing import List
+from typing import Annotated
+from typing import Any
 from typing import Optional
 
 from pydantic import Field
 from pydantic import HttpUrl
 from pydantic import model_validator
-from typing_extensions import Annotated
 from typing_extensions import Self
 
-from ... import logger
-from ...testbed_client import tb_client
-from ..base.content import IdInt
-from ..base.content import NameStr
-from ..base.content import SafeStr
-from ..base.shepherd import ShpModel
+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
 
 
@@ -30,7 +31,7 @@ class Testbed(ShpModel):
 
     url: Optional[HttpUrl] = None
 
-    observers: Annotated[List[Observer], Field(min_length=1, max_length=128)]
+    observers: Annotated[list[Observer], Field(min_length=1, max_length=128)]
 
     shared_storage: bool = True
     data_on_server: Path
@@ -42,7 +43,7 @@ class Testbed(ShpModel):
 
     @model_validator(mode="before")
     @classmethod
-    def query_database(cls, values: dict) -> dict:
+    def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
         # allow instantiating an empty Testbed
         #   -> query the first (and only) entry of client
         if len(values) == 0:

shepherd_core/data_models/virtual_source_doc.txt

@@ -35,14 +35,14 @@ class VirtualSourceDoc(ShpModel, title="Virtual Source (Documented, Testversion)
     )
 
     interval_startup_delay_drain_ms: float = Field(
-        description="Model begins running but Target is not draining the buffer",
+        description="Model begins running but Target is not draining the storage capacitor",
         default=0,
         ge=0,
         le=10e3,
     )
 
     harvester: VirtualHarvesterConfig = Field(
-        description="Only active / needed if input is 'ivcurves'",
+        description="Only active / needed if input is ivsurface / curves,
         default=VirtualHarvesterConfig(name="mppt_opt"),
     )
 
@@ -85,7 +85,7 @@ class VirtualSourceDoc(ShpModel, title="Virtual Source (Documented, Testversion)
         le=10_000,
     )
     I_intermediate_leak_nA: float = Field(
-        description="Current leakage of intermediate buffer capacitor",
+        description="Current leakage of intermediate storage capacitor",
         default=0,
         ge=0,
         le=4.29e9,

shepherd_core/decoder_waveform/uart.py

@@ -28,7 +28,7 @@ from typing import Union
 
 import numpy as np
 
-from ..logger import logger
+from shepherd_core.logger import logger
 
 
 class Parity(str, Enum):
@@ -208,10 +208,10 @@ class Uart:
         if self.events_symbols is not None:
             return self.events_symbols
 
-        pos_df = None
-        symbol = 0
-        t_start = None
-        content = []
+        pos_df: Optional[int] = None
+        symbol: int = 0
+        t_start: Optional[float] = None
+        content: list = []
 
         for time, value, steps in self.events_sig:
             if steps > self.frame_length: