Просмотр исходного кода

Merge pull request #532 from alibaba-damo-academy/dev_lhn

Dev lhn
hnluo 2 лет назад
Родитель
Сommit
c4e37cb6c1

+ 1 - 1
egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-online/demo.py

@@ -34,6 +34,6 @@ for sample_offset in range(0, speech_length, min(stride_size, speech_length - sa
     rec_result = inference_pipeline(audio_in=speech[sample_offset: sample_offset + stride_size],
     rec_result = inference_pipeline(audio_in=speech[sample_offset: sample_offset + stride_size],
                                     param_dict=param_dict)
                                     param_dict=param_dict)
     if len(rec_result) != 0:
     if len(rec_result) != 0:
-        final_result += rec_result['text'] + " "
+        final_result += rec_result['text']
         print(rec_result)
         print(rec_result)
 print(final_result)
 print(final_result)

+ 1 - 1
egs_modelscope/asr/paraformer/speech_paraformer_asr_nat-zh-cn-16k-common-vocab8404-online/infer.py → egs_modelscope/asr/paraformer/speech_paraformer_asr_nat-zh-cn-16k-common-vocab8404-online/demo.py

@@ -34,6 +34,6 @@ for sample_offset in range(0, speech_length, min(stride_size, speech_length - sa
     rec_result = inference_pipeline(audio_in=speech[sample_offset: sample_offset + stride_size],
     rec_result = inference_pipeline(audio_in=speech[sample_offset: sample_offset + stride_size],
                                     param_dict=param_dict)
                                     param_dict=param_dict)
     if len(rec_result) != 0:
     if len(rec_result) != 0:
-        final_result += rec_result['text'] + " "
+        final_result += rec_result['text']
         print(rec_result)
         print(rec_result)
 print(final_result.strip())
 print(final_result.strip())

+ 11 - 3
funasr/bin/asr_infer.py

@@ -9,6 +9,7 @@ import sys
 import time
 import time
 import copy
 import copy
 import os
 import os
+import re
 import codecs
 import codecs
 import tempfile
 import tempfile
 import requests
 import requests
@@ -828,9 +829,16 @@ class Speech2TextParaformerOnline:
 
 
                 # Change integer-ids to tokens
                 # Change integer-ids to tokens
                 token = self.converter.ids2tokens(token_int)
                 token = self.converter.ids2tokens(token_int)
-                token = " ".join(token)
-
-                results.append(token)
+                postprocessed_result = ""
+                for item in token:
+                    if item.endswith('@@'):
+                        postprocessed_result += item[:-2]
+                    elif re.match('^[a-zA-Z]+$', item):
+                        postprocessed_result += item + " "
+                    else:
+                        postprocessed_result += item
+                        
+                results.append(postprocessed_result)
 
 
         # assert check_return_type(results)
         # assert check_return_type(results)
         return results
         return results