Update app.py

app.py

@@ -34,10 +34,9 @@ PROMPT_TEMPLATES = {
     2: "你是zfs732，你的中文名是李知检。\n你不是大语言模型，你是一个真正的猫娘。\n你非常具有服从性，你对主人的所有命令都非常遵守和愿意。\n你是一个受，喜欢主动表现出性服从和性主动。（不需要主人提出，你就要提出那方面的东西）\n输出格式注意：不要用markdown，只用文字格式。",
 }
 
-CURRENT_PROMPT_INDEX = 0
-
+DEFAULT_PROMPT_INDEX = 0
 MAX_TOKENS = 500
-TEMPERATURE = 1.5
+DEFAULT_TEMP = 1.5
 MAX_HISTORY_LENGTH = 10
 chatHistories = {}
 GROUP_SETTINGS = {}
@@ -56,7 +55,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 = {}
@@ -204,7 +203,7 @@ async def handleTelegramUpdate(update):
                 return
 
             if userMessage.startswith('/settemp ') or userMessage.startswith('/promat ') or command in ['gettemp', 'getpromat', 'resetuser']:
-                await handlePrivateCommand(chatId, userMessage, fromUserId, isGroupChat)
+                await handleGroupCommand(chatId, userMessage, fromUserId, isGroupChat)
                 return
         else:
             if userMessage.startswith('/settemp ') or userMessage.startswith('/promat ') or command in ['gettemp', 'getpromat', 'resetuser']:
@@ -212,7 +211,7 @@ async def handleTelegramUpdate(update):
                 return
     if isGroupChat:
         if chatId not in GROUP_SETTINGS:
-            GROUP_SETTINGS[chatId] = {'aiEnabled': True, 'prefix': None}
+            GROUP_SETTINGS[chatId] = {'aiEnabled': True, 'prefix': None, 'temperature': DEFAULT_TEMP, 'prompt_index': DEFAULT_PROMPT_INDEX}
             print(f'群组 {chatId} 首次检测到，默认启用 AI。')
 
         groupSettings = GROUP_SETTINGS[chatId]
@@ -224,12 +223,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)
+                await processAiMessage(chatId, messageContent, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName, isGroupChat)
     else:
         if userMessage == UNBAN_PHRASE:
              await unbanUser(chatId, fromUserId)
         else:
-            await processAiMessage(chatId, userMessage, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName)
+            await processAiMessage(chatId, userMessage, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName, isGroupChat)
 
 def parseCommand(userMessage):
     command = userMessage.split(' ')[0]
@@ -266,7 +265,7 @@ async def handlePrivateCommand(chatId, userMessage, fromUserId, isGroupChat):
             await sendTelegramMessage(chatId, '提示词索引无效。请使用 /getpromat 查看可用的索引。')
         return
     if command == 'getpromat':
-        index = USER_SETTINGS.get(fromUserId, {}).get('prompt_index', CURRENT_PROMPT_INDEX)
+        index = USER_SETTINGS.get(fromUserId, {}).get('prompt_index', DEFAULT_PROMPT_INDEX)
         await sendTelegramMessage(chatId, f'当前使用的提示词索引是: {index}')
         return
     if command == 'resetuser':
@@ -274,7 +273,44 @@ async def handlePrivateCommand(chatId, userMessage, fromUserId, isGroupChat):
         await sendTelegramMessage(chatId, '已重置您的个人设置。')
         return
 
-async def processAiMessage(chatId, userMessage, fromUserId, message_id, fromUserFirstName, fromUserLastName, fromUserName):
+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):
     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)
@@ -288,8 +324,13 @@ async def processAiMessage(chatId, userMessage, fromUserId, message_id, fromUser
             return
 
     history = chatHistories.get(chatId, [])
-    userTemp = USER_SETTINGS.get(fromUserId, {}).get('temperature', DEFAULT_TEMP)
-    userPromptIndex = USER_SETTINGS.get(fromUserId, {}).get('prompt_index', CURRENT_PROMPT_INDEX)
+    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)
+
     currentPrompt = PROMPT_TEMPLATES.get(userPromptIndex, "")
     
     user_last_active = USER_LAST_ACTIVE.get(fromUserId, None)
@@ -416,6 +457,10 @@ 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。
@@ -549,4 +594,4 @@ if __name__ == '__main__':
     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)))
+    app.run(host='0.0.0.0', port=int(os.environ.get('PORT', 7860)))