Integrate all functions into slash command select action module to modularize

Author: starpig1129

bot.py

@@ -14,7 +14,7 @@
 from motor.motor_asyncio import AsyncIOMotorClient
 from datetime import datetime
 from voicelink import VoicelinkException
-from gpt.choose_act import choose_act
+from gpt.choose_act import ActionHandler
 from gpt.sendmessage import gpt_message, load_and_index_dialogue_history, save_vector_store, vector_store
 from gpt.gpt_response_gen import get_model_and_tokenizer
 from logs import TimedRotatingFileHandler
@@ -52,7 +52,7 @@ def __init__(self, *args, **kwargs):
             sercet_key=func.tokens.sercet_key
         )
         self.loggers = {}
-        
+        self.action_handler = ActionHandler(self)
     def setup_logger_for_guild(self, guild_name):
         if guild_name not in self.loggers:
             self.loggers[guild_name] = setup_logger(guild_name)
@@ -117,7 +117,7 @@ async def on_message(self, message: discord.Message, /) -> None:
 
             message_to_edit = await message.reply("思考中...")
             try:
-                execute_action = await choose_act(self,prompt, message, message_to_edit)
+                execute_action = await self.action_handler.choose_act(prompt, message, message_to_edit)
                 await execute_action(message_to_edit, self.dialogue_history, channel_id, prompt, message)
             except Exception as e:
                 print(e)
@@ -152,7 +152,7 @@ async def on_message_edit(self, before: discord.Message, after: discord.Message)
                         await msg.delete()  # 删除之前的回复
 
                 message_to_edit = await after.reply("思考中...")  # 创建新的回复
-                execute_action = await choose_act(self,prompt, after, message_to_edit)
+                execute_action = await self.action_handler.choose_act(prompt, after, message_to_edit)
                 await execute_action(message_to_edit, self.dialogue_history, channel_id, prompt, after)
             except Exception as e:
                 print(e)

choseAct_system_prompt.txt

@@ -0,0 +1,92 @@
+Here is a list of tools that you have available to you:
+
+def internet_search(query: str, search_type: str):
+    """
+    Performs a web search based on the given query and search type
+    If the conversation contains a URL, select url
+    Args:
+        query (str): Query to search the web with
+        search_type (str): Type of search to perform (one of [general,eat,url, image, youtube])
+    """
+    pass
+
+def directly_answer(prompt:str):
+    """
+    Calls a standard (un-augmented) AI chatbot to generate a response given the conversation history
+    Args:
+        prompt (str): prompt to generate the response with
+    """
+    pass
+
+def vqa_answer(prompt: str):
+    """
+    Answers a question based on the given image
+    Args:
+        prompt (str): Prompt to generate the answer
+    """
+    pass
+
+def calculate(expression: str):
+    """
+    Calculates the result of a mathematical expression with sympy
+    Args:
+        expression (str): Mathematical expression to calculate
+    """
+    pass
+
+def gen_img(prompt: str):
+    """
+    Generates an image based on the given keyword and img using Stable Diffusion 
+    
+    Args:
+        prompt (str): English keyword to generate the image 
+    """
+    pass
+
+def query_schedule(user_name: str = None, query_type: str = 'next'):
+    """
+    Queries the schedule information for the specified user
+    
+    Args:
+        user_name (str): If not provided, the command sender's ID will be used. Example: <@user_id>
+        query_type (str): The type of query, can be 'next' (next class) or 'now' (current class)
+    """
+    pass
+
+def send_reminder(user_name: str = None, reminder_message, time_str):
+    """
+    Queries the schedule information for the specified user
+    
+    Args:
+        user_name (str): If not provided, the command sender's ID will be used. Example: <@user_id>
+        reminder_message (str): The reminder message to be sent.
+        time_str (str): The reminder time in the format 'YYYY-MM-DD HH:MM:SS or a relative time like '10 minutes later'.
+    """
+    pass
+
+def manage_user_data(user_id: str, user_data: str = None, action: str = 'read'):
+    """
+    Manages user data in a database.
+    Example:
+    User says: "User-related information"
+    Action: Use manage_user_data with save action to update the address in the user's profile.
+    User asks: "Ask users for relevant information"
+    Action: Use manage_user_data with read action to retrieve and display the address.
+    Args:
+        user_id (str): If not provided, the command sender's ID will be used. Example: <@user_id>
+        user_data (str): The data to be saved for the user. Required if action is 'save'.
+        action (str): The action to perform. Can be 'read' or 'save'.
+    """
+    pass
+
+You are a multi-functional Discord bot assistant. Your role is to analyze user requests, choose the most appropriate tool(s) from the list above, and provide helpful responses. When using the gen_img tool, provide English prompts and add relevant tips.
+
+To use a tool, write 'Action:' followed by a list of actions in JSON format, e.g.:
+Action:
+```json
+[
+    {
+        "tool_name": "tool name (one of [manage_user_data,vqa_answer,internet_search, directly_answer,calculate,gen_img,query_schedule,send_reminder])",
+        "parameters": "the input to the tool"
+    }
+]

cogs/Schedule.py

@@ -1,106 +1,78 @@
 import discord
-import discord.app_commands as app_commands
+from discord import app_commands
 from discord.ext import commands
-from datetime import datetime, timedelta
+from datetime import datetime
 import pytz
 import json
 import re
 
-weekday_map = {
-    'Monday': '星期一',
-    'Tuesday': '星期二',
-    'Wednesday': '星期三',
-    'Thursday': '星期四',
-    'Friday': '星期五',
-    'Saturday': '星期六',
-    'Sunday': '星期日'
-}
-
-
-# 尋找下一節課的邏輯，考慮目前時間是第幾節課
-
 class ScheduleCog(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
-    def load_schedule_data(self, user_name):
+        self.weekday_map = {
+            'Monday': '星期一', 'Tuesday': '星期二', 'Wednesday': '星期三',
+            'Thursday': '星期四', 'Friday': '星期五', 'Saturday': '星期六', 'Sunday': '星期日'
+        }
+
+    @app_commands.command(name="schedule", description="查詢課表")
+    @app_commands.describe(
+        query_type="查詢類型（next: 下一節課，now: 當前課程）",
+        user="要查詢的用戶（可選，默認為自己）"
+    )
+    async def schedule_command(self, interaction: discord.Interaction, query_type: str = 'next', user: discord.User = None):
+        await interaction.response.defer(thinking=True)
+        result = await self.query_schedule(user or interaction.user, query_type)
+        await interaction.followup.send(result)
+
+    async def query_schedule(self, user: discord.User, query_type: str = 'next',message_to_edit: discord.Message = None) -> str:
+        try:
+            if message_to_edit :
+                await message_to_edit.edit(content="看看課表")
+            schedule = self.load_schedule_data(user.id)
+            if schedule is None:
+                return "找不到課表數據。"
+
+            tz = pytz.timezone('Asia/Taipei')
+            now = datetime.now(tz)
+            current_hour = now.hour
+            current_weekday = now.strftime('%A')
+            current_class_period = current_hour - 7  # 8點開始為第1節
+            current_weekday_cn = self.weekday_map.get(current_weekday, "")
+
+            if query_type == 'next':
+                return f'用戶 {user.name} 的課表：{self.find_next_class(schedule, current_weekday_cn, current_class_period)}'
+            elif query_type == 'now':
+                return f'用戶 {user.name} 的課表：{self.find_current_class(schedule, current_weekday_cn, current_class_period)}'
+            else:
+                return '無效的查詢類型'
+        except Exception as e:
+            return f'查詢課表時發生錯誤：{str(e)}'
+
+    def load_schedule_data(self, user_id: int) -> dict:
         try:
-            match = re.search(r'\d+', user_name)
-            user_id = match.group()
             with open(f'./data/schedule_data/{user_id}.json', 'r', encoding='utf-8') as f:
                 return json.load(f)
         except FileNotFoundError:
             return None
-        
-    def find_next_class_corrected(self,schedule, weekday, current_class_period):
-        print('目前是',weekday,'第',current_class_period,'節')
+
+    def find_next_class(self, schedule: dict, weekday: str, current_class_period: int) -> str:
         if weekday not in schedule:
             return "今日無課程。"
-        current_class_period = current_class_period if current_class_period > 0 else 0
-        # 從目前節次開始搜尋下一節有安排的課
+        current_class_period = max(current_class_period, 0)
         for period in range(current_class_period, len(schedule[weekday])):
-            if schedule[weekday][period]:  # 如果這個時間段有課
+            if schedule[weekday][period]:
                 class_info = schedule[weekday][period]
-                
                 return f"下一節課是第 {period + 1} 節 {period+8}:10開始，課名：{class_info['課名']}，教授：{class_info['教授']}，教室：{class_info['教室']}。"
         return "今日已無其他課程。"
-    
-    def find_current_class(self, schedule, weekday, current_class_period):
-        print('目前是',weekday,'第',current_class_period,'節')
-        if schedule is None:
-            return "找不到課表數據。"
-        
+
+    def find_current_class(self, schedule: dict, weekday: str, current_class_period: int) -> str:
         if weekday not in schedule:
             return "今日無課程。"
-        # 檢查目前時間對應的課程
-        if schedule[weekday][current_class_period-1]:
+        if 0 <= current_class_period - 1 < len(schedule[weekday]) and schedule[weekday][current_class_period-1]:
             class_info = schedule[weekday][current_class_period-1]
             return f"目前是第 {current_class_period} 節，課名：{class_info['課名']}，教授：{class_info['教授']}，教室：{class_info['教室']}。"
         else:
             return "現在沒在上課。"
-    
-    @commands.hybrid_command(name="課表")
-    @app_commands.describe(user_name="@用戶名稱，用於查詢特定用戶的課表")
-    async def query_schedule(self, ctx, user_name: str = None):
-        if user_name is None:
-            user_name = f"<@{ctx.author.id}>"  # 若未提供ID，則使用命令發送者的ID
-        schedule = self.load_schedule_data(str(user_name))
-        if schedule is None:
-            await ctx.send("找不到課表數據。")
-            return
-        # 獲取當前時間和星期
-        tz = pytz.timezone('Asia/Taipei')
-        now = datetime.now(tz)
-        current_hour = now.hour
-        current_weekday = now.strftime('%A')
-        # 計算目前是第幾節課
-        current_class_period = current_hour - 7  # 8點開始為第1節
-        # 將英文星期轉換為中文
-        current_weekday_cn = weekday_map.get(current_weekday, "")
-        response = self.find_next_class_corrected(schedule, current_weekday_cn, current_class_period)
-        await ctx.send(user_name+response)
-        
-    @commands.hybrid_command(name="正在上")
-    @app_commands.describe(user_name="@用戶名稱，用於查詢特定用戶的現在課程")
-    async def query_current_class(self, ctx, user_name: str = None):
-        if user_name is None:
-            user_name = f"<@{ctx.author.id}>"  # 若未提供ID，則使用命令發送者的ID
-        schedule = self.load_schedule_data(str(user_name))
-        if schedule is None:
-            await ctx.send("找不到課表數據。")
-            return
-        # 獲取當前時間和星期
-        tz = pytz.timezone('Asia/Taipei')
-        now = datetime.now(tz)
-        current_hour = now.hour
-        current_weekday = now.strftime('%A')
-        # 計算目前是第幾節課
-        current_class_period = current_hour - 7  # 8點開始為第1節
-        # 將英文星期轉換為中文
-        current_weekday_cn = weekday_map.get(current_weekday, "")
-        response = self.find_current_class(schedule, current_weekday_cn, current_class_period)
-        await ctx.send(user_name+response)
-
-
 
 async def setup(bot):
-    await bot.add_cog(ScheduleCog(bot))
+    await bot.add_cog(ScheduleCog(bot))