追加: デフォルトプリセット機能を削除しプリセット保存先を指定する機能へ変更

Dockerfile

@@ -227,7 +227,7 @@ COPY --from=download-onnxruntime-env /opt/onnxruntime /opt/onnxruntime
 # Add local files
 ADD ./voicevox_engine /opt/voicevox_engine/voicevox_engine
 ADD ./docs /opt/voicevox_engine/docs
-ADD ./run.py ./presets.yaml ./engine_manifest.json /opt/voicevox_engine/
+ADD ./run.py ./engine_manifest.json /opt/voicevox_engine/
 ADD ./resources /opt/voicevox_engine/resources
 ADD ./build_util/generate_licenses.py /opt/voicevox_engine/build_util/
 ADD ./build_util/licenses /opt/voicevox_engine/build_util/licenses

build_util/make_docs.py

@@ -42,15 +42,14 @@ def generate_api_docs_html(schema: str) -> str:
     core_manager.register_core(CoreAdapter(MockCoreWrapper()), "mock")
     tts_engines = TTSEngineManager()
     tts_engines.register_engine(MockTTSEngine(), "mock")
+    preset_path = engine_root() / "presets.yaml"
     # FastAPI の機能を用いて OpenAPI schema を生成する
     app = generate_app(
         tts_engines=tts_engines,
         core_manager=core_manager,
         latest_core_version="mock",
         setting_loader=SettingHandler(USER_SETTING_PATH),
-        preset_manager=PresetManager(  # FIXME: impl MockPresetManager
-            preset_path=engine_root() / "presets.yaml",
-        ),
+        preset_manager=PresetManager(preset_path),
         user_dict=UserDictionary(),
         engine_manifest=load_manifest(engine_manifest_path()),
     )

run.spec

@@ -8,7 +8,6 @@ datas = [
     ('speaker_info', 'speaker_info'),
     ('engine_manifest.json', '.'),
     ('licenses.json', '.'),
-    ('presets.yaml', '.'),
 ]
 datas += collect_data_files('pyopenjtalk')
 

test/e2e/conftest.py

@@ -4,6 +4,7 @@
 from typing import Any
 
 import pytest
+import yaml
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 
@@ -32,8 +33,9 @@ def app_params(tmp_path: Path) -> dict[str, Any]:
     setting_loader = SettingHandler(Path("./not_exist.yaml"))
 
     # テスト用に隔離されたプリセットを生成する
-    preset_path = Path("./presets.yaml")
-    preset_manager = PresetManager(_copy_under_dir(preset_path, tmp_path))
+    preset_path = tmp_path / "presets.yaml"
+    _generate_preset(preset_path)
+    preset_manager = PresetManager(preset_path)
 
     # テスト用に隔離されたユーザー辞書を生成する
     user_dict = UserDictionary(
@@ -65,6 +67,26 @@ def client(app: FastAPI) -> TestClient:
     return TestClient(app)
 
 
+def _generate_preset(preset_path: Path) -> None:
+    """指定パス下にプリセットファイルを生成する。"""
+    contents = [
+        {
+            "id": 1,
+            "name": "サンプルプリセット",
+            "speaker_uuid": "7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff",
+            "style_id": 0,
+            "speedScale": 1,
+            "pitchScale": 0,
+            "intonationScale": 1,
+            "volumeScale": 1,
+            "prePhonemeLength": 0.1,
+            "postPhonemeLength": 0.1,
+        }
+    ]
+    with open(preset_path, mode="w", encoding="utf-8") as f:
+        yaml.safe_dump(contents, f, allow_unicode=True, sort_keys=False)
+
+
 def _generate_user_dict(dir_path: Path) -> Path:
     """指定されたディレクトリ下にユーザー辞書ファイルを生成し、生成されたファイルのパスを返す。"""
     contents = {

voicevox_engine/preset/Preset.py

@@ -6,6 +6,7 @@
 from pydantic import BaseModel, Field, ValidationError, parse_obj_as
 
 from voicevox_engine.metas.Metas import StyleId
+from voicevox_engine.utility.path_utility import engine_root
 
 
 class Preset(BaseModel):
@@ -51,6 +52,25 @@ def __init__(self, preset_path: Path):
         self.last_modified_time = 0.0
         self.preset_path = preset_path
 
+        # プリセットファイルが無指定の場合、初期値を生成する
+        default_path = engine_root() / "presets.yaml"
+        preset_not_specified = default_path.resolve() == preset_path.resolve()
+        if not self.preset_path.exists() and preset_not_specified:
+            self.preset_path.write_text("[]")
+            default_preset = Preset(
+                id=1,
+                name="サンプルプリセット",
+                speaker_uuid="7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff",
+                style_id=0,
+                speedScale=1,
+                pitchScale=0,
+                intonationScale=1,
+                volumeScale=1,
+                prePhonemeLength=0.1,
+                postPhonemeLength=0.1,
+            )
+            self.add_preset(default_preset)
+
     def _refresh_cache(self) -> None:
         """プリセットの設定ファイルの最新状態をキャッシュへ反映する"""