🔧 chore(makeprompt.py): refactor prepare_messages and chatgpt_process functions to accept an error_call function for error handling

🔧 chore(makeprompt.py): refactor chat_process function to use the error_call function for error handling
This commit is contained in:
2023-08-15 18:53:22 +02:00
parent df3e01900e
commit f2e1b2ffe3

View File

@@ -49,17 +49,9 @@ async def fetch_messages_history(channel: discord.TextChannel, limit, original_m
return messages
async def prepare_messages(self, messages, message: discord.Message, api_key, prompt):
async def error_call(error=""):
try:
if error != "":
await message.channel.send(
f"An error occured: {error}", delete_after=10
)
await message.channel.trigger_typing()
except:
pass
async def prepare_messages(
self, messages, message: discord.Message, api_key, prompt, error_call
):
msgs = [] # create the msgs list
msgs.append(
{"role": "system", "content": prompt}
@@ -123,18 +115,8 @@ async def prepare_messages(self, messages, message: discord.Message, api_key, pr
async def chatgpt_process(
self, msgs, message: discord.Message, api_key, prompt, model, depth=0
self, msgs, message: discord.Message, api_key, prompt, model, error_call, depth=0
):
async def error_call(error=""):
try:
if error != "":
await message.channel.send(
f"An error occured: {error}", delete_after=10
)
await message.channel.trigger_typing()
except:
pass
response = str()
caller = openai_caller()
called_functions = (
@@ -317,5 +299,16 @@ async def chat_process(self, message):
)
.replace("[pretend-to-be]", pretend_to_be)
)
emesgs = await prepare_messages(self, messages, message, api_key, prompt)
await chatgpt_process(self, emesgs, message, api_key, prompt, model)
async def error_call(error=""):
try:
if error != "":
await message.channel.send(f"An error occured: {error}", delete_after=4)
await message.channel.trigger_typing()
except:
pass
emesgs = await prepare_messages(
self, messages, message, api_key, prompt, error_call
)
await chatgpt_process(self, emesgs, message, api_key, prompt, model, error_call)