diff --git a/cogs/gpt_3_commands_and_converser.py b/cogs/gpt_3_commands_and_converser.py index e135761..05b8744 100644 --- a/cogs/gpt_3_commands_and_converser.py +++ b/cogs/gpt_3_commands_and_converser.py @@ -96,14 +96,18 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"): @commands.Cog.listener() async def on_member_join(self, member): - if self.welcome_message_enabled(): + if self.model.welcome_message_enabled: query = f"Please generate a welcome message for {member.name} who has just joined the server." - welcome_message = self.model.send_request(query, tokens=self.usage_service.count_tokens(query)) + try: + welcome_message = self.model.send_request(query, tokens=self.usage_service.count_tokens(query)) + except: + welcome_message = None + if not welcome_message: welcome_message = EnvService.get_welcome_message() welcome_embed = discord.Embed(title=f"Welcome, {member.name}!", description=welcome_message) welcome_embed.add_field(name="Just so you know...", value="> My commands are invoked with a forward slash ("/")\n> Use /help to see my help message(s).") - await member.send(content=None, embed=welcome_embded) + await member.send(content=None, embed=welcome_embed) @commands.Cog.listener() async def on_member_remove(self, member): diff --git a/models/openai_model.py b/models/openai_model.py index 39fb535..1a012b3 100644 --- a/models/openai_model.py +++ b/models/openai_model.py @@ -53,7 +53,7 @@ class Model: self._summarize_conversations = True self._summarize_threshold = 2500 self.model_max_tokens = 4024 - self.send_welcome_message = False + self._welcome_message_enabled = False try: self.IMAGE_SAVE_PATH = os.environ["IMAGE_SAVE_PATH"] @@ -81,14 +81,14 @@ class Model: @property def welcome_message_enabled(self): - return self.send_welcome_message + return self._welcome_message_enabled - @send_welcome_message.setter + @welcome_message_enabled.setter def welcome_message_enabled(self, value): if value.lower() == "true": - self.send_welcome_message = True + self._welcome_message_enabled = True elif value.lower() == "false": - self.send_welcome_message = False + self._welcome_message_enabled = False else: raise ValueError("Value must be either true or false!")