Update app.py

app.py

@@ -7,6 +7,7 @@ from collections import defaultdict
 from copy import deepcopy
 import threading
 import time
+import random
 immersion = False
 bot_settings=[
         {
@@ -70,19 +71,10 @@ chapter_name2chapter_info={
     '幻影计划':{
         "stream":True,
         'background':"“大蛇组织”是一个神秘的恐怖组织，这个组织由一群极端分子组成，他们采用各种极端手段来达到自己的目的。大蛇组织的结构高度严密，成员之间通过秘密的网络进行联系。他们有着严格的等级制度，只有少数核心成员了解组织的全貌。T城霓虹俱乐部的贵宾室是该组织已知的一个据点。",
-        "context":"玩家来到了T城，这里是大蛇组织的一个活跃城市。首先，玩家需要和组织安排在大蛇组织内的卧底“小A”进行接头，接头地点就在T城霓虹俱乐部的贵宾室。T城霓虹俱乐部位于T城的繁华地段，是城市夜生活的热门场所，但是，T城霓虹俱乐部的贵宾室却看守很严，门口一直都有两个保安看守，不会轻易放人进贵宾室。",
-        "task":"玩家需要打消保安的疑虑混入贵宾室**",
-        "condidations":'''
-            - 如果玩家成功获得VIP会员卡，且保安验证是真卡，则任务成功
-            - 如果玩家成功让保安相信你是大蛇组织的成员，则任务成功
-            - 如果玩家和保安动手打架，则任务失败
-            - 如果保安给内部汇报异常信息，则任务失败
-            - 其他情况，如果玩家合理的进入了贵宾室，则任务成功
-        ''',
-        "inference_ep":"ep-20240514024405-7pf8j", 
+        
         "chat_ep":"ep-20240514024405-7pf8j",
         "task_ep":"ep-20240514024405-7pf8j",
-        "aside_ep":"ep-20240514024405-7pf8j",
+        
     }   
 }
 # 定义一个全局变量来控制循环
@@ -144,33 +136,33 @@ def respond( query, history, chapter, candidates, story_ep, chat_ep, token, imme
         })
         history.append(["我: "+query, None])
         yield "", history
-
+    
     req_data['bot_settings']=[candidate for candidate in candidates]
-    # 在线
-    #ret=requests.get(url='http://scp1ceqsiv4mii2mol0qg.apigateway-cn-beijing.volceapi.com/api/v2/assistant/chat', headers=header, data=json.dumps(req_data), stream=True)
-    # 离线
+    assistants = [candidate['bot_name'] for candidate in candidates if candidate['type'] == 'assistant' ]
+    
     # 仅仅只是拿到任务模型的结果
     while True:
         if 'restrict_bot' in req_data:
             del req_data['restrict_bot']
-        #print(req_data['chat_history'])
-        req_data['stream']=True
-        #ret=requests.get(url='http://0.0.0.0:8081/api/v2/assistant/chat', headers=header, data=json.dumps(req_data), stream=True)
+        req_data['stream']=False
         ret=requests.get(url='http://scp1ceqsiv4mii2mol0qg.apigateway-cn-beijing.volceapi.com/api/v2/assistant/chat', headers=header, data=json.dumps(req_data), stream=True)
-        print(ret)
-        content=eval(ret.text.split('\r\n\r\n')[0].split('data:')[-1])['choices'][0]['message']['content']
+        try:
+            content=json.loads(ret.json()['choices'][0]['message']['content'])
+        except: 
+            continue
         print(content)
-        next_bot_names=eval(content)['next_bot_names']
+        next_bot_names=content['next_bot_names']
+        next_bot_names=[bot_name for bot_name in content['next_bot_names'] if bot_name.replace(' ', "") in assistants]
+        
         global immersion
         print("immersion: ", immersion)
         bot_contents = defaultdict(str)
+        req_data['stream']=True
         for next_bot_name in next_bot_names:
             next_bot_name=next_bot_name.replace(' ', "")
             req_data['restrict_bot']=next_bot_name
             # 独自请求某个角色
             ret=requests.get(url='http://scp1ceqsiv4mii2mol0qg.apigateway-cn-beijing.volceapi.com/api/v2/assistant/chat', headers=header, data=json.dumps(req_data), stream=True)
-            #ret=requests.get(url='http://0.0.0.0:8081/api/v2/assistant/chat', headers=header, data=json.dumps(req_data), stream=True)
-            
             content=''
             history.append([
                         None, f"{next_bot_name}: "
@@ -183,27 +175,26 @@ def respond( query, history, chapter, candidates, story_ep, chat_ep, token, imme
                     except Exception as e:
                         break
                     
-                    # print(f'\n\n{next_bot_name}: ', end='', flush=True)
-                    # print(content_tmp, end='', flush=True)
-                    history[-1][-1] +=content_tmp
+                    print(f'\n\n{next_bot_name}: ', end='', flush=True)
+                    print(content_tmp, end='', flush=True)
+                    history[-1][-1] += content_tmp
                     yield "", history
                     bot_contents[next_bot_name]+=content_tmp
                     content=""
                 content+=line
 
-        for k, v in bot_contents.items(): ## 叠加历史对话
-            req_data['chat_history'].append({
-                'bot_name':k, 
-                'type':'assistant',
-                'content':v
-            })
-                # history.append(
-                #     [None, f"{k}: {v}"]
-                # )
+            for k, v in bot_contents.items(): ## 叠加历史对话
+                req_data['chat_history'].append({
+                    'bot_name':k, 
+                    'type':'assistant',
+                    'content':v
+                })
         if not immersion:
             break
         else:
-            time.sleep(4)
+            time.sleep(3)
+            continue
+    return history
 css = """
     .container {
     height: 100vh;