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.

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

ENH: pydanticをv2へ #1184

Merged
merged 7 commits into from
Jun 10, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
FIX: 変数名
sabonerune committed Jun 6, 2024
commit 6062ef6ea5a2d66612bd5ebbc815de4f1456a460
6 changes: 3 additions & 3 deletions test/e2e/test_speakers.py
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

from voicevox_engine.metas.Metas import Speaker

_adapter = TypeAdapter(list[Speaker])
_speaker_list_adapter = TypeAdapter(list[Speaker])


def test_話者一覧が取得できる(
@@ -25,7 +25,7 @@ def test_話者一覧が取得できる(
def test_話者の情報を取得できる(
client: TestClient, snapshot_json: SnapshotAssertion
) -> None:
speakers = _adapter.validate_python(client.get("/speakers").json())
speakers = _speaker_list_adapter.validate_python(client.get("/speakers").json())
for speaker in speakers:
response = client.get(
"/speaker_info", params={"speaker_uuid": speaker.speaker_uuid}
@@ -46,7 +46,7 @@ def test_歌手一覧が取得できる(
def test_歌手の情報を取得できる(
client: TestClient, snapshot_json: SnapshotAssertion
) -> None:
singers = _adapter.validate_python(client.get("/singers").json())
singers = _speaker_list_adapter.validate_python(client.get("/singers").json())
for singer in singers:
response = client.get(
"/singer_info", params={"speaker_uuid": singer.speaker_uuid}
4 changes: 2 additions & 2 deletions voicevox_engine/app/routers/speaker.py
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ def speaker_info(
core_version=core_version,
)

_adapter = TypeAdapter(list[Speaker])
_speaker_list_adapter = TypeAdapter(list[Speaker])

# FIXME: この関数をどこかに切り出す
def _speaker_info(
@@ -78,7 +78,7 @@ def _speaker_info(
# ...

# 該当話者を検索する
speakers = _adapter.validate_python(
speakers = _speaker_list_adapter.validate_python(
core_manager.get_core(core_version).speakers, from_attributes=True
)
speakers = filter_speakers_and_styles(speakers, speaker_or_singer)
4 changes: 2 additions & 2 deletions voicevox_engine/preset/preset_manager.py
Original file line number Diff line number Diff line change
@@ -52,8 +52,8 @@ def _refresh_cache(self) -> None:
if obj is None:
raise PresetInternalError("プリセットの設定ファイルが空の内容です")
try:
adapter = TypeAdapter(list[Preset])
_presets = adapter.validate_python(obj)
preset_list_adapter = TypeAdapter(list[Preset])
_presets = preset_list_adapter.validate_python(obj)
except ValidationError:
raise PresetInternalError("プリセットの設定ファイルにミスがあります")