非推奨化されたdistutils.versionへの依存をなくし、python-semverに移行する (#609)

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
voicevox-bridge · Sep 17, 2023 · df01f98 · df01f98
1 parent 32d6c5d
commit df01f98
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 6 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -53,6 +53,7 @@ requests = "^2.28.1"
 jinja2 = "^3.1.2"
 pyopenjtalk = {git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "f4ade29ef9a4f43d8605103cb5bacc29e0b2ccae"}
 espnet = {git = "https://github.com/voicevox-bridge/espnet", rev = "d7633eb0eec9b00646847abdee3d34e5a62d2dea"}
+semver = "^3.0.1"
 
 [tool.poetry.group.dev.dependencies]
 cython = "^0.29.24"

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -91,6 +91,7 @@ resampy==0.4.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
 scikit-learn==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
 scipy==1.7.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
 secretstorage==3.3.3 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "linux"
+semver==3.0.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
 sentencepiece==0.1.97 ; python_full_version >= "3.8.1" and python_version < "3.9"
 setuptools==65.6.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
 shellingham==1.5.0.post1 ; python_full_version >= "3.8.1" and python_version < "3.9"

diff --git a/requirements-license.txt b/requirements-license.txt
@@ -58,6 +58,7 @@ requests==2.28.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
 resampy==0.4.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
 scikit-learn==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
 scipy==1.7.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
+semver==3.0.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
 sentencepiece==0.1.97 ; python_full_version >= "3.8.1" and python_version < "3.9"
 setuptools==65.6.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
 six==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.9"

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -81,6 +81,7 @@ requests==2.28.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
 resampy==0.4.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
 scikit-learn==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
 scipy==1.7.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
+semver==3.0.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
 sentencepiece==0.1.97 ; python_full_version >= "3.8.1" and python_version < "3.9"
 setuptools==65.6.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
 six==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.9"

diff --git a/requirements.txt b/requirements.txt
@@ -56,6 +56,7 @@ requests==2.28.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
 resampy==0.4.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
 scikit-learn==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
 scipy==1.7.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
+semver==3.0.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
 sentencepiece==0.1.97 ; python_full_version >= "3.8.1" and python_version < "3.9"
 setuptools==65.6.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
 six==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.9"

diff --git a/run.py b/run.py
@@ -8,7 +8,6 @@
 import sys
 import traceback
 import zipfile
-from distutils.version import LooseVersion
 from io import BytesIO, TextIOWrapper
 from pathlib import Path
 from tempfile import NamedTemporaryFile, TemporaryFile
@@ -68,6 +67,7 @@
     connect_base64_waves,
     delete_file,
     engine_root,
+    get_latest_core_version,
     get_save_dir,
 )
 
@@ -1143,7 +1143,7 @@ def setting_post(
         bridge_config_loader=bridge_config_loader,
     )
     assert len(synthesis_engines) != 0, "音声合成エンジンがありません。"
-    latest_core_version = str(max([LooseVersion(ver) for ver in synthesis_engines]))
+    latest_core_version = get_latest_core_version(versions=synthesis_engines.keys())
 
     cancellable_engine = None
 

diff --git a/test/test_core_version_utility.py b/test/test_core_version_utility.py
@@ -0,0 +1,40 @@
+from unittest import TestCase
+
+from voicevox_engine.utility import get_latest_core_version, parse_core_version
+
+
+class TestCoreVersion(TestCase):
+    def test_parse_core_version(self):
+        parse_core_version("0.0.0")
+        parse_core_version("0.1.0")
+        parse_core_version("0.10.0")
+        parse_core_version("0.10.0-preview.1")
+        parse_core_version("0.14.0")
+        parse_core_version("0.14.0-preview.1")
+        parse_core_version("0.14.0-preview.10")
+
+    def test_get_latest_core_version(self):
+        self.assertEqual(
+            get_latest_core_version(
+                versions=[
+                    "0.0.0",
+                    "0.1.0",
+                    "0.10.0",
+                    "0.10.0-preview.1",
+                    "0.14.0",
+                    "0.14.0-preview.1",
+                    "0.14.0-preview.10",
+                ]
+            ),
+            "0.14.0",
+        )
+
+        self.assertEqual(
+            get_latest_core_version(
+                versions=[
+                    "0.14.0",
+                    "0.15.0-preview.1",
+                ]
+            ),
+            "0.15.0-preview.1",
+        )
diff --git a/voicevox_engine/cancellable_engine.py b/voicevox_engine/cancellable_engine.py
@@ -1,7 +1,6 @@
 import argparse
 import asyncio
 import queue
-from distutils.version import LooseVersion
 from multiprocessing import Pipe, Process
 from multiprocessing.connection import Connection
 from tempfile import NamedTemporaryFile
@@ -14,6 +13,7 @@
 
 from .model import AudioQuery
 from .synthesis_engine import make_synthesis_engines
+from .utility import get_latest_core_version
 
 
 class CancellableEngine:
@@ -197,7 +197,7 @@ def start_synthesis_subprocess(
         enable_mock=args.enable_mock,
     )
     assert len(synthesis_engines) != 0, "音声合成エンジンがありません。"
-    latest_core_version = str(max([LooseVersion(ver) for ver in synthesis_engines]))
+    latest_core_version = get_latest_core_version(versions=synthesis_engines.keys())
     while True:
         try:
             query, speaker_id, core_version = sub_proc_con.recv()

diff --git a/voicevox_engine/utility/__init__.py b/voicevox_engine/utility/__init__.py
@@ -3,6 +3,7 @@
     connect_base64_waves,
     decode_base64_waves,
 )
+from .core_version_utility import get_latest_core_version, parse_core_version
 from .mutex_utility import mutex_wrapper
 from .path_utility import delete_file, engine_root
 from .save_dir import get_save_dir
@@ -11,6 +12,8 @@
     "ConnectBase64WavesException",
     "connect_base64_waves",
     "decode_base64_waves",
+    "get_latest_core_version",
+    "parse_core_version",
     "delete_file",
     "engine_root",
     "get_save_dir",

diff --git a/voicevox_engine/utility/core_version_utility.py b/voicevox_engine/utility/core_version_utility.py
@@ -0,0 +1,14 @@
+from typing import Iterable
+
+from semver.version import Version
+
+
+def parse_core_version(version: str) -> Version:
+    return Version.parse(version)
+
+
+def get_latest_core_version(versions: Iterable[str]) -> str:
+    if len(versions) == 0:
+        raise Exception("versions must be non-empty.")
+
+    return str(max(map(parse_core_version, versions)))