Update app.py

app.py

@@ -120,33 +120,33 @@ def find_bounding_boxes(state, response):
     return returned_image if len(matches) > 0 else None
 
 
-def vote_last_response(state, liked, model_selector, request: gr.Request):
+def vote_last_response(state, liked, request: gr.Request):
     conv_data = {
         "tstamp": round(time.time(), 4),
         "like": liked,
-        "model": model_selector,
+        "model": 'InternVL2.5-78B',
         "state": state.dict(),
         "ip": request.client.host,
     }
     write2file(get_log_filename(), json.dumps(conv_data) + "\n")
 
 
-def upvote_last_response(state, model_selector, request: gr.Request):
+def upvote_last_response(state, request: gr.Request):
     logger.info(f"upvote. ip: {request.client.host}")
-    vote_last_response(state, True, model_selector, request)
+    vote_last_response(state, True, request)
     textbox = gr.MultimodalTextbox(value=None, interactive=True)
     return (textbox,) + (disable_btn,) * 3
 
 
-def downvote_last_response(state, model_selector, request: gr.Request):
+def downvote_last_response(state, request: gr.Request):
     logger.info(f"downvote. ip: {request.client.host}")
-    vote_last_response(state, False, model_selector, request)
+    vote_last_response(state, False, request)
     textbox = gr.MultimodalTextbox(value=None, interactive=True)
     return (textbox,) + (disable_btn,) * 3
 
 
 def vote_selected_response(
-    state, model_selector, request: gr.Request, data: gr.LikeData
+    state, request: gr.Request, data: gr.LikeData
 ):
     logger.info(
         f"Vote: {data.liked}, index: {data.index}, value: {data.value} , ip: {request.client.host}"
@@ -155,7 +155,7 @@ def vote_selected_response(
         "tstamp": round(time.time(), 4),
         "like": data.liked,
         "index": data.index,
-        "model": model_selector,
+        "model": 'InternVL2.5-78B',
         "state": state.dict(),
         "ip": request.client.host,
     }
@@ -163,9 +163,9 @@ def vote_selected_response(
     return
 
 
-def flag_last_response(state, model_selector, request: gr.Request):
+def flag_last_response(state, request: gr.Request):
     logger.info(f"flag. ip: {request.client.host}")
-    vote_last_response(state, "flag", model_selector, request)
+    vote_last_response(state, "flag", request)
     textbox = gr.MultimodalTextbox(value=None, interactive=True)
     return (textbox,) + (disable_btn,) * 3
 
@@ -189,13 +189,7 @@ def clear_history(request: gr.Request):
     return (state, state.to_gradio_chatbot(), textbox) + (disable_btn,) * 5
 
 
-def change_system_prompt(state, system_prompt, request: gr.Request):
-    logger.info(f"Change system prompt. ip: {request.client.host}")
-    state.set_system_message(system_prompt)
-    return state
-
-
-def add_text(state, message, system_prompt, model_selector, request: gr.Request):
+def add_text(state, message, system_prompt, request: gr.Request):
     print(f"state: {state}")
     if not state:
         state = init_state()
@@ -222,26 +216,23 @@ def add_text(state, message, system_prompt, model_selector, request: gr.Request)
     state.set_system_message(system_prompt)
     state.append_message(Conversation.USER, text, images)
     state.skip_next = False
-    return (state, state.to_gradio_chatbot(), textbox, model_selector) + (
+    return (state, state.to_gradio_chatbot(), textbox) + (
         disable_btn,
     ) * 5
 
 
 def http_bot(
     state,
-    model_selector,
     temperature,
     top_p,
     repetition_penalty,
     max_new_tokens,
     max_input_tiles,
-    # bbox_threshold,
-    # mask_threshold,
     request: gr.Request,
 ):
+    model_name = 'InternVL2.5-78B'
     logger.info(f"http_bot. ip: {request.client.host}")
     start_tstamp = time.time()
-    model_name = model_selector
     if hasattr(state, "skip_next") and state.skip_next:
         # This generate call is skipped due to invalid inputs
         yield (
@@ -343,7 +334,7 @@ def http_bot(
     ) + (enable_btn,) * 5
 
     finish_tstamp = time.time()
-    logger.info(f"{output}")
+    logger.info(f"{finnal_output}")
     data = {
         "tstamp": round(finish_tstamp, 4),
         "like": None,
@@ -358,29 +349,14 @@ def http_bot(
 
 
 title_html = """
-<h2> <span class="gradient-text" id="text">InternVL2</span><span class="plain-text">: Better than the Best—Expanding Performance Boundaries of Open-Source Multimodal Models with the Progressive Scaling Strategy</span></h2>
+<h2> <span class="gradient-text" id="text">InternVL2.5</span><span class="plain-text">: Better than the Best—Expanding Performance Boundaries of Open-Source Multimodal Models with the Progressive Scaling Strategy</span></h2>
 <a href="https://internvl.github.io/blog/2024-07-02-InternVL-2.0/">[📜 InternVL2 Blog]</a> 
 <a href="https://internvl.opengvlab.com/">[🌟 Official Demo]</a> 
 <a href="https://github.com/OpenGVLab/InternVL?tab=readme-ov-file#quick-start-with-huggingface">[🚀 Quick Start]</a> 
 <a href="https://github.com/OpenGVLab/InternVL/blob/main/document/How_to_use_InternVL_API.md">[🌐 API]</a> 
 """
 
-tos_markdown = """
-### Terms of use
-By using this service, users are required to agree to the following terms:
-The service is a research preview intended for non-commercial use only. It only provides limited safety measures and may generate offensive content. It must not be used for any illegal, harmful, violent, racist, or sexual purposes. The service may collect user dialogue data for future research.
-Please click the "Flag" button if you get any inappropriate answer! We will collect those to keep improving our moderator.
-For an optimal experience, please use desktop computers for this demo, as mobile devices may compromise its quality.
-"""
-
 
-learn_more_markdown = """
-### License
-The service is a research preview intended for non-commercial use only, subject to the model [License](https://github.com/facebookresearch/llama/blob/main/MODEL_CARD.md) of LLaMA, [Terms of Use](https://openai.com/policies/terms-of-use) of the data generated by OpenAI, and [Privacy Practices](https://chrome.google.com/webstore/detail/sharegpt-share-your-chatg/daiacboceoaocpibfodeljbdfacokfjb) of ShareGPT. Please contact us if you find any potential violation.
-
-### Acknowledgement
-This demo is modified from LLaVA's demo. Thanks for their awesome work!
-"""
 # .gradio-container {margin: 5px 10px 0 10px !important};
 block_css = """
 .gradio-container {margin: 0.1% 1% 0 1% !important; max-width: 98% !important;};
@@ -459,33 +435,20 @@ def build_demo(embed_mode):
         theme=gr.themes.Default(),
         css=block_css,
     ) as demo:
-        models = ['InternVL2-Pro']
         state = gr.State()
 
         if not embed_mode:
-            # gr.Markdown(title_markdown)
             gr.HTML(title_html)
 
         with gr.Row():
             with gr.Column(scale=2):
 
-                with gr.Row(elem_id="model_selector_row"):
-                    model_selector = gr.Dropdown(
-                        choices=models,
-                        value=models[0] if len(models) > 0 else "",
-                        # value="InternVL-Chat-V1-5",
-                        interactive=True,
-                        show_label=False,
-                        container=False,
-                    )
-
-                with gr.Accordion("System Prompt", open=False) as system_prompt_row:
+                with gr.Accordion("Settings", open=False) as setting_row:
                     system_prompt = gr.Textbox(
                         value="请尽可能详细地回答用户的问题。",
                         label="System Prompt",
                         interactive=True,
                     )
-                with gr.Accordion("Parameters", open=False) as parameter_row:
                     temperature = gr.Slider(
                         minimum=0.0,
                         maximum=1.0,
@@ -539,25 +502,17 @@ def build_demo(embed_mode):
                         [
                             {
                                 "files": [
-                                    "gallery/astro_on_unicorn.png",
+                                    "gallery/1-2.PNG",
                                 ],
-                                "text": "What does this image mean?",
+                                "text": "用python实现这个流程图",
                             }
                         ],
                         [
                             {
                                 "files": [
-                                    "gallery/prod_12.png",
+                                    "gallery/15.PNG",
                                 ],
-                                "text": "What are the consequences of the easy decisions shown in this image?",
-                            }
-                        ],
-                        [
-                            {
-                                "files": [
-                                    "gallery/water.jpg",
-                                ],
-                                "text": "Please describe this image.",
+                                "text": "请帮我分析一下这张图内容",
                             }
                         ],
                     ],
@@ -592,31 +547,28 @@ def build_demo(embed_mode):
                     )
                     clear_btn = gr.Button(value="🗑️  Clear", interactive=False)
 
-        if not embed_mode:
-            gr.Markdown(tos_markdown)
-            gr.Markdown(learn_more_markdown)
         url_params = gr.JSON(visible=False)
 
         # Register listeners
         btn_list = [upvote_btn, downvote_btn, flag_btn, regenerate_btn, clear_btn]
         upvote_btn.click(
             upvote_last_response,
-            [state, model_selector],
+            [state],
             [textbox, upvote_btn, downvote_btn, flag_btn],
         )
         downvote_btn.click(
             downvote_last_response,
-            [state, model_selector],
+            [state],
             [textbox, upvote_btn, downvote_btn, flag_btn],
         )
         chatbot.like(
             vote_selected_response,
-            [state, model_selector],
+            [state],
             [],
         )
         flag_btn.click(
             flag_last_response,
-            [state, model_selector],
+            [state],
             [textbox, upvote_btn, downvote_btn, flag_btn],
         )
         regenerate_btn.click(
@@ -627,14 +579,11 @@ def build_demo(embed_mode):
             http_bot,
             [
                 state,
-                model_selector,
                 temperature,
                 top_p,
                 repetition_penalty,
                 max_output_tokens,
                 max_input_tiles,
-                # bbox_threshold,
-                # mask_threshold,
             ],
             [state, chatbot, textbox] + btn_list,
         )
@@ -642,39 +591,33 @@ def build_demo(embed_mode):
 
         textbox.submit(
             add_text,
-            [state, textbox, system_prompt, model_selector],
-            [state, chatbot, textbox, model_selector] + btn_list,
+            [state, textbox, system_prompt],
+            [state, chatbot, textbox] + btn_list,
         ).then(
             http_bot,
             [
                 state,
-                model_selector,
                 temperature,
                 top_p,
                 repetition_penalty,
                 max_output_tokens,
                 max_input_tiles,
-                # bbox_threshold,
-                # mask_threshold,
             ],
             [state, chatbot, textbox] + btn_list,
         )
         submit_btn.click(
             add_text,
-            [state, textbox, system_prompt, model_selector],
-            [state, chatbot, textbox, model_selector] + btn_list,
+            [state, textbox, system_prompt],
+            [state, chatbot, textbox] + btn_list,
         ).then(
             http_bot,
             [
                 state,
-                model_selector,
                 temperature,
                 top_p,
                 repetition_penalty,
                 max_output_tokens,
                 max_input_tiles,
-                # bbox_threshold,
-                # mask_threshold,
             ],
             [state, chatbot, textbox] + btn_list,
         )