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

shepherd_core/data_models/base/shepherd.py

@@ -48,6 +48,24 @@ yaml.add_representer(IPv4Address, generic2str, SafeDumper)
 yaml.add_representer(UUID, generic2str, SafeDumper)
 
 
+def path_to_str(old: dict) -> dict:
+    r"""Allow platform-independent pickling of ShpModel.
+
+    Helper Fn
+    Posix-Paths (/xyz/abc) in WindowsPath gets converted to \\xyz\\abc when exported
+    intended usage: pickle.dump(path_to_str(model.model_dump()))
+    """
+    new: dict = {}
+    for key, value in old.items():
+        if isinstance(value, Path):
+            new[key] = value.as_posix().replace("\\", "/")
+        elif isinstance(value, dict):
+            new[key] = path_to_str(value)
+        else:
+            new[key] = value
+    return new
+
+
 class ShpModel(BaseModel):
     """Pre-configured Pydantic Base-Model (specifically for shepherd).
 
@@ -135,21 +153,21 @@ class ShpModel(BaseModel):
         pickle: uses pickle to serialize data, on BBB >100x faster for large files
         comment: documentation.
         """
-        model_dict = self.model_dump(exclude_unset=minimal)
         model_wrap = Wrapper(
             datatype=type(self).__name__,
             comment=comment,
             created=local_now(),
-            parameters=model_dict,
+            parameters=self.model_dump(exclude_unset=minimal),
         )
+        model_dict = model_wrap.model_dump(exclude_unset=minimal, exclude_defaults=minimal)
         if use_pickle:
-            model_serial = pickle.dumps(model_dict, fix_imports=True)
+            model_serial = pickle.dumps(path_to_str(model_dict))
             model_path = Path(path).resolve().with_suffix(".pickle")
         else:
             # TODO: x64 windows supports CSafeLoader/dumper,
             #       there are examples that replace load if avail
             model_serial = yaml.safe_dump(
-                model_wrap.model_dump(exclude_unset=minimal, exclude_defaults=minimal),
+                model_dict,
                 default_flow_style=False,
                 sort_keys=False,
             )
@@ -170,13 +188,13 @@ class ShpModel(BaseModel):
             raise FileNotFoundError
         if path.suffix.lower() == ".pickle":
             with Path(path).open("rb") as shp_file:
-                shp_wrap = pickle.load(shp_file, fix_imports=True)  # noqa: S301
+                shp_dict = pickle.load(shp_file)  # noqa: S301
         else:
             with Path(path).open() as shp_file:
                 shp_dict = yaml.safe_load(shp_file)
-            shp_wrap = Wrapper(**shp_dict)
+        shp_wrap = Wrapper(**shp_dict)
         if shp_wrap.datatype != cls.__name__:
-            raise ValueError("Model in file does not match the requirement")
+            raise ValueError("Model in file does not match the actual Class")
         return cls(**shp_wrap.parameters)
 
     def get_hash(self) -> str:

shepherd_core/data_models/task/__init__.py

@@ -47,7 +47,8 @@ def prepare_task(config: Union[ShpModel, Path, str], observer: Optional[str] = N
 
     if isinstance(config, Path) and config.exists() and config.suffix.lower() == ".pickle":
         with config.resolve().open("rb") as shp_file:
-            shp_wrap = pickle.load(shp_file, fix_imports=True)  # noqa: S301
+            shp_dict = pickle.load(shp_file)  # noqa: S301
+        shp_wrap = Wrapper(**shp_dict)
     elif isinstance(config, Path) and config.exists() and config.suffix.lower() == ".yaml":
         with config.resolve().open() as shp_file:
             shp_dict = yaml.safe_load(shp_file)

shepherd_core/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shepherd_core
-Version: 2025.6.2
+Version: 2025.6.3
 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.6.2.dist-info → shepherd_core-2025.6.3.dist-info}/RECORD

@@ -4,7 +4,7 @@ shepherd_core/commons.py,sha256=_phovuhCgLmO5gcazQ5hyykUPc907dyK9KpY2lUtoIM,205
 shepherd_core/config.py,sha256=YegFEXuBUBnbq5mb67em8ozEnSkEQSPXjqHlKA2HXCQ,967
 shepherd_core/logger.py,sha256=se8uBmlOKhU2ODs_cx1L0Nxkj4n7nlk67BpCFYgcHns,1803
 shepherd_core/reader.py,sha256=oTh42tCDyLRGxO505v3etBPpy9BhqfOrWeVfn0SXeJQ,29480
-shepherd_core/version.py,sha256=FEJD7Y6nIjgA1GntHr4Eta4zDjWL0iegU8jCdhrGybA,76
+shepherd_core/version.py,sha256=vYW_zqQqbw9dtRcdMGPw5ZffUDJau2hQDsEwAT2IvCA,76
 shepherd_core/writer.py,sha256=VRrM7cIv3RcX3JlYs4xq5DUK_3kD-6YH4Ie96tQ6Hcw,14591
 shepherd_core/data_models/__init__.py,sha256=jBsk2RpD5Gw5GNe1gql9YrWD-7Uv7F2jwRRx-CHdceQ,1909
 shepherd_core/data_models/readme.md,sha256=DHPVmkWqDksWomRHRTVWVHy9wXF9oMJrITgKs4Pnz2g,2494
@@ -13,7 +13,7 @@ shepherd_core/data_models/base/__init__.py,sha256=PSJ6acWViqBm0Eiom8DIgKfFVrp5lz
 shepherd_core/data_models/base/cal_measurement.py,sha256=c-vjACNxsQY8LU2Msw0COrsTY-8pToJ5ZWkOztJ9tVY,3380
 shepherd_core/data_models/base/calibration.py,sha256=25ls5q9d5ko5X2DwbNWFuUZIji2Zwh04l_UxdRt-AFk,10787
 shepherd_core/data_models/base/content.py,sha256=e8-UWjF7QW4mYMqnDSnbhZTY3ODxGyx50A_K4SgDnNs,2098
-shepherd_core/data_models/base/shepherd.py,sha256=m32eOpN_oGGVL0bJhN8IEQTQ04ZoQQoiTdRu64mtHLg,6871
+shepherd_core/data_models/base/shepherd.py,sha256=JOrSPweiMDR8Ry3X1nqf0PIUijpSMldsrmk7zjtRAf8,7400
 shepherd_core/data_models/base/timezone.py,sha256=2T6E46hJ1DAvmqKfu6uIgCK3RSoAKjGXRyzYNaqKyjY,665
 shepherd_core/data_models/base/wrapper.py,sha256=Dkvosu2gcJOUgDHhyRUmIsuWdtmtICIUmKmRU9ChtEM,784
 shepherd_core/data_models/content/__init__.py,sha256=69aiNG0h5t1OF7HsLg_ke5eaQKsKyMK8o6Kfaby5vlY,525
@@ -30,7 +30,7 @@ shepherd_core/data_models/experiment/__init__.py,sha256=lorsx0M-JWPIrt_UZfexsLwa
 shepherd_core/data_models/experiment/experiment.py,sha256=X304nrNMv69LLIT2k9oiM7swgpf3uFr91a95vipZSow,4701
 shepherd_core/data_models/experiment/observer_features.py,sha256=dxbdmAbh8a-fz2_ppTNWEnIDbzSskxvAayXNI2LCJfs,9058
 shepherd_core/data_models/experiment/target_config.py,sha256=qI72kj5_rpJXU3A2_TmfoN9vATOZPFjphpXLZfc9riM,4260
-shepherd_core/data_models/task/__init__.py,sha256=GsWyipHYbE7vg0G4Lvpuh_HpoJMsqh75F2YJhylMIUc,3673
+shepherd_core/data_models/task/__init__.py,sha256=IeXlmnP0NQpW9r_EuEW0f55-pCXtinMqosEvmvom8Uw,3694
 shepherd_core/data_models/task/emulation.py,sha256=7mOpB75qwunTT_KWCteLmrQwjbPVomcbm3LqCsrDiy8,7897
 shepherd_core/data_models/task/firmware_mod.py,sha256=wWfqWKvcbCXwepVXYYJhmdplDE97xsAE7ZnGFF3Pvm8,3484
 shepherd_core/data_models/task/harvest.py,sha256=OJKupuZ4yBuVl-WspuXjD6p-dvmwbfRwp4PsAUVeP1w,3813
@@ -76,8 +76,8 @@ shepherd_core/vsource/virtual_harvester_model.py,sha256=K9RnAHCz1ibdYMte5l_U7vrY
 shepherd_core/vsource/virtual_harvester_simulation.py,sha256=eK9uCn-j_8xSTa7BQhG879ep0oZDeatlnF31LeWEDiM,2547
 shepherd_core/vsource/virtual_source_model.py,sha256=-8RwBrkIdO0g4zpo7XHnqv8F_qNh_qf5hxEUJoIuAmg,3164
 shepherd_core/vsource/virtual_source_simulation.py,sha256=qfe4dQMaifpF54lCb_Vv_7imebdhqeKIhXj5xLPtWMM,5267
-shepherd_core-2025.6.2.dist-info/METADATA,sha256=WZcUnd9242FtTdD7Md5nnJEWYWlBP8bj5DeqVlizMFg,7778
-shepherd_core-2025.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shepherd_core-2025.6.2.dist-info/top_level.txt,sha256=wy-t7HRBrKARZxa-Y8_j8d49oVHnulh-95K9ikxVhew,14
-shepherd_core-2025.6.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-shepherd_core-2025.6.2.dist-info/RECORD,,
+shepherd_core-2025.6.3.dist-info/METADATA,sha256=0-DmTMOVOu4h1vnbCY4XCl7ghEteZNGoR3KAUICJxLA,7778
+shepherd_core-2025.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shepherd_core-2025.6.3.dist-info/top_level.txt,sha256=wy-t7HRBrKARZxa-Y8_j8d49oVHnulh-95K9ikxVhew,14
+shepherd_core-2025.6.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+shepherd_core-2025.6.3.dist-info/RECORD,,