Create docker-image.yml

.github/workflows/docker-image.yml

@@ -0,0 +1,18 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)

.gitignore

@@ -136,4 +136,3 @@ ssr_conf
 config_private.py
 gpt_log
 private.md
-private_upload

README.md

@@ -3,20 +3,8 @@
 **如果喜欢这个项目，请给它一个Star；如果你发明了更好用的学术快捷键，欢迎发issue或者pull requests**
 
 If you like this project, please give it a Star. If you've come up with more useful academic shortcuts, feel free to open an issue or pull request.
-
-```
-代码中参考了很多其他优秀项目中的设计，主要包括：
-# 借鉴项目1：借鉴了mdtex2html中公式处理的方法
-https://github.com/polarwinkel/mdtex2html
-
-# 借鉴项目2：借鉴了ChuanhuChatGPT中读取OpenAI json的方法、记录历史问询记录的方法以及gradio queue的使用技巧
-https://github.com/GaiZhenbiao/ChuanhuChatGPT
-
-项目使用OpenAI的gpt-3.5-turbo模型，期待gpt-4早点放宽门槛😂
-```
-
 <div align="center">
-    
+
 功能 | 描述
 --- | ---
 一键润色 | 支持一键润色、一键查找论文语法错误
@@ -38,7 +26,7 @@ chat分析报告生成 | [实验性功能] 运行后自动生成总结汇报
 
 - 新界面
 <div align="center">
-<img src="https://user-images.githubusercontent.com/96192199/227851398-fab5a158-aaf6-4151-95ac-a8172ce611c7.png" width="700" >
+<img src="https://user-images.githubusercontent.com/96192199/227528413-36ab42da-d589-4ef1-ba75-28aa02442d05.png" width="700" >
 </div>
 
 
@@ -48,7 +36,7 @@ chat分析报告生成 | [实验性功能] 运行后自动生成总结汇报
 <img src="img/公式.gif" width="700" >
 </div>
 
-- 润色/纠错
+- 代码的显示自然也不在话下 https://www.bilibili.com/video/BV1F24y147PD/
 <div align="center">
 <img src="img/润色.gif" width="700" >
 </div>
@@ -208,4 +196,10 @@ python check_proxy.py
 </div>
 
 
-
+## 参考项目
+```
+https://github.com/Python-Markdown/markdown
+https://github.com/gradio-app/gradio
+https://github.com/polarwinkel/mdtex2html
+https://github.com/GaiZhenbiao/ChuanhuChatGPT
+```

crazy_functions/解析项目源代码.py

@@ -127,23 +127,3 @@ def 解析一个C项目的头文件(txt, top_p, temperature, chatbot, history, s
         return
     yield from 解析源代码(file_manifest, project_folder, top_p, temperature, chatbot, history, systemPromptTxt)
 
-@CatchException
-def 解析一个C项目(txt, top_p, temperature, chatbot, history, systemPromptTxt, WEB_PORT):
-    history = []    # 清空历史，以免输入溢出
-    import glob, os
-    if os.path.exists(txt):
-        project_folder = txt
-    else:
-        if txt == "": txt = '空空如也的输入栏'
-        report_execption(chatbot, history, a = f"解析项目: {txt}", b = f"找不到本地项目或无权访问: {txt}")
-        yield chatbot, history, '正常'
-        return
-    file_manifest = [f for f in glob.glob(f'{project_folder}/**/*.h', recursive=True)]  + \
-                    [f for f in glob.glob(f'{project_folder}/**/*.cpp', recursive=True)] + \
-                    [f for f in glob.glob(f'{project_folder}/**/*.c', recursive=True)]
-    if len(file_manifest) == 0:
-        report_execption(chatbot, history, a = f"解析项目: {txt}", b = f"找不到任何.h头文件: {txt}")
-        yield chatbot, history, '正常'
-        return
-    yield from 解析源代码(file_manifest, project_folder, top_p, temperature, chatbot, history, systemPromptTxt)
-

functional_crazy.py

@@ -5,30 +5,25 @@ def get_crazy_functionals():
     from crazy_functions.解析项目源代码 import 解析项目本身
     from crazy_functions.解析项目源代码 import 解析一个Python项目
     from crazy_functions.解析项目源代码 import 解析一个C项目的头文件
-    from crazy_functions.解析项目源代码 import 解析一个C项目
     from crazy_functions.高级功能函数模板 import 高阶功能模板函数
 
     return {
         "[实验] 请解析并解构此项目本身": {
             "Function": 解析项目本身
         },
-        "[实验] 解析整个py项目（配合input输入框）": {
+        "[实验] 解析整个py项目（input输入项目根路径）": {
             "Color": "stop",    # 按钮颜色
             "Function": 解析一个Python项目
         },
-        "[实验] 解析整个C++项目头文件（配合input输入框）": {
+        "[实验] 解析整个C++项目（input输入项目根路径）": {
             "Color": "stop",    # 按钮颜色
             "Function": 解析一个C项目的头文件
         },
-        "[实验] 解析整个C++项目（配合input输入框）": {
-            "Color": "stop",    # 按钮颜色
-            "Function": 解析一个C项目
-        },
-        "[实验] 读tex论文写摘要（配合input输入框）": {
+        "[实验] 读tex论文写摘要（input输入项目根路径）": {
             "Color": "stop",    # 按钮颜色
             "Function": 读文章写摘要
         },
-        "[实验] 批量生成函数注释（配合input输入框）": {
+        "[实验] 批量生成函数注释（input输入项目根路径）": {
             "Color": "stop",    # 按钮颜色
             "Function": 批量生成函数注释
         },
@@ -38,31 +33,4 @@ def get_crazy_functionals():
         },
     }
 
-def on_file_uploaded(files, chatbot, txt):
-    if len(files) == 0: return chatbot, txt
-    import shutil, os, time, glob
-    from toolbox import extract_archive
-    try: shutil.rmtree('./private_upload/')
-    except: pass
-    time_tag = time.strftime("%Y-%m-%d-%H-%M-%S", time.localtime())
-    os.makedirs(f'private_upload/{time_tag}', exist_ok=True)
-    for file in files:
-        file_origin_name = os.path.basename(file.orig_name)
-        shutil.copy(file.name, f'private_upload/{time_tag}/{file_origin_name}')
-        extract_archive(f'private_upload/{time_tag}/{file_origin_name}', 
-                        dest_dir=f'private_upload/{time_tag}/{file_origin_name}.extract')
-    moved_files = [fp for fp in glob.glob('private_upload/**/*', recursive=True)]
-    txt = f'private_upload/{time_tag}'
-    moved_files_str = '\t\n\n'.join(moved_files)
-    chatbot.append(['我上传了文件，请查收', 
-                    f'[Local Message] 收到以下文件: \n\n{moved_files_str}\n\n调用路径参数已自动修正到: \n\n{txt}\n\n现在您可以直接选择任意实现性功能'])
-    return chatbot, txt
-
-def on_report_generated(files, chatbot):
-    from toolbox import find_recent_files
-    report_files = find_recent_files('gpt_log')
-    if len(report_files) == 0: return report_files, chatbot
-    # files.extend(report_files)
-    chatbot.append(['汇总报告如何远程获取？', '汇总报告已经添加到右侧文件上传区，请查收。'])
-    return report_files, chatbot
 

main.py

@@ -3,37 +3,40 @@ import gradio as gr
 from predict import predict
 from toolbox import format_io, find_free_port
 
-# 建议您复制一个config_private.py放自己的秘密, 如API和代理网址, 避免不小心传github被别人看到
-try: from config_private import proxies, WEB_PORT, LLM_MODEL
-except: from config import proxies, WEB_PORT, LLM_MODEL
+# 建议您复制一个config_private.py放自己的秘密，如API和代理网址，避免不小心传github被别人看到
+try: from config_private import proxies, WEB_PORT 
+except: from config import proxies, WEB_PORT
 
-# 如果WEB_PORT是-1, 则随机选取WEB端口
+# 如果WEB_PORT是-1，则随机选取WEB端口
 PORT = find_free_port() if WEB_PORT <= 0 else WEB_PORT
 
 initial_prompt = "Serve me as a writing and programming assistant."
 title_html = """<h1 align="center">ChatGPT 学术优化</h1>"""
 
-# 问询记录, python 版本建议3.9+（越新越好）
+# 问询记录，python 版本建议3.9+（越新越好）
 import logging
 os.makedirs('gpt_log', exist_ok=True)
 try:logging.basicConfig(filename='gpt_log/chat_secrets.log', level=logging.INFO, encoding='utf-8') 
 except:logging.basicConfig(filename='gpt_log/chat_secrets.log', level=logging.INFO)
-print('所有问询记录将自动保存在本地目录./gpt_log/chat_secrets.log, 请注意自我隐私保护哦！')
+print('所有问询记录将自动保存在本地目录./gpt_log/chat_secrets.log，请注意自我隐私保护哦！')
 
 # 一些普通功能模块
 from functional import get_functionals
 functional = get_functionals()
 
 # 对一些丧心病狂的实验性功能模块进行测试
-from functional_crazy import get_crazy_functionals, on_file_uploaded, on_report_generated
+from functional_crazy import get_crazy_functionals
 crazy_functional = get_crazy_functionals()
 
 # 处理markdown文本格式的转变
 gr.Chatbot.postprocess = format_io
 
-# 做一些外观色彩上的调整
-from theme import adjust_theme
-set_theme = adjust_theme()
+# 做一些样式上的调整
+try: set_theme = gr.themes.Default( primary_hue=gr.themes.utils.colors.orange,
+    font=["ui-sans-serif", "system-ui", "sans-serif", gr.themes.utils.fonts.GoogleFont("Source Sans Pro")], 
+    font_mono=["ui-monospace", "Consolas", "monospace", gr.themes.utils.fonts.GoogleFont("IBM Plex Mono")])
+except: 
+    set_theme = None; print('gradio版本较旧，不能自定义字体和颜色')
 
 with gr.Blocks(theme=set_theme, analytics_enabled=False) as demo:
     gr.HTML(title_html)
@@ -50,25 +53,16 @@ with gr.Blocks(theme=set_theme, analytics_enabled=False) as demo:
                 with gr.Column(scale=12):
                     txt = gr.Textbox(show_label=False, placeholder="Input question here.").style(container=False)
                 with gr.Column(scale=1):
-                    submitBtn = gr.Button("提交", variant="primary")
-            with gr.Row():
-                from check_proxy import check_proxy
-                statusDisplay = gr.Markdown(f"Tip: 按Enter提交, 按Shift+Enter换行. \nNetwork: {check_proxy(proxies)}\nModel: {LLM_MODEL}")
+                    submitBtn = gr.Button("Ask", variant="primary")
             with gr.Row():
                 for k in functional:
                     variant = functional[k]["Color"] if "Color" in functional[k] else "secondary"
                     functional[k]["Button"] = gr.Button(k, variant=variant)
-            with gr.Row():
-                gr.Markdown("以下部分实验性功能需从input框读取路径.")
-            with gr.Row():
                 for k in crazy_functional:
                     variant = crazy_functional[k]["Color"] if "Color" in crazy_functional[k] else "secondary"
                     crazy_functional[k]["Button"] = gr.Button(k, variant=variant)
-            with gr.Row():
-                gr.Markdown("上传本地文件供上面的实验性功能调用.")
-            with gr.Row():
-                file_upload = gr.Files(label='任何文件,但推荐上传压缩文件(zip, tar)', file_count="multiple")
-
+            from check_proxy import check_proxy
+            statusDisplay = gr.Markdown(f"{check_proxy(proxies)}")
             systemPromptTxt = gr.Textbox(show_label=True, placeholder=f"System Prompt", label="System prompt", value=initial_prompt).style(container=True)
             #inputs, top_p, temperature, top_k, repetition_penalty
             with gr.Accordion("arguments", open=False):
@@ -80,16 +74,11 @@ with gr.Blocks(theme=set_theme, analytics_enabled=False) as demo:
     for k in functional:
         functional[k]["Button"].click(predict, 
             [txt, top_p, temperature, chatbot, history, systemPromptTxt, TRUE, gr.State(k)], [chatbot, history, statusDisplay], show_progress=True)
-    file_upload.upload(on_file_uploaded, [file_upload, chatbot, txt], [chatbot, txt])
     for k in crazy_functional:
-        click_handle = crazy_functional[k]["Button"].click(crazy_functional[k]["Function"], 
-            [txt, top_p, temperature, chatbot, history, systemPromptTxt, gr.State(PORT)], [chatbot, history, statusDisplay]
-        )
-        try: click_handle.then(on_report_generated, [file_upload, chatbot], [file_upload, chatbot])
-        except: pass
+        crazy_functional[k]["Button"].click(crazy_functional[k]["Function"], 
+            [txt, top_p, temperature, chatbot, history, systemPromptTxt, gr.State(PORT)], [chatbot, history, statusDisplay])
 
-
-# 延迟函数, 做一些准备工作, 最后尝试打开浏览器
+# 延迟函数，做一些准备工作，最后尝试打开浏览器
 def auto_opentab_delay():
     import threading, webbrowser, time
     print(f"URL http://localhost:{PORT}")

predict.py

@@ -126,19 +126,13 @@ def predict(inputs, top_p, temperature, chatbot=[], history=[], system_prompt=''
 
                 except Exception as e:
                     traceback.print_exc()
-                    yield chatbot, history, "Json解析不合常规"
+                    yield chatbot, history, "Json解析不合常规，很可能是文本过长"
                     chunk = get_full_error(chunk, stream_response)
                     error_msg = chunk.decode()
                     if "reduce the length" in error_msg:
-                        chatbot[-1] = (chatbot[-1][0], "[Local Message] Input (or history) is too long, please reduce input or clear history by refleshing this page.")
+                        chatbot[-1] = (history[-1], "[Local Message] Input (or history) is too long, please reduce input or clear history by refleshing this page.")
                         history = []
-                    elif "Incorrect API key" in error_msg:
-                        chatbot[-1] = (chatbot[-1][0], "[Local Message] Incorrect API key provided.")
-                    else:
-                        from toolbox import regular_txt_to_markdown
-                        tb_str = regular_txt_to_markdown(traceback.format_exc())
-                        chatbot[-1] = (chatbot[-1][0], f"[Local Message] Json Error \n\n {tb_str} \n\n {regular_txt_to_markdown(chunk.decode()[4:])}")
-                    yield chatbot, history, "Json解析不合常规" + error_msg
+                    yield chatbot, history, "Json解析不合常规，很可能是文本过长" + error_msg
                     return
 
 def generate_payload(inputs, top_p, temperature, history, system_prompt, stream):

requirements.txt

@@ -1,3 +1,3 @@
-gradio>=3.23
+gradio
 requests[socks]
 mdtex2html

theme.py

@@ -1,83 +0,0 @@
-import gradio as gr 
-
-# gradio可用颜色列表
-
-# slate
-# gray
-# zinc
-# neutral
-# stone
-# red
-# orange
-# amber
-# yellow
-# lime
-# green
-# emerald
-# teal
-# cyan
-# sky
-# blue
-# indigo
-# violet
-# purple
-# fuchsia
-# pink
-# rose
-
-def adjust_theme():
-    try: 
-        color_er = gr.themes.utils.colors.pink
-        set_theme = gr.themes.Default( 
-                        primary_hue=gr.themes.utils.colors.orange,
-                        neutral_hue=gr.themes.utils.colors.gray,
-                        font=["sans-serif", "Microsoft YaHei", "ui-sans-serif", "system-ui", "sans-serif", gr.themes.utils.fonts.GoogleFont("Source Sans Pro")], 
-                        font_mono=["ui-monospace", "Consolas", "monospace", gr.themes.utils.fonts.GoogleFont("IBM Plex Mono")])
-        set_theme.set(
-            # Colors
-            input_background_fill_dark="*neutral_800",
-            # Transition
-            button_transition="none",
-            # Shadows
-            button_shadow="*shadow_drop",
-            button_shadow_hover="*shadow_drop_lg",
-            button_shadow_active="*shadow_inset",
-            input_shadow="0 0 0 *shadow_spread transparent, *shadow_inset",
-            input_shadow_focus="0 0 0 *shadow_spread *secondary_50, *shadow_inset",
-            input_shadow_focus_dark="0 0 0 *shadow_spread *neutral_700, *shadow_inset",
-            checkbox_label_shadow="*shadow_drop",
-            block_shadow="*shadow_drop",
-            form_gap_width="1px",
-            # Button borders
-            input_border_width="1px",
-            input_background_fill="white",
-            # Gradients
-            stat_background_fill="linear-gradient(to right, *primary_400, *primary_200)",
-            stat_background_fill_dark="linear-gradient(to right, *primary_400, *primary_600)",
-            error_background_fill=f"linear-gradient(to right, {color_er.c100}, *background_fill_secondary)",
-            error_background_fill_dark="*background_fill_primary",
-            checkbox_label_background_fill="linear-gradient(to top, *neutral_50, white)",
-            checkbox_label_background_fill_dark="linear-gradient(to top, *neutral_900, *neutral_800)",
-            checkbox_label_background_fill_hover="linear-gradient(to top, *neutral_100, white)",
-            checkbox_label_background_fill_hover_dark="linear-gradient(to top, *neutral_900, *neutral_800)",
-            button_primary_background_fill="linear-gradient(to bottom right, *primary_100, *primary_300)",
-            button_primary_background_fill_dark="linear-gradient(to bottom right, *primary_500, *primary_600)",
-            button_primary_background_fill_hover="linear-gradient(to bottom right, *primary_100, *primary_200)",
-            button_primary_background_fill_hover_dark="linear-gradient(to bottom right, *primary_500, *primary_500)",
-            button_primary_border_color_dark="*primary_500",
-            button_secondary_background_fill="linear-gradient(to bottom right, *neutral_100, *neutral_200)",
-            button_secondary_background_fill_dark="linear-gradient(to bottom right, *neutral_600, *neutral_700)",
-            button_secondary_background_fill_hover="linear-gradient(to bottom right, *neutral_100, *neutral_100)",
-            button_secondary_background_fill_hover_dark="linear-gradient(to bottom right, *neutral_600, *neutral_600)",
-            button_cancel_background_fill=f"linear-gradient(to bottom right, {color_er.c100}, {color_er.c200})",
-            button_cancel_background_fill_dark=f"linear-gradient(to bottom right, {color_er.c600}, {color_er.c700})",
-            button_cancel_background_fill_hover=f"linear-gradient(to bottom right, {color_er.c100}, {color_er.c100})",
-            button_cancel_background_fill_hover_dark=f"linear-gradient(to bottom right, {color_er.c600}, {color_er.c600})",
-            button_cancel_border_color=color_er.c200,
-            button_cancel_border_color_dark=color_er.c600,
-            button_cancel_text_color=color_er.c600,
-            button_cancel_text_color_dark="white",
-        )
-    except: 
-        set_theme = None; print('gradio版本较旧, 不能自定义字体和颜色')
-    return set_theme

toolbox.py

@@ -142,45 +142,4 @@ def find_free_port():
     with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
         s.bind(('', 0))
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        return s.getsockname()[1]
-    
-
-def extract_archive(file_path, dest_dir):
-    import zipfile
-    import tarfile
-    import os
-    # Get the file extension of the input file
-    file_extension = os.path.splitext(file_path)[1]
-
-    # Extract the archive based on its extension
-    if file_extension == '.zip':
-        with zipfile.ZipFile(file_path, 'r') as zipobj:
-            zipobj.extractall(path=dest_dir)
-            print("Successfully extracted zip archive to {}".format(dest_dir))
-
-    elif file_extension in ['.tar', '.gz', '.bz2']:
-        with tarfile.open(file_path, 'r:*') as tarobj:
-            tarobj.extractall(path=dest_dir)
-            print("Successfully extracted tar archive to {}".format(dest_dir))
-    else:
-        return
-    
-def find_recent_files(directory):
-    """
-        me: find files that is created with in one minutes under a directory with python, write a function
-        gpt: here it is!
-    """
-    import os
-    import time
-    current_time = time.time()
-    one_minute_ago = current_time - 60
-    recent_files = []
-
-    for filename in os.listdir(directory):
-        file_path = os.path.join(directory, filename)
-        if file_path.endswith('.log'): continue
-        created_time = os.path.getctime(file_path)
-        if created_time >= one_minute_ago:
-            recent_files.append(file_path)
-
-    return recent_files
+        return s.getsockname()[1]