fix bug

app.py

@@ -70,7 +70,7 @@ def predict(input, chatbot, messages, idx, answer, story_key, answer_key, known,
         messages1 += [{"role": 'user', "content": f"{' '.join(known)}\n请回答是或否或无关。"}, {"role": "assistant", "content": '是。'}, {"role": 'user', "content": f"{input}\n请回答是或否或无关。"}]
     else:
         messages1 += [{"role": 'user', "content": f"{input}\n请回答是或否或无关。"}]
-    messages.append({"role": 'user', "content": f"{input}\n请回答是或否或无关。"})
+    messages.append({"role": 'user', "content": input})
     llm = True
     finished = False
     response = ''
@@ -95,100 +95,121 @@ def predict(input, chatbot, messages, idx, answer, story_key, answer_key, known,
                 break
     if llm:
         history.append(input.replace('？', '。'))
-        data = {'predict': messages, 'idx': idx, 'isfinished': False, 'answer': answer, 'known': known, 'history': history, 'reasoning': reasoning, 'answer_key': answer_key, 'bingo': bingo}
+        data = {'predict': messages1, 'idx': idx, 'isfinished': False, 'answer': answer}
         response=requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
         if response.status_code == 200:
-            data = json.loads(str(response.content, encoding="utf-8"))
-            response = data['response']
-            known = data['known']
-            history = data['history']
-            reasoning = data['reasoning']
-            answer_key = data['answer_key']
-            bingo = data['bingo']
-            chatbot[-1] = (parse_text(input), parse_text(response))
-            messages.append({"role": "assistant", "content": response})
+            response = str(response.content, encoding="utf-8")
         else:
             completion = openai.ChatCompletion.create(
                 model="gpt-3.5-turbo",
                 messages=messages1,
             )
             response=completion.choices[0].message.content.strip()
-            relevant = False
-            if response.startswith("是"):
+        relevant = False
+        if response.startswith("是"):
+            decl_msg = [{"role": "user", "content": f"请将以下内容转述为陈述句，并简化为一句话：\n{input}"}]
+            data = {'predict': decl_msg, 'idx': idx, 'isfinished': False, 'answer': answer}
+            response=requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
+            if response.status_code == 200:
+                summary = str(response.content, encoding="utf-8")
+            else:
                 summary = openai.ChatCompletion.create(
                     model="gpt-3.5-turbo",
-                    messages=[{"role": "user", "content": f"请将以下内容转述为陈述句，并简化为一句话：\n{input}"}],
+                    messages=decl_msg,
                 )
                 summary = summary.choices[0].message.content.strip()
-                relevant = True
-            elif response.startswith("不是") or response.startswith("否"):
+            relevant = True
+        elif response.startswith("不是") or response.startswith("否"):
+            decl_msg = [{"role": "user", "content": f"请将以下内容取反义然后转述为陈述句，并简化为一句话：\n{input}"}]
+            data = {'predict': decl_msg, 'idx': idx, 'isfinished': False, 'answer': answer}
+            response=requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
+            if response.status_code == 200:
+                summary = str(response.content, encoding="utf-8")
+            else:
                 summary = openai.ChatCompletion.create(
                     model="gpt-3.5-turbo",
-                    messages=[{"role": "user", "content": f"请将以下内容取反义然后转述为陈述句，并简化为一句话：\n{input}"}],
+                    messages=decl_msg
                 )
                 summary = summary.choices[0].message.content.strip()
-                relevant = True
-            if relevant:
-                history.append(summary)
-                known.append(summary)
-                reasoning.append(summary)
-                if len(reasoning) >= 2:
+            relevant = True
+        if relevant:
+            history.append(summary)
+            known.append(summary)
+            reasoning.append(summary)
+            if len(reasoning) >= 2:
+                simp_msg = [{"role": "user", "content": f"请将以下内容简化为一句话：\n{' '.join(reasoning)}"}]
+                data = {'predict': simp_msg, 'idx': idx, 'isfinished': False, 'answer': answer}
+                response=requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
+                if response.status_code == 200:
+                    merge = str(response.content, encoding="utf-8")
+                else:
                     merge = openai.ChatCompletion.create(
                         model="gpt-3.5-turbo",
-                        messages=[{"role": "user", "content": f"请将以下内容简化为一句话：\n{' '.join(reasoning)}"}],
+                        messages=simp_msg,
                     )
                     merge = merge.choices[0].message.content.strip()
+            else:
+                merge = summary
+            for key in answer_key:
+                key = key.strip()
+                if ' ' in key:
+                    key1 = key.split(' ')[1]
+                else:
+                    key1 = key
+                if len(input.replace('？', '')) < len(key1):
+                    continue
+                comp_msg = [{"role": "user", "content": f"请对比第一句话和第二句话之间的信息，判断第二句话是否完整地概括了第一句话的全部信息，包括关键细节和描述。请用是或否回答。\n第一句话：{key1}\n第二句话：{merge}"}]
+                data = {'predict': comp_msg, 'idx': idx, 'isfinished': False, 'answer': answer}
+                response=requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
+                if response.status_code == 200:
+                    compare = str(response.content, encoding="utf-8")
                 else:
-                    merge = summary
-                for key in answer_key:
-                    key = key.strip()
-                    if ' ' in key:
-                        key1 = key.split(' ')[1]
-                    else:
-                        key1 = key
-                    if len(input.replace('？', '')) < len(key1):
-                        continue
                     compare = openai.ChatCompletion.create(
                         model="gpt-3.5-turbo",
-                        messages=[{"role": "user", "content": f"请对比第一句话和第二句话之间的信息，判断第二句话是否完整地概括了第一句话的全部信息，包括关键细节和描述。请用是或否回答。\n第一句话：{key1}\n第二句话：{merge}"}],
+                        messages=comp_msg
                     )
                     compare = compare.choices[0].message.content.strip()
-                    if compare.startswith('是'):
-                        vote = 1
-                        comp_msg = [{"role": "user", "content": f"请对比第一句话和第二句话之间的信息，判断第二句话是否完整地概括了第一句话的全部信息，包括关键细节和描述。请用是或否回答。\n第一句话：{key1}\n第二句话：{input.replace('？', '。')}"},{"role": "assistant", "content": "是"},{"role": "user", "content": f"请对比第一句话和第二句话之间的信息，判断第二句话是否完整地概括了第一句话的全部信息，包括关键细节和描述。请用是或否回答。\n第一句话：{key1}\n第二句话：{input.replace('？', '。')}"}]
+                if compare.startswith('是'):
+                    vote = 1
+                    comp_msg += [{"role": "assistant", "content": "是"},{"role": "user", "content": f"请对比第一句话和第二句话之间的信息，判断第二句话是否完整地概括了第一句话的全部信息，包括关键细节和描述。请用是或否回答。\n第一句话：{key1}\n第二句话：{merge}"}]
+                    data = {'predict': comp_msg, 'idx': idx, 'isfinished': False, 'answer': answer}
+                    response=requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
+                    if response.status_code == 200:
+                        compare = str(response.content, encoding="utf-8")
+                    else:
                         compare = openai.ChatCompletion.create(
                             model="gpt-3.5-turbo",
                             messages=comp_msg,
                         )
                         compare = compare.choices[0].message.content.strip()
-                        if compare.startswith('是'):
-                            vote += 1
-                        comp_msg += [{"role": "assistant", "content": compare},{"role": "user", "content": f"请对比第一句话和第二句话之间的信息，判断第二句话是否完整地概括了第一句话的全部信息，包括关键细节和描述。请用是或否回答。\n第一句话：{key1}\n第二句话：{input.replace('？', '。')}"}]
+                    if compare.startswith('是'):
+                        vote += 1
+                    comp_msg += [{"role": "assistant", "content": compare},{"role": "user", "content": f"请对比第一句话和第二句话之间的信息，判断第二句话是否完整地概括了第一句话的全部信息，包括关键细节和描述。请用是或否回答。\n第一句话：{key1}\n第二句话：{merge}"}]
+                    data = {'predict': comp_msg, 'idx': idx, 'isfinished': False, 'answer': answer}
+                    response=requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
+                    if response.status_code == 200:
+                        compare = str(response.content, encoding="utf-8")
+                    else:
                         compare = openai.ChatCompletion.create(
                             model="gpt-3.5-turbo",
                             messages=comp_msg,
                         )
                         compare = compare.choices[0].message.content.strip()
-                        if compare.startswith('是'):
-                            vote += 1
-                        if vote >= 2:
-                            bingo += 1
-                            answer_key.remove(key)
-                            print(key)
-                            reasoning = []
-                            break
-                if bingo >= len(answer_key):
-                    finished = True
-                    response += f'恭喜你猜到了汤底，汤底是：{answer}\n点击"再来一局"按钮开始下一局游戏。'
-            messages.append({"role": "assistant", "content": response})
-            data = {'predict': messages, 'idx': idx, 'isfinished': finished, 'answer': answer}
-            requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
-            chatbot[-1] = (parse_text(input), parse_text(response))
-    else:
-        messages.append({"role": "assistant", "content": response})
-        data = {'predict': messages, 'idx': idx, 'isfinished': finished, 'answer': answer}
-        requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
-        chatbot[-1] = (parse_text(input), parse_text(response))
+                    if compare.startswith('是'):
+                        vote += 1
+                    if vote >= 2:
+                        bingo += 1
+                        answer_key.remove(key)
+                        print(key)
+                        reasoning = []
+                        break
+            if bingo >= len(answer_key):
+                finished = True
+                response += f'恭喜你猜到了汤底，汤底是：{answer}\n点击"再来一局"按钮开始下一局游戏。'
+    messages.append({"role": "assistant", "content": response})
+    data = {'predict': messages, 'idx': idx, 'isfinished': finished, 'answer': answer}
+    requests.post(os.environ.get("URL"), data=json.dumps(data, ensure_ascii=False).encode('utf-8'))
+    chatbot[-1] = (parse_text(input), parse_text(response))
     return chatbot, messages, known, bingo, reasoning, history