chore: mypy設定をstrictにする (#1580)

Author: Hiroshiba

mypy.ini

@@ -1,25 +1,7 @@
-# TODO: Review mypy settings
 # TODO: Move it to pyproject.toml after the review is done
 [mypy]
-check_untyped_defs = True
-disallow_any_decorated = False
-disallow_any_generics = False
-disallow_any_unimported = False
-disallow_incomplete_defs = True
-disallow_subclassing_any = True
-disallow_untyped_calls = True
-disallow_untyped_decorators = False
-disallow_untyped_defs = True
-ignore_errors = False
-ignore_missing_imports = True
-no_implicit_optional = True
+strict = True
 plugins = numpy.typing.mypy_plugin,pydantic.mypy
 python_version = 3.11
-show_error_codes = True
-strict_equality = True
-strict_optional = True
-warn_redundant_casts = True
-warn_return_any = True
+ignore_missing_imports = True
 warn_unreachable = True
-warn_unused_configs = True
-warn_unused_ignores = False

test/e2e/conftest.py

@@ -67,7 +67,7 @@ def app_params(tmp_path: Path) -> dict[str, Any]:
 
 
 @pytest.fixture()
-def app(app_params: dict) -> FastAPI:
+def app(app_params: dict[str, Any]) -> FastAPI:
     return generate_app(**app_params)
 
 

test/e2e/single_api/tts_pipeline/test_cancellable_synthesis.py

@@ -2,6 +2,8 @@
 /cancellable_synthesis API のテスト
 """
 
+from typing import Any
+
 import pytest
 from fastapi.testclient import TestClient
 from syrupy.assertion import SnapshotAssertion
@@ -13,7 +15,7 @@
 
 
 @pytest.fixture()
-def cancellable_client(app_params: dict) -> TestClient:
+def cancellable_client(app_params: dict[str, Any]) -> TestClient:
     app_params["cancellable_engine"] = CancellableEngine(
         init_processes=1,
         use_gpu=False,

test/e2e/test_disable_api.py

@@ -2,7 +2,7 @@
 APIを無効化するテスト
 """
 
-from typing import Literal
+from typing import Any, Literal
 
 from fastapi.testclient import TestClient
 
@@ -29,7 +29,7 @@ def _assert_request_and_response_403(
     assert response.status_code == 403, f"{method} {path} が403を返しませんでした"
 
 
-def test_disable_mutable_api(app_params: dict) -> None:
+def test_disable_mutable_api(app_params: dict[str, Any]) -> None:
     """エンジンの静的なデータを変更するAPIを無効化するテスト"""
     client = TestClient(generate_app(**app_params, disable_mutable_api=True))
 

test/unit/tts_pipeline/test_tts_engine.py

@@ -151,11 +151,11 @@ def test_update_pitch() -> None:
 
     # 空のリストでエラーを吐かないか
     # Inputs
-    phrases: list = []
+    phrases: list[AccentPhrase] = []
     # Outputs
     result = tts_engine.update_pitch(phrases, StyleId(1))
     # Expects
-    true_result: list = []
+    true_result: list[AccentPhrase] = []
     # Tests
     assert result == true_result
 

test/unit/user_dict/test_user_dict.py

@@ -5,10 +5,13 @@
 import pytest
 from pyopenjtalk import g2p, unset_user_dict
 
-from voicevox_engine.user_dict.model import UserDictWord, WordTypes
+from voicevox_engine.user_dict.model import (
+    USER_DICT_MAX_PRIORITY,
+    UserDictWord,
+    WordTypes,
+)
 from voicevox_engine.user_dict.user_dict_manager import UserDictionary
 from voicevox_engine.user_dict.user_dict_word import (
-    USER_DICT_MAX_PRIORITY,
     UserDictInputError,
     WordProperty,
     create_word,

test/utility.py

@@ -5,6 +5,7 @@
 import numpy as np
 import soundfile as sf
 from fastapi.encoders import jsonable_encoder
+from numpy.typing import NDArray
 
 
 def round_floats(value: Any, round_value: int) -> Any:
@@ -45,7 +46,7 @@ def to_hash(value: str) -> str:
 def summarize_big_ndarray(value: Any) -> Any:
     """要素数が100を超える NDArray を、ハッシュ値と shape からなる文字列へ要約する"""
 
-    def to_hash(value: np.ndarray) -> str:
+    def to_hash(value: NDArray[Any]) -> str:
         return "MD5:" + hashlib.md5(value.tobytes()).hexdigest()
 
     if isinstance(value, np.ndarray):

tools/merge_engine_manifest.py

@@ -10,16 +10,15 @@
 
 
 def merge_json_string(src: str, dst: str) -> str:
-    src_json: dict[str, JsonValue | dict[str, dict]] = json.loads(src)
-    dst_json: dict[str, JsonValue | dict[str, dict]] = json.loads(dst)
+    src_json: dict[str, JsonValue | dict[str, dict[str, JsonValue]]] = json.loads(src)
+    dst_json: dict[str, JsonValue | dict[str, dict[str, JsonValue]]] = json.loads(dst)
 
     for key, dst_value in dst_json.items():
         assert key in src_json, f"Key {key} is not found in src_json"
 
         # `manage_library` のみdictなので特別に処理
         if key == "supported_features":
             assert isinstance(dst_value, dict)
-
             src_value = src_json[key]
             assert isinstance(src_value, dict)
             src_value.update(dst_value)

voicevox_engine/app/routers/user_dict.py

@@ -6,14 +6,14 @@
 from pydantic import ValidationError
 from pydantic.json_schema import SkipJsonSchema
 
-from voicevox_engine.user_dict.model import UserDictWord, WordTypes
-from voicevox_engine.user_dict.user_dict_manager import UserDictionary
-from voicevox_engine.user_dict.user_dict_word import (
+from voicevox_engine.user_dict.model import (
     USER_DICT_MAX_PRIORITY,
     USER_DICT_MIN_PRIORITY,
-    UserDictInputError,
-    WordProperty,
+    UserDictWord,
+    WordTypes,
 )
+from voicevox_engine.user_dict.user_dict_manager import UserDictionary
+from voicevox_engine.user_dict.user_dict_word import UserDictInputError, WordProperty
 
 from ..dependencies import VerifyMutabilityAllowed