Update app.py

app.py

@@ -4,6 +4,7 @@ import requests
 from flask import Flask, request, jsonify
 from datetime import datetime, timezone, timedelta
 import asyncio
+import re
 
 app = Flask(__name__)
 
@@ -52,16 +53,28 @@ BOT_COMMANDS = [
 ]
 DEFAULT_TEMP = 1.5
 
-def get_current_datetime_utc8():
-    utc_plus_8 = timezone(timedelta(hours=8))
-    now = datetime.now(utc_plus_8)
-    return now.strftime("%Y年%m月%d日 %H时%M分%S秒")
-
-TOOL_DEFINITIONS = {
-    "get_current_datetime_utc8": {
-        "description": "获取当前的日期和时间（UTC+8时区）。",
+# 工具定义
+TOOLS = [
+    {
+        "type": "function",
+        "function": {
+            "name": "get_current_datetime",
+            "description": "获取当前的日期和时间，并返回UTC+8时区的时间。",
+            "parameters": {
+                "type": "object",
+                "properties": {},
+                "required": []
+            }
+        }
     }
-}
+]
+
+def get_current_datetime():
+    """获取当前的日期和时间，并返回UTC+8时区的时间。"""
+    utc_time = datetime.now(timezone.utc)
+    local_time = utc_time.astimezone(timezone(timedelta(hours=8)))
+    return local_time.strftime("%Y-%m-%d %H:%M:%S")
+
 
 def make_telegram_request(method, data=None):
     url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/{method}"
@@ -193,6 +206,7 @@ def parseCommand(userMessage):
         command = command.split('@')[0]
     return command[1:]
 
+
 async def handlePrivateCommand(chatId, userMessage, fromUserId, isGroupChat):
     command = parseCommand(userMessage)
     if userMessage.startswith('/settemp '):
@@ -244,60 +258,22 @@ async def processAiMessage(chatId, userMessage, fromUserId, message_id):
         {'role': 'system', 'content': currentPrompt},
         *history
     ]
-    
+
     thinking_message = await sendTelegramMessage(chatId, "正在思考，请等待...", options={'reply_to_message_id': message_id})
     thinking_message_id = thinking_message.get('result', {}).get('message_id')
-    
-    tools = [
-        {
-            "type": "function",
-            "function": {
-                "name": "get_current_datetime_utc8",
-                "description": "获取当前的日期和时间（UTC+8时区）。",
-            }
-        }
-    ]
-    
+
     try:
         ai_response = requests.post(AI_API_ENDPOINT, headers=AI_API_HEADERS, json={
             'model': AI_MODEL,
             'messages': messages,
             'max_tokens': MAX_TOKENS,
             'temperature': userTemp,
-            'tools': tools,
-            'tool_choice': 'auto',
+            'tools': TOOLS,
         })
         ai_response.raise_for_status()
         ai_data = ai_response.json()
-        ai_reply = await handleAiResponse(ai_data, chatId, history)
-        
-        if isinstance(ai_reply, dict) and ai_reply.get('tool_calls'):
-            tool_calls = ai_reply['tool_calls']
-            for tool_call in tool_calls:
-                tool_call_id = tool_call.get('id')
-                function_name = tool_call['function']['name']
-                
-                if function_name == 'get_current_datetime_utc8':
-                    tool_result = get_current_datetime_utc8()
-                    
-                    messages.append({
-                        'tool_call_id': tool_call_id,
-                        'role': 'tool',
-                        'name': function_name,
-                        'content': tool_result
-                    })
-                    
-                    ai_response = requests.post(AI_API_ENDPOINT, headers=AI_API_HEADERS, json={
-                        'model': AI_MODEL,
-                        'messages': messages,
-                        'max_tokens': MAX_TOKENS,
-                        'temperature': userTemp,
-                    })
-                    ai_response.raise_for_status()
-                    ai_data = ai_response.json()
-                    ai_reply = await handleAiResponse(ai_data, chatId, history)
-                    break
-        
+        ai_reply = await handleAiResponse(ai_data, chatId, history, thinking_message_id)
+
         history.append({'role': 'assistant', 'content': ai_reply})
         chatHistories[chatId] = history
 
@@ -309,16 +285,54 @@ async def processAiMessage(chatId, userMessage, fromUserId, message_id):
         print(f'处理消息时发生错误: {error}')
         await editTelegramMessage(chatId, thinking_message_id, '处理消息时发生错误，请稍后再试')
 
-async def handleAiResponse(ai_data, chatId, history):
+
+async def handleAiResponse(ai_data, chatId, history, thinking_message_id):
     if ai_data and ai_data.get('choices') and len(ai_data['choices']) > 0:
         choice = ai_data['choices'][0]
         if choice.get('message'):
-            if choice['message'].get('content'):
-                return choice['message']['content']
-            elif choice['message'].get('tool_calls'):
-                return {'tool_calls': choice['message']['tool_calls']}
+            message = choice['message']
+            if message.get('tool_calls'):
+                tool_call = message['tool_calls'][0]
+                function_name = tool_call['function']['name']
+                
+                if function_name == 'get_current_datetime':
+                    current_datetime = get_current_datetime()
+                    history.append({
+                        'tool_call_id': tool_call['id'],
+                        'role': 'tool',
+                        'name': function_name,
+                        'content': current_datetime,
+                    })
+                    messages = [
+                        {'role': 'system', 'content': PROMPT_TEMPLATES.get(USER_SETTINGS.get(chatId, {}).get('prompt_index', CURRENT_PROMPT_INDEX), "")},
+                        *history
+                    ]
+
+                    try:
+                        ai_response = requests.post(AI_API_ENDPOINT, headers=AI_API_HEADERS, json={
+                            'model': AI_MODEL,
+                            'messages': messages,
+                            'max_tokens': MAX_TOKENS,
+                            'temperature': USER_SETTINGS.get(chatId, {}).get('temperature', DEFAULT_TEMP),
+                            'tools': TOOLS,
+                        })
+                        ai_response.raise_for_status()
+                        ai_data = ai_response.json()
+                        return await handleAiResponse(ai_data, chatId, history, thinking_message_id)
+                    except requests.exceptions.RequestException as e:
+                        print(f'AI API 响应失败: {e}')
+                        await editTelegramMessage(chatId, thinking_message_id, 'AI API 响应失败，请稍后再试')
+                        return 'AI API 响应失败，请稍后再试'
+                    
+                
+                else:
+                     return '不支持的工具调用'
+            elif message.get('content'):
+              return message['content']
+
     return 'AI 返回了无法识别的格式'
 
+
 async def handleCallbackQuery(callbackQuery):
     chatId = callbackQuery['message']['chat']['id']
     data = callbackQuery['data']
@@ -370,6 +384,7 @@ async def editTelegramMessage(chatId, message_id, text, options={}):
     except requests.exceptions.RequestException as e:
         print(f'编辑 Telegram 消息失败: {e}')
 
+
 def getHelpMessage():
     return f"""
 可用指令：