Update app.py

app.py

@@ -1,9 +1,11 @@
 import gradio as gr
 from huggingface_hub import InferenceClient
-
-"""
-For more information on `huggingface_hub` Inference API support, please check the docs: https://huggingface.co/docs/huggingface_hub/v0.22.2/en/guides/inference
-"""
+import time
+import os
+import sys
+import json
+import base64
+import tqdm
 
 
 from openai import OpenAI
@@ -18,53 +20,118 @@ client = OpenAI(
 )
 
 
-def respond(
-    message,
-    history: list[tuple[str, str]],
-    system_message,
-    max_tokens,
-    temperature,
-    top_p,
-):
-    messages = [{"role": "system", "content": system_message}]
-
-    for val in history:
-        if val[0]:
-            messages.append({"role": "user", "content": val[0]})
-        if val[1]:
-            messages.append({"role": "assistant", "content": val[1]})
-
-    messages.append({"role": "user", "content": message})
-
-    response = openai.chat.completions.create(
-        model="Qwen2_5VL",
-        messages=messages,
-        extra_body={},
-        extra_headers={
-            "apikey": "empty"
-        },
-        stream=True,
-        temperature=0.7,
-        top_p=1.0,
-    )
-    for chunk in response:
-        yield chunk.choices[0].delta.content
-
-
-"""
-For information on how to customize the ChatInterface, peruse the gradio docs: https://www.gradio.app/docs/chatinterface
-"""
-demo = gr.ChatInterface(
-    respond,
-    additional_inputs=[
-        gr.Textbox(value="You are a friendly Chatbot.", label="System message"),
-        gr.Slider(minimum=1, maximum=2048, value=512, step=1, label="Max new tokens"),
-        gr.Slider(minimum=0.1, maximum=4.0, value=0.7, step=0.1, label="Temperature"),
-        gr.Slider(minimum=0.1, maximum=1.0, value=0.95, step=0.05, label="Top-p (nucleus sampling)"),
-        gr.Image(type="pil", label="Upload Image", optional=True)  # 新增的图像输入组件
-    ]
-)
+def convert_sigle_message_to_gpt(dialogs):
+    if not dialogs:
+        return []
+
+    merged = []
+    current_role = None
+    current_contents = []
+
+    for item in dialogs:
+        role = item["role"]
+        content = item["content"]
+
+        # 如果 role 变化了，说明要开启一个新的合并段
+        if role != current_role:
+            # 如果之前有积累的内容，需要写入 merged
+            if current_role is not None:
+                merged.append({
+                    "role": current_role,
+                    "content": current_contents
+                })
+            # 重置当前合并信息
+            current_role = role
+            current_contents = []
+            if isinstance(content, tuple):
+                for path in content:
+                    current_contents.append({
+                            "type": "image_url",
+                            "image_url": {"url": f"data:image/jpeg;base64,{encode_image(path)}"}})
+            else:
+                current_contents.append({"type": "text", "text": content})
+        else:
+            # 如果 role 相同，则把 content 加到当前内容列表里
+            if isinstance(content, tuple):
+                for path in content:
+                    current_contents.append({
+                            "type": "image_url",
+                            "image_url": {"url": f"data:image/jpeg;base64,{encode_image(path)}"}})
+            else:
+                current_contents.append({"type": "text", "text": content})
+
+    # 循环结束后，把最后的合并段写入 merged
+    if current_role is not None:
+        merged.append({
+            "role": current_role,
+            "content": current_contents
+        })
+
+    return merged
+
+def clear_fn():
+    return []
 
+def store_values(num_val, name_val):
+    return num_val, name_val  # 存入状态
 
+def use_values(num_state, name_state):
+    return f"使用了数量: {num_state}，文件名: {name_state}"
+
+def main():
+    
+ 
+    
+    def bot(history: list):
+        history = convert_sigle_message_to_gpt(history)
+        response = openai.chat.completions.create(
+            model=self.model_name,
+            messages=history,
+            extra_body=self.extra,
+            extra_headers={
+                "apikey": self.apikey
+            },
+            stream=self.stream,
+            temperature=0.7,
+            top_p=1.0,
+        )
+
+        history.append({"role": "assistant", "content": ""})
+        for character in response:
+            if not character:
+                continue
+            history[-1]["content"] += character
+            yield history
+
+    # 页面布局
+    
+    with gr.Blocks(css=load_css_as_string(args.styles)) as demo:
+        with gr.Row():
+            with gr.Column(scale=4):
+                chatbot = gr.Chatbot(elem_id="chatbot", bubble_full_width=True, type="messages")
+                chat_input = gr.MultimodalTextbox(
+                    interactive=True,
+                    file_count="multiple",
+                    placeholder="Enter message or upload file...",
+                    show_label=False,
+                    sources=["microphone", "upload"],
+                    elem_id="chat_page"
+                )
+                clear_button = gr.Button('Clear')
+                chat_msg = chat_input.submit(
+                    add_message, [chatbot, chat_input], [chatbot, chat_input]
+                )
+                
+                bot_msg = chat_msg.then(bot, chatbot, chatbot, api_name="bot_response")
+                bot_msg.then(lambda: gr.MultimodalTextbox(interactive=True), None, [chat_input])
+
+                chatbot.like(print_like_dislike, None, None, like_user_message=True)       
+
+        clear_button.click(fn=clear_fn, inputs=[], outputs=chatbot)
+        
+    demo.launch(share=True)
+
+    
 if __name__ == "__main__":
-    demo.launch()
+    main()
+