Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 8 additions & 5 deletions swift/llm/dataset/preprocessor/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def __init__(self,
random_state: Union[np.random.RandomState, int, None] = None,
traceback_limit: int = 10) -> None:
self.columns_mapping = columns_mapping or {}
self.origin_columns_mapping = self.columns_mapping.copy() # Higher priority and raise Error
images_keys = ['images', 'image']
audios_keys = ['audios', 'audio']
videos_keys = ['videos', 'video']
Expand Down Expand Up @@ -179,13 +180,14 @@ def batched_preprocess(self, batched_row: Dict[str, Any], *, strict: bool) -> Di

return res

@staticmethod
def safe_rename_columns(dataset: DATASET_TYPE, columns_mapping: Dict[str, Any]) -> DATASET_TYPE:
def _rename_columns(self, dataset: DATASET_TYPE) -> DATASET_TYPE:
dataset = get_features_dataset(dataset)
dataset = dataset.rename_columns(self.origin_columns_mapping)

columns_keys = {k.lower(): k for k in dataset.features.keys()} # lower -> lower/upper
safe_columns_mapping = {
columns_keys[k.lower()]: v
for k, v in columns_mapping.items() if k.lower() in columns_keys
for k, v in self.columns_mapping.items() if k.lower() in columns_keys
}

counter = Counter(safe_columns_mapping.values())
Expand Down Expand Up @@ -251,7 +253,7 @@ def __call__(
if self.dataset_sample is not None:
dataset = sample_dataset(dataset, self.dataset_sample, self.random_state)

dataset = self.safe_rename_columns(dataset, self.columns_mapping)
dataset = self._rename_columns(dataset)
dataset = self.prepare_dataset(dataset)
dataset = self._cast_pil_image(dataset)
map_kwargs = {}
Expand Down Expand Up @@ -474,6 +476,7 @@ def __call__(
strict: bool = False,
load_from_cache_file: bool = False,
) -> DATASET_TYPE:
dataset = RowPreprocessor.safe_rename_columns(dataset, self.columns_mapping)
dataset = get_features_dataset(dataset)
dataset = dataset.rename_columns(self.columns_mapping)
preprocessor = self._get_preprocessor(dataset)
return preprocessor(dataset, num_proc=num_proc, load_from_cache_file=load_from_cache_file, strict=strict)
7 changes: 2 additions & 5 deletions swift/llm/dataset/preprocessor/extra.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,8 @@ def __init__(self,
super().__init__(columns_mapping=columns_mapping, **kwargs)

def preprocess(self, row: Dict[str, Any]) -> Dict[str, Any]:
row = super().preprocess(row)
messages = row['messages']
query_message = messages[-2]
query_message['content'] = self.prompt.replace(self.query_tag, query_message['content'])
return row
row['query'] = self.prompt.replace(self.query_tag, row['query'])
return super().preprocess(row)


class ClsPreprocessor(ResponsePreprocessor):
Expand Down
Loading