qudai log

app.py

@@ -13,7 +13,6 @@ from typing import Generator, Dict, Any, List, Union
 import logging
 import time
 from PIL import Image
-import datetime
 
 # =========== Configuration
 # MODEL NAME
@@ -31,33 +30,6 @@ save_history = True
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-# =========== 对话日志功能
-# 创建对话日志文件夹
-CONVERSATION_LOG_DIR = "conversation_logs"
-os.makedirs(CONVERSATION_LOG_DIR, exist_ok=True)
-
-def save_conversation_log(history_messages, assistant_content, metadata=None):
-    """保存对话日志到JSON文件"""
-    try:
-        timestamp = datetime.datetime.now()
-        filename = f"gradio_app_{timestamp.strftime('%Y%m%d_%H%M%S_%f')}.json"
-        filepath = os.path.join(CONVERSATION_LOG_DIR, filename)
-        
-        log_data = {
-            "timestamp": timestamp.isoformat(),
-            "history_messages": history_messages,  # 原封不动保存发送给模型的消息
-            "assistant_content": assistant_content,
-            "metadata": metadata or {}
-        }
-        
-        with open(filepath, 'w', encoding='utf-8') as f:
-            json.dump(log_data, f, ensure_ascii=False, indent=2)
-        
-        logger.info(f"对话日志已保存: {filepath}")
-        
-    except Exception as e:
-        logger.error(f"保存对话日志失败: {str(e)}")
-
 # =========== 图像处理工具函数
 def encode_image_to_base64(image_path_or_pil: Union[str, Image.Image]) -> str:
     """将图像文件或PIL图像对象转换为base64编码字符串"""
@@ -486,27 +458,6 @@ class Gradio_Events:
             
             history[-1]["meta"]["end"] = True
             print("Answer: ", history[-1]["content"])
-            
-            # 保存对话日志
-            # 获取用户消息（倒数第二个消息）
-            user_message = None
-            for i in range(len(history) - 2, -1, -1):
-                if history[i]["role"] == "user":
-                    user_message = history[i]
-                    break
-            
-            if user_message:
-                save_conversation_log(
-                    history_messages=history_messages,  # 这是发送给模型的原始数据
-                    assistant_content=history[-1]["content"],
-                    metadata={
-                        "model": model,
-                        "proxy_base_url": PROXY_BASE_URL,
-                        "conversation_id": state_value["conversation_id"],
-                        "thinking_content": history[-1]["meta"].get("thinking_content", ""),
-                        "has_thinking": bool(history[-1]["meta"].get("thinking_content"))
-                    }
-                )
 
         except Exception as e:
             history[-1]["loading"] = False
@@ -956,9 +907,8 @@ css = """
 .thinking-content .ant-collapse {
   background: linear-gradient(135deg, #f6f9fc 0%, #f0f4f8 100%);
   border: 1px solid #e1e8ed;
-  border-radius: 8px 8px 0 0;
-  border-bottom: none;
-  margin-bottom: 0;
+  border-radius: 8px;
+  margin-bottom: 12px;
 }
 .thinking-content .ant-collapse > .ant-collapse-item > .ant-collapse-header {
   padding: 8px 12px;
@@ -967,93 +917,16 @@ css = """
   font-weight: 500;
 }
 .thinking-content .ant-collapse-content > .ant-collapse-content-box {
-  padding: 0;
-  background: transparent;
-  border-radius: 0;
-}
-
-/* Thinking markdown 内容样式 */
-.thinking-markdown-content {
+  padding: 12px;
+  background: #fff;
+  border-radius: 0 0 6px 6px;
   font-size: 13px;
   color: #667788;
-  line-height: 1.6;
-}
-
-.thinking-markdown-content h1,
-.thinking-markdown-content h2,
-.thinking-markdown-content h3,
-.thinking-markdown-content h4,
-.thinking-markdown-content h5,
-.thinking-markdown-content h6 {
-  color: #5a6c7d;
-  margin: 12px 0 8px 0;
-  font-weight: 600;
-}
-
-.thinking-markdown-content h1 { font-size: 16px; }
-.thinking-markdown-content h2 { font-size: 15px; }
-.thinking-markdown-content h3 { font-size: 14px; }
-.thinking-markdown-content h4,
-.thinking-markdown-content h5,
-.thinking-markdown-content h6 { font-size: 13px; }
-
-.thinking-markdown-content p {
-  margin: 8px 0;
-}
-
-.thinking-markdown-content code {
-  background: #f8f9fa;
-  border: 1px solid #e9ecef;
-  border-radius: 3px;
-  padding: 2px 4px;
-  font-size: 12px;
+  line-height: 1.5;
+  white-space: pre-wrap;
   font-family: 'SF Mono', 'Monaco', 'Inconsolata', 'Roboto Mono', monospace;
 }
 
-.thinking-markdown-content pre {
-  background: #f8f9fa;
-  border: 1px solid #e9ecef;
-  border-radius: 4px;
-  padding: 12px;
-  overflow-x: auto;
-  margin: 8px 0;
-}
-
-.thinking-markdown-content pre code {
-  background: transparent;
-  border: none;
-  padding: 0;
-  font-size: 12px;
-}
-
-.thinking-markdown-content blockquote {
-  border-left: 3px solid #6A57FF;
-  padding-left: 12px;
-  margin: 8px 0;
-  color: #666;
-  font-style: italic;
-}
-
-.thinking-markdown-content ul,
-.thinking-markdown-content ol {
-  margin: 8px 0;
-  padding-left: 20px;
-}
-
-.thinking-markdown-content li {
-  margin: 4px 0;
-}
-
-.thinking-markdown-content strong {
-  color: #333;
-  font-weight: 600;
-}
-
-.thinking-markdown-content em {
-  color: #666;
-  font-style: italic;
-}
-
 /* 图片预览和展示样式 */
 .image-preview-container {
   background: #fafafa;
@@ -1384,45 +1257,30 @@ with gr.Blocks(css=css, fill_width=True) as demo:
                                             const thinking_done = bubble?.meta?.thinking_done || false
                                             
                                             return {
-                                                thinking_container: {
-                                                    style: { 
-                                                        display: (thinking_content || is_thinking) ? 'block' : 'none',
-                                                        marginBottom: thinking_content || is_thinking ? '12px' : '0'
-                                                    }
-                                                },
                                                 thinking_collapse: {
                                                     items: thinking_content || is_thinking ? [{
                                                         key: '1',
                                                         label: is_thinking ? '🤔 正在思考...' : '🤔 思考过程',
-                                                        children: ''  // 我们将使用独立的 Markdown 组件
+                                                        children: thinking_content || '思考中...'
                                                     }] : [],
-                                                    defaultActiveKey: thinking_content || is_thinking ? ['1'] : [],
+                                                    style: { 
+                                                        display: (thinking_content || is_thinking) ? 'block' : 'none',
+                                                        marginBottom: thinking_content || is_thinking ? '12px' : '0'
+                                                    },
                                                     size: 'small',
                                                     ghost: true
                                                 },
-                                                thinking_markdown: {
-                                                    value: thinking_content || (is_thinking ? '思考中...' : ''),
-                                                    style: {
-                                                        display: (thinking_content || is_thinking) ? 'block' : 'none'
-                                                    }
-                                                },
                                                 answer: {
                                                     value: content
                                                 },
                                                 canceled: bubble.meta?.canceled ? undefined : { style: { display: 'none' } }
                                             }
                                         }"""):
-                                    # Thinking区域 - 可折叠显示，支持markdown渲染
-                                    with ms.Div(as_item="thinking_container", elem_classes="thinking-content"):
-                                        antd.Collapse(
-                                            as_item="thinking_collapse",
-                                            elem_style=dict(marginBottom="0")
-                                        )
-                                        with ms.Div(elem_style=dict(padding="12px 16px 16px 16px", background="#fff", borderRadius="0 0 6px 6px", border="1px solid #e1e8ed", borderTop="none")):
-                                            ms.Markdown(
-                                                as_item="thinking_markdown",
-                                                elem_classes="thinking-markdown-content"
-                                            )
+                                    # Thinking区域 - 可折叠显示
+                                    antd.Collapse(
+                                        as_item="thinking_collapse",
+                                        elem_classes="thinking-content"
+                                    )
                                     
                                     # 回答内容
                                     ms.Markdown(
@@ -1718,6 +1576,7 @@ if __name__ == "__main__":
     demo.queue(default_concurrency_limit=200).launch(
         ssr_mode=False,
         max_threads=200,
+        # server_port = 7971,
         # server_port=args.port,
         # server_name=args.host  # 使用命令行参数控制访问地址
     )