logging -> loguru: stage 3

shared_utils/advanced_markdown_format.py

@@ -2,6 +2,8 @@ import markdown
 import re
 import os
 import math
+
+from loguru import logger
 from textwrap import dedent
 from functools import lru_cache
 from pymdownx.superfences import fence_code_format
@@ -227,14 +229,14 @@ def fix_dollar_sticking_bug(txt):
 
             if single_stack_height > 0:
                 if txt[:(index+1)].find('\n') > 0 or txt[:(index+1)].find('<td>') > 0 or txt[:(index+1)].find('</td>') > 0:
-                    print('公式之中出现了异常 (Unexpect element in equation)')
+                    logger.error('公式之中出现了异常 (Unexpect element in equation)')
                     single_stack_height = 0
                     txt_result += ' $'
                     continue
 
             if double_stack_height > 0:
                 if txt[:(index+1)].find('\n\n') > 0:
-                    print('公式之中出现了异常 (Unexpect element in equation)')
+                    logger.error('公式之中出现了异常 (Unexpect element in equation)')
                     double_stack_height = 0
                     txt_result += '$$'
                     continue
@@ -253,13 +255,13 @@ def fix_dollar_sticking_bug(txt):
                 txt = txt[(index+2):]
             else:
                 if double_stack_height != 0:
-                    # print(txt[:(index)])
-                    print('发现异常嵌套公式')
+                    # logger.info(txt[:(index)])
+                    logger.info('发现异常嵌套公式')
                 if single_stack_height == 0:
                     single_stack_height = 1
                 else:
                     single_stack_height = 0
-                    # print(txt[:(index)])
+                    # logger.info(txt[:(index)])
                 txt_result += txt[:(index+1)]
                 txt = txt[(index+1):]
             break

shared_utils/config_loader.py

@@ -30,13 +30,13 @@ def read_env_variable(arg, default_value):
         env_arg = os.environ[arg]
     else:
         raise KeyError
-    print(f"[ENV_VAR] 尝试加载{arg}，默认值：{default_value} --> 修正值：{env_arg}")
+    log亮绿(f"[ENV_VAR] 尝试加载{arg}，默认值：{default_value} --> 修正值：{env_arg}")
     try:
         if isinstance(default_value, bool):
             env_arg = env_arg.strip()
             if env_arg == 'True': r = True
             elif env_arg == 'False': r = False
-            else: print('Enter True or False, but have:', env_arg); r = default_value
+            else: log亮红('Expect `True` or `False`, but have:', env_arg); r = default_value
         elif isinstance(default_value, int):
             r = int(env_arg)
         elif isinstance(default_value, float):

shared_utils/handle_upload.py

@@ -8,6 +8,7 @@ import gradio
 import shutil
 import glob
 from shared_utils.config_loader import get_conf
+from loguru import logger
 
 def html_local_file(file):
     base_path = os.path.dirname(__file__)  # 项目目录
@@ -100,7 +101,7 @@ def extract_archive(file_path, dest_dir):
         with zipfile.ZipFile(file_path, "r") as zipobj:
             zipobj._extract_member = lambda a,b,c: zip_extract_member_new(zipobj, a,b,c)    # 修复中文乱码的问题
             zipobj.extractall(path=dest_dir)
-            print("Successfully extracted zip archive to {}".format(dest_dir))
+            logger.info("Successfully extracted zip archive to {}".format(dest_dir))
 
     elif file_extension in [".tar", ".gz", ".bz2"]:
         with tarfile.open(file_path, "r:*") as tarobj:
@@ -113,7 +114,7 @@ def extract_archive(file_path, dest_dir):
                     raise Exception(f"Attempted Path Traversal in {member.name}")
 
             tarobj.extractall(path=dest_dir)
-            print("Successfully extracted tar archive to {}".format(dest_dir))
+            logger.info("Successfully extracted tar archive to {}".format(dest_dir))
 
     # 第三方库，需要预先pip install rarfile
     # 此外，Windows上还需要安装winrar软件，配置其Path环境变量，如"C:\Program Files\WinRAR"才可以
@@ -123,9 +124,9 @@ def extract_archive(file_path, dest_dir):
 
             with rarfile.RarFile(file_path) as rf:
                 rf.extractall(path=dest_dir)
-                print("Successfully extracted rar archive to {}".format(dest_dir))
+                logger.info("Successfully extracted rar archive to {}".format(dest_dir))
         except:
-            print("Rar format requires additional dependencies to install")
+            logger.info("Rar format requires additional dependencies to install")
             return "\n\n解压失败! 需要安装pip install rarfile来解压rar文件。建议：使用zip压缩格式。"
 
     # 第三方库，需要预先pip install py7zr
@@ -135,9 +136,9 @@ def extract_archive(file_path, dest_dir):
 
             with py7zr.SevenZipFile(file_path, mode="r") as f:
                 f.extractall(path=dest_dir)
-                print("Successfully extracted 7z archive to {}".format(dest_dir))
+                logger.info("Successfully extracted 7z archive to {}".format(dest_dir))
         except:
-            print("7z format requires additional dependencies to install")
+            logger.info("7z format requires additional dependencies to install")
             return "\n\n解压失败! 需要安装pip install py7zr来解压7z文件"
     else:
         return ""

shared_utils/logging.py

@@ -59,11 +59,8 @@ def setup_logging(PATH_LOGGING):
 
     logger.warning(f"所有对话记录将自动保存在本地目录{sensitive_log_path}, 请注意自我隐私保护哦！")
 
-    logger.bind(chat_msg=True).info("This message is logged to the file!")
-
-
-
 
+# logger.bind(chat_msg=True).info("This message is logged to the file!")
 # logger.debug(f"debug message")
 # logger.info(f"info message")
 # logger.success(f"success message")