Update app.py

app.py

@@ -4,6 +4,7 @@ import requests
 from flask import Flask, request, jsonify
 from datetime import datetime
 import asyncio
+import aiohttp
 
 app = Flask(__name__)
 
@@ -114,7 +115,7 @@ class EventEmitter:
             'metadata': [{'name': title, 'source': url, 'html': False}],
         })
 
-def make_telegram_request(method, data=None):
+async 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]
@@ -123,10 +124,11 @@ def make_telegram_request(method, data=None):
     if data:
       data = json.dumps(data)
     try:
-      response = requests.post(url, headers=headers, data=data)
-      response.raise_for_status()
-      return response.json()
-    except requests.exceptions.RequestException as e:
+      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:
       print(f"Telegram request failed: {e}")
       return None
     except json.JSONDecodeError as e:
@@ -143,13 +145,13 @@ async def setBotCommands():
         set_url = f"{PHP_PROXY_URL}{set_method_name}"
 
     try:
-        delete_response = make_telegram_request('deleteMyCommands')
+        delete_response = await make_telegram_request('deleteMyCommands')
         if delete_response:
             print('Telegram 命令删除成功')
         else:
             print('Telegram 命令删除失败')
 
-        set_response = make_telegram_request('setMyCommands', {"commands": BOT_COMMANDS})
+        set_response = await make_telegram_request('setMyCommands', {"commands": BOT_COMMANDS})
         if set_response:
              print('Telegram 命令设置成功')
         else:
@@ -292,22 +294,23 @@ async def processAiMessage(chatId, userMessage, fromUserId):
     eventEmitter = EventEmitter(event_handler)
 
     try:
-        ai_response = requests.post(AI_API_ENDPOINT, headers=AI_API_HEADERS, json={
+       async with aiohttp.ClientSession() as session:
+        async with session.post(AI_API_ENDPOINT, headers=AI_API_HEADERS, json={
             'model': AI_MODEL,
             'messages': messages,
             'max_tokens': MAX_TOKENS,
             'temperature': userTemp,
             'tools': TOOL_DEFINITIONS
-        })
-        ai_response.raise_for_status()
-        ai_data = ai_response.json()
-        ai_reply = await handleAiResponse(ai_data, chatId, history, eventEmitter)
+        }) as ai_response:
+          ai_response.raise_for_status()
+          ai_data = await ai_response.json()
+          ai_reply = await handleAiResponse(ai_data, chatId, history, eventEmitter)
 
-        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 requests.exceptions.RequestException as e:
+          await sendTelegramMessage(chatId, ai_reply)
+    except aiohttp.ClientError as e:
         print(f'AI API 响应失败: {e}')
         await sendTelegramMessage(chatId, 'AI API 响应失败，请稍后再试')
     except Exception as error:
@@ -331,17 +334,18 @@ async def handleAiResponse(ai_data, chatId, history, eventEmitter):
                 {'role': "assistant", 'content': None, 'tool_calls': toolCalls},
                 *toolResults,
             ]
-            ai_response = requests.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)
-            })
-            ai_response.raise_for_status()
-            ai_data = 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 返回了无法识别的格式'
+            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):
@@ -369,22 +373,23 @@ async def executeToolCall(toolCall, eventEmitter,chatId):
 
       async def processUrl(url):
         try:
-          response = requests.post(api_url, headers=headers, json={
-            "link": url,
-            "ur": "summary of the page",
-            "lp": True,
-            "rt": False,
-            "l": "en",
-          })
-          response.raise_for_status()
-          result = 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 requests.exceptions.RequestException as e:
+            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))
@@ -458,9 +463,10 @@ async def sendTelegramMessage(chatId, text, options={}):
         **options
     }
     try:
-        response = requests.post(url, headers={'Content-Type': 'application/json'}, json=data)
-        response.raise_for_status()
-    except requests.exceptions.RequestException as e:
+        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:
         print(f'发送 Telegram 消息失败: {e}')
 
 def getHelpMessage():
@@ -492,7 +498,6 @@ def getHelpMessage():
   - 机器人具有攻击性，请谨慎使用。
 """
 
-
 @app.route('/update_commands', methods=['GET'])
 async def update_commands():
     await setBotCommands()