Improve tree.command, add async eval

discord_bot.py

@@ -9,6 +9,7 @@ from threading import Thread
 import json
 from horde import HordeAPI
 import inspect
+from async_eval import eval
 
 
 
@@ -33,26 +34,52 @@ with open("discord.json", "r") as f:
     json_data = json.load(f)
 
 
-# 自动生成调用函数
 COMMAND_NAME_PREFIX="discord_bot_call_"
-FILE_CONTENT="\n\n".join([
-f"async def {COMMAND_NAME_PREFIX}{command['name']}"
-+"(interaction: discord.Interaction"
-+''.join([f", {param['name']}: {param['type']}" for param in command["parameters"]])
-+f"):\n\
-    await interaction.response.defer()\n\
-    result = await {command['function']}("
-+', '.join([f"{param['name']}={param['name']}" for param in command["parameters"]])
-+f")\n\
-    if result is not None:\n\
-        await interaction.followup.send(result)\n\
-tree.add_command(app_commands.Command(\
-name=\"{command['name']}\", \
-description=\"{command['description']}\", \
-callback={COMMAND_NAME_PREFIX}{command['name']}\
-))"
-for command in json_data["command"]])
-exec(FILE_CONTENT)
+
+
+# 生成discord command的callback的调用参数
+def generate_discord_command_callback_param_str(parameters: list = []) -> str:
+	result=f'''
+	interaction: discord.Interaction{''.join([f", {param['name']}: {param['type']}"
+	for param in parameters])}
+'''
+	return result
+
+
+# 生成调用用户自定义的函数的参数
+def generate_user_function_param_str(parameters: list = []) -> str:
+	result=f'''{', '.join([f"{param['name']}={param['name']}"
+	for param in parameters])}'''
+	return result
+
+
+# 生成tree add_command
+def generate_tree_add_command(command: dict = {}) -> str:
+	result=f'''
+tree.add_command(app_commands.Command(
+	name="{command['name']}",
+	description="{command['description']}",
+	callback={COMMAND_NAME_PREFIX}{command['name']}
+))
+'''
+	return result
+
+
+# 生成discord command的callback的调用函数
+def generate_discord_command_callback_function_str(command: dict = {}) -> str:
+	result=f'''
+async def {COMMAND_NAME_PREFIX}{command['name']}({generate_discord_command_callback_param_str(command['parameters'])}):
+	await interaction.response.defer()
+	result = await {command['function']}({generate_user_function_param_str(command['parameters'])})
+	if result is not None:
+		await interaction.followup.send(result)
+'''
+	return result
+
+
+for command in json_data["command"]:
+	exec(generate_discord_command_callback_function_str(command))
+	exec(generate_tree_add_command(command))
 
 
 async def greet(name: str):
@@ -114,8 +141,7 @@ async def on_message(message):
             # 如果规则指定了函数，则调用对应的函数
             if "function" in rule:
                 function_name = rule["function"]
-                function = globals()[function_name]
-                result = await function(message)
+                result = eval(f"await {function_name()}")
                 await message.channel.send(result)
             # 否则发送预定义的响应消息
             elif "response" in rule:

requirements.txt

@@ -10,3 +10,4 @@ py-cord
 discord-py-interactions
 nextcord
 httpx
+async-eval