Merge branch 'main' into release/1.6

Author: Jintao-Huang

swift/llm/utils/argument.py

@@ -796,8 +796,7 @@ def _check_path(
 def handle_path(args: Union[SftArguments, InferArguments]) -> None:
     check_exist_path = [
         'model_cache_dir', 'ckpt_dir', 'resume_from_checkpoint',
-        'deepspeed_config_path', 'custom_train_dataset_path',
-        'custom_val_dataset_path'
+        'custom_train_dataset_path', 'custom_val_dataset_path'
     ]
     if args.model_id_or_path is not None and (
             args.model_id_or_path.startswith('~')

swift/llm/utils/preprocess.py

@@ -95,6 +95,8 @@ def __call__(self, dataset: HfDataset) -> HfDataset:
             try:
                 conversations = d[self.conversations_key]
                 conversations = self.repair_conversations(conversations)
+                if conversations is None:
+                    continue
                 lo = 0
                 sys = None
                 h: History = []