From 2d1529918fda65fb7be87ffcb0e8a56ee44800f0 Mon Sep 17 00:00:00 2001
From: Joseph Cheung <luxtiasco@outlook.com>
Date: Thu, 2 Mar 2023 18:05:19 +0800
Subject: [PATCH] c

---
 searx/webapp.py  | 13 +++++++++++--
 searx/webapp1.py |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/searx/webapp.py b/searx/webapp.py
index e1d591b8c..e439071f1 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -700,10 +700,12 @@ def search():
     net_search = True
     net_search_str = 'true'
     prompt = ""
+    try:
         search_query, raw_text_query, _, _ = get_search_query_from_webapp(request.preferences, request.form)
         # search = Search(search_query) #  without plugins
         if request.environ['HTTP_CF_IPCOUNTRY'] == 'CN' and gfw.exists(search_query.query):
             return render('404.html'), 404
+        try:
             original_search_query = search_query.query
             if "模仿" in search_query.query or "扮演" in search_query.query or "你能" in search_query.query or "请推荐" in search_query.query or "帮我" in search_query.query or "写一段" in search_query.query or "写一个" in search_query.query or "请问" in search_query.query or "请给" in search_query.query or "请你" in search_query.query  or "请推荐" in search_query.query or "是谁" in search_query.query or "能帮忙" in search_query.query or "介绍一下" in search_query.query or "为什么" in search_query.query or "什么是" in search_query.query or "有什么" in search_query.query or "怎样" in search_query.query or "给我" in search_query.query or "如何" in search_query.query or "谁是" in search_query.query or "查询" in search_query.query or "告诉我" in search_query.query or "查一下" in search_query.query or "找一个" in search_query.query or "什么样" in search_query.query or "哪个" in search_query.query or "哪些" in search_query.query or "哪一个" in search_query.query or "哪一些" in search_query.query  or "啥是" in search_query.query or "为啥" in search_query.query or "怎么" in search_query.query:
                 if len(search_query.query)>5 and "谁是" in search_query.query:
@@ -731,7 +733,7 @@ def search():
             }
             gpt_data = {
                 "model": "gpt-3.5-turbo",
-                "messages": {"user":prompt},
+                "messages": [{"user":prompt}],
                 "max_tokens": 256,
                 "temperature": 0.9,
                 "top_p": 1,
@@ -770,11 +772,18 @@ def search():
                     search_type = gpt_judge[0]
                     net_search = False
                     net_search_str = 'false'
-
+        except Exception as ee:
+            logger.exception(ee, exc_info=True)
         search = SearchWithPlugins(search_query, request.user_plugins, request)  # pylint: disable=redefined-outer-name
 
         result_container = search.search()
 
+    except SearxParameterException as e:
+        logger.exception('search error: SearxParameterException')
+        return index_error(output_format, e.message), 400
+    except Exception as e:  # pylint: disable=broad-except
+        logger.exception(e, exc_info=True)
+        return index_error(output_format, gettext('No item found')), 500
 
     # results
     results = result_container.get_ordered_results()
diff --git a/searx/webapp1.py b/searx/webapp1.py
index 19f271a2b..e439071f1 100644
--- a/searx/webapp1.py
+++ b/searx/webapp1.py
@@ -733,7 +733,7 @@ def search():
             }
             gpt_data = {
                 "model": "gpt-3.5-turbo",
-                "messages": {"user":prompt},
+                "messages": [{"user":prompt}],
                 "max_tokens": 256,
                 "temperature": 0.9,
                 "top_p": 1,