Update app.py

app.py

@@ -48,36 +48,7 @@ def generate(
     top_k: int = 50,
     repetition_penalty: float = 1.2,
 ) -> Iterator[str]:
-    conversation = [{"role": "system", "content": system_prompt}]
-    for user, assistant in chat_history:
-        conversation.extend([{"role": "user", "content": user}, {"role": "assistant", "content": assistant}])
-    conversation.append({"role": "user", "content": message})
-
-    input_ids = tokenizer.apply_chat_template(conversation, return_tensors="pt")
-    if input_ids.shape[1] > MAX_INPUT_TOKEN_LENGTH:
-        input_ids = input_ids[:, -MAX_INPUT_TOKEN_LENGTH:]
-        gr.Warning(f"Trimmed input from conversation as it was longer than {MAX_INPUT_TOKEN_LENGTH} tokens.")
-    input_ids = input_ids.to(model.device)
-
-    streamer = TextIteratorStreamer(tokenizer, timeout=10.0, skip_prompt=True, skip_special_tokens=True)
-    generate_kwargs = dict(
-        {"input_ids": input_ids},
-        streamer=streamer,
-        max_new_tokens=max_new_tokens,
-        do_sample=True,
-        top_p=top_p,
-        top_k=top_k,
-        temperature=temperature,
-        num_beams=1,
-        repetition_penalty=repetition_penalty,
-    )
-    t = Thread(target=model.generate, kwargs=generate_kwargs)
-    t.start()
-
-    outputs = []
-    for text in streamer:
-        outputs.append(text)
-        yield "".join(outputs)
+    # ... (保持 generate 函数不变)
 
 chat_interface = gr.ChatInterface(
     fn=generate,
@@ -128,18 +99,86 @@ chat_interface = gr.ChatInterface(
         ["写一篇关于'AI在中医研究中的应用'的100字文章。"],
         ["写一篇从中医角度关于'秋季女性健康调养方案'的1000字科普文章，从季节变化、饮食调理、活动养生等方面进行阐述"],
     ],
-    chatbot=gr.Chatbot(height=600),  # 增加聊天框高度
 )
 
-with gr.Blocks(css="style.css") as demo:
-    with gr.Row():
-        with gr.Column(scale=2):
-            gr.Markdown(DESCRIPTION)
-            gr.DuplicateButton(value="Duplicate Space for private use", elem_id="duplicate-button")
-            chat_interface.render()
-        with gr.Column(scale=1):
-            gr.Markdown("## Additional Information")
-            gr.Markdown(LICENSE)
+css = """
+body, .gradio-container {
+    margin: 0;
+    padding: 0;
+    height: 100vh;
+    overflow: hidden;
+}
+#main-container {
+    display: flex;
+    height: 100vh;
+    flex-direction: column;
+}
+#description {
+    padding: 10px;
+    overflow-y: auto;
+    flex-shrink: 0;
+}
+#chat-container {
+    display: flex;
+    flex-grow: 1;
+    overflow: hidden;
+}
+#chat-column {
+    flex: 2;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+}
+#info-column {
+    flex: 1;
+    overflow-y: auto;
+    padding: 10px;
+}
+#chatbot {
+    flex-grow: 1;
+    overflow-y: auto;
+}
+"""
+
+js = """
+function adjustHeight() {
+    const mainContainer = document.getElementById('main-container');
+    const description = document.getElementById('description');
+    const chatContainer = document.getElementById('chat-container');
+    const chatbot = document.getElementById('chatbot');
+    
+    const windowHeight = window.innerHeight;
+    const descriptionHeight = description.offsetHeight;
+    const availableHeight = windowHeight - descriptionHeight;
+    
+    chatContainer.style.height = `${availableHeight}px`;
+    chatbot.style.height = `${availableHeight * 0.7}px`;
+}
+
+// 在页面加载完成后调整高度
+window.addEventListener('load', adjustHeight);
+// 在窗口大小改变时调整高度
+window.addEventListener('resize', adjustHeight);
+"""
+
+with gr.Blocks(css=css) as demo:
+    gr.HTML(f"""
+    <div id="main-container">
+        <div id="description">{DESCRIPTION}</div>
+        <div id="chat-container">
+            <div id="chat-column">
+                <div id="chatbot"></div>
+            </div>
+            <div id="info-column">
+                <h2>Additional Information</h2>
+                {LICENSE}
+            </div>
+        </div>
+    </div>
+    """)
+    gr.DuplicateButton(value="Duplicate Space for private use", elem_id="duplicate-button")
+    chat_interface.render()
+    gr.HTML("<script>" + js + "</script>")
 
 if __name__ == "__main__":
     demo.queue(max_size=20).launch()