Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

追加:queryに無音時間調整関連のパラメータを作成 #1308

Merged
merged 35 commits into from
Jun 7, 2024
Merged

追加:queryに無音時間調整関連のパラメータを作成 #1308

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3643fe5
追加:絶対値か倍率かのフラグ
X-20A May 23, 2024
28cafba
追加:絶対値か倍率かのフラグ[is_pauseLengthUseScale]
X-20A May 23, 2024
f3c1e84
追加:絶対値か倍率かのフラグ[is_pauseLengthUseScale]
X-20A May 23, 2024
ed2d5e4
追加:絶対値か倍率かのフラグ[is_pauseLengthUseScale]
X-20A May 23, 2024
6e9843d
追加:絶対値か倍率かのフラグ[is_pauseLengthUseScale]
X-20A May 23, 2024
0c9654d
追加:絶対値か倍率かのフラグ[is_pauseLengthUseScale]
X-20A May 23, 2024
0d14296
追加:絶対値か倍率かのフラグ[is_pauseLengthUseScale]
X-20A May 23, 2024
9a4fba3
追加:絶対値か倍率かのフラグ[is_pauseLengthUseScale]
X-20A May 23, 2024
7a4d629
追加:絶対値か倍率かのフラグ[is_pauseLengthUseScale]
X-20A May 23, 2024
2a42719
Update tts_engine.py
X-20A May 23, 2024
de25a16
Update tts_engine.py
X-20A May 24, 2024
3670286
Update tts_engine.py
X-20A May 24, 2024
83e7b87
Update tts_engine.py
X-20A May 24, 2024
432fea2
Update tts_engine.py
X-20A May 24, 2024
a5c329e
Update tts_engine.py
X-20A May 24, 2024
3edd5e4
Update tts_engine.py
X-20A May 24, 2024
3454dea
Update tts_engine.py
X-20A May 24, 2024
6f0ff91
削除:isPauseLengthUseScale, isPauseLengthFixed
X-20A May 25, 2024
b825e36
削除:isPauseLengthUseScale, isPauseLengthFixed
X-20A May 25, 2024
c1f4751
削除:isPauseLengthUseScale, isPauseLengthFixed
X-20A May 25, 2024
5ba4beb
削除:isPauseLengthUseScale, isPauseLengthFixed
X-20A May 25, 2024
d4140c2
pauseLengthをNone許容
X-20A May 28, 2024
9eb99fb
pauseLengthをNone許容
X-20A May 28, 2024
dca9d42
片付け
X-20A Jun 6, 2024
b7f91db
片付け
X-20A Jun 6, 2024
3f58be8
片付け
X-20A Jun 6, 2024
806954e
片付け
X-20A Jun 6, 2024
484a34f
片付け
X-20A Jun 6, 2024
9b613e0
片付け
X-20A Jun 6, 2024
2410d3e
Apply suggestions from code review
Hiroshiba Jun 7, 2024
50ff096
テストをちょっと変更
Hiroshiba Jun 7, 2024
d7192fe
minimum追加
Hiroshiba Jun 7, 2024
21f7f9d
Merge remote-tracking branch 'upstream/master' into pr/X-20A/1308-1
Hiroshiba Jun 7, 2024
777674b
更新忘れ
Hiroshiba Jun 7, 2024
29f3ff5
「句読点などの無音時間」
Hiroshiba Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions presets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
volumeScale: 1
prePhonemeLength: 0.1
postPhonemeLength: 0.1
isPauseLengthUseScale: True
pauseLength: 0.3
isPauseLengthFixed: False
pauseLengthScale: 1
42 changes: 41 additions & 1 deletion test/e2e/__snapshots__/test_openapi/test_OpenAPIの形が変わっていないことを確認.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions test/e2e/single_api/morphing/test_synthesis_morphing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ def test_post_synthesis_morphing_200(client: TestClient) -> None:
"volumeScale": 1.0,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
"outputSamplingRate": 24000,
"outputStereo": False,
"kana": "テ'_スト",
Expand Down
4 changes: 4 additions & 0 deletions test/e2e/single_api/preset/__snapshots__/test_presets/test_get_presets_200.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion test/e2e/single_api/preset/__snapshots__/test_update_preset/test_post_update_preset_422.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions test/e2e/single_api/preset/test_add_preset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ def test_post_add_preset_200(
"volumeScale": 1,
"prePhonemeLength": 10,
"postPhonemeLength": 10,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
response = client.post("/add_preset", params={}, json=preset)
assert response.status_code == 200
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/single_api/preset/test_presets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@

def test_get_presets_200(client: TestClient, snapshot_json: SnapshotAssertion) -> None:
response = client.get("/presets")
print("snapshot", snapshot_json)
print("response", response.json())
Hiroshiba marked this conversation as resolved.
Show resolved Hide resolved
assert response.status_code == 200
assert snapshot_json == response.json()
8 changes: 8 additions & 0 deletions test/e2e/single_api/preset/test_update_preset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ def test_post_update_preset_200(
"volumeScale": 1,
"prePhonemeLength": 10,
"postPhonemeLength": 10,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
response = client.post("/update_preset", params={}, json=preset)
assert response.status_code == 200
Expand All @@ -40,6 +44,10 @@ def test_post_update_preset_422(
"volumeScale": 404,
"prePhonemeLength": 404,
"postPhonemeLength": 404,
"isPauseLengthUseScale": 404,
"pauseLength": 404,
"isPauseLengthFixed": 404,
"pauseLengthScale": 404,
}
response = client.post("/update_preset", params={}, json=preset)
assert response.status_code == 422
Expand Down
4 changes: 4 additions & 0 deletions ...e2e/single_api/tts_pipeline/__snapshots__/test_audio_query/test_post_audio_query_200.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions test/e2e/single_api/tts_pipeline/test_multi_synthesis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ def test_post_multi_synthesis_200(client: TestClient) -> None:
"volumeScale": 1.0,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
"outputSamplingRate": 24000,
"outputStereo": False,
"kana": "テ'_スト",
Expand All @@ -52,6 +56,10 @@ def test_post_multi_synthesis_200(client: TestClient) -> None:
"volumeScale": 1.0,
"prePhonemeLength": 0.2,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
"outputSamplingRate": 24000,
"outputStereo": False,
"kana": "テ'_ストト",
Expand Down
4 changes: 4 additions & 0 deletions test/e2e/single_api/tts_pipeline/test_synthesis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ def test_post_synthesis_200(client: TestClient, snapshot: SnapshotAssertion) ->
"volumeScale": 1.0,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
"outputSamplingRate": 24000,
"outputStereo": False,
"kana": "テ'_スト",
Expand Down
8 changes: 8 additions & 0 deletions test/preset/presets-test-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
volumeScale: 1
prePhonemeLength: 0.1
postPhonemeLength: 0.1
isPauseLengthUseScale: True
pauseLength: 0.3
isPauseLengthFixed: False
pauseLengthScale: 1.0

- id: 2
name: test2
Expand All @@ -19,3 +23,7 @@
volumeScale: 0.7
prePhonemeLength: 0.5
postPhonemeLength: 0.5
isPauseLengthUseScale: True
pauseLength: 0.3
isPauseLengthFixed: False
pauseLengthScale: 1.0
8 changes: 8 additions & 0 deletions test/preset/presets-test-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
volumeScale: 1
prePhonemeLength: 0.1
postPhonemeLength: 0.1
isPauseLengthUseScale: True
pauseLength: 0.3
isPauseLengthFixed: False
pauseLengthScale: 1.0

- id: 2
name: test2
Expand All @@ -19,3 +23,7 @@
volumeScale: 0.7
prePhonemeLength: 0.5
postPhonemeLength: 0.5
isPauseLengthUseScale: True
pauseLength: 0.3
isPauseLengthFixed: False
pauseLengthScale: 1.0
8 changes: 8 additions & 0 deletions test/preset/presets-test-3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
volumeScale: 1
prePhonemeLength: 0.1
postPhonemeLength: 0.1
isPauseLengthUseScale: True
pauseLength: 0.3
isPauseLengthFixed: False
pauseLengthScale: 1.0

- id: 1
name: test2
Expand All @@ -19,3 +23,7 @@
volumeScale: 0.7
prePhonemeLength: 0.5
postPhonemeLength: 0.5
isPauseLengthUseScale: True
pauseLength: 0.3
isPauseLengthFixed: False
pauseLengthScale: 1.0
36 changes: 36 additions & 0 deletions test/preset/test_preset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ def test_add_preset(self) -> None:
"volumeScale": 1,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
)
id = preset_manager.add_preset(preset)
Expand Down Expand Up @@ -106,6 +110,10 @@ def test_add_preset_load_failure(self) -> None:
"volumeScale": 0,
"prePhonemeLength": 0,
"postPhonemeLength": 0,
"isPauseLengthUseScale": True,
"pauseLength": 0,
"isPauseLengthFixed": False,
"pauseLengthScale": 0,
}
)
)
Expand All @@ -126,6 +134,10 @@ def test_add_preset_conflict_id(self) -> None:
"volumeScale": 1,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
)
id = preset_manager.add_preset(preset)
Expand All @@ -152,6 +164,10 @@ def test_add_preset_conflict_id2(self) -> None:
"volumeScale": 1,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
)
id = preset_manager.add_preset(preset)
Expand All @@ -178,6 +194,10 @@ def test_add_preset_write_failure(self) -> None:
"volumeScale": 1,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
)
preset_manager.load_presets()
Expand Down Expand Up @@ -206,6 +226,10 @@ def test_update_preset(self) -> None:
"volumeScale": 1,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
)
id = preset_manager.update_preset(preset)
Expand Down Expand Up @@ -234,6 +258,10 @@ def test_update_preset_load_failure(self) -> None:
"volumeScale": 0,
"prePhonemeLength": 0,
"postPhonemeLength": 0,
"isPauseLengthUseScale": True,
"pauseLength": 0,
"isPauseLengthFixed": False,
"pauseLengthScale": 0,
}
)
)
Expand All @@ -254,6 +282,10 @@ def test_update_preset_not_found(self) -> None:
"volumeScale": 1,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
)
with self.assertRaises(
Expand All @@ -279,6 +311,10 @@ def test_update_preset_write_failure(self) -> None:
"volumeScale": 1,
"prePhonemeLength": 0.1,
"postPhonemeLength": 0.1,
"isPauseLengthUseScale": True,
"pauseLength": 0.3,
"isPauseLengthFixed": False,
"pauseLengthScale": 1.0,
}
)
preset_manager.load_presets()
Expand Down
4 changes: 4 additions & 0 deletions test/test_mock_tts_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ def test_synthesize_wave(self) -> None:
volumeScale=1,
prePhonemeLength=0.1,
postPhonemeLength=0.1,
isPauseLengthUseScale=True,
pauseLength=0.3,
isPauseLengthFixed=False,
pauseLengthScale=1.0,
outputSamplingRate=24000,
outputStereo=False,
kana=create_kana(self.accent_phrases_hello_hiho),
Expand Down
Loading