From 0d6a9cdc4ee70697de017177ae4f6e677ab29ace Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Sun, 28 Jan 2024 06:04:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?sing=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=82=92talk?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- voicevox_engine/metas/Metas.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/voicevox_engine/metas/Metas.py b/voicevox_engine/metas/Metas.py index 39c45cb64..2d79c263a 100644 --- 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): From 2de2be187a813068a9cba415c2b711e509b18f30 Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Sun, 28 Jan 2024 06:18:41 +0900 Subject: [PATCH 2/2] test --- ...\343\202\222\347\242\272\350\252\215.json" | 4 +++- .../test_fetch_speakers_success.json | 20 +++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git "a/test/e2e/__snapshots__/test_openapi/test_OpenAPI\343\201\256\345\275\242\343\201\214\345\244\211\343\202\217\343\201\243\343\201\246\343\201\204\343\201\252\343\201\204\343\201\223\343\201\250\343\202\222\347\242\272\350\252\215.json" "b/test/e2e/__snapshots__/test_openapi/test_OpenAPI\343\201\256\345\275\242\343\201\214\345\244\211\343\202\217\343\201\243\343\201\246\343\201\204\343\201\252\343\201\204\343\201\223\343\201\250\343\202\222\347\242\272\350\252\215.json" index adee912c3..c8f168a31 100644 --- "a/test/e2e/__snapshots__/test_openapi/test_OpenAPI\343\201\256\345\275\242\343\201\214\345\244\211\343\202\217\343\201\243\343\201\246\343\201\204\343\201\252\343\201\204\343\201\223\343\201\250\343\202\222\347\242\272\350\252\215.json" +++ "b/test/e2e/__snapshots__/test_openapi/test_OpenAPI\343\201\256\345\275\242\343\201\214\345\244\211\343\202\217\343\201\243\343\201\246\343\201\204\343\201\252\343\201\204\343\201\223\343\201\250\343\202\222\347\242\272\350\252\215.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 index 9464bec39..fba38bc61 100644 --- 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": {