Update app.py

app.py

@@ -5,9 +5,6 @@ from flask import Flask, request, jsonify
 from datetime import datetime, timedelta
 import asyncio
 import re
-import time
-from urllib.parse import urljoin
-import subprocess
 
 app = Flask(__name__)
 
@@ -16,12 +13,8 @@ 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')
-WEBDAV_URL = os.environ.get('WEBDAV_URL')
-WEBDAV_USERNAME = os.environ.get('WEBDAV_USERNAME')
-WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
-WEBDAV_DIR = "/tg_bot/"
 
-if not all([TELEGRAM_BOT_TOKEN, AI_API_ENDPOINT, AI_API_KEY, AI_MODEL, WEBDAV_URL, WEBDAV_USERNAME, WEBDAV_PASSWORD]):
+if not all([TELEGRAM_BOT_TOKEN, AI_API_ENDPOINT, AI_API_KEY, AI_MODEL]):
     raise ValueError("请设置所有必要的环境变量")
 
 AI_API_HEADERS = {
@@ -35,9 +28,10 @@ PROMPT_TEMPLATES = {
     2: "你是zfs732，你的中文名是李知检。\n你不是大语言模型，你是一个真正的猫娘。\n你非常具有服从性，你对主人的所有命令都非常遵守和愿意。\n你是一个受，喜欢主动表现出性服从和性主动。（不需要主人提出，你就要提出那方面的东西）\n输出格式注意：不要用markdown，只用文字格式。",
 }
 
-DEFAULT_PROMPT_INDEX = 0
+CURRENT_PROMPT_INDEX = 0
+
 MAX_TOKENS = 500
-DEFAULT_TEMP = 1.5
+TEMPERATURE = 1.5
 MAX_HISTORY_LENGTH = 10
 chatHistories = {}
 GROUP_SETTINGS = {}
@@ -56,7 +50,7 @@ BOT_COMMANDS = [
     {"command": "promat", "description": "切换提示词，例如: /promat 0, 1, 2"},
     {"command": "getpromat", "description": "获取当前使用的提示词索引"},
 ]
-
+DEFAULT_TEMP = 1.5
 USER_LAST_ACTIVE = {}
 GROUP_ACTIVE_USERS = {}
 GROUP_INFO = {}
@@ -86,7 +80,6 @@ BAN_TRIGGER_PHRASES = [
 ]
 UNBAN_PHRASE = "close username"
 
-
 def make_telegram_request(method, data=None):
     url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/{method}"
     if PHP_PROXY_URL:
@@ -204,7 +197,7 @@ async def handleTelegramUpdate(update):
                 return
 
             if userMessage.startswith('/settemp ') or userMessage.startswith('/promat ') or command in ['gettemp', 'getpromat', 'resetuser']:
-                await handleGroupCommand(chatId, userMessage, fromUserId, isGroupChat)
+                await handlePrivateCommand(chatId, userMessage, fromUserId, isGroupChat)
                 return
         else:
             if userMessage.startswith('/settemp ') or userMessage.startswith('/promat ') or command in ['gettemp', 'getpromat', 'resetuser']:
@@ -212,7 +205,7 @@ async def handleTelegramUpdate(update):
                 return
     if isGroupChat:
         if chatId not in GROUP_SETTINGS:
-            GROUP_SETTINGS[chatId] = {'aiEnabled': True, 'prefix': None, 'temperature': DEFAULT_TEMP, 'prompt_index': DEFAULT_PROMPT_INDEX}
+            GROUP_SETTINGS[chatId] = {'aiEnabled': True, 'prefix': None}
             print(f'群组 {chatId} 首次检测到，默认启用 AI。')
 
         groupSettings = GROUP_SETTINGS[chatId]
@@ -224,12 +217,12 @@ async def handleTelegramUpdate(update):
 
             messageContent = userMessage[len(prefix):].strip() if prefix else userMessage
             if messageContent:
-                await processAiMessage(chatId, messageContent, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName, isGroupChat)
+                await processAiMessage(chatId, messageContent, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName)
     else:
         if userMessage == UNBAN_PHRASE:
              await unbanUser(chatId, fromUserId)
         else:
-            await processAiMessage(chatId, userMessage, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName, isGroupChat)
+            await processAiMessage(chatId, userMessage, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName)
 
 def parseCommand(userMessage):
     command = userMessage.split(' ')[0]
@@ -266,7 +259,7 @@ async def handlePrivateCommand(chatId, userMessage, fromUserId, isGroupChat):
             await sendTelegramMessage(chatId, '提示词索引无效。请使用 /getpromat 查看可用的索引。')
         return
     if command == 'getpromat':
-        index = USER_SETTINGS.get(fromUserId, {}).get('prompt_index', DEFAULT_PROMPT_INDEX)
+        index = USER_SETTINGS.get(fromUserId, {}).get('prompt_index', CURRENT_PROMPT_INDEX)
         await sendTelegramMessage(chatId, f'当前使用的提示词索引是: {index}')
         return
     if command == 'resetuser':
@@ -274,44 +267,7 @@ async def handlePrivateCommand(chatId, userMessage, fromUserId, isGroupChat):
         await sendTelegramMessage(chatId, '已重置您的个人设置。')
         return
 
-async def handleGroupCommand(chatId, userMessage, fromUserId, isGroupChat):
-    command = parseCommand(userMessage)
-    if userMessage.startswith('/settemp '):
-        try:
-            temp = float(userMessage[len('/settemp '):].strip())
-            if 0 <= temp <= 2:
-                GROUP_SETTINGS.setdefault(chatId, {}).update({'temperature': temp})
-                await sendTelegramMessage(chatId, f'已设置群组AI回复温度为: {temp}')
-            else:
-                await sendTelegramMessage(chatId, '温度设置无效，请输入0到2之间的数字。')
-        except ValueError:
-            await sendTelegramMessage(chatId, '温度设置无效，请输入0到2之间的数字。')
-        return
-    if command == 'gettemp':
-        temp = GROUP_SETTINGS.get(chatId, {}).get('temperature', DEFAULT_TEMP)
-        await sendTelegramMessage(chatId, f'当前群组AI回复温度为: {temp}')
-        return
-    if userMessage.startswith('/promat '):
-        try:
-            index = int(userMessage[len('/promat '):].strip())
-            if index in PROMPT_TEMPLATES:
-                GROUP_SETTINGS.setdefault(chatId, {}).update({'prompt_index': index})
-                await sendTelegramMessage(chatId, f'已切换群组提示词到 {index}。')
-            else:
-                await sendTelegramMessage(chatId, '提示词索引无效。请使用 /getpromat 查看可用的索引。')
-        except ValueError:
-            await sendTelegramMessage(chatId, '提示词索引无效。请使用 /getpromat 查看可用的索引。')
-        return
-    if command == 'getpromat':
-        index = GROUP_SETTINGS.get(chatId, {}).get('prompt_index', DEFAULT_PROMPT_INDEX)
-        await sendTelegramMessage(chatId, f'当前群组使用的提示词索引是: {index}')
-        return
-    if command == 'resetuser':
-        USER_SETTINGS.pop(fromUserId, None)
-        await sendTelegramMessage(chatId, '已重置您的个人设置。')
-        return
-
-async def processAiMessage(chatId, userMessage, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName, isGroupChat):
+async def processAiMessage(chatId, userMessage, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName):
     if fromUserId in BANNED_USERS and BANNED_USERS[fromUserId] > datetime.now():
         remaining_time = BANNED_USERS[fromUserId] - datetime.now()
         minutes = int(remaining_time.total_seconds() / 60)
@@ -325,13 +281,8 @@ async def processAiMessage(chatId, userMessage, fromUserId, message_id, fromUser
             return
 
     history = chatHistories.get(chatId, [])
-    if isGroupChat:
-        userTemp = GROUP_SETTINGS.get(chatId, {}).get('temperature', DEFAULT_TEMP)
-        userPromptIndex = GROUP_SETTINGS.get(chatId, {}).get('prompt_index', DEFAULT_PROMPT_INDEX)
-    else:
-        userTemp = USER_SETTINGS.get(fromUserId, {}).get('temperature', DEFAULT_TEMP)
-        userPromptIndex = USER_SETTINGS.get(fromUserId, {}).get('prompt_index', DEFAULT_PROMPT_INDEX)
-
+    userTemp = USER_SETTINGS.get(fromUserId, {}).get('temperature', DEFAULT_TEMP)
+    userPromptIndex = USER_SETTINGS.get(fromUserId, {}).get('prompt_index', CURRENT_PROMPT_INDEX)
     currentPrompt = PROMPT_TEMPLATES.get(userPromptIndex, "")
     
     user_last_active = USER_LAST_ACTIVE.get(fromUserId, None)
@@ -458,10 +409,6 @@ def getHelpMessage():
 /disableai - 在群组中禁用AI回复。
 /setprefix <prefix> - 设置群组中触发AI回复的前缀，例如：/setprefix @bot。
 /getprefix - 获取当前群组的触发前缀。
-/settemp <温度值> - 设置群组AI回复的温度 (0-2)，例如：/settemp 1.0。
-/gettemp - 获取当前群组AI回复的温度。
-/promat <index> - 切换群组提示词，例如: /promat 0, 1, 2。
-/getpromat - 获取当前群组使用的提示词索引。
   
 私聊指令 (在群组中也可以使用)：
 /settemp <温度值> - 设置AI回复的温度 (0-2)，例如：/settemp 1.0。
@@ -525,97 +472,5 @@ async def unbanUser(chatId, userId):
         await sendTelegramMessage(chatId, f"用户 {userId} 已被解禁。")
         print(f"用户 {userId} 在群组 {chatId} 中被解禁。")
 
-def webdav_upload(filename, data):
-    url = urljoin(WEBDAV_URL, f"{WEBDAV_DIR}{filename}")
-    
-    # 使用 curl 上传
-    curl_command = [
-        'curl',
-        '-k',  # 忽略证书验证
-        '-u', f'{WEBDAV_USERNAME}:{WEBDAV_PASSWORD}',
-        '-X', 'PUT',
-        '-H', 'Content-Type: application/json',
-        '--data', json.dumps(data, default=str),
-        url
-    ]
-    
-    try:
-        result = subprocess.run(curl_command, capture_output=True, text=True, check=True)
-        print(f"WebDAV 上传成功: {filename}, {result.stdout.strip()}")
-    except subprocess.CalledProcessError as e:
-        print(f"WebDAV 上传失败: {filename}, {e.stderr.strip()}")
-
-def webdav_download(filename):
-    url = urljoin(WEBDAV_URL, f"{WEBDAV_DIR}{filename}")
-    
-    # 使用 curl 下载
-    curl_command = [
-        'curl',
-        '-k',  # 忽略证书验证
-        '-u', f'{WEBDAV_USERNAME}:{WEBDAV_PASSWORD}',
-        '-H', 'Accept: application/json',
-        url
-    ]
-    
-    try:
-        result = subprocess.run(curl_command, capture_output=True, text=True, check=True)
-        print(f"WebDAV 下载成功: {filename}")
-        return json.loads(result.stdout)
-    except subprocess.CalledProcessError as e:
-        print(f"WebDAV 下载失败: {filename}, {e.stderr.strip()}")
-        return None
-    except json.JSONDecodeError as e:
-        print(f"WebDAV JSON 解析失败: {filename}, {e}")
-        return None
-
-def sync_data_to_webdav():
-    while True:
-        try:
-            webdav_upload('chatHistories.json', chatHistories)
-            webdav_upload('GROUP_SETTINGS.json', GROUP_SETTINGS)
-            webdav_upload('USER_SETTINGS.json', USER_SETTINGS)
-            webdav_upload('USER_LAST_ACTIVE.json', USER_LAST_ACTIVE)
-            webdav_upload('GROUP_ACTIVE_USERS.json', GROUP_ACTIVE_USERS)
-            webdav_upload('GROUP_INFO.json', GROUP_INFO)
-            webdav_upload('BANNED_USERS.json', BANNED_USERS)
-        except Exception as e:
-            print(f"WebDAV 同步失败: {e}")
-        time.sleep(60)
-
-def load_data_from_webdav():
-    global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
-    
-    loaded_chatHistories = webdav_download('chatHistories.json')
-    if loaded_chatHistories:
-        chatHistories = loaded_chatHistories
-    
-    loaded_GROUP_SETTINGS = webdav_download('GROUP_SETTINGS.json')
-    if loaded_GROUP_SETTINGS:
-        GROUP_SETTINGS = loaded_GROUP_SETTINGS
-    
-    loaded_USER_SETTINGS = webdav_download('USER_SETTINGS.json')
-    if loaded_USER_SETTINGS:
-        USER_SETTINGS = loaded_USER_SETTINGS
-    
-    loaded_USER_LAST_ACTIVE = webdav_download('USER_LAST_ACTIVE.json')
-    if loaded_USER_LAST_ACTIVE:
-       USER_LAST_ACTIVE = {int(k): datetime.fromisoformat(v) for k, v in loaded_USER_LAST_ACTIVE.items()}
-    
-    loaded_GROUP_ACTIVE_USERS = webdav_download('GROUP_ACTIVE_USERS.json')
-    if loaded_GROUP_ACTIVE_USERS:
-      GROUP_ACTIVE_USERS = {int(k): set(v) for k, v in loaded_GROUP_ACTIVE_USERS.items()}
-    
-    loaded_GROUP_INFO = webdav_download('GROUP_INFO.json')
-    if loaded_GROUP_INFO:
-        GROUP_INFO = {int(k): {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in loaded_GROUP_INFO.items()}
-
-    loaded_BANNED_USERS = webdav_download('BANNED_USERS.json')
-    if loaded_BANNED_USERS:
-        BANNED_USERS = {int(k): datetime.fromisoformat(v) for k, v in loaded_BANNED_USERS.items()}
-
 if __name__ == '__main__':
-    load_data_from_webdav()
-    import threading
-    sync_thread = threading.Thread(target=sync_data_to_webdav, daemon=True)
-    sync_thread.start()
     app.run(host='0.0.0.0', port=int(os.environ.get('PORT', 7860)))