fix list not exist dir for gpt and sovits train

Author: suchen-sci

src/rest/rest.py

@@ -397,7 +397,7 @@ async def train_gpt(self, params: GPTTrainParams):
         # Note: it could not be empty, because the training processing has multiple processes, each process could generate a model name
         if params.output_model_name == "":
             params.output_model_name = "gpt_" + generate_random_name()
-        model_path = get_gpt_train_dir(params.output_model_name)
+        model_path = get_gpt_train_dir(params.project_dir, params.output_model_name)
 
         backtask_with_session_guard(uid, TaskType.train_gpt, asdict(params), start_task_with_subprocess, uid=uid, request=params, cmd_file=TaskCMD.train_gpt)
         return EaseVoiceResponse(ResponseStatus.SUCCESS, "GPT training started", uuid=str(uid), data={"model_path": model_path})
@@ -408,7 +408,7 @@ async def train_sovits(self, params: SovitsTrainParams):
         # Note: it could not be empty, because the training processing has multiple processes, each process could generate a model name
         if params.output_model_name == "":
             params.output_model_name = "sovits_" + generate_random_name()
-        model_path = get_sovits_train_dir(params.output_model_name)
+        model_path = get_sovits_train_dir(params.project_dir, params.output_model_name)
         uid = str(uuid.uuid4())
         backtask_with_session_guard(uid, TaskType.train_sovits, asdict(params), start_task_with_subprocess, uid=uid, request=params, cmd_file=TaskCMD.tran_sovits)
         return EaseVoiceResponse(ResponseStatus.SUCCESS, "Sovits training started", uuid=uid, data={"model_path": model_path})

src/train/helper.py

@@ -5,6 +5,8 @@
 from pathlib import Path
 from typing import Optional
 
+from src.logger import logger
+
 train_logs_path = "logs"
 
 
@@ -33,25 +35,33 @@ def get_sovits_train_dir(project_dir: str, name: Optional[str]):
 
 
 def list_train_gpts(project_dir: str):
-    all_gpts = Path(_get_all_gpt_train_output_dir(project_dir))
-    res = {}
-    for dir in all_gpts.iterdir():
-        if dir.is_dir():
-            for file in dir.iterdir():
-                if file.is_file() and file.name.endswith(".ckpt"):
-                    res[f"{dir.name}/{file.name}"] = str(file)
-    return res
+    try:
+        all_gpts = Path(_get_all_gpt_train_output_dir(project_dir))
+        res = {}
+        for dir in all_gpts.iterdir():
+            if dir.is_dir():
+                for file in dir.iterdir():
+                    if file.is_file() and file.name.endswith(".ckpt"):
+                        res[f"{dir.name}/{file.name}"] = str(file)
+        return res
+    except Exception as e:
+        logger.warning(f"list_train_gpts failed: {e}")
+        return {}
 
 
 def list_train_sovits(project_dir: str):
-    all_sovits = Path(_get_all_sovits_train_output_dir(project_dir))
-    res = {}
-    for dir in all_sovits.iterdir():
-        if dir.is_dir():
-            for file in dir.iterdir():
-                if file.is_file() and file.name.endswith(".pth"):
-                    res[f"{dir.name}/{file.name}"] = str(file)
-    return res
+    try:
+        all_sovits = Path(_get_all_sovits_train_output_dir(project_dir))
+        res = {}
+        for dir in all_sovits.iterdir():
+            if dir.is_dir():
+                for file in dir.iterdir():
+                    if file.is_file() and file.name.endswith(".pth"):
+                        res[f"{dir.name}/{file.name}"] = str(file)
+        return res
+    except Exception as e:
+        logger.warning(f"list_train_sovits failed: {e}")
+        return {}
 
 
 @dataclass