Merge remote-tracking branch 'origin/main'

# Conflicts: # ChuanhuChatbot.py
GaiZhenbiao · May 5, 2023 · f5c3895 · f5c3895
2 parents 8a6da33 + 677b142
commit f5c3895
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/ChuanhuChatbot.py b/ChuanhuChatbot.py
@@ -42,7 +42,7 @@ def create_new_model():
     with gr.Row().style(equal_height=True):
         with gr.Column(scale=5):
             with gr.Row():
-                chatbot = gr.Chatbot(elem_id="chuanhu_chatbot").style(height="100%")
+                chatbot = gr.Chatbot(label="Chuanhu Chat", elem_id="chuanhu_chatbot").style(height="100%")
             with gr.Row():
                 with gr.Column(min_width=225, scale=12):
                     user_input = gr.Textbox(
@@ -267,9 +267,20 @@ def create_new_model():
                         default_btn = gr.Button(i18n("🔙 恢复默认设置"))
 
     gr.Markdown(CHUANHU_DESCRIPTION, elem_id="description")
-    # gr.HTML(FOOTER.format(versions=versions_html()), elem_id="footer")
-    gr.HTML(FOOTER.format(versions=""), elem_id="footer")
-    demo.load(refresh_ui_elements_on_load, [current_model, model_select_dropdown], [like_dislike_area], show_progress=False)
+    gr.HTML(FOOTER.format(versions=versions_html()), elem_id="footer")
+
+    # https://github.com/gradio-app/gradio/pull/3296
+    def create_greeting(request: gr.Request):
+        if hasattr(request, "username") and request.username: # is not None or is not ""
+            logging.info(f"Get User Name: {request.username}")
+            user_info, user_name = gr.Markdown.update(value=f"User: {request.username}"), request.username
+        else:
+            user_info, user_name = gr.Markdown.update(value=f"", visible=False), ""
+        current_model = get_model(model_name = MODELS[DEFAULT_MODEL], access_key = my_api_key)[0]
+        current_model.set_user_identifier(user_name)
+        chatbot = gr.Chatbot.update(label=MODELS[DEFAULT_MODEL])
+        return user_info, user_name, current_model, toggle_like_btn_visibility(DEFAULT_MODEL), *current_model.auto_load(), get_history_names(False, user_name), chatbot
+    demo.load(create_greeting, inputs=None, outputs=[user_info, user_name, current_model, like_dislike_area, systemPromptTxt, chatbot, historyFileSelectDropdown, chatbot], api_name="load")
     chatgpt_predict_args = dict(
         fn=predict,
         inputs=[
@@ -381,9 +392,9 @@ def create_new_model():
     keyTxt.change(set_key, [current_model, keyTxt], [user_api_key, status_display], api_name="set_key").then(**get_usage_args)
     keyTxt.submit(**get_usage_args)
     single_turn_checkbox.change(set_single_turn, [current_model, single_turn_checkbox], None)
-    model_select_dropdown.change(get_model, [model_select_dropdown, lora_select_dropdown, user_api_key, temperature_slider, top_p_slider, systemPromptTxt, user_name], [current_model, status_display, lora_select_dropdown], show_progress=True, api_name="get_model")
+    model_select_dropdown.change(get_model, [model_select_dropdown, lora_select_dropdown, user_api_key, temperature_slider, top_p_slider, systemPromptTxt, user_name], [current_model, status_display, chatbot, lora_select_dropdown], show_progress=True, api_name="get_model")
     model_select_dropdown.change(toggle_like_btn_visibility, [model_select_dropdown], [like_dislike_area], show_progress=False)
-    lora_select_dropdown.change(get_model, [model_select_dropdown, lora_select_dropdown, user_api_key, temperature_slider, top_p_slider, systemPromptTxt, user_name], [current_model, status_display], show_progress=True)
+    lora_select_dropdown.change(get_model, [model_select_dropdown, lora_select_dropdown, user_api_key, temperature_slider, top_p_slider, systemPromptTxt, user_name], [current_model, status_display, chatbot], show_progress=True)
 
     # Template
     systemPromptTxt.change(set_system_prompt, [current_model, systemPromptTxt], None)
@@ -449,11 +460,11 @@ def create_new_model():
 
 logging.info(
     colorama.Back.GREEN
-    + "\n小亮的温馨提示：访问 http://localhost:7860 查看界面"
+    + "\n川虎的温馨提示：访问 http://localhost:7860 查看界面"
     + colorama.Style.RESET_ALL
 )
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接
-demo.title = i18n("小亮Chat 👀")
+demo.title = i18n("川虎Chat 🚀")
 
 if __name__ == "__main__":
     reload_javascript()

diff --git a/modules/models/models.py b/modules/models/models.py
@@ -602,13 +602,14 @@ def get_model(
         elif model_type == ModelType.Unknown:
             raise ValueError(f"未知模型: {model_name}")
         logging.info(msg)
+        chatbot = gr.Chatbot.update(label=model_name)
     except Exception as e:
         logging.error(e)
         msg = f"{STANDARD_ERROR_MSG}: {e}"
     if dont_change_lora_selector:
-        return model, msg
+        return model, msg, chatbot
     else:
-        return model, msg, gr.Dropdown.update(choices=lora_choices, visible=lora_selector_visibility)
+        return model, msg, chatbot, gr.Dropdown.update(choices=lora_choices, visible=lora_selector_visibility)
 
 
 if __name__ == "__main__":