Update app.py

app.py

@@ -571,6 +571,335 @@
 #     cleanup_thread.start()
     
 #     # 启动Flask应用
+#     app.run(host='0.0.0.0', port=7860, debug=True)
+# #!/usr/bin/env python
+# # -*- coding: utf-8 -*-
+# from flask import Flask, request, make_response
+# import hashlib
+# import time
+# import xml.etree.ElementTree as ET
+# import os
+# import json
+# from openai import OpenAI
+# from dotenv import load_dotenv
+# from markdown import markdown
+# import re
+# import threading
+# import logging
+# from datetime import datetime
+# import asyncio
+# from concurrent.futures import ThreadPoolExecutor
+# import queue
+# import uuid
+
+# # 配置日志记录
+# logging.basicConfig(
+#     level=logging.INFO,
+#     format='%(asctime)s - %(levelname)s - %(message)s',
+#     handlers=[
+#         logging.FileHandler('wechat_service.log'),
+#         logging.StreamHandler()
+#     ]
+# )
+
+# # 加载环境变量
+# load_dotenv()
+
+# app = Flask(__name__)
+
+# # 基础配置
+# TOKEN = os.getenv('TOKEN')
+# API_KEY = os.getenv("API_KEY")
+# BASE_URL = os.getenv("OPENAI_BASE_URL")
+# client = OpenAI(api_key=API_KEY, base_url=BASE_URL)
+
+# # 创建线程池
+# executor = ThreadPoolExecutor(max_workers=10)
+
+# def convert_markdown_to_wechat(md_text):
+#     """将Markdown转换为微信友好的文本格式"""
+#     if not md_text:
+#         return md_text
+        
+#     # 处理标题
+#     md_text = re.sub(r'^# (.*?)$', r'【标题】\1', md_text, flags=re.MULTILINE)
+#     md_text = re.sub(r'^## (.*?)$', r'【子标题】\1', md_text, flags=re.MULTILINE)
+#     md_text = re.sub(r'^### (.*?)$', r'【小标题】\1', md_text, flags=re.MULTILINE)
+    
+#     # 处理强调语法
+#     md_text = re.sub(r'\*\*(.*?)\*\*', r'『\1』', md_text)  # 粗体
+#     md_text = re.sub(r'\*(.*?)\*', r'「\1」', md_text)      # 斜体
+#     md_text = re.sub(r'`(.*?)`', r'「\1」', md_text)        # 行内代码
+    
+#     # 处理列表
+#     md_text = re.sub(r'^\- ', '• ', md_text, flags=re.MULTILINE)  # 无序列表
+#     md_text = re.sub(r'^\d\. ', '○ ', md_text, flags=re.MULTILINE)  # 有序列表
+    
+#     # 处理代码块
+#     md_text = re.sub(r'```[\w]*\n(.*?)```', r'【代码开始】\n\1\n【代码结束】', md_text, flags=re.DOTALL)
+    
+#     # 处理引用
+#     md_text = re.sub(r'^> (.*?)$', r'▎\1', md_text, flags=re.MULTILINE)
+    
+#     # 处理分隔线
+#     md_text = re.sub(r'^-{3,}$', r'—————————', md_text, flags=re.MULTILINE)
+    
+#     # 处理链接
+#     md_text = re.sub(r'\[(.*?)\]\((.*?)\)', r'\1（\2）', md_text)
+    
+#     # 净化处理：去除多余的空行
+#     md_text = re.sub(r'\n{3,}', '\n\n', md_text)
+    
+#     return md_text
+
+# class AsyncResponse:
+#     def __init__(self):
+#         self.status = "processing"  # processing, completed, failed
+#         self.result = None
+#         self.error = None
+
+# class UserSession:
+#     def __init__(self):
+#         self.messages = [{"role": "system", "content": "You are a helpful assistant."}]
+#         self.pending_parts = []
+#         self.last_active = time.time()
+#         self.current_task = None
+#         self.response_queue = {}
+
+# class SessionManager:
+#     def __init__(self):
+#         self.sessions = {}
+#         self.session_timeout = 3600
+#         self._lock = threading.Lock()
+
+#     def get_session(self, user_id):
+#         with self._lock:
+#             if user_id not in self.sessions:
+#                 self.sessions[user_id] = UserSession()
+#             session = self.sessions[user_id]
+#             session.last_active = time.time()
+#             return session
+
+#     def clear_session(self, user_id):
+#         with self._lock:
+#             if user_id in self.sessions:
+#                 self.sessions[user_id] = UserSession()
+                
+#     def cleanup_expired_sessions(self):
+#         with self._lock:
+#             current_time = time.time()
+#             expired_users = [
+#                 user_id for user_id, session in self.sessions.items()
+#                 if current_time - session.last_active > self.session_timeout
+#             ]
+#             for user_id in expired_users:
+#                 del self.sessions[user_id]
+#                 logging.info(f"已清理过期会话: {user_id}")
+
+# session_manager = SessionManager()
+
+# def verify_wechat(request):
+#     """验证微信服务器请求"""
+#     data = request.args
+#     signature = data.get('signature')
+#     timestamp = data.get('timestamp')
+#     nonce = data.get('nonce')
+#     echostr = data.get('echostr')
+    
+#     temp = [timestamp, nonce, TOKEN]
+#     temp.sort()
+#     temp = ''.join(temp)
+    
+#     if hashlib.sha1(temp.encode('utf8')).hexdigest() == signature:
+#         return echostr
+#     return 'error', 403
+
+# def parse_xml_message(xml_content):
+#     """解析微信XML消息"""
+#     root = ET.fromstring(xml_content)
+#     return {
+#         'content': root.find('Content').text,
+#         'from_user': root.find('FromUserName').text,
+#         'to_user': root.find('ToUserName').text,
+#         'msg_id': root.find('MsgId').text,
+#         'create_time': root.find('CreateTime').text
+#     }
+
+# def generate_response_xml(to_user, from_user, content):
+#     """生成回复的XML消息"""
+#     formatted_content = convert_markdown_to_wechat(content)
+#     xml_template = '''
+#     <xml>
+#         <ToUserName><![CDATA[%s]]></ToUserName>
+#         <FromUserName><![CDATA[%s]]></FromUserName>
+#         <CreateTime>%s</CreateTime>
+#         <MsgType><![CDATA[text]]></MsgType>
+#         <Content><![CDATA[%s]]></Content>
+#     </xml>
+#     '''
+#     response = make_response(
+#         xml_template % (to_user, from_user, str(int(time.time())), formatted_content)
+#     )
+#     response.content_type = 'application/xml'
+#     return response
+
+# def process_long_running_task(messages):
+#     """处理耗时任务"""
+#     try:
+#         response = client.chat.completions.create(
+#             model="gpt-4o-mini",
+#             messages=messages,
+#             timeout=60
+#         )
+#         return response.choices[0].message.content
+#     except Exception as e:
+#         logging.error(f"API调用错误: {str(e)}")
+#         raise
+
+# def handle_async_task(session, task_id, messages):
+#     """异步任务处理函数"""
+#     try:
+#         result = process_long_running_task(messages)
+#         session.response_queue[task_id].status = "completed"
+#         session.response_queue[task_id].result = result
+#     except Exception as e:
+#         session.response_queue[task_id].status = "failed"
+#         session.response_queue[task_id].error = str(e)
+
+# def generate_initial_response():
+#     """生成初始响应消息"""
+#     return "您的请求正在处理中"
+
+# def split_message(message, max_length=500):
+#     """将长消息分段"""
+#     return [message[i:i+max_length] for i in range(0, len(message), max_length)]
+
+# def append_status_message(content, has_pending_parts=False, is_processing=False):
+#     """添加状态提示信息"""
+#     status_message = "\n\n-------------------"
+#     if is_processing:
+#         status_message += "\n请回复'查询'获取结果"
+#     elif has_pending_parts:
+#         status_message += "\n当前消息已截断，发送'继续'查看后续内容"
+#     status_message += "\n发送'新对话'开始新的对话"
+#     return content + status_message
+
+# @app.route('/api/wx', methods=['GET', 'POST'])
+# def wechatai():
+#     if request.method == 'GET':
+#         return verify_wechat(request)
+    
+#     try:
+#         message_data = parse_xml_message(request.data)
+#         user_content = message_data['content'].strip()
+#         from_user = message_data['from_user']
+#         to_user = message_data['to_user']
+        
+#         logging.info(f"收到用户({from_user})消息: {user_content}")
+#         session = session_manager.get_session(from_user)
+
+#         if user_content == '新对话':
+#             session_manager.clear_session(from_user)
+#             return generate_response_xml(
+#                 from_user,
+#                 to_user,
+#                 append_status_message('已开始新的对话。请描述您的问题。')
+#             )
+
+#         if user_content == '继续':
+#             if session.pending_parts:
+#                 next_part = session.pending_parts.pop(0)
+#                 has_more = bool(session.pending_parts)
+#                 return generate_response_xml(
+#                     from_user,
+#                     to_user,
+#                     append_status_message(next_part, has_more)
+#                 )
+#             return generate_response_xml(
+#                 from_user,
+#                 to_user,
+#                 append_status_message('没有更多内容了。请继续您的问题。')
+#             )
+
+#         if user_content == '查询':
+#             if session.current_task:
+#                 task_response = session.response_queue.get(session.current_task)
+#                 if task_response:
+#                     if task_response.status == "completed":
+#                         response = task_response.result
+#                         del session.response_queue[session.current_task]
+#                         session.current_task = None
+                        
+#                         if len(response) > 500:
+#                             parts = split_message(response)
+#                             first_part = parts.pop(0)
+#                             session.pending_parts = parts
+#                             return generate_response_xml(
+#                                 from_user,
+#                                 to_user,
+#                                 append_status_message(first_part, True)
+#                             )
+#                         return generate_response_xml(
+#                             from_user,
+#                             to_user,
+#                             append_status_message(response)
+#                         )
+#                     elif task_response.status == "failed":
+#                         error_message = '处理过程中出现错误，请重新提问。'
+#                         del session.response_queue[session.current_task]
+#                         session.current_task = None
+#                         return generate_response_xml(
+#                             from_user,
+#                             to_user,
+#                             append_status_message(error_message)
+#                         )
+#                     else:
+#                         return generate_response_xml(
+#                             from_user,
+#                             to_user,
+#                             append_status_message('正在处理中，请稍后再次查询。', is_processing=True)
+#                         )
+#             return generate_response_xml(
+#                 from_user,
+#                 to_user,
+#                 append_status_message('没有正在处理的请求。')
+#             )
+
+#         session.messages.append({"role": "user", "content": user_content})
+        
+#         task_id = str(uuid.uuid4())
+#         session.current_task = task_id
+#         session.response_queue[task_id] = AsyncResponse()
+        
+#         executor.submit(handle_async_task, session, task_id, session.messages.copy())
+        
+#         return generate_response_xml(
+#             from_user,
+#             to_user,
+#             append_status_message(generate_initial_response(), is_processing=True)
+#         )
+
+#     except Exception as e:
+#         logging.error(f"处理请求时出错: {str(e)}")
+#         return generate_response_xml(
+#             message_data['from_user'],
+#             message_data['to_user'],
+#             append_status_message('抱歉，系统暂时出现问题，请稍后重试。')
+#         )
+
+# def cleanup_sessions():
+#     """定期清理过期会话"""
+#     while True:
+#         time.sleep(3600)
+#         try:
+#             session_manager.cleanup_expired_sessions()
+#         except Exception as e:
+#             logging.error(f"清理会话时出错: {str(e)}")
+
+# if __name__ == '__main__':
+#     cleanup_thread = threading.Thread(target=cleanup_sessions, daemon=True)
+#     cleanup_thread.start()
+    
 #     app.run(host='0.0.0.0', port=7860, debug=True)
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
@@ -768,7 +1097,7 @@ def handle_async_task(session, task_id, messages):
 
 def generate_initial_response():
     """生成初始响应消息"""
-    return "您的请求正在处理中"
+    return "您的请求正在处理中，请回复'查询'获取结果"
 
 def split_message(message, max_length=500):
     """将长消息分段"""
@@ -776,6 +1105,9 @@ def split_message(message, max_length=500):
 
 def append_status_message(content, has_pending_parts=False, is_processing=False):
     """添加状态提示信息"""
+    if "您的请求正在处理中" in content:
+        return content + "\n\n-------------------\n发送'新对话'开始新的对话"
+        
     status_message = "\n\n-------------------"
     if is_processing:
         status_message += "\n请回复'查询'获取结果"