mirror of
https://github.com/Paillat-dev/Botator.git
synced 2026-01-02 09:16:19 +00:00
🔧 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:
@@ -49,17 +49,9 @@ async def fetch_messages_history(channel: discord.TextChannel, limit, original_m
|
|||||||
return messages
|
return messages
|
||||||
|
|
||||||
|
|
||||||
async def prepare_messages(self, messages, message: discord.Message, api_key, prompt):
|
async def prepare_messages(
|
||||||
async def error_call(error=""):
|
self, messages, message: discord.Message, api_key, prompt, error_call
|
||||||
try:
|
):
|
||||||
if error != "":
|
|
||||||
await message.channel.send(
|
|
||||||
f"An error occured: {error}", delete_after=10
|
|
||||||
)
|
|
||||||
await message.channel.trigger_typing()
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
msgs = [] # create the msgs list
|
msgs = [] # create the msgs list
|
||||||
msgs.append(
|
msgs.append(
|
||||||
{"role": "system", "content": prompt}
|
{"role": "system", "content": prompt}
|
||||||
@@ -123,18 +115,8 @@ async def prepare_messages(self, messages, message: discord.Message, api_key, pr
|
|||||||
|
|
||||||
|
|
||||||
async def chatgpt_process(
|
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()
|
response = str()
|
||||||
caller = openai_caller()
|
caller = openai_caller()
|
||||||
called_functions = (
|
called_functions = (
|
||||||
@@ -317,5 +299,16 @@ async def chat_process(self, message):
|
|||||||
)
|
)
|
||||||
.replace("[pretend-to-be]", pretend_to_be)
|
.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)
|
||||||
|
|||||||
Reference in New Issue
Block a user