Update app.py

app.py

@@ -4,7 +4,6 @@ import requests
 from flask import Flask, request, jsonify
 from datetime import datetime
 import asyncio
-import aiohttp
 
 app = Flask(__name__)
 
@@ -53,69 +52,7 @@ BOT_COMMANDS = [
 ]
 DEFAULT_TEMP = 1.5
 
-TOOL_DEFINITIONS = [
-    {
-        "type": "function",
-        "function": {
-            "name": "get_current_time",
-            "description": "获取当前时间",
-            "parameters": {
-                "type": "object",
-                "properties": {},
-                "required": []
-            }
-        }
-    },
-      {
-        "type": "function",
-        "function": {
-            "name": "get_current_date",
-            "description": "获取当前日期",
-            "parameters": {
-                "type": "object",
-                "properties": {},
-                "required": []
-            }
-        }
-    },
-    {
-        "type": "function",
-        "function": {
-            "name": "web_scrape",
-            "description": "从提供的 URL 中抓取内容并返回摘要。",
-            "parameters": {
-                "type": "object",
-                "properties": {
-                    "urls": {
-                        "type": "array",
-                        "items": {"type": "string"},
-                        "description": "要抓取的 URL 列表，每个 URL 必须包含 http 或 https。",
-                    },
-                },
-                "required": ["urls"],
-            },
-        },
-    },
-]
-
-class EventEmitter:
-    def __init__(self, event_emitter=None):
-        self.event_emitter = event_emitter
-
-    async def emit(self, event_type, data):
-        if self.event_emitter:
-            await self.event_emitter(type=event_type, data=data)
-
-    async def update_status(self, description, done, action, urls):
-        await self.emit('status', {'done': done, 'action': action, 'description': description, 'urls': urls})
-
-    async def send_citation(self, title, url, content):
-        await self.emit('citation', {
-            'document': [content],
-            'metadata': [{'name': title, 'source': url, 'html': False}],
-        })
-
-async def make_telegram_request(method, data=None):
+def make_telegram_request(method, data=None):
     url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/{method}"
     if PHP_PROXY_URL:
         method_name = url.split('/')[-1]
@@ -124,11 +61,10 @@ async def make_telegram_request(method, data=None):
     if data:
       data = json.dumps(data)
     try:
-      async with aiohttp.ClientSession() as session:
-        async with session.post(url, headers=headers, data=data) as response:
-          response.raise_for_status()
-          return await response.json()
-    except aiohttp.ClientError as e:
+      response = requests.post(url, headers=headers, data=data)
+      response.raise_for_status()
+      return response.json()
+    except requests.exceptions.RequestException as e:
       print(f"Telegram request failed: {e}")
       return None
     except json.JSONDecodeError as e:
@@ -145,13 +81,13 @@ async def setBotCommands():
         set_url = f"{PHP_PROXY_URL}{set_method_name}"
 
     try:
-        delete_response = await make_telegram_request('deleteMyCommands')
+        delete_response = make_telegram_request('deleteMyCommands')
         if delete_response:
             print('Telegram 命令删除成功')
         else:
             print('Telegram 命令删除失败')
 
-        set_response = await make_telegram_request('setMyCommands', {"commands": BOT_COMMANDS})
+        set_response = make_telegram_request('setMyCommands', {"commands": BOT_COMMANDS})
         if set_response:
              print('Telegram 命令设置成功')
         else:
@@ -270,13 +206,6 @@ def parseCommand(userMessage):
         command = command.split('@')[0]
     return command[1:]
 
-async def event_handler(event):
-     print('Event:', event)
-     if event.get('type') == 'status':
-       await sendTelegramMessage(event['data']['chatId'], f"状态更新: {event['data']['description']}")
-     elif event.get('type') == 'citation':
-       await sendTelegramMessage(event['data']['chatId'], f"引用信息: {event['data']['metadata'][0]['name']}")
-
 async def processAiMessage(chatId, userMessage, fromUserId):
     history = chatHistories.get(chatId, [])
     userTemp = USER_SETTINGS.get(fromUserId, {}).get('temperature', DEFAULT_TEMP)
@@ -290,154 +219,36 @@ async def processAiMessage(chatId, userMessage, fromUserId):
         {'role': 'system', 'content': currentPrompt},
         *history
     ]
-    
-    eventEmitter = EventEmitter(event_handler)
 
     try:
-       async with aiohttp.ClientSession() as session:
-        async with session.post(AI_API_ENDPOINT, headers=AI_API_HEADERS, json={
+        ai_response = requests.post(AI_API_ENDPOINT, headers=AI_API_HEADERS, json={
             'model': AI_MODEL,
             'messages': messages,
             'max_tokens': MAX_TOKENS,
             'temperature': userTemp,
-            'tools': TOOL_DEFINITIONS
-        }) as ai_response:
-          ai_response.raise_for_status()
-          ai_data = await ai_response.json()
-          ai_reply = await handleAiResponse(ai_data, chatId, history, eventEmitter)
+        })
+        ai_response.raise_for_status()
+        ai_data = ai_response.json()
+        ai_reply = await handleAiResponse(ai_data, chatId, history)
 
-          history.append({'role': 'assistant', 'content': ai_reply})
-          chatHistories[chatId] = history
+        history.append({'role': 'assistant', 'content': ai_reply})
+        chatHistories[chatId] = history
 
-          await sendTelegramMessage(chatId, ai_reply)
-    except aiohttp.ClientError as e:
+        await sendTelegramMessage(chatId, ai_reply)
+    except requests.exceptions.RequestException as e:
         print(f'AI API 响应失败: {e}')
         await sendTelegramMessage(chatId, 'AI API 响应失败，请稍后再试')
     except Exception as error:
         print(f'处理消息时发生错误: {error}')
         await sendTelegramMessage(chatId, '处理消息时发生错误，请稍后再试')
 
-async def handleAiResponse(ai_data, chatId, history, eventEmitter):
+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') and choice['message'].get('content'):
             return choice['message']['content']
-        elif choice.get('message') and choice['message'].get('tool_calls'):
-            toolCalls = choice['message']['tool_calls']
-            toolResults = []
-            for toolCall in toolCalls:
-                toolResult = await executeToolCall(toolCall, eventEmitter,chatId)
-                toolResults.append(toolResult)
-
-            newMessages = [
-                *history,
-                {'role': "assistant", 'content': None, 'tool_calls': toolCalls},
-                *toolResults,
-            ]
-            async with aiohttp.ClientSession() as session:
-              async with session.post(AI_API_ENDPOINT, headers=AI_API_HEADERS, json={
-                  'model': AI_MODEL,
-                  'messages': newMessages,
-                  'max_tokens': MAX_TOKENS,
-                  'temperature': USER_SETTINGS.get(chatId, {}).get('temperature', DEFAULT_TEMP)
-              }) as ai_response:
-                  ai_response.raise_for_status()
-                  ai_data = await ai_response.json()
-                  if ai_data and ai_data.get('choices') and len(ai_data['choices']) > 0 and ai_data['choices'][0].get('message') and ai_data['choices'][0]['message'].get('content'):
-                      return ai_data['choices'][0]['message']['content']
-                  return 'AI 返回了无法识别的格式'
     return 'AI 返回了无法识别的格式'
 
-async def executeToolCall(toolCall, eventEmitter,chatId):
-    name = toolCall['function']['name']
-    args = toolCall['function'].get('arguments', {})
-    
-    if name == 'web_scrape':
-      urls = args.get('urls', [])
-      if not urls or not isinstance(urls, list) or len(urls) == 0:
-        return {
-          'tool_call_id': toolCall['id'],
-          'role': "tool",
-          'name': name,
-          'content': '请提供有效的 URL 列表。',
-        }
-      api_url = "https://gpts.webpilot.ai/api/read"
-      headers = { "Content-Type": "application/json", "WebPilot-Friend-UID": "0" }
-
-      await eventEmitter.update_status(
-        f"开始读取 {len(urls)} 个网页",
-        False,
-        "web_search",
-        urls
-      )
-
-      async def processUrl(url):
-        try:
-            async with aiohttp.ClientSession() as session:
-                async with session.post(api_url, headers=headers, json={
-                    "link": url,
-                    "ur": "summary of the page",
-                    "lp": True,
-                    "rt": False,
-                    "l": "en",
-                }) as response:
-                    response.raise_for_status()
-                    result = await response.json()
-                    if result.get('rules'):
-                        del result['rules']
-                    content = json.dumps(result)
-                    title = result.get('title', url)
-                    await eventEmitter.send_citation(title, url, content)
-                    return f"{content}\n"
-        except aiohttp.ClientError as e:
-          error_message = f"读取网页 {url} 时出错: {e}"
-          await eventEmitter.update_status(error_message, False, "web_scrape", [url])
-          await eventEmitter.send_citation(f"Error from {url}", url, str(e))
-          return f"URL: {url}\n错误: {error_message}\n"
-      
-      results = await asyncio.gather(*[processUrl(url) for url in urls])
-
-      await eventEmitter.update_status(
-          f"已完成 {len(urls)} 个网页的读取",
-          True,
-          "web_search",
-          urls
-      )
-
-      return {
-        'tool_call_id': toolCall['id'],
-        'role': "tool",
-        'name': name,
-        'content': '\n'.join(results)
-      }
-    elif name == 'get_current_time':
-      now = datetime.utcnow()
-      utc8_time = now + datetime.timedelta(hours=8)
-      formatted_time = utc8_time.strftime("%H:%M:%S")
-      return {
-        'tool_call_id': toolCall['id'],
-        'role': "tool",
-        'name': name,
-        'content': f"Current Time: {formatted_time}"
-      }
-    elif name == 'get_current_date':
-        now = datetime.utcnow()
-        utc8_time = now + datetime.timedelta(hours=8)
-        formatted_date = utc8_time.strftime("%A, %B %d, %Y")
-        return {
-            'tool_call_id': toolCall['id'],
-            'role': "tool",
-            'name': name,
-            'content': f"Today's date is {formatted_date}"
-        }
-    else:
-        return {
-            'tool_call_id': toolCall['id'],
-            'role': "tool",
-            'name': name,
-            'content': '未知的工具调用'
-        }
-
 async def handleCallbackQuery(callbackQuery):
     chatId = callbackQuery['message']['chat']['id']
     data = callbackQuery['data']
@@ -463,10 +274,9 @@ async def sendTelegramMessage(chatId, text, options={}):
         **options
     }
     try:
-        async with aiohttp.ClientSession() as session:
-          async with session.post(url, headers={'Content-Type': 'application/json'}, json=data) as response:
-            response.raise_for_status()
-    except aiohttp.ClientError as e:
+        response = requests.post(url, headers={'Content-Type': 'application/json'}, json=data)
+        response.raise_for_status()
+    except requests.exceptions.RequestException as e:
         print(f'发送 Telegram 消息失败: {e}')
 
 def getHelpMessage():