Visitar URL original
Harden path-handling after pathlib migration by deruyter92 · Pull Request #3421 · DeepLabCut/DeepLabCut · GitHub
Skip to content

Harden path-handling after pathlib migration #3421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deruyter92 merged 9 commits into from
Jul 21, 2026
Merged

Harden path-handling after pathlib migration #3421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6859773
pathlib mkdir hardening + remaining str concat fixes
deruyter92 Jul 20, 2026
7667748
hardening of path-normalization in `guarantee_multiindex_rows`
deruyter92 Jul 20, 2026
77b9e1f
remove str-required `robust_path_split` (redundant with pathlib Path)
deruyter92 Jul 20, 2026
a272894
deprecate `str`-based `grab_files_in_folder` and migrate callers to p…
deruyter92 Jul 20, 2026
0a9bbbc
fix test_auxiliary functions wrong type: tmpdir.LocalPath -> str or Path
deruyter92 Jul 20, 2026
d050c04
fix numpy to list conversion in .mat image list.
deruyter92 Jul 21, 2026
5daaade
Ensure TF branch normalizes to str ( excluded from pathlib migration)
deruyter92 Jul 21, 2026
849644a
auxfun_multianimal migrate to Path in Load and Save MA data
deruyter92 Jul 21, 2026
a1eaaae
fix pad with spaces in normalize numpy file paths
deruyter92 Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ensure TF branch normalizes to str ( excluded from pathlib migration)
  • Loading branch information
@deruyter92
deruyter92 committed Jul 21, 2026
commit 5daaade27b7cde3e5e8bc9984d8a41c603be49ea
4 changes: 2 additions & 2 deletions deeplabcut/pose_estimation_tensorflow/datasets/pose_deterministic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from .utils import (
Batch,
DataItem,
_normalize_image_path,
crop_image,
data_to_input,
mirror_joints_map,
Expand Down Expand Up @@ -60,8 +61,7 @@ def load_dataset(self):

item = DataItem()
item.image_id = i
im_path = sample[0][0]
item.im_path = str(Path(*im_path) if isinstance(im_path, list) else Path(im_path))
item.im_path: str = _normalize_image_path(sample[0][0])
item.im_size = sample[1][0]
if len(sample) >= 3:
joints = sample[2][0][0]
Expand Down
12 changes: 3 additions & 9 deletions deeplabcut/pose_estimation_tensorflow/datasets/pose_imgaug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

from .factory import PoseDatasetFactory
from .pose_base import BasePoseDataset
from .utils import Batch, DataItem
from .utils import Batch, DataItem, _normalize_image_path


@PoseDatasetFactory.register("default")
Expand Down Expand Up @@ -92,10 +92,7 @@ def load_dataset(self):

item = DataItem()
item.image_id = i
im_path = sample[0][0]
if isinstance(im_path, np.ndarray):
im_path = [str(x) for x in im_path.flatten()]
item.im_path = str(Path(*im_path) if isinstance(im_path, list) else Path(im_path))
item.im_path: str = _normalize_image_path(sample[0][0])
item.im_size = sample[1][0]
if len(sample) >= 3:
joints = sample[2][0][0]
Expand Down Expand Up @@ -125,10 +122,7 @@ def load_dataset(self):
sample = pickledata[i] # mlab[0, i]
item = DataItem()
item.image_id = i
im_path = sample["image"]
if isinstance(im_path, np.ndarray):
im_path = [str(x) for x in im_path.flatten()]
item.im_path = str(Path(*im_path)) # [0][0]
item.im_path: str = _normalize_image_path(sample["image"]) # [0][0]
item.im_size = sample["size"] # sample[1][0]
if len(sample) >= 3:
item.num_animals = len(sample["joints"])
Expand Down
5 changes: 2 additions & 3 deletions deeplabcut/pose_estimation_tensorflow/datasets/pose_multianimal_imgaug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from deeplabcut.pose_estimation_tensorflow.datasets import augmentation
from deeplabcut.pose_estimation_tensorflow.datasets.factory import PoseDatasetFactory
from deeplabcut.pose_estimation_tensorflow.datasets.pose_base import BasePoseDataset
from deeplabcut.pose_estimation_tensorflow.datasets.utils import Batch, DataItem
from deeplabcut.pose_estimation_tensorflow.datasets.utils import Batch, DataItem, _normalize_image_path
from deeplabcut.utils import auxfun_multianimal, auxiliaryfunctions
from deeplabcut.utils.auxfun_videos import VideoReader, imread

Expand Down Expand Up @@ -100,8 +100,7 @@ def load_dataset(self):
sample = pickledata[i] # mlab[0, i]
item = DataItem()
item.image_id = i
im_path = sample["image"]
item.im_path = str(Path(*im_path) if isinstance(im_path, list) else Path(im_path))
item.im_path: str = _normalize_image_path(sample["image"])
item.im_size = sample["size"]
if "joints" in sample.keys():
Joints = sample["joints"]
Expand Down
6 changes: 2 additions & 4 deletions deeplabcut/pose_estimation_tensorflow/datasets/pose_tensorpack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

from .factory import PoseDatasetFactory
from .pose_base import BasePoseDataset
from .utils import Batch, data_to_input
from .utils import Batch, _normalize_image_path, data_to_input


def img_to_bgr(im_path):
Expand Down Expand Up @@ -113,9 +113,7 @@ def load_dataset(self):
item = DataItem()
item.image_id = i
base = str(self.cfg["project_path"])
im_path = sample[0][0]
im_path = Path(*im_path) if isinstance(im_path, list) else Path(im_path)
item.im_path = str(Path(base) / im_path)
item.im_path = str(Path(base) / _normalize_image_path(sample[0][0]))
item.im_size = sample[1][0]
if len(sample) >= 3:
joints = sample[2][0][0]
Expand Down
10 changes: 10 additions & 0 deletions deeplabcut/pose_estimation_tensorflow/datasets/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# Licensed under GNU Lesser General Public License v3.0
#
from enum import Enum
from pathlib import Path

import numpy as np

Expand All @@ -28,6 +29,15 @@ class DataItem:
pass


# NOTE @deruyter92 2026-07-21: the TensorFlow branch is deprecated soon, and excluded from the migration to pathlib
def _normalize_image_path(im_path: np.ndarray | list | tuple | Path | str) -> str:
"""Convert a raw image path from .mat or pickle format to a string."""
if isinstance(im_path, np.ndarray):
im_path = [str(x) for x in im_path.flatten()]
im_path = Path(*im_path) if isinstance(im_path, (list, tuple)) else Path(im_path)
return str(im_path)


def data_to_input(data):
return np.expand_dims(data, axis=0).astype(float)

Expand Down
Loading