From 64236348625a24d81a628a70258b2efc972523d3 Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Thu, 24 Apr 2025 01:50:26 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore(dependencies):=20pyopenjtalk=20?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=A8?= =?UTF-8?q?=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 29 +++++-------------- pyproject.toml | 2 +- requirements-build.txt | 3 +- requirements-dev.txt | 3 +- requirements.txt | 3 +- .../user_dict/user_dict_manager.py | 4 +-- 6 files changed, 14 insertions(+), 30 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3ec3d4e82..881ecb864 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1892,30 +1892,29 @@ setuptools = ">=42.0.0" [[package]] name = "pyopenjtalk" -version = "0.3.2+5b70b94" +version = "0.1.dev251+g74703b0" description = "A python wrapper for OpenJTalk" optional = false -python-versions = "*" +python-versions = ">=3.8" groups = ["main"] files = [] develop = false [package.dependencies] numpy = ">=1.20.0" -six = "*" tqdm = "*" [package.extras] -dev = ["black (>=19.19b0,<=20.8)", "click (<8.1.0)", "cython (>=0.21.0,<3.0.0)", "flake8 (>=3.7,<4)", "flake8-bugbear", "importlib-metadata (<5.0)", "isort (>=4.3,<5.2.0)", "mypy (<=0.910)", "pysen", "types-decorator", "types-setuptools"] -docs = ["Jinja2 (>=3.0.1)", "ipython", "jupyter", "nbsphinx (>=0.8.6)", "pandoc", "sphinx-rtd-theme"] +dev = ["black (>=19.19b0,<=20.8)", "click (<8.1.0)", "cython (>=0.29.16)", "flake8 (>=3.7,<4)", "flake8-bugbear", "importlib-metadata (<5.0)", "isort (>=4.3,<5.2.0)", "mypy (<=0.910)", "pysen", "types-decorator", "types-setuptools"] +docs = ["Jinja2 (>=3.0.1)", "ipython", "jupyter", "nbsphinx (>=0.8.6)", "pandoc", "sphinx_rtd_theme"] marine = ["marine (>=0.0.5)"] test = ["pytest", "scipy"] [package.source] type = "git" -url = "https://github.com/VOICEVOX/pyopenjtalk" -reference = "5b70b94f3460ece07ea183227db088ce8d5212a6" -resolved_reference = "5b70b94f3460ece07ea183227db088ce8d5212a6" +url = "https://github.com/VOICEVOX/pyopenjtalk.git" +reference = "74703b034dd90a1f199f49bb70bf3b66b1728a86" +resolved_reference = "74703b034dd90a1f199f49bb70bf3b66b1728a86" [[package]] name = "pyparsing" @@ -2328,18 +2327,6 @@ files = [ {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"}, ] -[[package]] -name = "six" -version = "1.17.0" -description = "Python 2 and 3 compatibility utilities" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" -groups = ["main"] -files = [ - {file = "six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"}, - {file = "six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"}, -] - [[package]] name = "sniffio" version = "1.3.1" @@ -2894,4 +2881,4 @@ cffi = ["cffi (>=1.11)"] [metadata] lock-version = "2.1" python-versions = "~3.11" -content-hash = "533861a126da1e334ab157d7edf21bb78efff4a0a105a888e5b2e22093ca593b" +content-hash = "15919cc4ae4b6313fde4a0f7588645a3e52d69cdc845cffeece92de904806098" diff --git a/pyproject.toml b/pyproject.toml index 88eb99f9a..3061460a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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.git", rev = "74703b034dd90a1f199f49bb70bf3b66b1728a86"} semver = "^3.0.0" platformdirs = "^4.2.0" soxr = "^0.5.0" diff --git a/requirements-build.txt b/requirements-build.txt index c4f6a34c1..15d6f43cc 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -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.git@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" diff --git a/requirements-dev.txt b/requirements-dev.txt index af442fe6c..6e4cf8958 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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.git@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" @@ -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" diff --git a/requirements.txt b/requirements.txt index 6acf4bc26..c52b6a5b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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.git@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" diff --git a/voicevox_engine/user_dict/user_dict_manager.py b/voicevox_engine/user_dict/user_dict_manager.py index 2559e60ee..f1d5c4d52 100644 --- a/voicevox_engine/user_dict/user_dict_manager.py +++ b/voicevox_engine/user_dict/user_dict_manager.py @@ -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によりコンパイル実行時でも相対パスを正しく認識できる From ea178acc0db47cd60306edee170a43b963749e38 Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Thu, 24 Apr 2025 01:57:24 +0900 Subject: [PATCH 2/4] Apply suggestions from code review --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3061460a4..c433a298f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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.git", rev = "74703b034dd90a1f199f49bb70bf3b66b1728a86"} +pyopenjtalk = { git = "https://github.com/VOICEVOX/pyopenjtalk.git", rev = "74703b034dd90a1f199f49bb70bf3b66b1728a86" } semver = "^3.0.0" platformdirs = "^4.2.0" soxr = "^0.5.0" From 6761e1e78789189e6ebfdcca6838f1c0f8307c89 Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Thu, 24 Apr 2025 01:58:51 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore(dependencies):=20pyopenjtalk=20?= =?UTF-8?q?=E3=81=AE=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88=E3=83=AA=20URL=20?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 2 +- pyproject.toml | 2 +- requirements-build.txt | 2 +- requirements-dev.txt | 2 +- requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 881ecb864..588e35200 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1912,7 +1912,7 @@ test = ["pytest", "scipy"] [package.source] type = "git" -url = "https://github.com/VOICEVOX/pyopenjtalk.git" +url = "https://github.com/VOICEVOX/pyopenjtalk" reference = "74703b034dd90a1f199f49bb70bf3b66b1728a86" resolved_reference = "74703b034dd90a1f199f49bb70bf3b66b1728a86" diff --git a/pyproject.toml b/pyproject.toml index c433a298f..1efcdc7ab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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.git", rev = "74703b034dd90a1f199f49bb70bf3b66b1728a86" } +pyopenjtalk = { git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "74703b034dd90a1f199f49bb70bf3b66b1728a86" } semver = "^3.0.0" platformdirs = "^4.2.0" soxr = "^0.5.0" diff --git a/requirements-build.txt b/requirements-build.txt index 15d6f43cc..1b5185959 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -19,7 +19,7 @@ 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.git@74703b034dd90a1f199f49bb70bf3b66b1728a86 ; 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" diff --git a/requirements-dev.txt b/requirements-dev.txt index 6e4cf8958..f0dfed375 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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.git@74703b034dd90a1f199f49bb70bf3b66b1728a86 ; 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" diff --git a/requirements.txt b/requirements.txt index c52b6a5b6..18fff6213 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ 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.git@74703b034dd90a1f199f49bb70bf3b66b1728a86 ; 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" From 0d25bb59120489a2d6fa0f3b826ae37d7f5299bb Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Thu, 24 Apr 2025 02:01:56 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore(lock):=20poetry.lock=20=E3=81=AE?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=86=E3=83=B3=E3=83=84=E3=83=8F=E3=83=83?= =?UTF-8?q?=E3=82=B7=E3=83=A5=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 588e35200..0296b7385 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2881,4 +2881,4 @@ cffi = ["cffi (>=1.11)"] [metadata] lock-version = "2.1" python-versions = "~3.11" -content-hash = "15919cc4ae4b6313fde4a0f7588645a3e52d69cdc845cffeece92de904806098" +content-hash = "07ef5e53b2b3162eeab5522fe153554da6c94a73deac89aa5923b97f3d8a4af5"