Paillat-dev/Botator
1
0
Fork 0
mirror of https://github.com/Paillat-dev/Botator.git synced 2026-01-02 01:06:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(makeprompt.py): import FuntionCallError from src.functionscalls to fix NameError

Browse Source 
✨ feat(makeprompt.py): add depth parameter to chatgpt_process function to limit recursive function calls and raise FuntionCallError if exceeded
This commit is contained in:
Paillat
2023-08-15 14:15:35 +02:00
parent 4b8070b413
commit f79bdd2086
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/makeprompt.py
View File

@@ -8,7 +8,7 @@ import json
from src.config import curs_data, max_uses, curs_premium, gpt_3_5_turbo_prompt from src.config import curs_data, max_uses, curs_premium, gpt_3_5_turbo_prompt
from src.utils.misc import moderate from src.utils.misc import moderate
from src.utils.openaicaller import openai_caller from src.utils.openaicaller import openai_caller
from src.functionscalls import call_function, functions, server_normal_channel_functions from src.functionscalls import call_function, functions, server_normal_channel_functions, FuntionCallError
async def replace_mentions(content, bot): async def replace_mentions(content, bot):
@@ -117,7 +117,7 @@ async def prepare_messages(self, messages, message: discord.Message, api_key, pr
return msgs return msgs
async def chatgpt_process(self, msgs, message: discord.Message, api_key, prompt, model): async def chatgpt_process(self, msgs, message: discord.Message, api_key, prompt, model, depth=0):
async def error_call(error=""): async def error_call(error=""):
try: try:
if error != "": if error != "":
@@ -155,6 +155,12 @@ async def chatgpt_process(self, msgs, message: discord.Message, api_key, prompt,
"name": function_call.get("name"), "name": function_call.get("name"),
} }
) )
depth += 1
if depth > 2:
await message.channel.send(
"Oh uh, it seems like i am calling functions recursively. I will stop now."
)
raise FuntionCallError("Too many recursive function calls")
await chatgpt_process(self, msgs, message, api_key, prompt, model) await chatgpt_process(self, msgs, message, api_key, prompt, model)
else: else:
content = response.get("content", "") content = response.get("content", "")