Update app.py

app.py

@@ -5,7 +5,7 @@ from chatharuhi import ChatHaruhi
 import wget
 import os
 import openai
-
+import copy
 
 
 NAME_DICT = {'汤师爷': 'tangshiye', '慕容复': 'murongfu', '李云龙': 'liyunlong', 'Luna': 'Luna', '王多鱼': 'wangduoyu',
@@ -18,6 +18,7 @@ NAME_DICT = {'汤师爷': 'tangshiye', '慕容复': 'murongfu', '李云龙': 'li
              '乔峰': 'qiaofeng', '神里绫华': 'ayaka', '雷电将军': 'raidenShogun', '于谦': 'yuqian'}
 
 
+
 try:
   os.makedirs("characters_zip")
 except:
@@ -26,35 +27,39 @@ try:
   os.makedirs("characters")
 except:
   pass
-AI_ROLES_OBJ = {}
+ai_roles_obj = {}
 for ai_role_en in NAME_DICT.values():
   file_url = f"https://github.com/LC1332/Haruhi-2-Dev/raw/main/data/character_in_zip/{ai_role_en}.zip"
   try:
-      os.makedirs(f"characters/{ai_role_en}")
+    os.makedirs(f"characters/{ai_role_en}")
   except:
-      pass
-  destination_file = f"characters_zip/{ai_role_en}.zip"
-  wget.download(file_url, destination_file)
-  destination_folder = f"characters/{ai_role_en}"
-  with zipfile.ZipFile(destination_file, 'r') as zip_ref:
-      zip_ref.extractall(destination_folder)
+    pass
+  if f"{ai_role_en}.zip" not in os.listdir(f"characters_zip"):
+    destination_file = f"characters_zip/{ai_role_en}.zip"
+    wget.download(file_url, destination_file)
+    destination_folder = f"characters/{ai_role_en}"
+    with zipfile.ZipFile(destination_file, 'r') as zip_ref:
+        zip_ref.extractall(destination_folder)
   db_folder = f"./characters/{ai_role_en}/content/{ai_role_en}"
   system_prompt = f"./characters/{ai_role_en}/content/system_prompt.txt"
-  AI_ROLES_OBJ[ai_role_en] = ChatHaruhi(system_prompt=system_prompt,
-                        llm="GLMPro",
+  ai_roles_obj[ai_role_en] = ChatHaruhi(system_prompt=system_prompt,
+                        llm="openai",
                         story_db=db_folder,
                         verbose=True)
 
 
-def get_response(user_role, user_text, ai_role, chatbot, history=None):
-    ai_role_en = NAME_DICT[ai_role]
-
-    AI_ROLES_OBJ[ai_role_en].dialogue_history = history
-    response = AI_ROLES_OBJ[ai_role_en].chat(role=user_role, text=user_text)
-    
+async def get_response(user_role, user_text, ai_role, chatbot):
+    role_en = NAME_DICT[ai_role]
+    ai_roles_obj[role_en].dialogue_history = copy.deepcopy(chatbot)
+    response = ai_roles_obj[role_en].chat(role=user_role, text=user_text)
     user_msg = user_role + ':「' + user_text + '」'
-    chatbot.append((user_msg, response))
-    return chatbot, None
+    latest_msg = (user_msg, response)
+    print(latest_msg)
+    chatbot.append(latest_msg)
+    return chatbot
+
+async def respond(user_role, user_text, ai_role, chatbot):
+    return await get_response(user_role, user_text, ai_role, chatbot), None
 
 
 def clear(user_role, user_text, chatbot):
@@ -62,8 +67,8 @@ def clear(user_role, user_text, chatbot):
 
 
 def get_image(ai_role):
-    ai_role_en = NAME_DICT[ai_role]
-    return Image.open(f'./images/{ai_role_en}.jpg'), None, None, []
+    role_en = NAME_DICT[ai_role]
+    return Image.open(f'images/{role_en}.jpg'), None, None, []
 
 
 with gr.Blocks() as demo:
@@ -71,14 +76,10 @@ with gr.Blocks() as demo:
         """
         # Chat凉宫春日 ChatHaruhi
         ## Reviving Anime Character in Reality via Large Language Model
-        
-        ChatHaruhi2.0 的GLMPro 版本demo implemented by [Weishi MI](https://github.com/hhhwmws0117) and [chenxi](https://github.com/todochenxi)
-        
+        ChatHaruhi2.0的GLMPro 版本demo implemented by [chenxi](https://github.com/todochenxi)
         更多信息见项目github链接 [https://github.com/LC1332/Chat-Haruhi-Suzumiya](https://github.com/LC1332/Chat-Haruhi-Suzumiya)
-        
         如果觉得有趣请拜托为我们点上star. If you find it interesting, please be kind enough to give us a star.
-        
-        user_role 为角色扮演的人物 请尽量设置为与剧情相关的人物 且不要与主角同名
+        user_role 为用户扮演的人物 请尽量设置为与剧情相关的人物 且不要与主角同名
         """
     )
     with gr.Row():
@@ -102,7 +103,7 @@ with gr.Blocks() as demo:
                      '韦小宝', '乔峰', '神里绫华',
                      '雷电将军', '于谦'], label="characters", value='凉宫春日')
     ai_role.change(get_image, ai_role, [role_image, user_role, user_text, chatbot])
-    user_text.submit(fn=get_response, inputs=[user_role, user_text, ai_role, chatbot], outputs=[chatbot, user_text])
-    submit.click(fn=get_response, inputs=[user_role, user_text, ai_role, chatbot], outputs=[chatbot, user_text])
+    user_text.submit(fn=respond, inputs=[user_role, user_text, ai_role, chatbot], outputs=[chatbot, user_text])
+    submit.click(fn=respond, inputs=[user_role, user_text, ai_role, chatbot], outputs=[chatbot, user_text])
     clean.click(clear, [user_role, user_text, chatbot], [user_role, user_text, chatbot])
-demo.launch(debug=True)
+demo.launch(debug=True)