0.6 some cleanup, testing original DFIF

app.py

@@ -22,15 +22,18 @@ import time
 #fix error on first command on bot startup
 #stable diffusion upscale
 #buttons for deepfloydIF (1,2,3,4)
+#application commands instead of message content checks (more user-friendly)
 
 
 
 
-#token update
 DFIF_TOKEN = os.getenv('DFIF_TOKEN')
-#deepfloydif
-#df = Client("DeepFloyd/IF") #not reliable at the moment
-df = Client("huggingface-projects/IF", DFIF_TOKEN)
+
+#deepfloydIF
+df = Client("DeepFloyd/IF", DFIF_TOKEN) #not reliable at the moment
+#df = Client("huggingface-projects/IF", DFIF_TOKEN)
+
+#stable diffusion upscaler
 sdlu = Client("huggingface-projects/stable-diffusion-latent-upscaler", DFIF_TOKEN)
 
 # Set up discord bot 
@@ -38,28 +41,29 @@ class MyClient(discord.Client):
     async def on_ready(self):
         print('Logged on as', self.user)
 
-    #----------------------------------------------------------------------------------------------------
+
     async def on_message(self, message):
 
-        #tldr, bot should run if
+        #safety checks----------------------------------------------------------------------------------------------------
+
+        #   tldr, bot should run if
         #1) it does not have @offline role
         #2) user has @verified role
         #3) bot is in #bot-test channel
         
+        # bot won't respond to itself, prevents feedback loop + API spam
+        if message.author == self.user:
+            return       
 
         # if the bot has this role, it won't run
-        OFFLINE_ROLE_ID = 1103676632667017266  # 1103676632667017266 = @offline-bot
+        OFFLINE_ROLE_ID = 1103676632667017266  # 1103676632667017266 = @offline / under maintenance
         guild = message.guild
         bot_member = guild.get_member(self.user.id)
         if any(role.id == OFFLINE_ROLE_ID for role in bot_member.roles):
             return
         
-        # don't respond to ourselves
-        if message.author == self.user:
-            return
-
-        # if the message author doesn't have this role, the bot won't run
-        REQUIRED_ROLE_ID = 897376942817419265 # 900063512829755413 = @verified     897376942817419265 = @huggingfolks
+        # the message author needs this role in order to use the bot
+        REQUIRED_ROLE_ID = 897376942817419265 # 900063512829755413 = @verified, 897376942817419265 = @huggingfolks
         if not any(role.id == REQUIRED_ROLE_ID for role in message.author.roles):
             return            
 
@@ -68,18 +72,14 @@ class MyClient(discord.Client):
         if message.channel.id not in ALLOWED_CHANNEL_IDS:
             return
 
-        #----------------------------------------------------------------------------------------------------
-        #deepfloydif
-        # start with preset values for now
-        if message.content.startswith('!deepfloydif'):
+        #deepfloydif----------------------------------------------------------------------------------------------------
+            
+        if message.content.startswith('!deepfloydif'): # change to application commands, more intuitive
 
-            #predict
-            #was: 1,4,7.0
-            #predict
             #(prompt, negative_prompt, seed, number_of_images, guidance_scale,custom_timesteps_1, number_of_inference_steps, api_name="/generate64") 
             #-> (stage_1_results, stage_1_param_path, stage_1_result_path)
 
-            # custom input
+            # input prompt
             prompt = message.content[12:].strip()   
             number_of_images = 4
 
@@ -92,43 +92,46 @@ class MyClient(discord.Client):
 
             #stage_1_results, stage_1_param_path, stage_1_result_path = df.predict("gradio written on a wall", "blur", 1,1,7.0, 'smart100',50, api_name="/generate64")
             
-            # Assuming stage_1_results contains the path to the directory
+            # stage_1_results -> path to directory with png files, so we isolate those
             png_files = [f for f in os.listdir(stage_1_results) if f.endswith('.png')]
 
-
-            # image merge test
-            # Assuming png_files contains the list of all PNG files in the directory
+            # merge images into larger, 2x2 image the way midjourney does it
             if png_files:
                 first_png = png_files[0]
                 second_png = png_files[1]
                 third_png = png_files[2]
                 fourth_png = png_files[3]
+
+                '''
+                [],[],[],[] -> [][]
+                               [][]
+                
+                '''
             
                 first_png_path = os.path.join(stage_1_results, first_png)
                 second_png_path = os.path.join(stage_1_results, second_png)
                 third_png_path = os.path.join(stage_1_results, third_png)
                 fourth_png_path = os.path.join(stage_1_results, fourth_png)
             
-                # Open the images using Pillow
                 img1 = Image.open(first_png_path)
                 img2 = Image.open(second_png_path)
                 img3 = Image.open(third_png_path)
                 img4 = Image.open(fourth_png_path)
             
-                # Create a new image with the size of the combined images (2x2)
+                # create a new blank image with the size of the combined images (2x2)
                 combined_image = Image.new('RGB', (img1.width * 2, img1.height * 2))
             
-                # Paste the individual images into the combined image
+                # paste the individual images into the combined image
                 combined_image.paste(img1, (0, 0))
                 combined_image.paste(img2, (img1.width, 0))
                 combined_image.paste(img3, (0, img1.height))
                 combined_image.paste(img4, (img1.width, img1.height))
             
-                # Save the combined image
+                # save the combined image
                 combined_image_path = os.path.join(stage_1_results, 'combined_image.png')
                 combined_image.save(combined_image_path)
             
-            # Send the combined image file as a Discord attachment
+            # send the combined image file as a discord attachment
             with open(combined_image_path, 'rb') as f:
                 await message.reply('Here is the combined image', file=discord.File(f, 'combined_image.png'))
 
@@ -156,11 +159,6 @@ class MyClient(discord.Client):
             # Send the image file as a Discord attachment
             with open(img_path, 'rb') as f:
                 await message.reply(f'Here is the generated image', file=discord.File(f, 'generated_image.png'))                
-            
-            
-            
-            
-            
             '''