Update app.py

app.py

@@ -105,7 +105,7 @@ def make_chat_history(history):
         })
 
     return chat_history
-def respond( query, history, chapter, candidates, story_ep, chat_ep, token, immersion_btn):
+def respond(query, history, chapter, candidates, story_ep, chat_ep, token, immersion_btn):
     global state
     candidates = [json.loads(bot_info) for bot_info in candidates]
     chat_history=make_chat_history(history)
@@ -139,20 +139,27 @@ def respond( query, history, chapter, candidates, story_ep, chat_ep, token, imme
     
     req_data['bot_settings']=[candidate for candidate in candidates]
     assistants = [candidate['bot_name'] for candidate in candidates if candidate['type'] == 'assistant' ]
-    
+
+    for candidate in candidates:
+        if '@' in query and candidate in query:
+            req_data['restrict_bot']=candidate
+            break
     # 仅仅只是拿到任务模型的结果
     while True:
-        if 'restrict_bot' in req_data:
-            del req_data['restrict_bot']
+        
         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)
-        try:
-            content=json.loads(ret.json()['choices'][0]['message']['content'])
-        except: 
-            continue
-        print(content)
-        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]
+        if 'restrict_bot' not in req_data or  len(requests['restrict_bot']) == 0:
+            
+            ret=requests.get(url='http://scp1ceqsiv4mii2mol0qg.apigateway-cn-beijing.volceapi.com/api/v2/assistant/chat', headers=header, data=json.dumps(req_data), stream=True)
+            try:
+                content=json.loads(ret.json()['choices'][0]['message']['content'])
+            except: 
+                continue
+            print(content)
+            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]
+        else:
+            next_bot_names=req_data['restrict_bot']
         
         global immersion
         print("immersion: ", immersion)
@@ -193,6 +200,8 @@ def respond( query, history, chapter, candidates, story_ep, chat_ep, token, imme
             break
         else:
             time.sleep(3)
+            if 'restrict_bot' in req_data:
+                del req_data['restrict_bot']
             continue
     return history
 css = """