Skip to content
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.

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

run.py: __main__実装をmain関数スコープに移動させる #761

Merged
merged 4 commits into from
Oct 9, 2023

Conversation

aoirint
Copy link
Member

@aoirint aoirint commented Oct 9, 2023

内容

の実装です。

run.pyif __name__ == "__main__":以下の実装を、新しく追加したmain関数に移動させます。

generate_app関数内でグローバルスコープ変数(run.pyのファイルスコープ変数)を参照することを防ぎ、run.py以外のテストなどからgenerate_appが呼び出された際の不具合を防ぎます。

関連 Issue

スクリーンショット・動画など

その他

default_cors_policy_mode変数の削除について

もともと未使用変数だったため削除しました。引数--cors_policy_modeが指定されなかった場合、リポジトリのdefault_setting.ymlに記述されたlocalappsが使用されます。

generate_app関数内のenable_cancellable_synthesis判定について

generate_app関数にenable_cancellable_synthesis: bool引数を追加する代わりに、cancellable_engine: CancellableEngine | None引数を追加して、is not Noneで判定するようにしました。

Cancellable Engineを有効化するコマンド例(Windows)

poetry run python run.py --voicevox_dir "$HOME/AppData/Local/Programs/VOICEVOX" --enable_cancellable_synthesis --init_processes 2

@aoirint aoirint requested a review from a team as a code owner October 9, 2023 03:51
@aoirint aoirint requested review from y-chan and removed request for a team October 9, 2023 03:51
@aoirint aoirint changed the title run.py: __main__実装をmain関数スコープに移動させる run.py: __main__実装をmain関数スコープに移動させる Oct 9, 2023
@github-actions
Copy link

github-actions bot commented Oct 9, 2023

Coverage Result

Resultを開く
Name Stmts Miss Cover
run.py 446 298 coverage-33%
voicevox_engine/init.py 1 0 coverage-100%
voicevox_engine/acoustic_feature_extractor.py 75 0 coverage-100%
voicevox_engine/cancellable_engine.py 85 66 coverage-22%
voicevox_engine/dev/core/init.py 2 0 coverage-100%
voicevox_engine/dev/core/mock.py 27 12 coverage-56%
voicevox_engine/dev/synthesis_engine/init.py 2 0 coverage-100%
voicevox_engine/dev/synthesis_engine/mock.py 36 2 coverage-94%
voicevox_engine/downloadable_library.py 93 5 coverage-95%
voicevox_engine/engine_manifest/EngineManifest.py 34 0 coverage-100%
voicevox_engine/engine_manifest/EngineManifestLoader.py 12 0 coverage-100%
voicevox_engine/engine_manifest/init.py 3 0 coverage-100%
voicevox_engine/full_context_label.py 162 3 coverage-98%
voicevox_engine/kana_parser.py 86 1 coverage-99%
voicevox_engine/metas/Metas.py 33 0 coverage-100%
voicevox_engine/metas/MetasStore.py 29 12 coverage-59%
voicevox_engine/metas/init.py 2 0 coverage-100%
voicevox_engine/model.py 160 9 coverage-94%
voicevox_engine/mora_list.py 4 0 coverage-100%
voicevox_engine/morphing.py 70 46 coverage-34%
voicevox_engine/part_of_speech_data.py 5 0 coverage-100%
voicevox_engine/preset/Preset.py 12 0 coverage-100%
voicevox_engine/preset/PresetError.py 2 0 coverage-100%
voicevox_engine/preset/PresetManager.py 81 2 coverage-98%
voicevox_engine/preset/init.py 4 0 coverage-100%
voicevox_engine/setting/Setting.py 11 0 coverage-100%
voicevox_engine/setting/SettingLoader.py 19 0 coverage-100%
voicevox_engine/setting/init.py 3 0 coverage-100%
voicevox_engine/synthesis_engine/init.py 5 0 coverage-100%
voicevox_engine/synthesis_engine/core_wrapper.py 201 146 coverage-27%
voicevox_engine/synthesis_engine/make_synthesis_engines.py 59 30 coverage-49%
voicevox_engine/synthesis_engine/synthesis_engine.py 130 11 coverage-92%
voicevox_engine/synthesis_engine/synthesis_engine_base.py 67 9 coverage-87%
voicevox_engine/user_dict.py 144 11 coverage-92%
voicevox_engine/utility/init.py 5 0 coverage-100%
voicevox_engine/utility/connect_base64_waves.py 37 0 coverage-100%
voicevox_engine/utility/core_version_utility.py 8 1 coverage-88%
voicevox_engine/utility/mutex_utility.py 10 0 coverage-100%
voicevox_engine/utility/path_utility.py 26 8 coverage-69%
TOTAL 2191 672 coverage-69%

Copy link
Member

@Hiroshiba Hiroshiba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!!

思っていたよりずっと分離できていたんだな〜と感じました!すごい。

@Hiroshiba Hiroshiba removed the request for review from y-chan October 9, 2023 04:42
@Hiroshiba Hiroshiba merged commit 5ca4c30 into VOICEVOX:master Oct 9, 2023
3 checks passed
@aoirint aoirint deleted the patch-main_script_function_scope branch October 9, 2023 05:05
takana-v pushed a commit to voicevox-bridge/bridge-plugin that referenced this pull request Nov 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

run.py__main__実装を関数スコープにしたい
2 participants