From b87fb64deb0f750284dffb78b16ef470fd9d32ac Mon Sep 17 00:00:00 2001 From: Enno Hermann Date: Wed, 18 Oct 2023 11:47:22 +0200 Subject: [PATCH 1/2] fix(utils.manage): remove hard-coded model_type variable --- TTS/utils/manage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/TTS/utils/manage.py b/TTS/utils/manage.py index eef987efd4..8811f5658c 100644 --- a/TTS/utils/manage.py +++ b/TTS/utils/manage.py @@ -109,7 +109,6 @@ def _list_models(self, model_type, model_count=0): def _list_for_model_type(self, model_type): models_name_list = [] model_count = 1 - model_type = "tts_models" models_name_list.extend(self._list_models(model_type, model_count)) return models_name_list From 9e8da1a07eaee27b6f5d6aafb31674d31cb3b7c9 Mon Sep 17 00:00:00 2001 From: Enno Hermann Date: Wed, 18 Oct 2023 11:48:09 +0200 Subject: [PATCH 2/2] refactor(utils.manage): address lint issues, fix typos Addressed the following: TTS/utils/manage.py:307:12: R1705: Unnecessary "else" after "return" (no-else-return) TTS/utils/manage.py:308:21: W1514: Using open without explicitly specifying an encoding (unspecified-encoding) TTS/utils/manage.py:299:4: R1710: Either all return statements in a function should return an expression, or none of them should. (inconsistent-return-statements) TTS/utils/manage.py:299:4: R0201: Method could be a function (no-self-use) TTS/utils/manage.py:314:4: R0201: Method could be a function (no-self-use) --- TTS/utils/manage.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/TTS/utils/manage.py b/TTS/utils/manage.py index 8811f5658c..4eac0b72fc 100644 --- a/TTS/utils/manage.py +++ b/TTS/utils/manage.py @@ -297,22 +297,22 @@ def _set_model_item(self, model_name): model_item = self.set_model_url(model_item) return model_item, model_full_name, model, md5hash - def ask_tos(self, model_full_path): + @staticmethod + def ask_tos(model_full_path): """Ask the user to agree to the terms of service""" tos_path = os.path.join(model_full_path, "tos_agreed.txt") - if not os.path.exists(tos_path): - print(" > You must agree to the terms of service to use this model.") - print(" | > Please see the terms of service at https://coqui.ai/cpml.txt") - print(' | > "I have read, understood and agreed the Terms and Conditions." - [y/n]') - answer = input(" | | > ") - if answer.lower() == "y": - with open(tos_path, "w") as f: - f.write("I have read, understood ad agree the Terms and Conditions.") - return True - else: - return False + print(" > You must agree to the terms of service to use this model.") + print(" | > Please see the terms of service at https://coqui.ai/cpml.txt") + print(' | > "I have read, understood and agreed to the Terms and Conditions." - [y/n]') + answer = input(" | | > ") + if answer.lower() == "y": + with open(tos_path, "w", encoding="utf-8") as f: + f.write("I have read, understood and agreed to the Terms and Conditions.") + return True + return False - def tos_agreed(self, model_item, model_full_path): + @staticmethod + def tos_agreed(model_item, model_full_path): """Check if the user has agreed to the terms of service""" if "tos_required" in model_item and model_item["tos_required"]: tos_path = os.path.join(model_full_path, "tos_agreed.txt")