diff --git a/README.md b/README.md index adff17f..1c01cda 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ # Screenshots -

-

+

+ + + +

diff --git a/cogs/draw_image_generation.py b/cogs/draw_image_generation.py index 38318cb..ced39ae 100644 --- a/cogs/draw_image_generation.py +++ b/cogs/draw_image_generation.py @@ -213,13 +213,14 @@ class SaveView(discord.ui.View): self.converser_cog = converser_cog for x in range(1, len(image_urls) + 1): self.add_item(SaveButton(x, image_urls[x - 1])) + if not no_retry: + self.add_item(RedoButton(self.cog, converser_cog=self.converser_cog)) + for x in range(1, len(image_urls) + 1): self.add_item( VaryButton( x, image_urls[x - 1], self.cog, converser_cog=self.converser_cog ) ) - if not no_retry: - self.add_item(RedoButton(self.cog, converser_cog=self.converser_cog)) class VaryButton(discord.ui.Button): diff --git a/cogs/gpt_3_commands_and_converser.py b/cogs/gpt_3_commands_and_converser.py index 4a521f6..8d1bcc3 100644 --- a/cogs/gpt_3_commands_and_converser.py +++ b/cogs/gpt_3_commands_and_converser.py @@ -164,7 +164,7 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"): async def send_help_text(self, message): embed = discord.Embed( - title="GPT3Bot Help", description="The current commands", color=0x00FF00 + title="GPT3Bot Help", description="The current commands", color=0xC730C7 ) embed.add_field( name="!g ", diff --git a/cogs/image_prompt_optimizer.py b/cogs/image_prompt_optimizer.py index d767e35..93a4584 100644 --- a/cogs/image_prompt_optimizer.py +++ b/cogs/image_prompt_optimizer.py @@ -141,7 +141,7 @@ class DrawButton(discord.ui.Button["OptimizeView"]): return msg = await interaction.response.send_message( - "Drawing this prompt!", ephemeral=False + "Drawing this prompt...", ephemeral=False ) self.converser_cog.users_to_interactions[interaction.user.id].append(msg.id) self.converser_cog.users_to_interactions[interaction.user.id].append( @@ -156,7 +156,7 @@ class DrawButton(discord.ui.Button["OptimizeView"]): # Use regex to replace "Output Prompt:" loosely with nothing. # This is to ensure that the prompt is formatted correctly - prompt = re.sub(r"Output Prompt: ?", "", prompt) + prompt = re.sub(r"Optimized Prompt: ?", "", prompt) # Call the image service cog to draw the image await self.image_service_cog.encapsulated_send( diff --git a/models/openai_model.py b/models/openai_model.py index 162cefe..dc6ab5a 100644 --- a/models/openai_model.py +++ b/models/openai_model.py @@ -389,8 +389,10 @@ class Model: # If the image size is greater than 8MB, we can't return this to the user, so we will need to downscale the # image and try again safety_counter = 0 - while image_size > 8 or safety_counter >= 2: + while image_size > 8: safety_counter += 1 + if safety_counter >= 2: + break print( f"Image size is {image_size}MB, which is too large for discord. Downscaling and trying again" )