From d166d25eb4eb82848f89028cd6b98795c7f6a09e Mon Sep 17 00:00:00 2001 From: binary-husky Date: Mon, 11 Mar 2024 18:09:38 +0800 Subject: [PATCH] resolve invalid escape sequence warning to support python3.12 --- README.md | 1 - crazy_functions/Latex全文润色.py | 8 ++++---- crazy_functions/解析项目源代码.py | 7 +++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c0c7fdd..48132de 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ > [!IMPORTANT] > 2024.3.11: 恭迎Claude3和Moonshot，全力支持Qwen、GLM、DeepseekCoder等中文大语言模型！ > 2024.1.18: 更新3.70版本，支持Mermaid绘图库（让大模型绘制脑图） -> 2024.1.17: 某些依赖包尚不兼容python 3.12，推荐python 3.11。 > 2024.1.17: 安装依赖时，请选择`requirements.txt`中**指定的版本**。 安装命令：`pip install -r requirements.txt`。本项目完全开源免费，您可通过订阅[在线服务](https://github.com/binary-husky/gpt_academic/wiki/online)的方式鼓励本项目的发展。
diff --git a/crazy_functions/Latex全文润色.py b/crazy_functions/Latex全文润色.py index 8f3074a..960571f 100644 --- a/crazy_functions/Latex全文润色.py +++ b/crazy_functions/Latex全文润色.py @@ -81,8 +81,8 @@ def 多文件润色(file_manifest, project_folder, llm_kwargs, plugin_kwargs, ch # <-------- 多线程润色开始 ----------> if language == 'en': if mode == 'polish': - inputs_array = ["Below is a section from an academic paper, polish this section to meet the academic standard, " + - "improve the grammar, clarity and overall readability, do not modify any latex command such as \section, \cite and equations:" + + inputs_array = [r"Below is a section from an academic paper, polish this section to meet the academic standard, " + + r"improve the grammar, clarity and overall readability, do not modify any latex command such as \section, \cite and equations:" + f"\n\n{frag}" for frag in pfg.sp_file_contents] else: inputs_array = [r"Below is a section from an academic paper, proofread this section." + @@ -93,10 +93,10 @@ def 多文件润色(file_manifest, project_folder, llm_kwargs, plugin_kwargs, ch sys_prompt_array = ["You are a professional academic paper writer." for _ in range(n_split)] elif language == 'zh': if mode == 'polish': - inputs_array = [f"以下是一篇学术论文中的一段内容，请将此部分润色以满足学术标准，提高语法、清晰度和整体可读性，不要修改任何LaTeX命令，例如\section，\cite和方程式：" + + inputs_array = [r"以下是一篇学术论文中的一段内容，请将此部分润色以满足学术标准，提高语法、清晰度和整体可读性，不要修改任何LaTeX命令，例如\section，\cite和方程式：" + f"\n\n{frag}" for frag in pfg.sp_file_contents] else: - inputs_array = [f"以下是一篇学术论文中的一段内容，请对这部分内容进行语法矫正。不要修改任何LaTeX命令，例如\section，\cite和方程式：" + + inputs_array = [r"以下是一篇学术论文中的一段内容，请对这部分内容进行语法矫正。不要修改任何LaTeX命令，例如\section，\cite和方程式：" + f"\n\n{frag}" for frag in pfg.sp_file_contents] inputs_show_user_array = [f"润色 {f}" for f in pfg.sp_file_tag] sys_prompt_array=["你是一位专业的中文学术论文作家。" for _ in range(n_split)] diff --git a/crazy_functions/解析项目源代码.py b/crazy_functions/解析项目源代码.py index 3df13d4..e510a73 100644 --- a/crazy_functions/解析项目源代码.py +++ b/crazy_functions/解析项目源代码.py @@ -345,9 +345,12 @@ def 解析任意code项目(txt, llm_kwargs, plugin_kwargs, chatbot, history, sys pattern_except_suffix = [_.lstrip(" ^*.,").rstrip(" ,") for _ in txt_pattern.split(" ") if _ != "" and _.strip().startswith("^*.")] pattern_except_suffix += ['zip', 'rar', '7z', 'tar', 'gz'] # 避免解析压缩文件 # 将要忽略匹配的文件名(例如: ^README.md) - pattern_except_name = [_.lstrip(" ^*,").rstrip(" ,").replace(".", "\.") for _ in txt_pattern.split(" ") if _ != "" and _.strip().startswith("^") and not _.strip().startswith("^*.")] + pattern_except_name = [_.lstrip(" ^*,").rstrip(" ,").replace(".", r"\.") # 移除左边通配符，移除右侧逗号，转义点号 + for _ in txt_pattern.split(" ") # 以空格分割 + if (_ != "" and _.strip().startswith("^") and not _.strip().startswith("^*.")) # ^开始，但不是^*.开始 + ] # 生成正则表达式 - pattern_except = '/[^/]+\.(' + "|".join(pattern_except_suffix) + ')$' + pattern_except = r'/[^/]+\.(' + "|".join(pattern_except_suffix) + ')$' pattern_except += '|/(' + "|".join(pattern_except_name) + ')$' if pattern_except_name != [] else '' history.clear()