mirror of
https://github.com/Paillat-dev/Botator.git
synced 2026-01-02 01:06:19 +00:00
🐛 fix(ChatProcess.py): handle exceptions and send error message with logs to the user when an error occurs during message processing
🐛 fix(channelSetup.py): format code to improve readability and adhere to PEP 8 style guide 🐛 fix(makeprompt.py): fix spacing issue in if statement 🐛 fix(openaicaller.py): format code to improve readability and adhere to PEP 8 style guide
This commit is contained in:
@@ -189,8 +189,17 @@ class Chat:
|
|||||||
return
|
return
|
||||||
if await self.postExitCriteria():
|
if await self.postExitCriteria():
|
||||||
return
|
return
|
||||||
await self.message.channel.trigger_typing()
|
try:
|
||||||
await self.formatContext()
|
await self.message.channel.trigger_typing()
|
||||||
await self.createThePrompt()
|
await self.formatContext()
|
||||||
await self.getResponse()
|
await self.createThePrompt()
|
||||||
await self.processResponse()
|
await self.getResponse()
|
||||||
|
await self.processResponse()
|
||||||
|
except Exception as e:
|
||||||
|
await self.message.channel.send(
|
||||||
|
f"""An error occured while processing your message. Please check your settings and try again. If the issue persists, please join uor discord server here: https://discord.gg/pB6hXtUeDv and send the following logs:
|
||||||
|
```
|
||||||
|
{e}
|
||||||
|
```"""
|
||||||
|
)
|
||||||
|
raise e
|
||||||
|
|||||||
@@ -233,7 +233,9 @@ class ChannelSetup(commands.Cog):
|
|||||||
await ctx.respond(f"Set API key for {api} to `secret`.", ephemeral=True)
|
await ctx.respond(f"Set API key for {api} to `secret`.", ephemeral=True)
|
||||||
|
|
||||||
@setup.command(name="premium", description="Set the guild to premium.")
|
@setup.command(name="premium", description="Set the guild to premium.")
|
||||||
async def premium(self, ctx: discord.ApplicationContext, guild_id: str = None, days: int = 180):
|
async def premium(
|
||||||
|
self, ctx: discord.ApplicationContext, guild_id: str = None, days: int = 180
|
||||||
|
):
|
||||||
guild = Guild(guild_id or str(ctx.guild.id))
|
guild = Guild(guild_id or str(ctx.guild.id))
|
||||||
guild.load()
|
guild.load()
|
||||||
if await self.bot.is_owner(ctx.author):
|
if await self.bot.is_owner(ctx.author):
|
||||||
|
|||||||
@@ -43,9 +43,9 @@ async def fetch_messages_history(channel: discord.TextChannel, limit, original_m
|
|||||||
async for msg in channel.history(limit=100, before=original_message):
|
async for msg in channel.history(limit=100, before=original_message):
|
||||||
if not is_ignorable(msg.content):
|
if not is_ignorable(msg.content):
|
||||||
messages.append(msg)
|
messages.append(msg)
|
||||||
if len(messages) == limit-1:
|
if len(messages) == limit - 1:
|
||||||
break
|
break
|
||||||
|
|
||||||
messages.append(original_message)
|
messages.append(original_message)
|
||||||
messages.reverse()
|
messages.reverse()
|
||||||
return messages
|
return messages
|
||||||
|
|||||||
@@ -92,11 +92,11 @@ class openai_caller:
|
|||||||
|
|
||||||
error_call = nothing
|
error_call = nothing
|
||||||
if error_call == None:
|
if error_call == None:
|
||||||
|
|
||||||
async def nothing(x):
|
async def nothing(x):
|
||||||
return x
|
return x
|
||||||
|
|
||||||
error_call = nothing
|
error_call = nothing
|
||||||
if kwargs.get("model", "") in chat_models:
|
if kwargs.get("model", "") in chat_models:
|
||||||
return await self.chat_generate(error_call, **kwargs)
|
return await self.chat_generate(error_call, **kwargs)
|
||||||
elif kwargs.get("engine", "") in text_models:
|
elif kwargs.get("engine", "") in text_models:
|
||||||
|
|||||||
Reference in New Issue
Block a user