diff --git a/check_proxy.py b/check_proxy.py index 4f8f5a1..d6263ad 100644 --- a/check_proxy.py +++ b/check_proxy.py @@ -1,8 +1,4 @@ -""" -我:用python的requests库查询本机ip地址所在地 -ChatGPT: -""" def check_proxy(proxies): import requests proxies_https = proxies['https'] if proxies is not None else '无' diff --git a/crazy_functions/读文章写摘要.py b/crazy_functions/读文章写摘要.py index 97d62ee..2ce6b36 100644 --- a/crazy_functions/读文章写摘要.py +++ b/crazy_functions/读文章写摘要.py @@ -1,25 +1,8 @@ -from functools import wraps from predict import predict_no_ui +from toolbox import CatchException, report_execption fast_debug = False -def report_execption(chatbot, history, a, b): - chatbot.append((a, b)) - history.append(a); history.append(b) - -# 捕获不能预料的异常 -def CatchException(f): - @wraps(f) - def decorated(txt, top_p, temperature, chatbot, history, systemPromptTxt, WEB_PORT): - try: - yield from f(txt, top_p, temperature, chatbot, history, systemPromptTxt, WEB_PORT) - except Exception as e: - import traceback - tb_str = traceback.format_exc() - chatbot[-1] = (chatbot[-1][0], f"[Local Message] something error occured: \n {tb_str}") - yield chatbot, history, f'异常 {e}' - return decorated - def 解析Paper(file_manifest, project_folder, top_p, temperature, chatbot, history, systemPromptTxt): import time, glob, os print('begin analysis on:', file_manifest) diff --git a/functional_crazy.py b/functional_crazy.py index 6961d61..ce4b9dc 100644 --- a/functional_crazy.py +++ b/functional_crazy.py @@ -1,18 +1,7 @@ -from functools import wraps from predict import predict_no_ui +from toolbox import CatchException, report_execption fast_debug = False -def CatchException(f): - @wraps(f) - def decorated(txt, top_p, temperature, chatbot, history, systemPromptTxt, WEB_PORT): - try: - yield from f(txt, top_p, temperature, chatbot, history, systemPromptTxt, WEB_PORT) - except Exception as e: - import traceback - tb_str = traceback.format_exc() - chatbot[-1] = (chatbot[-1][0], f"[Local Message] something error occured: \n {tb_str}") - yield chatbot, history, f'异常 {e}' - return decorated @CatchException @@ -66,12 +55,6 @@ def 解析项目本身(txt, top_p, temperature, chatbot, history, systemPromptTx history.append(i_say); history.append(gpt_say) yield chatbot, history, '正常' -def report_execption(chatbot, history, a, b): - chatbot.append((a, b)) - history.append(a); history.append(b) - - - def 解析源代码(file_manifest, project_folder, top_p, temperature, chatbot, history, systemPromptTxt): diff --git a/main.py b/main.py index 8af31a8..a04509e 100644 --- a/main.py +++ b/main.py @@ -1,20 +1,11 @@ import os; os.environ['no_proxy'] = '*' import gradio as gr -import markdown, mdtex2html from predict import predict -from show_math import convert as convert_math +from toolbox import format_io, find_free_port try: from config_private import proxies, WEB_PORT # 放自己的秘密如API和代理网址 os.path.exists('config_private.py') except: from config import proxies, WEB_PORT -def find_free_port(): - import socket - from contextlib import closing - 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] - PORT = find_free_port() if WEB_PORT <= 0 else WEB_PORT initial_prompt = "Serve me as a writing and programming assistant." @@ -33,41 +24,6 @@ functional = get_functionals() from functional_crazy import get_crazy_functionals crazy_functional = get_crazy_functionals() -def reset_textbox(): return gr.update(value='') - -def text_divide_paragraph(text): - if '```' in text: - # careful input - return text - else: - # wtf input - lines = text.split("\n") - for i, line in enumerate(lines): - if i!=0: lines[i] = "
"+lines[i].replace(" ", " ")+"
" - text = "".join(lines) - return text - -def markdown_convertion(txt): - if ('$' in txt) and ('```' not in txt): - math_config = {'mdx_math': {'enable_dollar_delimiter': True}} - return markdown.markdown(txt,extensions=['fenced_code','tables']) + '"+lines[i].replace(" ", " ")+"
" + text = "".join(lines) + return text + +def markdown_convertion(txt): + if ('$' in txt) and ('```' not in txt): + return markdown.markdown(txt,extensions=['fenced_code','tables']) + '