⏳,❌ (1+2)

emoji_guild = ctx.guild
failure_emoji_id = 1098628957521313892
failure_emoji = discord.utils.get(emoji_guild.emojis, id=failure_emoji_id)

app.py

@@ -64,15 +64,19 @@ async def on_ready():
 async def commands(ctx):
     try:
         if await safetychecks(ctx):    
-            await ctx.reply(f"Use !deepfloydif [prompt], !jojo !disney !spidey or !sketch. Have fun! 🤗💖")
+            await ctx.reply(f"Use !deepfloydif [prompt], !jojo !spidey or !sketch. Have fun! 🤗💖")
     except Exception as e:
         print(f"Error: unable to help :(")   
 #---------------------------------------------------------------------------------------------------------------------------------------------   
 async def safetychecks(ctx):
     try:
+        emoji_guild = ctx.guild  
+        failure_emoji_id = 1098628957521313892
+        failure_emoji = discord.utils.get(emoji_guild.emojis, id=failure_emoji_id)
+
         if ctx.author.bot:
             print(f"Error: The bot is not allowed to use its own commands.")
-            await ctx.message.add_reaction('❌')
+            await ctx.message.add_reaction(failure_emoji)
             return False
     
         #✅✅ check if the bot is offline 
@@ -80,9 +84,9 @@ async def safetychecks(ctx):
         bot_member = ctx.guild.get_member(bot.user.id)
         if any(role.id == offline_bot_role_id for role in bot_member.roles):
             print(f"Error: {ctx.author} The bot is offline or under maintenance. (Remove the offline-bot role to bring it online)") 
-            thread = await ctx.message.create_thread(name=f'{ctx.author} Offline Error')
+            thread = await ctx.message.create_thread(name=f'Offline Error')
             await thread.send(f"Error: {ctx.author.mention} The bot is offline or under maintenance. (Remove the offline-bot role to bring it online)")
-            await ctx.message.add_reaction('❌')
+            await ctx.message.add_reaction(failure_emoji)
             return False
     
         #✅✅ check if the command is in the allowed channel(s)
@@ -91,9 +95,9 @@ async def safetychecks(ctx):
         channel_ids = [bot_test, testing_the_bot]
         if ctx.channel.id not in channel_ids: 
             print(f"{ctx.author}, commands are not permitted in {ctx.channel}")
-            thread = await ctx.message.create_thread(name=f'{ctx.author} Channel Error')
+            thread = await ctx.message.create_thread(name=f'Channel Error')
             await thread.send(f"Error: {ctx.author.mention} commands are not permitted in {ctx.channel}")
-            await ctx.message.add_reaction('❌')
+            await ctx.message.add_reaction(failure_emoji)
             return False            
             
         #✅✅ check if the user has the required role(s)   
@@ -110,9 +114,9 @@ async def safetychecks(ctx):
         has_allowed_role = any(role.id in allowed_role_ids for role in user_roles)
         if not has_allowed_role:
             print(f"Error: {ctx.author} does not have any of the required roles to use that command.")
-            thread = await ctx.message.create_thread(name=f'{ctx.author} Perms Error')
+            thread = await ctx.message.create_thread(name=f'Perms Error')
             await thread.send(f"Error: {ctx.author.mention} does not have any of the required roles to use that command.")
-            await ctx.message.add_reaction('❌')
+            await ctx.message.add_reaction(failure_emoji)
             return False
             
     
@@ -262,7 +266,7 @@ def inference(prompt):
     
     return [stage_1_results, stage_1_param_path, stage_1_result_path]
 #---------------------------------------------------------------------------------------------------------------------------------------------- 
-# deepfloydif stage 2 upscaling ❌
+# deepfloydif stage 2 upscaling ✅
 def inference2(index, stage_1_result_path):
     selected_index_for_stage_2 = index
     seed_2 = 0
@@ -282,10 +286,14 @@ async def react1234(reaction_emojis, combined_image_dfif):
 # Stage 1 ✅
 @bot.command()
 async def deepfloydif(ctx, *, prompt: str):
+    emoji_guild = ctx.guild  
+    failure_emoji_id = 1098628957521313892
+    failure_emoji = discord.utils.get(emoji_guild.emojis, id=failure_emoji_id)
     try:
         try:
             if await safetychecks(ctx): #✅
-                await ctx.message.add_reaction('🤖') # loading emoji?
+                await ctx.message.add_reaction('🤖')
+                await ctx.message.add_reaction('⏳') 
                 dfif_command_message_id = ctx.message.id # we will use this in some magic later on
                 thread = await ctx.message.create_thread(name=f'{ctx.author} DeepfloydIF Image Upscaling Thread ')
                 # create thread -> send new message inside thread + combined_image -> add reactions -> dfif2
@@ -306,8 +314,10 @@ async def deepfloydif(ctx, *, prompt: str):
             
         except Exception as e:
             print(f"Error: {e}")
-            #await ctx.reply('stage 1 error -> pre generation')
-            await ctx.message.add_reaction('❌')
+            thread = await ctx.message.create_thread(name=f'DFIF1 Error')
+            await thread.send(f"{ctx.author.mention} Error during stage 1 pre-generation.")
+            await ctx.message.remove_reaction('⏳')
+            await ctx.message.add_reaction(failure_emoji)
             
         #generation✅-------------------------------------------------------
         try:
@@ -326,8 +336,10 @@ async def deepfloydif(ctx, *, prompt: str):
             
         except Exception as e:
             print(f"Error: {e}")
-            #await ctx.reply('❌stage 1 error -> during generation')
-            await ctx.message.add_reaction('❌')            
+            thread = await ctx.message.create_thread(name=f'Generation Error')
+            await thread.send(f"{ctx.author.mention} Error during stage 1 generation.")
+            await ctx.message.remove_reaction('⏳')
+            await ctx.message.add_reaction(failure_emoji)            
         #posting images✅----------------------------------------------------------------    
         try:
             #await thread.send(f'✅combining images...') 
@@ -382,14 +394,18 @@ async def deepfloydif(ctx, *, prompt: str):
             
         except Exception as e:
             print(f"Error: {e}")
-            #await ctx.reply('❌stage 1 error -> posting images in thread')
-            await ctx.message.add_reaction('❌')
+            thread = await ctx.message.create_thread(name=f'Posting Error')
+            await thread.send(f"{ctx.author.mention} Encountered error while posting combined image in thread.")
+            await ctx.message.remove_reaction('⏳')
+            await ctx.message.add_reaction(failure_emoji)
             
     #deepfloydif try/except
     except Exception as e:
         print(f"Error: {e}")
-        #await ctx.reply('❌An error occurred in stage 1 for deepfloydif')
-        await ctx.message.add_reaction('❌')
+        thread = await ctx.message.create_thread(name=f'deepfloydif Error')
+        await thread.send(f"{ctx.author.mention} Overall error with deepfloydif.")
+        await ctx.message.remove_reaction('⏳')
+        await ctx.message.add_reaction(failure_emoji)
 
 #----------------------------------------------------------------------------------------------------------------------------
 # Stage 2 ✅
@@ -439,16 +455,15 @@ async def dfif2(index: int, stage_1_result_path, thread, dfif_command_message_id
         failure_emoji = discord.utils.get(emoji_guild.emojis, id=failure_emoji_id)
         parent_channel = thread.parent
         dfif_command_message = await parent_channel.fetch_message(dfif_command_message_id)
-        await dfif_command_message.add_reaction(failure_emoji)        
-        #await ctx.reply('An error occured in stage 2') need to fix
-        #await ctx.message.add_reaction('❌')
+        await dfif_command_message.add_reaction(failure_emoji)     
+        await thread.send(f"Error during stage 2 upscaling.") 
 #----------------------------------------------------------------------------------------------------------------------------
-# react detector for stage 2 ❌
+# react detector for stage 2 ✅
 @bot.event
 async def on_reaction_add(reaction, user):    # ctx = await bot.get_context(reaction.message)? could try later, might simplify
     try:
         #ctx = await bot.get_context(reaction.message)
-        # safety checks first ❌
+        # safety checks first ✅
         thread = reaction.message.channel
         threadparentid = thread.parent.id
         
@@ -488,40 +503,16 @@ async def on_reaction_add(reaction, user):    # ctx = await bot.get_context(reac
                         ctx = await bot.get_context(reaction.message)
                         #await reaction.message.channel.send(f"✅calling dfif2")  
                         await dfif2(index, stage_1_result_path, thread, dfif_command_message_id)
-        
-        '''
-
-            if reaction.message.attachments:
-                if user.id == reaction.message.mentions[0].id:  # all we care about is upscaling whatever image this is 
-                    
-                    # magic begins
-                    attachment = reaction.message.attachments[0]
-                    image_name = attachment.filename
-                    # we know image_name will be something like 1tmpgtv4qjix.png
-                    # remove .png first
-                    indexpartialpath = image_name[:-4] # should be 1tmpgtv4qjix 
-                    # extract index as an integer (dfif2 needs integer)
-                    index = int(indexpartialpath[0]) - 1# should be 1
-                    # extract partialpath
-                    partialpath = indexpartialpath[1:] # should be tmpgtv4qjix
-                    # add /tmp/ to partialpath, save as new variable
-                    fullpath = "/tmp/" + partialpath # should be /tmp/tmpgtv4qjix
-    
-                    stage_1_result_path = fullpath
-                    index = index
-                    await dfif2(index, stage_1_result_path, thread)        
-        
-        '''
 
-                
     except Exception as e:
         print(f"Error: {e}")
-        
-        #await ctx.reply('An error occured in stage 2') need to fix
-        #await ctx.message.add_reaction('���')
+        emoji_guild = reaction.message.guild  
+        failure_emoji_id = 1098628957521313892
+        failure_emoji = discord.utils.get(emoji_guild.emojis, id=failure_emoji_id)
+        await reaction.message.add_reaction(failure_emoji) 
+        await reaction.message.channel.send(f"Error during reactions.")
 #---------------------------------------------------------------------------------------------------------------------------- 
 
-    
 def run_bot():
     bot.run(DISCORD_TOKEN)