From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001
From: liugz18 <57401541+liugz18@users.noreply.github.com>
Date: 星期四, 18 七月 2024 21:34:55 +0800
Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365
---
funasr/models/ct_transformer/utils.py | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/funasr/models/ct_transformer/utils.py b/funasr/models/ct_transformer/utils.py
index 01b1850..b6e11e7 100644
--- a/funasr/models/ct_transformer/utils.py
+++ b/funasr/models/ct_transformer/utils.py
@@ -14,10 +14,11 @@
length = len(words)
sentence_len = length // word_limit
for i in range(sentence_len):
- sentences.append(words[i * word_limit:(i + 1) * word_limit])
+ sentences.append(words[i * word_limit : (i + 1) * word_limit])
if length % word_limit > 0:
- sentences.append(words[sentence_len * word_limit:])
+ sentences.append(words[sentence_len * word_limit :])
return sentences
+
def split_words(text: str, jieba_usr_dict=None, **kwargs):
if jieba_usr_dict:
@@ -27,21 +28,21 @@
token_list_tmp = []
language_flag = None
for token in input_list:
- if isEnglish(token) and language_flag == 'Chinese':
+ if isEnglish(token) and language_flag == "Chinese":
token_list_all.append(token_list_tmp)
- langauge_list.append('Chinese')
+ langauge_list.append("Chinese")
token_list_tmp = []
- elif not isEnglish(token) and language_flag == 'English':
+ elif not isEnglish(token) and language_flag == "English":
token_list_all.append(token_list_tmp)
- langauge_list.append('English')
+ langauge_list.append("English")
token_list_tmp = []
token_list_tmp.append(token)
if isEnglish(token):
- language_flag = 'English'
+ language_flag = "English"
else:
- language_flag = 'Chinese'
+ language_flag = "Chinese"
if token_list_tmp:
token_list_all.append(token_list_tmp)
@@ -49,7 +50,7 @@
result_list = []
for token_list_tmp, language_flag in zip(token_list_all, langauge_list):
- if language_flag == 'English':
+ if language_flag == "English":
result_list.extend(token_list_tmp)
else:
seg_list = jieba_usr_dict.cut(join_chinese_and_english(token_list_tmp), HMM=False)
@@ -77,17 +78,19 @@
words.append(current_word)
return words
-def isEnglish(text:str):
- if re.search('^[a-zA-Z\']+$', text):
+
+def isEnglish(text: str):
+ if re.search("^[a-zA-Z']+$", text):
return True
else:
return False
+
def join_chinese_and_english(input_list):
- line = ''
+ line = ""
for token in input_list:
if isEnglish(token):
- line = line + ' ' + token
+ line = line + " " + token
else:
line = line + token
--
Gitblit v1.9.1