Skip to content

chore: pyopenjtalk を最新版に更新（API変更対応） #1640

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

Merged
Hiroshiba merged 4 commits into from
Apr 23, 2025
Merged

chore: pyopenjtalk を最新版に更新（API変更対応） #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6423634
chore(dependencies): pyopenjtalk のバージョンと依存関係を更新
Hiroshiba Apr 23, 2025
ea178ac
Apply suggestions from code review
Hiroshiba Apr 23, 2025
6761e1e
chore(dependencies): pyopenjtalk のリポジトリ URL を修正
Hiroshiba Apr 23, 2025
0d25bb5
chore(lock): poetry.lock のコンテンツハッシュを更新
Hiroshiba Apr 23, 2025
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
27 changes: 7 additions & 20 deletions poetry.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ uvicorn = "^0.34.0"
soundfile = "^0.13.1"
pyyaml = "^6.0.1"
pyworld = "^0.3.5"
pyopenjtalk = { git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "5b70b94f3460ece07ea183227db088ce8d5212a6" }
pyopenjtalk = { git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "74703b034dd90a1f199f49bb70bf3b66b1728a86" }
semver = "^3.0.0"
platformdirs = "^4.2.0"
soxr = "^0.5.0"
Expand Down
3 changes: 1 addition & 2 deletions requirements-build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@ pydantic-core==2.27.2 ; python_version == "3.11"
pydantic==2.10.6 ; python_version == "3.11"
pyinstaller-hooks-contrib==2025.1 ; python_version == "3.11"
pyinstaller==5.13.2 ; python_version == "3.11"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@5b70b94f3460ece07ea183227db088ce8d5212a6 ; python_version == "3.11"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@74703b034dd90a1f199f49bb70bf3b66b1728a86 ; python_version == "3.11"
python-multipart==0.0.20 ; python_version == "3.11"
pywin32-ctypes==0.2.3 ; python_version == "3.11" and sys_platform == "win32"
pyworld==0.3.5 ; python_version == "3.11"
pyyaml==6.0.2 ; python_version == "3.11"
semver==3.0.4 ; python_version == "3.11"
setuptools==75.8.0 ; python_version == "3.11"
six==1.17.0 ; python_version == "3.11"
sniffio==1.3.1 ; python_version == "3.11"
soundfile==0.13.1 ; python_version == "3.11"
soxr==0.5.0.post1 ; python_version == "3.11"
Expand Down
3 changes: 1 addition & 2 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pycparser==2.22 ; python_version == "3.11"
pydantic-core==2.27.2 ; python_version == "3.11"
pydantic==2.10.6 ; python_version == "3.11"
pygments==2.19.1 ; python_version == "3.11"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@5b70b94f3460ece07ea183227db088ce8d5212a6 ; python_version == "3.11"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@74703b034dd90a1f199f49bb70bf3b66b1728a86 ; python_version == "3.11"
pyparsing==3.2.1 ; python_version == "3.11"
pyproject-hooks==1.2.0 ; python_version == "3.11"
pytest==8.3.4 ; python_version == "3.11"
Expand All @@ -85,7 +85,6 @@ ruff==0.11.1 ; python_version == "3.11"
secretstorage==3.3.3 ; python_version == "3.11" and sys_platform == "linux"
semver==3.0.4 ; python_version == "3.11"
shellingham==1.5.4 ; python_version == "3.11"
six==1.17.0 ; python_version == "3.11"
sniffio==1.3.1 ; python_version == "3.11"
sortedcontainers==2.4.0 ; python_version == "3.11"
soundfile==0.13.1 ; python_version == "3.11"
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ platformdirs==4.3.6 ; python_version == "3.11"
pycparser==2.22 ; python_version == "3.11"
pydantic-core==2.27.2 ; python_version == "3.11"
pydantic==2.10.6 ; python_version == "3.11"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@5b70b94f3460ece07ea183227db088ce8d5212a6 ; python_version == "3.11"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@74703b034dd90a1f199f49bb70bf3b66b1728a86 ; python_version == "3.11"
python-multipart==0.0.20 ; python_version == "3.11"
pyworld==0.3.5 ; python_version == "3.11"
pyyaml==6.0.2 ; python_version == "3.11"
semver==3.0.4 ; python_version == "3.11"
six==1.17.0 ; python_version == "3.11"
sniffio==1.3.1 ; python_version == "3.11"
soundfile==0.13.1 ; python_version == "3.11"
soxr==0.5.0.post1 ; python_version == "3.11"
Expand Down
4 changes: 2 additions & 2 deletions voicevox_engine/user_dict/user_dict_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ def update_dict(self) -> None:
tmp_csv_path.write_text(csv_text, encoding="utf-8")

# 辞書.csvをOpenJTalk用にコンパイル
pyopenjtalk.create_user_dict(str(tmp_csv_path), str(tmp_compiled_path))
pyopenjtalk.mecab_dict_index(str(tmp_csv_path), str(tmp_compiled_path))
if not tmp_compiled_path.is_file():
raise RuntimeError("辞書のコンパイル時にエラーが発生しました。")

# コンパイル済み辞書の読み込み
pyopenjtalk.set_user_dict(
pyopenjtalk.update_global_jtalk_with_user_dict(
str(tmp_compiled_path.resolve(strict=True))
) # NOTE: resolveによりコンパイル実行時でも相対パスを正しく認識できる

Expand Down