_

chatbot/plugins/chat.py

@@ -231,29 +231,30 @@ def split_message(text: str) -> List[str]:
 async def closeed(client, callback):
     await callback.message.delete()
 
-@Client.on_callback_query(filters.regex("^modelmenu$"))
+@Client.on_callback_query(filters.regex("^modelmenu:([a-f0-9]{8})$"))
 async def modelgeminimenu(client, callback):
+    uuidstr = callback.matches[0].group(1)
     keyboard = []
     keyboard.append([
-        InlineKeyboardButton("Gemini Flash EXP", callback_data="modelset:gemini-2.0-flash-exp"),
-        InlineKeyboardButton("Gemini EXP", callback_data="modelset:gemini-exp-1206")
+        InlineKeyboardButton("Gemini Flash EXP", callback_data=f"us:gemini-2.0-flash-exp:{uuidstr}"),
+        InlineKeyboardButton("Gemini EXP", callback_data=f"us:gemini-exp-1206:{uuidstr}")
     ])
     keyboard.append([
-        InlineKeyboardButton("Gemini Flash 8B", callback_data="modelset:gemini-1.5-flash-8b"),
-        InlineKeyboardButton("Gemini 2.0 Flash ", callback_data="modelset:gemini-2.0-flash-001")
+        InlineKeyboardButton("Gemini Flash 8B", callback_data=f"us:gemini-1.5-flash-8b:{uuidstr}"),
+        InlineKeyboardButton("Gemini 2.0 Flash ", callback_data=f"us:gemini-2.0-flash-001:{uuidstr}")
     ])
     keyboard.append([
-        InlineKeyboardButton("Gemini PRO", callback_data="modelset:gemini-1.5-pro"),
-        InlineKeyboardButton("Gemini Flash", callback_data="modelset:gemini-1.5-flash"),
+        InlineKeyboardButton("Gemini PRO", callback_data=f"us:gemini-1.5-pro:{uuidstr}"),
+        InlineKeyboardButton("Gemini Flash", callback_data=f"us:gemini-1.5-flash:{uuidstr}"),
     ])
     keyboard.append([
-        InlineKeyboardButton("Close", callback_data="close")
+        InlineKeyboardButton("Close", callback_data="closedd")
     ])
     await callback.edit_message_reply_markup(reply_markup=InlineKeyboardMarkup(keyboard))
 
-@Client.on_callback_query(filters.regex(r"^modelset:(.*)$"))
+@Client.on_callback_query(filters.regex(r"^us:(.*):([a-f0-9]{8})$"))
 async def gemini_setmodel(client, callback):
-    model = callback.matches[0].group(1)
+    model, uuidstr = callback.matches[0].groups()
     user_id = callback.from_user.id
     await users_collection.update_one(
         {"user_id": user_id},
@@ -261,23 +262,11 @@ async def gemini_setmodel(client, callback):
         upsert=True
     )
     await callback.answer(f"Model set to {model}")
-    keyboard = []
-    keyboard.append([
-        InlineKeyboardButton("Gemini Flash EXP", callback_data="modelset:gemini-2.0-flash-exp"),
-        InlineKeyboardButton("Gemini EXP", callback_data="modelset:gemini-exp-1206")
-    ])
-    keyboard.append([
-        InlineKeyboardButton("Gemini Flash 8B", callback_data="modelset:gemini-1.5-flash-8b"),
-        InlineKeyboardButton("Gemini 2.0 Flash ", callback_data="modelset:gemini-2.0-flash-001")
-    ])
-    keyboard.append([
-        InlineKeyboardButton("Gemini PRO", callback_data="modelset:gemini-1.5-pro"),
-        InlineKeyboardButton("Gemini Flash", callback_data="modelset:gemini-1.5-flash"),
-    ])
-    keyboard.append([
-        InlineKeyboardButton("Close", callback_data="close")
-    ])
-    await callback.edit_message_reply_markup(reply_markup=InlineKeyboardMarkup(keyboard))
+    keyboard = create_keyboard(
+        user_id=user_id,
+        uuid_str=uuidstr
+    )
+    await callback.edit_message_reply_markup(reply_markup=keyboard)
 
 @Client.on_callback_query(filters.regex("^deletemydatagm$"))
 async def deletemydata(client, callback):
@@ -695,7 +684,7 @@ def create_keyboard(
                 [
                     InlineKeyboardButton(f"♾️", callback_data=f"trmulti_{user_id}_{uuid_str}"),
                     InlineKeyboardButton(f"🔒", callback_data=f"showchat_{user_id}"),
-                    InlineKeyboardButton(f"⛏️", callback_data=f"modelmenu"),
+                    InlineKeyboardButton(f"⛏️", callback_data=f"modelmenu:{uuid_str}"),
                     InlineKeyboardButton(f"💾", callback_data=f"memory_{user_id}_{uuid_str}")
                 ],
                 [