Merge branch 'master' into refactor/character_wide_wide

VOICEVOX · Jun 24, 2024 · 2dd8b4e · 2dd8b4e
2 parents df5b871 + 3c30f30
commit 2dd8b4e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/test/e2e/__snapshots__/test_openapi/test_OpenAPIの形が変わっていないことを確認.json b/test/e2e/__snapshots__/test_openapi/test_OpenAPIの形が変わっていないことを確認.json
diff --git a/voicevox_engine/metas/Metas.py b/voicevox_engine/metas/Metas.py
@@ -1,6 +1,5 @@
 """話者情報と話者メタ情報"""
 
-from enum import Enum
 from typing import Literal, NewType
 
 from pydantic import BaseModel, Field
@@ -31,20 +30,15 @@ class SpeakerStyle(BaseModel):
     )
 
 
-class SpeakerSupportPermittedSynthesisMorphing(str, Enum):
-    ALL = "ALL"  # 全て許可
-    SELF_ONLY = "SELF_ONLY"  # 同じ話者内でのみ許可
-    NOTHING = "NOTHING"  # 全て禁止
-
-
 class SpeakerSupportedFeatures(BaseModel):
     """
     話者の対応機能の情報
     """
 
-    permitted_synthesis_morphing: SpeakerSupportPermittedSynthesisMorphing = Field(
+    permitted_synthesis_morphing: Literal["ALL", "SELF_ONLY", "NOTHING"] = Field(
         title="モーフィング機能への対応",
-        default=SpeakerSupportPermittedSynthesisMorphing.ALL,
+        description="'ALL' は「全て許可」、'SELF_ONLY' は「同じ話者内でのみ許可」、'NOTHING' は「全て禁止」",
+        default="ALL",
     )
 
 

diff --git a/voicevox_engine/morphing/morphing.py b/voicevox_engine/morphing/morphing.py
@@ -16,7 +16,7 @@
 from voicevox_engine.morphing.model import MorphableTargetInfo
 
 from ..core.core_adapter import CoreAdapter
-from ..metas.Metas import SpeakerSupportPermittedSynthesisMorphing, StyleId
+from ..metas.Metas import StyleId
 from ..model import AudioQuery
 from ..tts_pipeline.tts_engine import TTSEngine
 
@@ -85,21 +85,18 @@ def is_morphable(
     morphable_2 = character_2.supported_features.permitted_synthesis_morphing
 
     # 禁止されている場合はFalse
-    if morphable_1 == SpeakerSupportPermittedSynthesisMorphing.NOTHING:
+    if morphable_1 == "NOTHING":
         return False
-    elif morphable_2 == SpeakerSupportPermittedSynthesisMorphing.NOTHING:
+    elif morphable_2 == "NOTHING":
         return False
     # 同一話者のみの場合は同一話者判定
-    elif morphable_1 == SpeakerSupportPermittedSynthesisMorphing.SELF_ONLY:
+    elif morphable_1 == "SELF_ONLY":
         return uuid_1 == uuid_2
-    elif morphable_2 == SpeakerSupportPermittedSynthesisMorphing.SELF_ONLY:
+    elif morphable_2 == "SELF_ONLY":
         return uuid_1 == uuid_2
 
     # 念のため許可されているかチェック
-    return (
-        morphable_1 == SpeakerSupportPermittedSynthesisMorphing.ALL
-        and morphable_2 == SpeakerSupportPermittedSynthesisMorphing.ALL
-    )
+    return morphable_1 == "ALL" and morphable_2 == "ALL"
 
 
 def synthesis_morphing_parameter(