Update app.py

app.py

@@ -3,7 +3,8 @@ import gradio as gr
 import json
 import requests
 from volcengine.maas import MaasService, MaasException, ChatRole
-
+from collections import defaultdict
+from copy import deepcopy
 bot_settings=[
         {
             'bot_name':'保安A',
@@ -70,6 +71,7 @@ bot_settings=[
 
 chapter_name2chapter_info={
     '幻影计划':{
+        "stream":True,
         'background':"“大蛇组织”是一个神秘的恐怖组织，这个组织由一群极端分子组成，他们采用各种极端手段来达到自己的目的。大蛇组织的结构高度严密，成员之间通过秘密的网络进行联系。他们有着严格的等级制度，只有少数核心成员了解组织的全貌。T城霓虹俱乐部的贵宾室是该组织已知的一个据点。",
         "context":"玩家来到了T城，这里是大蛇组织的一个活跃城市。首先，玩家需要和组织安排在大蛇组织内的卧底“小A”进行接头，接头地点就在T城霓虹俱乐部的贵宾室。T城霓虹俱乐部位于T城的繁华地段，是城市夜生活的热门场所，但是，T城霓虹俱乐部的贵宾室却看守很严，门口一直都有两个保安看守，不会轻易放人进贵宾室。",
         "main_context":"最近，我方情报机构得知大蛇组织在策划一个恐怖袭击计划，其威胁性足以撼动整个国家的安全。特工组织得知了这个计划的存在，他们决定派出他们最顶尖的特工，代号为“幻影”，来阻止这场灾难的发生。",
@@ -85,74 +87,91 @@ chapter_name2chapter_info={
         "chat_ep":"ep-20240514024405-7pf8j",
         "task_ep":"ep-20240514024405-7pf8j",
         "aside_ep":"ep-20240514024405-7pf8j",
-        "chat_history":[]
     }   
 }
-def llm_infer(endpoint_id, messages, agent_network_output=True):
-    req = {
-        "model":{
-           "endpoint_id":endpoint_id
-        },
-        "parameters": {
-            "max_prompt_tokens": 4000,  # 最大prompt，自动截断前面的输入。0-不生效
-            "max_new_tokens": 0,  # 输出文本的最大tokens限制。0-不生效
-            "min_new_tokens": 0,  # 输出文本的最小tokens限制。0-不生效
-            "temperature":1,  # 用于控制生成文本的随机性和创造性，Temperature值越大随机性越大。取值范围0~1
-            "top_p": 0.7,  # 用于控制输出tokens的多样性，TopP值越大输出的tokens类型越丰富。取值范围0~1
-            "top_k": 0,  # 选择预测值最大的k个token进行采样，取值范围0-1000。0-不生效
-        },
-            "messages": messages,
-        }
-    try:
-        resp = maas.chat(req)
-    except MaasException as e:
-        print(e)
-    return resp['choice']['message']['content']
 
 def select_bot(bot_name: str):
     global bot_settings
     for bot_setting in bot_settings:
         if bot_name == bot_setting['bot_name']:
             return bot_setting
+def make_chat_history(history):
+    chat_history = []
+    for part in history:
+        user, assistant = part
+        _type = 'user' if user is not None else 'assistant'
+        split=user.find(': ')
+        bot_name = user[:split] if user is not None else assistant[:split]
+        content=user[split:] if user is not None else assistant[split:]
+        chat_history.append({
+            'bot_name':bot_name,
+            'type':_type,
+            'content':content
+        })
+
+    return chat_history
 def respond( query, history, chapter, candidates, token):
+    chat_history=make_chat_history(history)
     if chapter is None:
         return "", []
+    
     header={
         'Content-Type':'application/json',
         'Accept': 'text/event-stream',
         'Authorization':f'Bearer {token}'
     }
-    chapter_info=chapter_name2chapter_info[chapter]
+    chapter_info=deepcopy(chapter_name2chapter_info[chapter])
     req_data=chapter_info
-
+    req_data['chat_history']=chat_history
     if query != "":
         req_data['chat_history'].append({
             'bot_name':'玩家',
             'type':'user',
             'content':query
         })
+        history.append([query, None])
+        yield "", history
+
     req_data['bot_settings']=[select_bot(bot_name) for bot_name in candidates]
-    ret=requests.get(url='http://scp1ceqsiv4mii2mol0qg.apigateway-cn-beijing.volceapi.com/api/v2/assistant/chat', headers=header, data=json.dumps(req_data))
-    ret_dict=ret.json()
-    content = ret_dict['choices'][0]['message']['content']
-    print(ret_dict)
-    if ret_dict['extra'] is not None  and 'bot_name' in ret_dict['extra']:
-        bot_name=ret_dict['extra']['bot_name']
-        content=f'{bot_name}:{content}'
+    # 在线
+    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)
+    bot_contents = defaultdict(str)
+    content = ""
     
-        chapter_info['chat_history'].append(
-            {
-                'bot_name':bot_name,
-                'type':'assistant',
-                'content':content
-            }
-        )
-    else:
-        chapter_info['chat_history'].append(
-            content
+    bot_name=''
+    for line in ret.iter_content(decode_unicode=True):
+        if content.endswith('\r\n\r\n'):
+            data=eval(content.strip('data:'))
+            try:
+                _bot_name=data['extra']['bot_name']
+                content_tmp=data['choices'][0]['message']['content']
+            except Exception as e:
+                break
+            if _bot_name!= bot_name:
+                bot_name=_bot_name
+                history.append([
+                    None, f"{bot_name}:"
+                ])
+                print(f'\n\n{bot_name}: ', end='', flush=True)
+            print(content_tmp, end='', flush=True)
+            history[-1][-1] +=content_tmp
+            yield "", history
+            bot_contents[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}"]
         )
-    history.append([None if query == "" else query, content])
-    return "", history
+        
 
 css = """
     .container {
@@ -162,25 +181,7 @@ css = """
 
 def bot_change(bot):
     return bot_settings[bot]
-def chapter_history(story_drop):
-    history = []
-    chat_history=chapter_name2chapter_info[story_drop]['chat_history']
-    for part in chat_history:
-        if isinstance(part, dict):
-            if part['type'] == 'assistant':
-                history.append([
-                    None, f"{part['bot_name']}: {part['content']}"
-                ])
-            else:
-                history.append([
-                    f"{part['bot_name']}: {part['content']}",
-                    None
-                ])
-        else:
-            history.append(
-                [None, part]
-            )
-    return history
+
 def clear_history(story_drop, chatbot):
     print(story_drop)
     if story_drop is None:
@@ -194,7 +195,7 @@ with gr.Blocks() as demo:
     # 配置内容
     with gr.Row():
         description1 = gr.Markdown("<h1>角色扮演——剧情模式</h1>")
-    with gr.Row(equal_height=True, visible=False):
+    with gr.Row(equal_height=True, visible=True):
         with gr.Column():
             description2 = gr.Markdown("<h2>新建章节</h2>")
             new_story_title = gr.TextArea(label="章节标题", lines=1, max_lines=1)
@@ -224,7 +225,7 @@ with gr.Blocks() as demo:
 
     clear = gr.Button(value="Clear chat hsitory")
 
-    story_drop.change(chapter_history, inputs=[story_drop], outputs=[chatbot]) 
+    #story_drop.change(chapter_history, inputs=[story_drop], outputs=[chatbot]) 
     clear.click(clear_history, inputs=[story_drop, chatbot], outputs=[chatbot])
     chat_input.submit(respond, inputs=[chat_input, chatbot, story_drop, candidates_drop, JWT_token], outputs=[chat_input, chatbot])
-demo.launch(width='500px')
+demo.launch()