Update app.py

app.py

@@ -2,10 +2,8 @@ import os
 import json
 import requests
 from flask import Flask, request, jsonify
-from datetime import datetime, timezone, timedelta
+from datetime import datetime
 import asyncio
-import re
-from urllib.parse import quote
 
 app = Flask(__name__)
 
@@ -14,7 +12,6 @@ AI_API_ENDPOINT = os.environ.get('AI_API_ENDPOINT')
 AI_API_KEY = os.environ.get('AI_API_KEY')
 AI_MODEL = os.environ.get('AI_MODEL')
 PHP_PROXY_URL = os.environ.get('PHP_PROXY_URL')
-SEARXNG_URL = os.environ.get('SEARXNG_URL', 'https://sousuo.emoe.top')  # 使用环境变量，默认值
 
 if not all([TELEGRAM_BOT_TOKEN, AI_API_ENDPOINT, AI_API_KEY, AI_MODEL]):
     raise ValueError("请设置所有必要的环境变量")
@@ -55,68 +52,6 @@ BOT_COMMANDS = [
 ]
 DEFAULT_TEMP = 1.5
 
-TOOLS = [
-    {
-        "type": "function",
-        "function": {
-            "name": "get_current_datetime",
-            "description": "获取当前的日期和时间",
-            "parameters": {
-                "type": "object",
-                "properties": {},
-                "required": []
-            }
-        }
-    },
-        {
-        "type": "function",
-        "function": {
-            "name": "search_with_searxng",
-            "description": "使用 Searxng 搜索信息，并返回搜索结果的摘要",
-            "parameters": {
-                "type": "object",
-                "properties": {
-                    "query": {
-                        "type": "string",
-                        "description": "要搜索的关键词"
-                    }
-                },
-                "required": ["query"]
-            }
-        }
-    }
-]
-
-def get_current_datetime():
-    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 search_with_searxng(query):
-    """使用 Searxng 搜索信息，并返回搜索结果的摘要"""
-    try:
-        search_url = f"{SEARXNG_URL}/search?q={quote(query)}&format=json"
-        response = requests.get(search_url)
-        response.raise_for_status()
-        results = response.json().get('results', [])
-        if results:
-             # 提取标题和链接，返回格式化的结果
-            formatted_results = []
-            for result in results:
-                title = result.get('title', '无标题')
-                url = result.get('url', '无链接')
-                formatted_results.append(f"- [{title}]({url})")
-            return "\n".join(formatted_results)
-        else:
-            return "没有找到相关的搜索结果。"
-    except requests.exceptions.RequestException as e:
-        print(f"Searxng 请求失败: {e}")
-        return "搜索请求失败，请稍后再试。"
-    except Exception as e:
-        print(f"处理搜索结果时发生错误：{e}")
-        return "处理搜索结果时发生错误。"
-
-
 def make_telegram_request(method, data=None):
     url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/{method}"
     if PHP_PROXY_URL:
@@ -247,6 +182,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 '):
@@ -298,7 +234,7 @@ 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')
 
@@ -308,11 +244,10 @@ async def processAiMessage(chatId, userMessage, fromUserId, message_id):
             'messages': messages,
             'max_tokens': MAX_TOKENS,
             'temperature': userTemp,
-            'tools': TOOLS,
         })
         ai_response.raise_for_status()
         ai_data = ai_response.json()
-        ai_reply = await handleAiResponse(ai_data, chatId, history, thinking_message_id)
+        ai_reply = await handleAiResponse(ai_data, chatId, history)
 
         history.append({'role': 'assistant', 'content': ai_reply})
         chatHistories[chatId] = history
@@ -325,78 +260,11 @@ async def processAiMessage(chatId, userMessage, fromUserId, message_id):
         print(f'处理消息时发生错误: {error}')
         await editTelegramMessage(chatId, thinking_message_id, '处理消息时发生错误，请稍后再试')
 
-async def handleAiResponse(ai_data, chatId, history, thinking_message_id):
+async def handleAiResponse(ai_data, chatId, history):
     if ai_data and ai_data.get('choices') and len(ai_data['choices']) > 0:
         choice = ai_data['choices'][0]
-        if choice.get('message'):
-            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 响应失败，请稍后再试'
-                elif function_name == 'search_with_searxng':
-                   query = tool_call['function']['arguments']['query']
-                   search_results = search_with_searxng(query)
-                   history.append({
-                        'tool_call_id': tool_call['id'],
-                        'role': 'tool',
-                        'name': function_name,
-                        'content': search_results,
-                    })
-                   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']
-
+        if choice.get('message') and choice['message'].get('content'):
+            return choice['message']['content']
     return 'AI 返回了无法识别的格式'
 
 async def handleCallbackQuery(callbackQuery):
@@ -450,7 +318,6 @@ async def editTelegramMessage(chatId, message_id, text, options={}):
     except requests.exceptions.RequestException as e:
         print(f'编辑 Telegram 消息失败: {e}')
 
-
 def getHelpMessage():
     return f"""
 可用指令：