Skip to content

Commit

Permalink
Merge 3ca5320 into 3d8b1e4
Browse files Browse the repository at this point in the history
  • Loading branch information
tarepan committed May 22, 2024
2 parents 3d8b1e4 + 3ca5320 commit 44cfef9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.

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

26 changes: 9 additions & 17 deletions voicevox_engine/app/routers/speaker.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,15 @@ def generate_speaker_router(
router = APIRouter()

@router.get("/speakers", tags=["その他"])
def speakers(
core_version: str | None = None,
) -> list[Speaker]:
def speakers(core_version: str | None = None) -> list[Speaker]:
"""speaker情報の一覧を取得します。"""
speakers = metas_store.load_combined_metas(core_manager.get_core(core_version))
return filter_speakers_and_styles(speakers, "speaker")

@router.get("/speaker_info", tags=["その他"])
def speaker_info(
speaker_uuid: str,
core_version: str | None = None,
) -> SpeakerInfo:
def speaker_info(speaker_uuid: str, core_version: str | None = None) -> SpeakerInfo:
"""
指定されたspeaker_uuidに関する情報をjson形式で返します
指定されたspeaker_uuidのspeakerに関する情報をjson形式で返します
画像や音声はbase64エンコードされたものが返されます。
"""
return _speaker_info(
Expand Down Expand Up @@ -144,19 +140,15 @@ def _speaker_info(
return ret_data

@router.get("/singers", tags=["その他"])
def singers(
core_version: str | None = None,
) -> list[Speaker]:
def singers(core_version: str | None = None) -> list[Speaker]:
"""singer情報の一覧を取得します"""
singers = metas_store.load_combined_metas(core_manager.get_core(core_version))
return filter_speakers_and_styles(singers, "singer")

@router.get("/singer_info", tags=["その他"])
def singer_info(
speaker_uuid: str,
core_version: str | None = None,
) -> SpeakerInfo:
def singer_info(speaker_uuid: str, core_version: str | None = None) -> SpeakerInfo:
"""
指定されたspeaker_uuidに関する情報をjson形式で返します
指定されたspeaker_uuidのsingerに関する情報をjson形式で返します
画像や音声はbase64エンコードされたものが返されます。
"""
return _speaker_info(
Expand All @@ -171,7 +163,7 @@ def initialize_speaker(
skip_reinit: Annotated[
bool,
Query(
description="既に初期化済みのスタイルの再初期化をスキップするかどうか",
description="既に初期化済みのスタイルの再初期化をスキップするかどうか"
),
] = False,
core_version: str | None = None,
Expand Down

0 comments on commit 44cfef9

Please sign in to comment.