Fix bug in translate.py (#69)

tools/translate.py

@@ -22,33 +22,40 @@ def translate(Sentence: str, to_Language: str = "jp", from_Language: str = ""):
     if appid == "" or key == "":
         return "请在开发者config.yml中配置app_key与secret_key"
     url = "https://fanyi-api.baidu.com/api/trans/vip/translate"
-    # 签名计算 参考文档 https://api.fanyi.baidu.com/product/113
-    salt = str(random.randint(1, 100000))
-    signString = appid + Sentence + salt + key
-    hs = hashlib.md5()
-    hs.update(signString.encode("utf-8"))
-    signString = hs.hexdigest()
-    if from_Language == "":
-        from_Language = "auto"
-    headers = {"Content-Type": "application/x-www-form-urlencoded"}
-    payload = {
-        "q": Sentence,
-        "from": from_Language,
-        "to": to_Language,
-        "appid": appid,
-        "salt": salt,
-        "sign": signString,
-    }
-    # 发送请求
-    try:
-        response = requests.post(url=url, data=payload, headers=headers, timeout=3)
-        response = response.json()
-        if "trans_result" in response.keys():
-            result = response["trans_result"][0]
-            if "dst" in result.keys():
-                dst = result["dst"]
-                return dst
-    except Exception:
-        return Sentence
-    # 不成功就返回原句子
-    return Sentence
+    texts = Sentence.split("\n")
+    outTexts = []
+    for t in texts:
+        if t != "":
+            # 签名计算 参考文档 https://api.fanyi.baidu.com/product/113
+            salt = str(random.randint(1, 100000))
+            signString = appid + Sentence + salt + key
+            hs = hashlib.md5()
+            hs.update(signString.encode("utf-8"))
+            signString = hs.hexdigest()
+            if from_Language == "":
+                from_Language = "auto"
+            headers = {"Content-Type": "application/x-www-form-urlencoded"}
+            payload = {
+                "q": Sentence,
+                "from": from_Language,
+                "to": to_Language,
+                "appid": appid,
+                "salt": salt,
+                "sign": signString,
+            }
+            # 发送请求
+            try:
+                response = requests.post(
+                    url=url, data=payload, headers=headers, timeout=3
+                )
+                response = response.json()
+                if "trans_result" in response.keys():
+                    result = response["trans_result"][0]
+                    if "dst" in result.keys():
+                        dst = result["dst"]
+                        outTexts.append(dst)
+            except Exception:
+                return Sentence
+        else:
+            outTexts.append(t)
+    return "\n".join(outTexts)

webui.py

@@ -24,7 +24,7 @@
 import numpy as np
 from config import config
 from tools.translate import translate
-from oldVersion import V111
+from oldVersion.V111.models import SynthesizerTrn as V111SynthesizerTrn
 
 net_g = None
 
@@ -65,7 +65,7 @@ def tts_fn(
         logging.basicConfig(level=logging.DEBUG)
     hps = utils.get_hparams_from_file(config.webui_config.config_path)
     version = hps.version if hasattr(hps, "version") else "1.1.1-dev"
-    SynthesizerTrnMap = {"1.1.1": V111.SynthesizerTrn}
+    SynthesizerTrnMap = {"1.1.1": V111SynthesizerTrn}
     if version != "1.1.1-dev":
         net_g = SynthesizerTrnMap[version](
             len(symbols),