Skip to content
Merged
Changes from 3 commits
Commits
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
16 changes: 10 additions & 6 deletions src/datatrove/utils/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class DatatroveFolderDataset(Dataset):
Dataset for a folder of .ds files created by datatrove.

Args:
folder_path (str): path to folder on S3, locally, or some other fsspec supported path
data_folder (DataFolderLike): path to folder on S3, locally, or some other fsspec supported path
seq_len (int): sequence length
filename_pattern (str, optional): Glob pattern to match files within the folder. Defaults to ".ds".
recursive (bool, optional): Search recursively within the folder. Defaults to True.
Expand All @@ -235,7 +235,7 @@ class DatatroveFolderDataset(Dataset):

def __init__(
self,
folder_path: DataFolderLike,
data_folder: DataFolderLike,
seq_len: int,
filename_pattern: str = ".ds",
recursive: bool = True,
Expand All @@ -246,7 +246,7 @@ def __init__(
positions_from_eos_token_id: int | None = None,
paths_file: str | None = None,
):
self.folder_path = get_datafolder(folder_path)
self.data_folder = get_datafolder(data_folder)
self.seq_len = seq_len
self.filename_pattern = filename_pattern
self.return_positions = return_positions
Expand Down Expand Up @@ -278,15 +278,19 @@ def __init__(

self.current_file = 0

@property
def folder_path(self):
return self.data_folder.resolve_paths("")

def _load_file_list(self):
fsizes = {}

if not self.paths_file or not file_exists(self.paths_file):
matched_files = self.folder_path.list_files(
matched_files = self.data_folder.list_files(
glob_pattern=self.filename_pattern, recursive=self.recursive
)
if not matched_files:
raise FileNotFoundError(f'No files matching "{self.filename_pattern}" found in {self.folder_path}')
raise FileNotFoundError(f'No files matching "{self.filename_pattern}" found in {self.data_folder}')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here should be self.folder_path (string)

else:
with open_file(self.paths_file, "r") as f:
file_data = json.load(f)
Expand All @@ -296,7 +300,7 @@ def _load_file_list(self):

self.files = [
DatatroveFileDataset(
(path, self.folder_path),
(path, self.data_folder),
self.seq_len,
token_size=self.token_size,
return_positions=self.return_positions,
Expand Down