Refactor: moved common/subprocess_utils.py to style_bert_vits2/utils/subprocess.py

common/subprocess_utils.py

@@ -1,33 +0,0 @@
-import subprocess
-import sys
-
-from style_bert_vits2.logging import logger
-from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT
-
-python = sys.executable
-
-
-def run_script_with_log(cmd: list[str], ignore_warning=False) -> tuple[bool, str]:
-    logger.info(f"Running: {' '.join(cmd)}")
-    result = subprocess.run(
-        [python] + cmd,
-        stdout=SAFE_STDOUT,  # type: ignore
-        stderr=subprocess.PIPE,
-        text=True,
-        encoding="utf-8",
-    )
-    if result.returncode != 0:
-        logger.error(f"Error: {' '.join(cmd)}\n{result.stderr}")
-        return False, result.stderr
-    elif result.stderr and not ignore_warning:
-        logger.warning(f"Warning: {' '.join(cmd)}\n{result.stderr}")
-        return True, result.stderr
-    logger.success(f"Success: {' '.join(cmd)}")
-    return True, ""
-
-
-def second_elem_of(original_function):
-    def inner_function(*args, **kwargs):
-        return original_function(*args, **kwargs)[1]
-
-    return inner_function

style_bert_vits2/utils/subprocess.py

@@ -0,0 +1,56 @@
+import subprocess
+import sys
+from typing import Any, Callable
+
+from style_bert_vits2.logging import logger
+from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT
+
+PYTHON = sys.executable
+
+
+def run_script_with_log(cmd: list[str], ignore_warning: bool = False) -> tuple[bool, str]:
+    """
+    指定されたコマンドを実行し、そのログを記録する
+
+    Args:
+        cmd: 実行するコマンドのリスト
+        ignore_warning: 警告を無視するかどうかのフラグ
+
+    Returns:
+        tuple[bool, str]: 実行が成功したかどうかのブール値と、エラーまたは警告のメッセージ（ある場合）
+    """
+
+    logger.info(f"Running: {' '.join(cmd)}")
+    result = subprocess.run(
+        [PYTHON] + cmd,
+        stdout = SAFE_STDOUT,
+        stderr = subprocess.PIPE,
+        text = True,
+        encoding = "utf-8",
+    )
+    if result.returncode != 0:
+        logger.error(f"Error: {' '.join(cmd)}\n{result.stderr}")
+        return False, result.stderr
+    elif result.stderr and not ignore_warning:
+        logger.warning(f"Warning: {' '.join(cmd)}\n{result.stderr}")
+        return True, result.stderr
+    logger.success(f"Success: {' '.join(cmd)}")
+
+    return True, ""
+
+
+def second_elem_of(original_function: Callable[..., tuple[Any, Any]]) -> Callable[..., Any]:
+    """
+    与えられた関数をラップし、その戻り値の 2 番目の要素のみを返す関数を生成する
+
+    Args:
+        original_function (Callable[..., tuple[Any, Any]])): ラップする元の関数
+
+    Returns:
+        Callable[..., Any]: 元の関数の戻り値の 2 番目の要素のみを返す関数
+    """
+
+    def inner_function(*args, **kwargs) -> Any:  # type: ignore
+        return original_function(*args, **kwargs)[1]
+
+    return inner_function

webui_dataset.py

@@ -6,7 +6,7 @@ import yaml
 
 from style_bert_vits2.constants import GRADIO_THEME
 from style_bert_vits2.logging import logger
-from common.subprocess_utils import run_script_with_log
+from style_bert_vits2.utils.subprocess import run_script_with_log
 
 # Get path settings
 with open(os.path.join("configs", "paths.yml"), "r", encoding="utf-8") as f:

webui_train.py

@@ -17,7 +17,7 @@ import yaml
 from style_bert_vits2.constants import GRADIO_THEME, VERSION
 from style_bert_vits2.logging import logger
 from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT
-from common.subprocess_utils import run_script_with_log, second_elem_of
+from style_bert_vits2.utils.subprocess import run_script_with_log, second_elem_of
 
 logger_handler = None
 tensorboard_executed = False