diff --git a/Dockerfile b/Dockerfile index da5053d..19d988f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,16 @@ RUN echo '[global]' > /etc/pip.conf && \ WORKDIR /gpt -COPY requirements.txt . + +# 装载项目文件 +COPY . . + +# 安装依赖 RUN pip3 install -r requirements.txt -COPY . . # 可选步骤,用于预热模块 RUN python3 -c 'from check_proxy import warm_up_modules; warm_up_modules()' +# 启动 CMD ["python3", "-u", "main.py"] diff --git a/README.md b/README.md index fed770f..9a1e72d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ > **Note** > -> 安装依赖时,请严格选择requirements.txt中**指定的版本**。 +> 5月27日对gradio依赖进行了较大的修复和调整,fork并解决了官方Gradio的一系列bug。但如果27日当天进行了更新,可能会导致代码报错(依赖缺失,卡在loading界面等),请及时更新到**最新版代码**并重新安装pip依赖即可。若给您带来困扰还请谅解。安装依赖时,请严格选择requirements.txt中**指定的版本**: > -> `pip install -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple/` +> `pip install -r requirements.txt -i https://pypi.org/simple` > # GPT 学术优化 (GPT Academic) @@ -302,7 +302,7 @@ gpt_academic开发者QQ群-2:610599535 - 已知问题 - 某些浏览器翻译插件干扰此软件前端的运行 - - gradio版本过高或过低,都会导致多种异常 + - 官方Gradio目前有很多兼容性Bug,请务必使用requirement.txt安装Gradio ## 参考与学习 diff --git a/crazy_functions/Latex全文润色.py b/crazy_functions/Latex全文润色.py index 1175e86..8d3f97b 100644 --- a/crazy_functions/Latex全文润色.py +++ b/crazy_functions/Latex全文润色.py @@ -66,7 +66,7 @@ def 多文件润色(file_manifest, project_folder, llm_kwargs, plugin_kwargs, ch with open(fp, 'r', encoding='utf-8', errors='replace') as f: file_content = f.read() # 定义注释的正则表达式 - comment_pattern = r'%.*' + comment_pattern = r'(? bash -c " echo '[gpt-academic] 正在从github拉取最新代码...' && git pull && + pip install -r requirements.txt && echo '[jittorllms] 正在从github拉取最新代码...' && git --git-dir=request_llm/jittorllms/.git --work-tree=request_llm/jittorllms pull --force && python3 -u main.py" diff --git a/docs/gradio-3.32.2-py3-none-any.whl b/docs/gradio-3.32.2-py3-none-any.whl new file mode 100644 index 0000000..ce87604 Binary files /dev/null and b/docs/gradio-3.32.2-py3-none-any.whl differ diff --git a/main.py b/main.py index ed74dc3..b9abf0e 100644 --- a/main.py +++ b/main.py @@ -2,6 +2,7 @@ import os; os.environ['no_proxy'] = '*' # 避免代理网络产生意外污染 def main(): import gradio as gr + if gr.__version__ not in ['3.28.3','3.32.2']: assert False, "请用 pip install -r requirements.txt 安装依赖" from request_llm.bridge_all import predict from toolbox import format_io, find_free_port, on_file_uploaded, on_report_generated, get_conf, ArgsGeneralWrapper, DummyWith # 建议您复制一个config_private.py放自己的秘密, 如API和代理网址, 避免不小心传github被别人看到 @@ -196,7 +197,10 @@ def main(): threading.Thread(target=warm_up_modules, name="warm-up", daemon=True).start() auto_opentab_delay() - demo.queue(concurrency_count=CONCURRENT_COUNT).launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION, favicon_path="docs/logo.png") + demo.queue(concurrency_count=CONCURRENT_COUNT).launch( + server_name="0.0.0.0", server_port=PORT, + favicon_path="docs/logo.png", auth=AUTHENTICATION, + blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile"]) # 如果需要在二级路径下运行 # CUSTOM_PATH, = get_conf('CUSTOM_PATH') @@ -204,7 +208,8 @@ def main(): # from toolbox import run_gradio_in_subpath # run_gradio_in_subpath(demo, auth=AUTHENTICATION, port=PORT, custom_path=CUSTOM_PATH) # else: - # demo.launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION, favicon_path="docs/logo.png") + # demo.launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION, favicon_path="docs/logo.png", + # blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile"]) if __name__ == "__main__": main() diff --git a/requirements.txt b/requirements.txt index 7caaceb..d3082a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -gradio==3.28.3 +./docs/gradio-3.32.2-py3-none-any.whl tiktoken>=0.3.3 requests[socks] transformers diff --git a/version b/version index b1c8367..ad75b2c 100644 --- a/version +++ b/version @@ -1,5 +1,5 @@ { - "version": 3.36, + "version": 3.37, "show_feature": true, - "new_feature": "修复PDF翻译的BUG, 新增HTML中英双栏对照 <-> 添加了OpenAI图片生成插件 <-> 添加了OpenAI音频转文本总结插件 <-> 通过Slack添加对Claude的支持 <-> 提供复旦MOSS模型适配(启用需额外依赖) <-> 提供docker-compose方案兼容LLAMA盘古RWKV等模型的后端 <-> 新增Live2D装饰 <-> 完善对话历史的保存/载入/删除 <-> 保存对话功能" + "new_feature": "修复gradio复制按钮BUG <-> 修复PDF翻译的BUG, 新增HTML中英双栏对照 <-> 添加了OpenAI图片生成插件 <-> 添加了OpenAI音频转文本总结插件 <-> 通过Slack添加对Claude的支持 <-> 提供复旦MOSS模型适配(启用需额外依赖) <-> 提供docker-compose方案兼容LLAMA盘古RWKV等模型的后端 <-> 新增Live2D装饰 <-> 完善对话历史的保存/载入/删除 <-> 保存对话功能" }