Optimize multi-user multi-thread search logic.

yym68686 · Dec 19, 2023 · f5ec065 · f5ec065
1 parent e4ef199
commit f5ec065
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/utils/chatgpt2api.py b/utils/chatgpt2api.py
@@ -335,7 +335,7 @@ def __init__(
         }
         self.function_calls_counter = {}
         self.function_call_max_loop = 3
-        self.encode_web_text_list = []
+        # self.encode_web_text_list = []
 
         if self.get_token_count("default") > self.max_tokens:
             raise t.ActionRefuseError("System prompt is too long")
@@ -621,11 +621,16 @@ def ask_stream(
                             break
                     tiktoken.get_encoding("cl100k_base")
                     encoding = tiktoken.encoding_for_model(config.GPT_ENGINE)
-                    if self.encode_web_text_list == []:
-                        self.encode_web_text_list = encoding.encode(" ".join(get_url_text_list(prompt)))
-                        print("search len", len(self.encode_web_text_list))
-                    function_response = encoding.decode(self.encode_web_text_list[:function_call_max_tokens])
-                    self.encode_web_text_list = self.encode_web_text_list[function_call_max_tokens:]
+
+                    encode_web_text_list = encoding.encode(" ".join(get_url_text_list(prompt)))
+                    print("search len", len(encode_web_text_list))
+                    function_response = encoding.decode(encode_web_text_list[:function_call_max_tokens])
+                    # if self.encode_web_text_list == []:
+                    #     self.encode_web_text_list = encoding.encode(" ".join(get_url_text_list(prompt)))
+                    #     print("search len", len(self.encode_web_text_list))
+                    # function_response = encoding.decode(self.encode_web_text_list[:function_call_max_tokens])
+                    # self.encode_web_text_list = self.encode_web_text_list[function_call_max_tokens:]
+
                     # function_response = eval(function_call_name)(prompt, function_call_max_tokens)
                     function_response = (
                         "Here is the Search results, inside <Search_results></Search_results> XML tags:"
@@ -654,7 +659,7 @@ def ask_stream(
             self.add_to_conversation(full_response, response_role, convo_id=convo_id)
             self.function_calls_counter = {}
             # self.clear_function_call(convo_id=convo_id)
-            self.encode_web_text_list = []
+            # self.encode_web_text_list = []
             # total_tokens = self.get_token_count(convo_id)
 
     async def ask_stream_async(