Update app.py

app.py

@@ -83,7 +83,7 @@ DEFAULT_SUGGESTIONS = [{
 
 DEFAULT_CONVERSATIONS_HISTORY = [{"role": "placeholder"}]
 
-DEFAULT_LOCALE = 'en_US'
+DEFAULT_LOCALE = 'zh_CN' if is_modelscope_studio else 'en_US'
 
 DEFAULT_THEME = {
     "token": {
@@ -108,10 +108,10 @@ def format_history(history):
 class Gradio_Events:
 
     @staticmethod
-    def submit(state_value):
-
+    def _submit(state_value):
         history = state_value["conversations_history"][
             state_value["conversation_id"]]
+        # submit 
         history_messages = format_history(history)
 
         history.append({
@@ -170,9 +170,10 @@ class Gradio_Events:
                 state: gr.update(value=state_value)
             }
             raise e
+   
 
     @staticmethod
-    def add_user_message(sender_value, state_value):
+    def submit(sender_value, state_value):
         if not state_value["conversation_id"]:
             random_id = str(uuid.uuid4())
             history = []
@@ -191,7 +192,46 @@ class Gradio_Events:
             "key": str(uuid.uuid4()),
             "content": sender_value
         })
-        return gr.update(value=state_value)
+
+        # preprocess submit
+        yield Gradio_Events.preprocess_submit()(state_value)
+        try:
+          for chunk in Gradio_Events._submit(state_value):
+                yield chunk
+        finally:
+          # postprocess submit
+          yield Gradio_Events.postprocess_submit(state_value)
+
+    @staticmethod
+    def regenerate_message(state_value, e: gr.EventData):
+        conversation_key = e._data["component"]["conversationKey"]
+        history = state_value["conversations_history"][
+            state_value["conversation_id"]]
+        index = -1
+        for i, conversation in enumerate(history):
+            if conversation["key"] == conversation_key:
+                index = i
+                break
+        if index == -1:
+            yield gr.skip()
+        history = history[:index]
+        state_value["conversations_history"][
+            state_value["conversation_id"]] = history
+
+        yield {
+            chatbot:gr.update(items=history),
+            state: gr.update(value=state_value)
+        }
+
+        # preprocess submit
+        yield Gradio_Events.preprocess_submit(clear_input=False)(state_value)
+        try:
+          for chunk in Gradio_Events._submit(state_value):
+                yield chunk
+        finally:
+          # postprocess submit
+          yield Gradio_Events.postprocess_submit(state_value)
+
 
     @staticmethod
     def preprocess_submit(clear_input=True):
@@ -203,9 +243,7 @@ class Gradio_Events:
                 if "meta" in conversation:
                     conversation["meta"]["disabled"] = True
             return {
-                **({
-                    sender: gr.update(value=None, loading=True) if clear_input else gr.update(loading=True),
-                }),
+                sender: gr.update(value=None, loading=True) if clear_input else gr.update(loading=True),
                 conversations:
                 gr.update(active_key=state_value["conversation_id"],
                           items=list(
@@ -269,23 +307,7 @@ class Gradio_Events:
                          0 else DEFAULT_CONVERSATIONS_HISTORY), gr.update(
                              value=state_value)
 
-    @staticmethod
-    def regenerate_message(state_value, e: gr.EventData):
-        conversation_key = e._data["component"]["conversationKey"]
-        history = state_value["conversations_history"][
-            state_value["conversation_id"]]
-        index = -1
-        for i, conversation in enumerate(history):
-            if conversation["key"] == conversation_key:
-                index = i
-                break
-        if index == -1:
-            return gr.skip()
-        history = history[:index]
-        state_value["conversations_history"][
-            state_value["conversation_id"]] = history
 
-        return gr.update(items=history), gr.update(value=state_value)
 
     @staticmethod
     def edit_message(state_value, e: gr.EventData):
@@ -771,7 +793,7 @@ with gr.Blocks(css=css, fill_width=True) as demo:
                                             with ms.Slot("icon"):
                                                 antd.Icon("EditOutlined")
                                         with antd.Popconfirm(
-                                                title="Delete the message",
+                                                title=get_text("Delete the message", "删除消息"),
                                                 description=get_text(
                                                     "Are you sure to delete this message?",
                                                     "确定要删除这条消息吗?"),
@@ -885,50 +907,19 @@ with gr.Blocks(css=css, fill_width=True) as demo:
     regenerating_event = chatbot_regenerate_popconfirm.confirm(
         fn=Gradio_Events.regenerate_message,
         inputs=[state],
-        outputs=[chatbot, state
-                 ]).then(fn=Gradio_Events.preprocess_submit(clear_input=False),
-                         inputs=[state],
-                         outputs=[
-                             sender, clear_btn, conversation_delete_menu_item,
-                             add_conversation_btn, conversations, chatbot,
-                             state
-                         ]).then(fn=Gradio_Events.submit,
-                                 inputs=[state],
-                                 outputs=[chatbot, state])
-
-    submit_event = sender.submit(
-        fn=Gradio_Events.add_user_message,
-        inputs=[sender, state],
-        outputs=[state
-                 ]).then(fn=Gradio_Events.preprocess_submit(clear_input=True),
-                         inputs=[state],
-                         outputs=[
-                             sender, clear_btn, conversation_delete_menu_item,
-                             add_conversation_btn, conversations, chatbot,
-                             state
-                         ]).then(fn=Gradio_Events.submit,
-                                 inputs=[state],
-                                 outputs=[chatbot, state])
-    regenerating_event.then(fn=Gradio_Events.postprocess_submit,
-                            inputs=[state],
-                            outputs=[
-                                sender, conversation_delete_menu_item,
-                                clear_btn, conversations, add_conversation_btn,
-                                chatbot, state
-                            ])
-    submit_event.then(fn=Gradio_Events.postprocess_submit,
-                      inputs=[state],
-                      outputs=[
-                          sender, conversation_delete_menu_item, clear_btn,
-                          conversations, add_conversation_btn, chatbot, state
-                      ])
-    # sender.cancel(fn=None, cancels=[submit_event, regenerating_event])
-    # sender.cancel(fn=Gradio_Events.cancel,
-    #               inputs=[state],
-    #               outputs=[
-    #                   sender, conversation_delete_menu_item, clear_btn,
-    #                   conversations, add_conversation_btn, chatbot, state
-    #               ])
+        outputs=[sender, clear_btn, conversation_delete_menu_item, add_conversation_btn, conversations, chatbot, state])
+
+    submit_event = sender.submit(fn=Gradio_Events.submit,
+                                 inputs=[sender, state],
+                                 outputs=[sender, clear_btn, conversation_delete_menu_item,
+                             add_conversation_btn, conversations,chatbot, state])
+    sender.cancel(fn=None, cancels=[submit_event, regenerating_event])
+    sender.cancel(fn=Gradio_Events.cancel,
+                  inputs=[state],
+                  outputs=[
+                      sender, conversation_delete_menu_item, clear_btn,
+                      conversations, add_conversation_btn, chatbot, state
+                  ])
 
 if __name__ == "__main__":
-    demo.queue(default_concurrency_limit=70).launch(ssr_mode=False)
+    demo.queue(default_concurrency_limit=20).launch(ssr_mode=False)