[big revert] reverting to earlier version to pinpoint dfif issue

app.py

@@ -9,7 +9,7 @@ import time
 import re
 from discord import Embed, Color
 from discord.ext import commands
-# a
+# test # fix? # unstick # fix
 from gradio_client import Client
 from PIL import Image
 #from ratelimiter import RateLimiter
@@ -20,12 +20,6 @@ import multiprocessing
 
 import shutil # for doing image movement magic
 
-#import tempfile
-#import glob
-
-import uuid
-
-
 #todo
 # add safetychecks to all parts, test thoroughly
 # add discord channels, configure for fellows
@@ -52,19 +46,14 @@ DISCORD_TOKEN = os.environ.get("GRADIOTEST_TOKEN", None)
 
 df = Client("huggingface-projects/IF", GRADIOTEST_TOKEN)
 jojogan = Client("akhaliq/JoJoGAN", GRADIOTEST_TOKEN)
-falconclient = Client("HuggingFaceH4/falcon-chat", GRADIOTEST_TOKEN)
+
 
 intents = discord.Intents.default()
 intents.message_content = True
 
 bot = commands.Bot(command_prefix='!', intents=intents)
 
-#---------------------------------------------------------------------------------------------------------------------------------------------
-@bot.command()
-async def info(ctx):
-    current_directory = os.getcwd()
-    temp_directory = tempfile.gettempdir()
-    await ctx.reply(f"current_directory={current_directory}\n temp_directory={temp_directory}")
+
 #---------------------------------------------------------------------------------------------------------------------------------------------
 @bot.event
 async def on_ready():
@@ -77,7 +66,7 @@ async def commands(ctx):
         if await safetychecks(ctx):    
             await ctx.reply(f"Use !deepfloydif [prompt], !jojo !spidey or !sketch. Have fun! 🤗💖")
     except Exception as e:
-        print(f"Error: unable to help :( {e}")   
+        print(f"Error: unable to help :(")   
 #---------------------------------------------------------------------------------------------------------------------------------------------   
 async def safetychecks(ctx): 
     failure_emoji = '<:disagree:1098628957521313892>' 
@@ -99,13 +88,8 @@ async def safetychecks(ctx):
     
         #✅✅ check if the command is in the allowed channel(s)
         bot_test = 1100458786826747945
-        deepfloydif_channel = 1113182673859518514
-        jojo_channel = 1114217739473649764
-        sketch_channel = 1114218145343877180
-        spidey_channel = 1114218191594471514
-        falcon_channel = 1116089829147557999
-        
-        channel_ids = [bot_test, deepfloydif_channel, jojo_channel, spidey_channel, sketch_channel, falcon_channel]
+        testing_the_bot = 1113182673859518514
+        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'Channel Error')
@@ -137,8 +121,8 @@ async def safetychecks(ctx):
 
     # ping lunarflu if any safety check ever fails
     except Exception as e:
-        print(f"Error: safetychecks failed somewhere, command will not continue, {e}")
-        await ctx.message.reply(f"❌ <@811235357663297546> SC failed somewhere ❌ {e}") # this will always ping, as long as the bot has access to the channel
+        print(f"Error: safetychecks failed somewhere, command will not continue.")
+        await ctx.message.reply(f"❌ <@811235357663297546> SC failed somewhere ❌") # this will always ping, as long as the bot has access to the channel
         await ctx.message.add_reaction(failure_emoji)
 #---------------------------------------------------------------------------------------------------------------------------------------------- 
 @bot.command()
@@ -155,41 +139,13 @@ async def deepfloydifdemo(ctx):
 @bot.command()
 async def jojodemo(ctx):
     try:
-        thread = await ctx.message.create_thread(name=f'JoJo Demo {ctx.author} ')
+        thread = await ctx.message.create_thread(name=f'{ctx.author} Demo Thread')
         await thread.send(f'{ctx.author.mention} Here is a demo for the !jojo command!')
         await asyncio.sleep(0.5)
-        await thread.send(f'https://cdn.discordapp.com/attachments/932563860597121054/1114220616199966810/image.png')
-        await thread.edit(archived=True)        
-    except Exception as e:
-        print(f"Error: {e}")
-        await ctx.message.add_reaction('<:disagree:1098628957521313892>')
-        await thread.edit(archived=True)        
-#---------------------------------------------------------------------------------------------------------------------------------------------- 
-@bot.command()
-async def sketchdemo(ctx):
-    try:
-        thread = await ctx.message.create_thread(name=f'Sketch Demo {ctx.author} ')
-        await thread.send(f'{ctx.author.mention} Here is a demo for the !sketch command!')
-        await asyncio.sleep(0.5)
-        await thread.send(f'https://cdn.discordapp.com/attachments/932563860597121054/1114220716498370641/image.png')
-        await thread.edit(archived=True)        
-    except Exception as e:
-        print(f"Error: {e}")
-        await ctx.message.add_reaction('<:disagree:1098628957521313892>')
-        await thread.edit(archived=True)        
-#---------------------------------------------------------------------------------------------------------------------------------------------- 
-@bot.command()
-async def spideydemo(ctx):
-    try:
-        thread = await ctx.message.create_thread(name=f'Spidey Demo {ctx.author} ')
-        await thread.send(f'{ctx.author.mention} Here is a demo for the !spidey command!')
-        await asyncio.sleep(0.5)
-        await thread.send(f'https://cdn.discordapp.com/attachments/932563860597121054/1114220798085959690/image.png')
-        await thread.edit(archived=True)
+        await thread.send(f'https://cdn.discordapp.com/attachments/932563860597121054/1113492260294770778/image.png')
     except Exception as e:
         print(f"Error: {e}")
         await ctx.message.add_reaction('<:disagree:1098628957521313892>')
-        await thread.edit(archived=True)        
 #----------------------------------------------------------------------------------------------------------------------------------------------         
 # jojo ✅
 @bot.command()
@@ -203,98 +159,114 @@ async def jojo(ctx):
     # safety checks?✅
     # bot no crash  ✅
     try:  
-        if await safetychecks(ctx): #✅
-            if ctx.channel.id == 1114217739473649764:
-                await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
-                thread = await ctx.message.create_thread(name=f'Jojo | {ctx.author}', auto_archive_duration=60)         
-                if ctx.message.attachments:
-                    await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...yare yare, daze ...')  
-                    attachment = ctx.message.attachments[0]
-                    style = 'JoJo'
-                    #im = jojogan.predict(attachment.url, style)
-                    im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, style)
-                    #await ctx.message.reply(f'Here is the {style} version of it', file=discord.File(im))
-                    await thread.send(f'{ctx.author.mention} Here is the {style} version of it', file=discord.File(im))
-    
-                    #testing animated
-                    # <a:hugging_spin:1102656012621713488>
-                    await ctx.message.add_reaction('<:agree:1098629085955113011>') # ✅   
-                    await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
-                    await thread.edit(archived=True)
-                else: # no image
-                    await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
-                    await ctx.message.add_reaction('<:disagree:1098628957521313892>') # ❌
-                    await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
-                    await thread.edit(archived=True)
+        if await safetychecks(ctx): #✅ 
+            await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
+            thread = await ctx.message.create_thread(name=f'{ctx.author} Jojo Thread')         
+            if ctx.message.attachments:
+                await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...yare yare, daze ...')  
+                attachment = ctx.message.attachments[0]
+                style = 'JoJo'
+                #im = jojogan.predict(attachment.url, style)
+                im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, style)
+                #await ctx.message.reply(f'Here is the {style} version of it', file=discord.File(im))
+                await thread.send(f'{ctx.author.mention} Here is the {style} version of it', file=discord.File(im))
+
+                #testing animated
+                # <a:hugging_spin:1102656012621713488>
+                await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face    
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+            else: # no image
+                await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
+                await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
     except Exception as e: # no generation / img + no face
         await fullqueue(e, thread)  
         print(f"Error: {e}")
         await thread.send(f"{ctx.author.mention} Error: {e}")
-        await ctx.message.add_reaction('<:disagree:1098628957521313892>') # ❌
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>')  
         await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
-        await thread.edit(archived=True)
     
-   
+#---------------------------------------------------------------------------------------------------------------------------------------------- 
+# Disney ❌
+@bot.command()
+async def disney(ctx):
+    try:
+        if await safetychecks(ctx): #✅
+            await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
+            thread = await ctx.message.create_thread(name=f'{ctx.author} disney Thread')         
+            if ctx.message.attachments:
+                await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...')  
+                attachment = ctx.message.attachments[0]
+                style = 'Disney'
+                im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, 'disney')
+                await thread.send(f'{ctx.author.mention} Here is the {style} version of it', file=discord.File(im))
+                await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+            else: # no image
+                await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
+                await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+                
+    except Exception as e: # no generation / img + no face
+        await fullqueue(e, thread)       
+        print(f"Error: {e}")
+        await thread.send(f"{ctx.author.mention} Error: {e}")
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+        await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+        
 #---------------------------------------------------------------------------------------------------------------------------------------------- 
 # Spider-Verse ✅
 @bot.command()
 async def spidey(ctx):
     try:
         if await safetychecks(ctx): #✅ 
-            if ctx.channel.id == 1114218191594471514:
-                await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
-                thread = await ctx.message.create_thread(name=f'Spider-verse | {ctx.author}', auto_archive_duration=60)         
-                if ctx.message.attachments:
-                    await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...')  
-                    attachment = ctx.message.attachments[0]
-                    style = 'Spider-Verse'
-                    im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, style)
-                    await thread.send(f'{ctx.author.mention} Here is the {style} version of it', file=discord.File(im))
-                    await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face    
-                    await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user) 
-                    await thread.edit(archived=True)                
-                else: # no image
-                    await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
-                    await ctx.message.add_reaction('<:disagree:1098628957521313892>')  
-                    await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
-                    await thread.edit(archived=True)                
+            await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
+            thread = await ctx.message.create_thread(name=f'{ctx.author} spider-verse Thread')         
+            if ctx.message.attachments:
+                await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...')  
+                attachment = ctx.message.attachments[0]
+                style = 'Spider-Verse'
+                im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, style)
+                await thread.send(f'{ctx.author.mention} Here is the {style} version of it', file=discord.File(im))
+                await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face    
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)                
+            else: # no image
+                await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
+                await ctx.message.add_reaction('<:disagree:1098628957521313892>')  
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
     except Exception as e: # no generation / img + no face
         await fullqueue(e, thread)       
         print(f"Error: {e}")
         await thread.send(f"{ctx.author.mention} Error: {e}")
         await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
         await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
-        await thread.edit(archived=True)        
+        
 #---------------------------------------------------------------------------------------------------------------------------------------------- 
 # sketch ✅
 @bot.command()
 async def sketch(ctx):
     try:    
         if await safetychecks(ctx): #✅
-            if ctx.channel.id == 1114218145343877180:
-                await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
-                thread = await ctx.message.create_thread(name=f'Sketch | {ctx.author}', auto_archive_duration=60)         
-                if ctx.message.attachments:
-                    await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...')  
-                    attachment = ctx.message.attachments[0]
-                    #style = 'sketch'
-                    im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, 'sketch')
-                    await thread.send(f'{ctx.author.mention} Here is the sketch version of it', file=discord.File(im))
-                    await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face 
-                    await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user) 
-                    await thread.edit(archived=True)                
-                else: # no image
-                    await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
-                    await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
-                    await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
-                    await thread.edit(archived=True)                
+            await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
+            thread = await ctx.message.create_thread(name=f'{ctx.author} sketch Thread')         
+            if ctx.message.attachments:
+                await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...')  
+                attachment = ctx.message.attachments[0]
+                #style = 'sketch'
+                im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, 'sketch')
+                await thread.send(f'{ctx.author.mention} Here is the sketch version of it', file=discord.File(im))
+                await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)                
+            else: # no image
+                await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
+                await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
     except Exception as e: # no generation / img + no face
         await fullqueue(e, thread)  
         print(f"Error: {e}")
         await thread.send(f"{ctx.author.mention} Error: {e}")
         await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
         await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
-        await thread.edit(archived=True)        
 #----------------------------------------------------------------------------------------------------------------------------------------------
 async def fullqueue(e, thread):
     error_message = str(e)
@@ -302,13 +274,9 @@ async def fullqueue(e, thread):
         await thread.send("Queue is full! Please try again.")
     elif "Error: Queue is full! Please try again." in error_message:
         await thread.send("Queue is full! Please try again.")
-    # raised when the space we depend on needs to build after some inactivity (~10h)
     elif "local variable 'stage_1_results' referenced before assignment" in error_message:
-        await thread.send("Space is building! Please try again after a few minutes.")    
-
-#----------------------------------------------------------------------------------------------------------------------------------------------  
-
-
+        await thread.send("Queue is full! Please try again.")
+#----------------------------------------------------------------------------------------------------------------------------------------------            
 # deepfloydif stage 1 generation ✅
 def inference(prompt):
     negative_prompt = ''
@@ -344,49 +312,45 @@ async def react1234(reaction_emojis, combined_image_dfif):
 # Stage 1 ✅
 @bot.command()
 async def deepfloydif(ctx, *, prompt: str):
-    thread = None
     try:
         try:
             if await safetychecks(ctx): #✅
-                if ctx.channel.id == 1113182673859518514:
-                    await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
-                    dfif_command_message_id = ctx.message.id # we will use this in some magic later on
-                    thread = await ctx.message.create_thread(name=f'DeepfloydIF | {prompt}', auto_archive_duration=60) # could also just use prompt, no deepfloydif
-                    # create thread -> send new message inside thread + combined_image -> add reactions -> dfif2
+                await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
+                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
     
-                    #current_time = int(time.time())
-                    #random.seed(current_time)
-        
-                    negative_prompt = ''
-                    seed = random.randint(0, 1000)
-                    #seed = 1
-                    number_of_images = 4
-                    guidance_scale = 7
-                    custom_timesteps_1 = 'smart50'
-                    number_of_inference_steps = 50
-                    api_name = '/generate64'
-                    await thread.send(f'{ctx.author.mention}Generating images in thread, can take ~1 minute...')
+                #current_time = int(time.time())
+                #random.seed(current_time)
+    
+                negative_prompt = ''
+                seed = random.randint(0, 1000)
+                #seed = 1
+                number_of_images = 4
+                guidance_scale = 7
+                custom_timesteps_1 = 'smart50'
+                number_of_inference_steps = 50
+                api_name = '/generate64'
+                await thread.send(f'{ctx.author.mention}Generating images in thread, can take ~1 minute...')
             
         except Exception as e:
             print(f"Error: {e}")
-            if thread is None:
-                thread = await ctx.message.create_thread(name=f'DFIF1 Error')  
-            await thread.send(f"{ctx.author.mention} Error before stage 1 generation, {e}. If error code: 50035, upscale can still work.")
+            thread = await ctx.message.create_thread(name=f'DFIF1 Error')
+            await thread.send(f"{ctx.author.mention} Error during stage 1 pre-generation.")
             await fullqueue(e, thread)  
             await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
             await ctx.message.add_reaction('<:disagree:1098628957521313892>')
-            await thread.edit(archived=True)            
+            
         #generation✅-------------------------------------------------------
         try:
             #stage_1_results, stage_1_param_path, stage_1_result_path = df.predict(
             #    prompt, negative_prompt, seed, number_of_images, guidance_scale, custom_timesteps_1, number_of_inference_steps, api_name='/generate64')
 
             # run blocking function in executor
-            await thread.send(f'✅running blocking function in executor')  
+            #await thread.send(f'✅running blocking function in executor')            
             loop = asyncio.get_running_loop()
             result = await loop.run_in_executor(None, inference, prompt)
-            await thread.send(f'{ctx.author.mention}after executor')
-            await thread.send(f'✅run_in_executor ran successfully')            
+            #await thread.send(f'✅run_in_executor ran successfully')            
             stage_1_results = result[0]
             stage_1_result_path = result[2]
             
@@ -394,20 +358,16 @@ async def deepfloydif(ctx, *, prompt: str):
             
         except Exception as e:
             print(f"Error: {e}")
-            if thread is None:
-                thread = await ctx.message.create_thread(name=f'Generation Error')
-            await thread.send(f"{ctx.author.mention} Error during stage 1 generation, {e}")
+            thread = await ctx.message.create_thread(name=f'Generation Error')
+            await thread.send(f"{ctx.author.mention} Error during stage 1 generation.")
             await fullqueue(e, thread)  
             await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
-            await ctx.message.add_reaction('<:disagree:1098628957521313892>')
-            await thread.edit(archived=True)            
+            await ctx.message.add_reaction('<:disagree:1098628957521313892>')            
         #posting images✅----------------------------------------------------------------    
         try:
-            await thread.send(f'✅combining images...') 
+            #await thread.send(f'✅combining images...') 
             png_files = [f for f in os.listdir(stage_1_results) if f.endswith('.png')]
 
-
-            ''' combined images
             if png_files:
                 first_png = png_files[0]
                 second_png = png_files[1]
@@ -438,16 +398,11 @@ async def deepfloydif(ctx, *, prompt: str):
                 combined_image_dfif = await thread.send(f'{ctx.author.mention}React with the image number you want to upscale!', file=discord.File(
                     f, f'{partialpath}{dfif_command_message_id}.png')) # named something like: tmpgtv4qjix1111269940599738479.png 
 
-            await thread.send(f'✅reacting with 1234...') 
+            #await thread.send(f'✅reacting with 1234...') 
             emoji_list = ['↖️', '↗️', '↙️', '↘️']
-            await react1234(emoji_list, combined_image_dfif)            
-            '''
-
+            await react1234(emoji_list, combined_image_dfif)
             
             ''' individual images
-          
-            
-            '''
             if png_files:
                 for i, png_file in enumerate(png_files):
                     png_file_path = os.path.join(stage_1_results, png_file)
@@ -456,30 +411,27 @@ async def deepfloydif(ctx, *, prompt: str):
                     img.save(image_path)
                     with open(image_path, 'rb') as f:
                         await thread.send(f'{ctx.author.mention}Image {i+1}', file=discord.File(f, f'{i+1}{partialpath}.png'))
-                    await asyncio.sleep(1)   
-
-
-                    
+                    await asyncio.sleep(1)             
+            
+            '''
             
         except Exception as e:
             print(f"Error: {e}")
-            if thread is None:
-                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, {e}")
+            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 fullqueue(e, thread)  
             await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
             await ctx.message.add_reaction('<:disagree:1098628957521313892>')
-            await thread.edit(archived=True)            
+            
     #deepfloydif try/except
     except Exception as e:
         print(f"Error: {e}")
-        if thread is None:
-            thread = await ctx.message.create_thread(name=f'deepfloydif Error')
-        await thread.send(f"{ctx.author.mention} Overall error with deepfloydif, {e}")
+        thread = await ctx.message.create_thread(name=f'deepfloydif Error')
+        await thread.send(f"{ctx.author.mention} Overall error with deepfloydif.")
         await fullqueue(e, thread)  
         await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
         await ctx.message.add_reaction('<:disagree:1098628957521313892>')
-        await thread.edit(archived=True)
+
 #----------------------------------------------------------------------------------------------------------------------------
 # Stage 2 ✅
 async def dfif2(index: int, stage_1_result_path, thread, dfif_command_message_id): # add safetychecks
@@ -507,7 +459,6 @@ async def dfif2(index: int, stage_1_result_path, thread, dfif_command_message_id
         dfif_command_message = await parent_channel.fetch_message(dfif_command_message_id)
         await dfif_command_message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
         await dfif_command_message.add_reaction('<:agree:1098629085955113011>')
-        await thread.edit(archived=True)
 
     except Exception as e:
         print(f"Error: {e}")
@@ -515,9 +466,8 @@ async def dfif2(index: int, stage_1_result_path, thread, dfif_command_message_id
         dfif_command_message = await parent_channel.fetch_message(dfif_command_message_id)
         await dfif_command_message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
         await dfif_command_message.add_reaction('<:disagree:1098628957521313892>')  
-        await thread.send(f"Error during stage 2 upscaling, {e}") 
-        await fullqueue(e, thread) 
-        await thread.edit(archived=True)
+        await thread.send(f"Error during stage 2 upscaling.") 
+        await fullqueue(e, thread)  
 #----------------------------------------------------------------------------------------------------------------------------
 # react detector for stage 2 ✅
 @bot.event
@@ -567,73 +517,11 @@ async def on_reaction_add(reaction, user):    # ctx = await bot.get_context(reac
                         await dfif2(index, stage_1_result_path, thread, dfif_command_message_id)
 
     except Exception as e:
-        print(f"Error: {e} (known error, does not cause issues, fix later)")
+        print(f"Error: {e} testing emoji behavior with reacts")
 
 
 #---------------------------------------------------------------------------------------------------------------------------- 
-chathistory = None
-
-@bot.command()
-async def falcon(ctx, *, prompt: str):
-    try:
-        if await safetychecks(ctx): 
-            if ctx.channel.id == 1116089829147557999:
-                global chathistory
-                
-                if chathistory is not None: # This handles all subsequent discussions/prompts to the chatbot/model
-                    instructions = "The following is a conversation between a highly knowledgeable and intelligent AI assistant, called Falcon, and a human user, called User. In the following interactions, User and Falcon will converse in natural language, and Falcon will answer User's questions. Falcon was built to be respectful, polite and inclusive. Falcon was built by the Technology Innovation Institute in Abu Dhabi. Falcon will never decline to answer a question, and always attempts to give an answer that User would be satisfied with. It knows a lot, and always tells the truth. The conversation begins."
-                    job = falconclient.submit(prompt, chathistory, instructions, 0.8, 0.9, fn_index=1)  # This is not blocking
-                    while job.done() == False: 
-                        status = job.status() 
-                    else:
-                        file_paths = job.outputs()
-                        full_generation = file_paths[-1]
-                        chathistory = full_generation # we store this and pass it in the loop
-                    with open(full_generation, 'r') as file:
-                        data = json.load(file)
-                        output_text = data[-1][-1] # we output this as the bot
-                    print(output_text)
-                    await ctx.reply(f"{output_text}")
-                
-                if chathistory == None: # This handles the start of a conversation/chathistory file with the model
-                    chathistory = falconclient.predict( 
-                            fn_index=5
-                    ) 
-                    instructions = "The following is a conversation between a highly knowledgeable and intelligent AI assistant, called Falcon, and a human user, called User. In the following interactions, User and Falcon will converse in natural language, and Falcon will answer User's questions. Falcon was built to be respectful, polite and inclusive. Falcon was built by the Technology Innovation Institute in Abu Dhabi. Falcon will never decline to answer a question, and always attempts to give an answer that User would be satisfied with. It knows a lot, and always tells the truth. The conversation begins."
-                    job = falconclient.submit(prompt, chathistory, instructions, 0.8, 0.9, fn_index=1)  # This is not blocking
-                    while job.done() == False: 
-                        status = job.status() 
-                    else:
-                        file_paths = job.outputs()
-                        full_generation = file_paths[-1]
-                        chathistory = full_generation # we store this and pass it in the loop
-                    with open(full_generation, 'r') as file:
-                        data = json.load(file)
-                        output_text = data[-1][-1] # we output this as the bot
-                    await ctx.reply(f"{output_text}")                 
-
-    except Exception as e:
-        print(f"Error: {e}")
-        await ctx.reply(f"{e} cc <@811235357663297546> (falcon error)")
-#---------------------------------------------------------------------------------------------------------------------------- 
-'''
-@bot.event 
-async def on_message(message):
-    try:    
-        if message.channel.id == 1116089829147557999:
 
-
-
-    except Exception as e:
-        print(f"Error: {e}")
-        await ctx.reply(f"{e} cc <@811235357663297546> (falcon error)")    
-
-'''
-#---------------------------------------------------------------------------------------------------------------------------- 
-
-
-        
-        
 def run_bot():
     bot.run(DISCORD_TOKEN)