From c919210493f03351000109a6ee0a4652e9efc07d Mon Sep 17 00:00:00 2001 From: Joseph Cheung Date: Tue, 21 Feb 2023 15:14:25 +0800 Subject: [PATCH] Update webapp.py --- searx/webapp.py | 78 +++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/searx/webapp.py b/searx/webapp.py index c9247d7bf..ce1cbdec7 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -798,50 +798,52 @@ def search(): "logprobs": 0, "stream": False } - gpt_response = requests.post(gpt_url, headers=gpt_headers, data=json.dumps(gpt_data)) - gpt_json = gpt_response.json() - if 'choices' in gpt_json: - gpt = gpt_json['choices'][0]['text'] - gpt = gpt.replace("简报:","").replace("简报:","") - for i in range(len(url_pair)-1,-1,-1): - gpt = gpt.replace("https://url"+str(i),url_pair[i]) - rgpt = gpt + gpt = json.dumps({'data':gpt_data, 'url_pair':url_pair}) + gpt = '
' + gpt + '
' + # gpt_response = requests.post(gpt_url, headers=gpt_headers, data=json.dumps(gpt_data)) + # gpt_json = gpt_response.json() + # if 'choices' in gpt_json: + # gpt = gpt_json['choices'][0]['text'] + # gpt = gpt.replace("简报:","").replace("简报:","") + # for i in range(len(url_pair)-1,-1,-1): + # gpt = gpt.replace("https://url"+str(i),url_pair[i]) + # rgpt = gpt if gpt and gpt!="": if original_search_query != search_query.query: gpt = "Search 为您搜索:" + search_query.query + "\n\n" + gpt - for i in range(1,16): - gpt = gpt.replace("["+str(i)+"] http","[^"+str(i)+"]: http").replace("["+str(i)+"]http","[^"+str(i)+"]: http").replace("["+str(i)+"]","[^"+str(i)+"]") - rgpt = gpt + # for i in range(1,16): + # gpt = gpt.replace("["+str(i)+"] http","[^"+str(i)+"]: http").replace("["+str(i)+"]http","[^"+str(i)+"]: http").replace("["+str(i)+"]","[^"+str(i)+"]") + # rgpt = gpt # gpt = markdown.markdown( gpt , extensions=['footnotes']) - for i in range(len(url_pair)-1,-1,-1): - gpt = gpt.replace("#fn:"+str(i),url_pair[i]) - gpt = gpt.replace("#fn:url"+str(i),url_pair[i]) - gpt = re.sub(r'
(.*?)
', '', gpt, flags=re.DOTALL) - gpt = gpt + ''' - ''' - for i in range(1, 16): - rgpt = rgpt.replace(f"[{i}]", "") - rgpt = rgpt.replace(f"[^{i}]", "") + # for i in range(len(url_pair)-1,-1,-1): + # gpt = gpt.replace("#fn:"+str(i),url_pair[i]) + # gpt = gpt.replace("#fn:url"+str(i),url_pair[i]) + # gpt = re.sub(r'
(.*?)
', '', gpt, flags=re.DOTALL) + # gpt = gpt + ''' + # ''' + # for i in range(1, 16): + # rgpt = rgpt.replace(f"[{i}]", "") + # rgpt = rgpt.replace(f"[^{i}]", "") gptbox = { 'infobox': original_search_query, 'id': 'gpt'+str(len(prompt)),