Update app.py

app.py

@@ -14,6 +14,8 @@ from telegram.ext import (
     MessageHandler,
     filters,
 )
+import httpx
+from telegram.error import NetworkError
 
 # 配置
 TELEGRAM_BOT_TOKEN = os.environ.get("TELEGRAM_BOT_TOKEN")
@@ -41,18 +43,18 @@ chat_histories = {}  # Use a dict instead of a Map
 GROUP_SETTINGS = {}  # Use a dict instead of a Map
 USER_SETTINGS = {}  # Use a dict instead of a Map
 BOT_COMMANDS = [
-    ("start", "显示欢迎信息和操作按钮"),
-    ("clearall", "清空当前会话的聊天记录"),
-    ("help", "显示此帮助信息"),
-    ("enableai", "在群组中启用AI回复"),
-    ("disableai", "在群组中禁用AI回复"),
-    ("setprefix", "设置群组中触发AI回复的前缀，例如: /setprefix @bot"),
-    ("getprefix", "获取当前群组的触发前缀"),
-    ("settemp", "设置AI回复的温度，例如：/settemp 1.0"),
-    ("gettemp", "获取当前AI回复的温度"),
-    ("resetuser", "重置你的个人设置"),
-    ("promat", "切换提示词，例如: /promat 0, 1, 2"),
-    ("getpromat", "获取当前使用的提示词索引"),
+    {"command": "start", "description": "显示欢迎信息和操作按钮"},
+    {"command": "clearall", "description": "清空当前会话的聊天记录"},
+    {"command": "help", "description": "显示此帮助信息"},
+    {"command": "enableai", "description": "在群组中启用AI回复"},
+    {"command": "disableai", "description": "在群组中禁用AI回复"},
+    {"command": "setprefix", "description": "设置群组中触发AI回复的前缀，例如: /setprefix @bot"},
+    {"command": "getprefix", "description": "获取当前群组的触发前缀"},
+    {"command": "settemp", "description": "设置AI回复的温度，例如：/settemp 1.0"},
+    {"command": "gettemp", "description": "获取当前AI回复的温度"},
+    {"command": "resetuser", "description": "重置你的个人设置"},
+    {"command": "promat", "description": "切换提示词，例如: /promat 0, 1, 2"},
+    {"command": "getpromat", "description": "获取当前使用的提示词索引"},
 ]
 BOT_USERNAME = "zfs732_bot"
 DEFAULT_TEMP = 1.5
@@ -150,12 +152,14 @@ async def set_bot_commands(bot: Bot):
                     return
         logging.info("Telegram commands deleted successfully")
         commands = [
-            (command[0], command[1])
+            {"command": command["command"], "description": command["description"]}
             for command in BOT_COMMANDS
         ]
         url = f"{PHP_PROXY_URL}/bot{TELEGRAM_BOT_TOKEN}/setMyCommands"
+        json_data = {"commands": commands}
+        logging.info(f"Sending setMyCommands request with data: {json.dumps(json_data)}")
         async with aiohttp.ClientSession() as session:
-           async with session.post(url, json={"commands": commands}) as response:
+           async with session.post(url, json=json_data) as response:
                 if not response.ok:
                     error_text = await response.text()
                     logging.error(f"Telegram set commands failed: {response.status}, {error_text}")
@@ -545,6 +549,18 @@ def get_help_message():
   - 机器人具有攻击性，请谨慎使用。
 """
 
+async def initialize_with_retry(application):
+    max_retries = 3
+    for attempt in range(max_retries):
+        try:
+            await application.initialize()
+            return
+        except NetworkError as e:
+            logging.error(f"Error initializing application, attempt {attempt + 1}: {e}")
+            if attempt == max_retries - 1:
+                raise
+            await asyncio.sleep(2) # Wait for 2 seconds before retrying
+
 async def main():
     logging.basicConfig(level=logging.INFO)
 
@@ -552,7 +568,7 @@ async def main():
         logging.error("PHP proxy health check failed. Exiting.")
         return
 
-    application = Application.builder().token(TELEGRAM_BOT_TOKEN).build()
+    application = Application.builder().token(TELEGRAM_BOT_TOKEN).http_client(httpx.AsyncClient(trust_env=True)).build()
 
     # Set bot commands
     try:
@@ -582,7 +598,7 @@ async def main():
     application.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, handle_telegram_update))
 
     # Initialize the bot
-    await application.initialize()
+    await initialize_with_retry(application)
     # Start the bot
     await application.start()
     # Start polling updates from Telegram