整理: プリセットへモデルモジュールを追加 (#1346)

* refactor: プリセットへモデルモジュールを追加 * refactor: lint * Apply suggestions from code review * merge --------- Co-authored-by: Hiroshiba <hihokaruta@gmail.com> Co-authored-by: Hiroshiba Kazuyuki <kazuyuki_hiroshiba@dwango.co.jp>
VOICEVOX · Jun 2, 2024 · a272814 · a272814
1 parent 3b79fbc
commit a272814
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 28 deletions.
diff --git a/build_util/make_docs.py b/build_util/make_docs.py
@@ -7,7 +7,7 @@
 from voicevox_engine.dev.core.mock import MockCoreWrapper
 from voicevox_engine.dev.tts_engine.mock import MockTTSEngine
 from voicevox_engine.engine_manifest import load_manifest
-from voicevox_engine.preset.Preset import PresetManager
+from voicevox_engine.preset.preset_manager import PresetManager
 from voicevox_engine.setting.setting_manager import USER_SETTING_PATH, SettingHandler
 from voicevox_engine.tts_pipeline.tts_engine import TTSEngineManager
 from voicevox_engine.user_dict.user_dict_manager import UserDictionary

diff --git a/run.py b/run.py
@@ -15,7 +15,7 @@
 from voicevox_engine.cancellable_engine import CancellableEngine
 from voicevox_engine.core.core_initializer import initialize_cores
 from voicevox_engine.engine_manifest import load_manifest
-from voicevox_engine.preset.Preset import PresetManager
+from voicevox_engine.preset.preset_manager import PresetManager
 from voicevox_engine.setting.model import CorsPolicyMode
 from voicevox_engine.setting.setting_manager import USER_SETTING_PATH, SettingHandler
 from voicevox_engine.tts_pipeline.tts_engine import make_tts_engines_from_cores

diff --git a/test/e2e/conftest.py b/test/e2e/conftest.py
@@ -10,7 +10,7 @@
 from voicevox_engine.app.application import generate_app
 from voicevox_engine.core.core_initializer import initialize_cores
 from voicevox_engine.engine_manifest import load_manifest
-from voicevox_engine.preset.Preset import PresetManager
+from voicevox_engine.preset.preset_manager import PresetManager
 from voicevox_engine.setting.setting_manager import SettingHandler
 from voicevox_engine.tts_pipeline.tts_engine import make_tts_engines_from_cores
 from voicevox_engine.user_dict.user_dict_manager import (

diff --git a/test/preset/test_preset.py b/test/preset/test_preset.py
@@ -4,8 +4,8 @@
 
 import pytest
 
-from voicevox_engine.preset.Preset import (
-    Preset,
+from voicevox_engine.preset.model import Preset
+from voicevox_engine.preset.preset_manager import (
     PresetInputError,
     PresetInternalError,
     PresetManager,

diff --git a/voicevox_engine/app/application.py b/voicevox_engine/app/application.py
@@ -21,7 +21,7 @@
 from voicevox_engine.engine_manifest import EngineManifest
 from voicevox_engine.library.library_manager import LibraryManager
 from voicevox_engine.metas.MetasStore import MetasStore
-from voicevox_engine.preset.Preset import PresetManager
+from voicevox_engine.preset.preset_manager import PresetManager
 from voicevox_engine.setting.model import CorsPolicyMode
 from voicevox_engine.setting.setting_manager import SettingHandler
 from voicevox_engine.tts_pipeline.tts_engine import TTSEngineManager

diff --git a/voicevox_engine/app/routers/preset.py b/voicevox_engine/app/routers/preset.py
@@ -4,8 +4,8 @@
 
 from fastapi import APIRouter, Body, Depends, HTTPException, Query
 
-from voicevox_engine.preset.Preset import (
-    Preset,
+from voicevox_engine.preset.model import Preset
+from voicevox_engine.preset.preset_manager import (
     PresetInputError,
     PresetInternalError,
     PresetManager,

diff --git a/voicevox_engine/app/routers/tts_pipeline.py b/voicevox_engine/app/routers/tts_pipeline.py
@@ -17,7 +17,7 @@
 from voicevox_engine.core.core_initializer import CoreManager
 from voicevox_engine.metas.Metas import StyleId
 from voicevox_engine.model import AudioQuery
-from voicevox_engine.preset.Preset import (
+from voicevox_engine.preset.preset_manager import (
     PresetInputError,
     PresetInternalError,
     PresetManager,

diff --git a/voicevox_engine/preset/model.py b/voicevox_engine/preset/model.py
@@ -0,0 +1,25 @@
+"""
+プリセット機能に関して API と ENGINE 内部実装が共有するモデル
+「API と ENGINE 内部実装が共有するモデル」については `voicevox_engine/model.py` の module docstring を確認すること。
+"""
+
+from pydantic import BaseModel, Field
+
+from voicevox_engine.metas.Metas import StyleId
+
+
+class Preset(BaseModel):
+    """
+    プリセット情報
+    """
+
+    id: int = Field(title="プリセットID")
+    name: str = Field(title="プリセット名")
+    speaker_uuid: str = Field(title="話者のUUID")
+    style_id: StyleId = Field(title="スタイルID")
+    speedScale: float = Field(title="全体の話速")
+    pitchScale: float = Field(title="全体の音高")
+    intonationScale: float = Field(title="全体の抑揚")
+    volumeScale: float = Field(title="全体の音量")
+    prePhonemeLength: float = Field(title="音声の前の無音時間")
+    postPhonemeLength: float = Field(title="音声の後の無音時間")
diff --git a/voicevox_engine/preset/Preset.py → voicevox_engine/preset/preset_manager.py b/voicevox_engine/preset/Preset.py → voicevox_engine/preset/preset_manager.py
@@ -3,26 +3,9 @@
 from pathlib import Path
 
 import yaml
-from pydantic import BaseModel, Field, ValidationError, parse_obj_as
+from pydantic import ValidationError, parse_obj_as
 
-from voicevox_engine.metas.Metas import StyleId
-
-
-class Preset(BaseModel):
-    """
-    プリセット情報
-    """
-
-    id: int = Field(title="プリセットID")
-    name: str = Field(title="プリセット名")
-    speaker_uuid: str = Field(title="話者のUUID")
-    style_id: StyleId = Field(title="スタイルID")
-    speedScale: float = Field(title="全体の話速")
-    pitchScale: float = Field(title="全体の音高")
-    intonationScale: float = Field(title="全体の抑揚")
-    volumeScale: float = Field(title="全体の音量")
-    prePhonemeLength: float = Field(title="音声の前の無音時間")
-    postPhonemeLength: float = Field(title="音声の後の無音時間")
+from .model import Preset
 
 
 class PresetInputError(Exception):