shepherd-core 2025.6.2__tar.gz → 2025.6.3__tar.gz

{shepherd_core-2025.6.2 → shepherd_core-2025.6.3}/PKG-INFO

@@ -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 → shepherd_core-2025.6.3}/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-2025.6.2 → shepherd_core-2025.6.3}/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-2025.6.2 → shepherd_core-2025.6.3}/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 → shepherd_core-2025.6.3}/shepherd_core.egg-info/PKG-INFO

@@ -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>