fix(log): utils log cannot display

Author: fumiama

ChatTTS/core.py

@@ -17,8 +17,8 @@
 from .utils.infer import count_invalid_characters, detect_language, apply_character_map, apply_half2full_map, HomophonesReplacer
 from .utils.io import get_latest_modified_file, del_all
 from .infer.api import refine_text, infer_code
-from .utils.download import check_all_assets, download_all_assets
-from .utils.log import set_utils_logger
+from .utils.dl import check_all_assets, download_all_assets
+from .utils.log import logger as utils_logger
 
 
 class Chat:
@@ -27,7 +27,7 @@ def __init__(self, logger=logging.getLogger(__name__)):
         self.normalizer = {}
         self.homophones_replacer = None
         self.logger = logger
-        set_utils_logger(logger)
+        utils_logger.set_logger(logger)
 
     def has_loaded(self, use_decoder = False):
         not_finish = False

ChatTTS/utils/download.py renamed to ChatTTS/utils/dl.py

@@ -19,18 +19,18 @@ def check_model(
 ) -> bool:
     target = dir_name / model_name
     relname = target.as_posix()
-    logger.debug(f"checking {relname}...")
+    logger.get_logger().debug(f"checking {relname}...")
     if not os.path.exists(target):
-        logger.info(f"{target} not exist.")
+        logger.get_logger().info(f"{target} not exist.")
         return False
     with open(target, "rb") as f:
         digest = sha256(f.fileno())
         bakfile = f"{target}.bak"
         if digest != hash:
-            logger.warn(f"{target} sha256 hash mismatch.")
-            logger.info(f"expected: {hash}")
-            logger.info(f"real val: {digest}")
-            logger.warn("please add parameter --update to download the latest assets.")
+            logger.get_logger().warn(f"{target} sha256 hash mismatch.")
+            logger.get_logger().info(f"expected: {hash}")
+            logger.get_logger().info(f"real val: {digest}")
+            logger.get_logger().warn("please add parameter --update to download the latest assets.")
             if remove_incorrect:
                 if not os.path.exists(bakfile):
                     os.rename(str(target), bakfile)
@@ -45,7 +45,7 @@ def check_model(
 def check_all_assets(update=False) -> bool:
     BASE_DIR = Path(os.getcwd())
 
-    logger.info("checking assets...")
+    logger.get_logger().info("checking assets...")
     current_dir = BASE_DIR / "asset"
     names = [
         "Decoder.pt",
@@ -62,7 +62,7 @@ def check_all_assets(update=False) -> bool:
         ):
             return False
 
-    logger.info("checking configs...")
+    logger.get_logger().info("checking configs...")
     current_dir = BASE_DIR / "config"
     names = [
         "decoder.yaml",
@@ -78,44 +78,44 @@ def check_all_assets(update=False) -> bool:
         ):
             return False
 
-    logger.info("all assets are already latest.")
+    logger.get_logger().info("all assets are already latest.")
     return True
 
 
 def download_and_extract_tar_gz(url: str, folder: str):
     import tarfile
 
-    logger.info(f"downloading {url}")
+    logger.get_logger().info(f"downloading {url}")
     response = requests.get(url, stream=True, timeout=(5, 10))
     with BytesIO() as out_file:
         out_file.write(response.content)
         out_file.seek(0)
-        logger.info(f"downloaded.")
+        logger.get_logger().info(f"downloaded.")
         with tarfile.open(fileobj=out_file, mode="r:gz") as tar:
             tar.extractall(folder)
-        logger.info(f"extracted into {folder}")
+        logger.get_logger().info(f"extracted into {folder}")
 
 
 def download_and_extract_zip(url: str, folder: str):
     import zipfile
 
-    logger.info(f"downloading {url}")
+    logger.get_logger().info(f"downloading {url}")
     response = requests.get(url, stream=True, timeout=(5, 10))
     with BytesIO() as out_file:
         out_file.write(response.content)
         out_file.seek(0)
-        logger.info(f"downloaded.")
+        logger.get_logger().info(f"downloaded.")
         with zipfile.ZipFile(out_file) as zip_ref:
             zip_ref.extractall(folder)
-        logger.info(f"extracted into {folder}")
+        logger.get_logger().info(f"extracted into {folder}")
 
 
 def download_dns_yaml(url: str, folder: str):
-    logger.info(f"downloading {url}")
+    logger.get_logger().info(f"downloading {url}")
     response = requests.get(url, stream=True, timeout=(5, 10))
     with open(os.path.join(folder, "dns.yaml"), "wb") as out_file:
         out_file.write(response.content)
-        logger.info(f"downloaded into {folder}")
+        logger.get_logger().info(f"downloaded into {folder}")
 
 
 def download_all_assets(tmpdir: str, version="0.2.5"):
@@ -140,7 +140,7 @@ def download_all_assets(tmpdir: str, version="0.2.5"):
 
     architecture = archs.get(architecture, None)
     if not architecture:
-        logger.error(f"architecture {architecture} is not supported")
+        logger.get_logger().error(f"architecture {architecture} is not supported")
         exit(1)
     try:
         BASE_URL = "https://github.com/fumiama/RVC-Models-Downloader/releases/download/"

ChatTTS/utils/gpu.py

@@ -14,14 +14,14 @@ def select_device(min_memory=2048):
         device = torch.device(f'cuda:{selected_gpu}')
         free_memory_mb = max_free_memory / (1024 * 1024)
         if free_memory_mb < min_memory:
-            logger.warning(f'GPU {selected_gpu} has {round(free_memory_mb, 2)} MB memory left. Switching to CPU.')
+            logger.get_logger().warning(f'GPU {selected_gpu} has {round(free_memory_mb, 2)} MB memory left. Switching to CPU.')
             device = torch.device('cpu')
     elif torch.backends.mps.is_available():
         # For Apple M1/M2 chips with Metal Performance Shaders
-        logger.info('Apple GPU found, using MPS.')
+        logger.get_logger().info('Apple GPU found, using MPS.')
         device = torch.device('mps')
     else:
-        logger.warning('No GPU found, use CPU instead')
+        logger.get_logger().warning('No GPU found, use CPU instead')
         device = torch.device('cpu')
 
     return device

ChatTTS/utils/io.py

@@ -10,7 +10,7 @@ def get_latest_modified_file(directory):
 
     files = [os.path.join(directory, f) for f in os.listdir(directory)] 
     if not files:
-        logger.log(logging.WARNING, f'no files found in the directory: {directory}')
+        logger.get_logger().log(logging.WARNING, f'no files found in the directory: {directory}')
         return None
     latest_file = max(files, key=os.path.getmtime)
 

ChatTTS/utils/log.py

@@ -1,8 +1,14 @@
 import logging
 from pathlib import Path
 
-logger = logging.getLogger(Path(__file__).parent.name)
+class Logger():
+    def __init__(self, logger=logging.getLogger(Path(__file__).parent.name)):
+        self.logger = logger
 
-def set_utils_logger(l: logging.Logger):
-    global logger
-    logger = l
+    def set_logger(self, logger: logging.Logger):
+        self.logger = logger
+    
+    def get_logger(self) -> logging.Logger:
+        return self.logger
+
+logger = Logger()