libs/module/llm.py: Fixed MeloTTS initialization bug.

Signed-off-by: LittleMouse <[email protected]>

Author: LittleMouse

m5stack/libs/module/llm.py

@@ -486,7 +486,7 @@ def __init__(self, module_msg):
 
     def setup(
         self,
-        model="melotts_zh-cn",
+        model="melotts-zh-cn",
         response_format="sys.pcm",
         input="tts.utf-8.stream",
         enoutput=False,
@@ -903,6 +903,8 @@ def llm_setup(
             if self.version == "v1.0":
                 enkws = True
             else:
+                if isinstance(input, str):
+                    input = [input]
                 input.append(enkws)
         else:
             enkws = bool(enkws)
@@ -979,6 +981,8 @@ def tts_setup(
             if self.version == "v1.0":
                 enkws = True
             else:
+                if isinstance(input, str):
+                    input = [input]
                 input.append(enkws)
         else:
             enkws = bool(enkws)
@@ -995,19 +999,23 @@ def tts_inference(self, work_id, input_data, timeout=0, request_id="tts_inferenc
     def melotts_setup(
         self,
         language="en_US",
-        model="melotts_zh-cn",
+        model="melotts-en-default",
         response_format="sys.pcm",
         input=None,
         enoutput=False,
         enkws=None,
         request_id="tts_setup",
     ) -> str:
         if language == "zh_CN":
-            model = "melotts_zh-cn"
+            model = "melotts-zh-cn"
+        if language == "ja_JP":
+            model = "melotts-ja-jp"
         if input is None:
             input = ["tts.utf-8.stream"]
 
         if enkws:
+            if isinstance(input, str):
+                input = [input]
             input.append(enkws)
 
         self.latest_melotts_work_id = self.melotts.setup(
@@ -1058,6 +1066,8 @@ def asr_setup(
             if self.version == "v1.0":
                 enkws = True
             else:
+                if isinstance(input, str):
+                    input = [input]
                 input.append(enkws)
         else:
             enkws = bool(enkws)
@@ -1079,6 +1089,8 @@ def vad_setup(
         if input is None:
             input = ["sys.pcm"]
         if enkws:
+            if isinstance(input, str):
+                input = [input]
             input.append(enkws)
         self.latest_vad_work_id = self.vad.setup(
             model, response_format, input, enoutput, request_id
@@ -1099,8 +1111,12 @@ def whisper_setup(
         if input is None:
             input = ["sys.pcm"]
         if enkws:
+            if isinstance(input, str):
+                input = [input]
             input.append(enkws)
         if envad:
+            if isinstance(input, str):
+                input = [input]
             input.append(envad)
         self.latest_whisper_work_id = self.whisper.setup(
             model, response_format, input, enoutput, language, request_id