[project-s] sing追加してデフォルトをtalkにする (#1030)

* sing追加してデフォルトをtalkにする * test
VOICEVOX · Jan 27, 2024 · 2b88ff2 · 2b88ff2
1 parent ea76515
commit 2b88ff2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/test/e2e/__snapshots__/test_openapi/test_OpenAPIの形が変わっていないことを確認.json b/test/e2e/__snapshots__/test_openapi/test_OpenAPIの形が変わっていないことを確認.json
@@ -725,10 +725,12 @@
             "type": "string"
           },
           "type": {
+            "default": "talk",
             "enum": [
               "talk",
               "humming",
-              "sing_teacher"
+              "sing_teacher",
+              "sing"
             ],
             "title": "モデルの種類",
             "type": "string"

diff --git a/test/e2e/__snapshots__/test_validate_speakers/test_fetch_speakers_success.json b/test/e2e/__snapshots__/test_validate_speakers/test_fetch_speakers_success.json
@@ -6,22 +6,22 @@
       {
         "id": 0,
         "name": "style0",
-        "type": null
+        "type": "talk"
       },
       {
         "id": 2,
         "name": "style1",
-        "type": null
+        "type": "talk"
       },
       {
         "id": 4,
         "name": "style2",
-        "type": null
+        "type": "talk"
       },
       {
         "id": 6,
         "name": "style3",
-        "type": null
+        "type": "talk"
       }
     ],
     "supported_features": {
@@ -36,22 +36,22 @@
       {
         "id": 1,
         "name": "style0",
-        "type": null
+        "type": "talk"
       },
       {
         "id": 3,
         "name": "style1",
-        "type": null
+        "type": "talk"
       },
       {
         "id": 5,
         "name": "style2",
-        "type": null
+        "type": "talk"
       },
       {
         "id": 7,
         "name": "style3",
-        "type": null
+        "type": "talk"
       }
     ],
     "supported_features": {
@@ -66,7 +66,7 @@
       {
         "id": 8,
         "name": "style0",
-        "type": null
+        "type": "talk"
       }
     ],
     "supported_features": {
@@ -81,7 +81,7 @@
       {
         "id": 9,
         "name": "style0",
-        "type": null
+        "type": "talk"
       }
     ],
     "supported_features": {

diff --git a/voicevox_engine/metas/Metas.py b/voicevox_engine/metas/Metas.py
@@ -6,7 +6,7 @@
 # NOTE: 循環importを防ぐためにとりあえずここに書いている
 # FIXME: 他のmodelに依存せず、全modelから参照できる場所に配置する
 StyleId = NewType("StyleId", int)
-StyleType = Literal["talk", "humming", "sing_teacher"]
+StyleType = Literal["talk", "humming", "sing_teacher", "sing"]
 
 
 class SpeakerStyle(BaseModel):
@@ -16,7 +16,7 @@ class SpeakerStyle(BaseModel):
 
     name: str = Field(title="スタイル名")
     id: StyleId = Field(title="スタイルID")
-    type: Optional[StyleType] = Field(title="モデルの種類")
+    type: Optional[StyleType] = Field(default="talk", title="モデルの種類")
 
 
 class SpeakerSupportPermittedSynthesisMorphing(str, Enum):