Merge pull request #1928 from liugz18/main

Shi Xian

2024-07-22 e09d87193b57ad5ef99e0b170e78861b91cd2d2c

Merge pull request #1928 from liugz18/main

Rename 'res' in line 514 to avoid with naming conflict with line 365

 funasr/auto/auto_model.py

@@ -511,8 +511,8 @@
                sv_output = postprocess(all_segments, None, labels, spk_embedding.cpu())
                if self.spk_mode == "vad_segment":  # recover sentence_list
                    sentence_list = []
                    for res, vadsegment in zip(restored_data, vadsegments):
                        if "timestamp" not in res:
                    for rest, vadsegment in zip(restored_data, vadsegments):
                        if "timestamp" not in rest:
                            logging.error(
                                "Only 'iic/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-pytorch' \
                                           and 'iic/speech_seaco_paraformer_large_asr_nat-zh-cn-16k-common-vocab8404-pytorch'\
@@ -522,8 +522,8 @@
                            {
                                "start": vadsegment[0],
                                "end": vadsegment[1],
                                "sentence": res["text"],
                                "timestamp": res["timestamp"],
                                "sentence": rest["text"],
                                "timestamp": rest["timestamp"],
                            }
                        )
                elif self.spk_mode == "punc_segment":