[asyncio.queue] testing

app.py

@@ -9,37 +9,17 @@ import time
 import re
 from discord import Embed, Color
 from discord.ext import commands
-# test # fix? # unstick # fix
 from gradio_client import Client
 from PIL import Image
 #from ratelimiter import RateLimiter
-#
-from datetime import datetime
-from pytz import timezone
-#
-import asyncio
-
-import shutil # for doing image movement magic
-
-#todo
-# 4 -> combined image
-# loading emoji? animated emojis?
-# tasks for concurrent coroutines
-# ratelimits
-
-# enlarge each of 4 images?
-# Error: [Errno 104] Connection reset by peer?
 
-# clean up old threads
-# safety for on_reaction_add?
-# could use one channel, use threads to organize it. Otherwise may be too split and harder to keep track of
-# lock generation after ~120s, can change
-# restructure using slash commands? generate -> deepfloydif -> prompt -> thread -> combined -> upscale -> thread
+import asyncio
+import httpx
+from tasks import make_request_async
 
 DFIF_TOKEN = os.getenv('HF_TOKEN')
 DISCORD_TOKEN = os.environ.get("GRADIOTEST_TOKEN", None)
 
-df = Client("huggingface-projects/IF", DFIF_TOKEN)
 jojogan = Client("akhaliq/JoJoGAN", DFIF_TOKEN)
 
 
@@ -49,385 +29,54 @@ intents.message_content = True
 bot = commands.Bot(command_prefix='!', intents=intents)
 
 
-#---------------------------------------------------------------------------------------------------------------------------------------------
-@bot.event
-async def on_ready():
-    print('Logged on as', bot.user)
-    bot.log_channel = bot.get_channel(1100458786826747945) # 1100458786826747945 = bot-test, 1107006391547342910 = lunarbot server
-#---------------------------------------------------------------------------------------------------------------------------------------------
-async def safetychecks(ctx):
-    try:
-        if ctx.author.bot:
-            print(f"Error: The bot is not allowed to use its own commands.")
-            return False
-    
-        #✅✅ check if the bot is offline 
-        offline_bot_role_id = 1103676632667017266
-        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: The bot is offline or under maintenance. (Remove the offline-bot role to bring it online)")         
-            return False
-    
-        #✅✅ check if the command is in the allowed channel(s)
-        channel_id = 1100458786826747945
-        if ctx.channel.id != 1100458786826747945:
-            print(f"Error: This is not a permitted channel for that command. (bot-test is the correct channel)")
-            return False
-            
-        #✅✅ check if the user has the required role(s)   
-        guild_id = 879548962464493619
-        required_role_id = 900063512829755413  # @verified for now
-        guild = bot.get_guild(guild_id)
-        required_role = guild.get_role(required_role_id)
-        if required_role not in ctx.author.roles:
-            print(f"Error: The user does not have the required role to use that command. ({required_role} is the correct role)")        
-            return False
-    
-        return True
-
-    except Exception as e:
-        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
-#---------------------------------------------------------------------------------------------------------------------------------------------- 
-# jojo
-@bot.command()
+#---------------------------------------------------------------------------------------------------------------------------
 async def jojo(ctx):
-    # img + face    ✅
-    # img + no face ✅
-    # no image      ✅
-    # no generation ✅
-    # responsive?   ✅
-    # ratelimits?   ❌
-    # safety checks?✅
-    # bot no crash  ✅
-    try:  
-        if await safetychecks(ctx): #✅
-            await ctx.message.add_reaction('🤖') 
-            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)
-                #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))
-                await ctx.message.add_reaction('✅') # img + face    
-            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('❌')             
-    except Exception as e: # no generation / img + no face
-        print(f"Error: {e}")
-        await thread.send(f"{ctx.author.mention}Error: {e}")
-        await ctx.message.add_reaction('❌')            
-        
-#---------------------------------------------------------------------------------------------------------------------------------------------- 
-# Disney
-@bot.command()
-async def disney(ctx):
-    try:
-        if await safetychecks(ctx): #✅
-            await ctx.message.add_reaction('🤖') 
-            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 = 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('✅') # img + face    
-            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('❌')             
-    except Exception as e: # no generation / img + no face
-        print(f"Error: {e}")
-        await thread.send(f"{ctx.author.mention}Error: {e}")
-        await ctx.message.add_reaction('❌') 
-        
-#---------------------------------------------------------------------------------------------------------------------------------------------- 
-# Spider-Verse
-@bot.command()
-async def spiderverse(ctx):
-    try:
-        if await safetychecks(ctx): #✅
-            await ctx.message.add_reaction('🤖') 
-            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 = 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('✅') # img + face    
-            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('❌')             
-    except Exception as e: # no generation / img + no face
-        print(f"Error: {e}")
-        await thread.send(f"{ctx.author.mention}Error: {e}")
-        await ctx.message.add_reaction('❌') 
-        
-#---------------------------------------------------------------------------------------------------------------------------------------------- 
-# sketch
-@bot.command()
-async def sketch(ctx):
-    try:    
-        if await safetychecks(ctx): #✅
-            await ctx.message.add_reaction('🤖') 
-            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 = 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('✅') # img + face    
-            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('❌')             
-    except Exception as e: # no generation / img + no face
-        print(f"Error: {e}")
-        await thread.send(f"{ctx.author.mention}Error: {e}")
-        await ctx.message.add_reaction('❌') 
-#----------------------------------------------------------------------------------------------------------------------------------------------     
-# Stage 1
-@bot.command()
-async def deepfloydif(ctx, *, prompt: str):
-    try:
-        try:
-            if await safetychecks(ctx): #✅
-                await ctx.message.add_reaction('🤖') # loading emoji?
-                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
-    
-                await thread.send(f'{ctx.author.mention}Generating images in thread, can take ~1 minute...')
-            
-        except Exception as e:
-            print(f"Error: {e}")
-            await ctx.reply('stage 1 error -> pre generation')
-            await ctx.message.add_reaction('❌')
-
-        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')
-            
-            partialpath = stage_1_result_path[5:] #magic for later
-        except Exception as e:
-            print(f"Error: {e}")
-            await ctx.reply('stage 1 error -> during generation')
-            await ctx.message.add_reaction('❌')            
-            
-        try:
-            png_files = [f for f in os.listdir(stage_1_results) if f.endswith('.png')]
-
-            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)
-    
-                img1 = Image.open(first_png_path)
-                img2 = Image.open(second_png_path)
-                img3 = Image.open(third_png_path)
-                img4 = Image.open(fourth_png_path)
-    
-                combined_image = Image.new('RGB', (img1.width * 2, img1.height * 2))
-    
-                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))
-    
-                combined_image_path = os.path.join(stage_1_results, f'{partialpath}{dfif_command_message_id}.png')
-                combined_image.save(combined_image_path)   
-
-            with open(combined_image_path, 'rb') as f:
-                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 
-
-            for emoji in ['1️⃣', '2️⃣', '3️⃣', '4️⃣']:
-                await combined_image_dfif.add_reaction(emoji)            
-            ''' individual images
-            if png_files:
-                for i, png_file in enumerate(png_files):
-                    png_file_path = os.path.join(stage_1_results, png_file)
-                    img = Image.open(png_file_path)
-                    image_path = os.path.join(stage_1_results, f'{i+1}{partialpath}.png')
-                    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)             
-            
-            '''
-            
-        except Exception as e:
-            print(f"Error: {e}")
-            await ctx.reply('stage 1 error -> posting images in thread')
-            await ctx.message.add_reaction('❌')
-            
-    #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('❌')
-
+    start_time = time.time()  
+    style = 'JoJo'
+    atchurl = 'https://cdn.discordapp.com/attachments/1100458786826747945/1111746037640601610/image.png'
+    im = jojogan.predict(atchurl, style)
+    end_time = time.time()
+    generation_time = end_time - start_time    
+    await ctx.send(f"{style} image generated in {generation_time:.2f} seconds.")
+    await ctx.send(file=discord.File(im))
 #----------------------------------------------------------------------------------------------------------------------------
-# Stage 2
-async def dfif2(index: int, stage_1_result_path, thread, dfif_command_message_id): # add safetychecks
-    try:
-        await thread.send(f"inside dfif2, upscaling")  
-        selected_index_for_stage_2 = index
-        seed_2 = 0
-        guidance_scale_2 = 4
-        custom_timesteps_2 = 'smart50'
-        number_of_inference_steps_2 = 50
-        result_path = df.predict(stage_1_result_path, selected_index_for_stage_2, seed_2, 
-                                 guidance_scale_2, custom_timesteps_2, number_of_inference_steps_2, api_name='/upscale256')
+async def make_request_async(num, client):
+    # Make an asynchronous HTTP request
+    response = await jojo(ctx)
+    print(f"Response for request {num}: {response.status_code}")
 
-        await thread.send(f"upscale done")          
-        with open(result_path, 'rb') as f:
-            await thread.send(f'Here is the upscaled image! :) ', file=discord.File(f, 'result.png'))
+async def process_requests(queue, client):
+    while True:
+        num = await queue.get()
+        await make_request_async(num, client)
+        queue.task_done()
 
-        # using custom emoji that looks nicer
-        emoji_guild = thread.guild  
-        confirm_emoji_id = 1098629085955113011
-        confirm_emoji = discord.utils.get(emoji_guild.emojis, id=confirm_emoji_id)
-        
-        # assuming dfif2 is always inside a thread, we can always exit the thread to find the channel with the original command,
-        # which allows us to react confirm on that message.
-        parent_channel = thread.parent
-        dfif_command_message = await parent_channel.fetch_message(dfif_command_message_id)
+@bot.command()
+async def command(ctx, num_requests: int):
+    async with httpx.AsyncClient() as client:
+        queue = asyncio.Queue()
 
-        # reacting to original !deepfloydif command + using a custom emoji to do it
-        await dfif_command_message.add_reaction(confirm_emoji)
-        await thread.send(f"upscale posted")             
-            #await ctx.reply('Here is the result of the second stage', file=discord.File(f, 'result.png'))
-            #await ctx.message.add_reaction('✅') need to fix this
+        # Start the request processing tasks
+        request_tasks = []
+        for _ in range(num_requests):
+            task = asyncio.create_task(process_requests(queue, client))
+            request_tasks.append(task)
 
-        '''
-        try:
-            dfif_command_message = await channel.fetch_message(dfif_command_message_id)
-            await dfif_command_message.add_reaction('✅')            
-        '''
-            
-    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('❌')
-#----------------------------------------------------------------------------------------------------------------------------
-@bot.event
-async def on_reaction_add(reaction, user):    # ctx = await bot.get_context(reaction.message)? could try later, might simplify
-    try:
-        # safety checks first ❌
-        '''
-        if user.bot:
-            return   
+        # Add the requests to the queue
+        for num in range(1, num_requests + 1):
+            await queue.put(num)
 
-        #offline bot check ❌
-        offline_bot_role_id = 1103676632667017266
-        bot_member = reaction.message.guild.get_member(bot.user.id)
-        if any(role.id == offline_bot_role_id for role in bot_member.roles):            
-            return
-            
-        # verified role check ❌
-        guild = reaction.message.guild            
-        required_role_id = 900063512829755413  # @verified for now
-        required_role = guild.get_role(required_role_id)
-        if required_role not in user.roles:
-            return    
+        # Wait for all requests to be processed
+        await queue.join()
 
-        #channel check ❌
-        if reaction.message.channel.id != 1100458786826747945: 
-            return        
-        
-        '''
+        # Cancel the request processing tasks
+        for task in request_tasks:
+            task.cancel()
+
+    await ctx.send("Command executed.")
 
-        thread = reaction.message.channel
-        threadparentid = thread.parent.id
-        
-        if not user.bot: 
-            if threadparentid == 1100458786826747945: # bot-test
-                # 811235357663297546 =  lunarflu
-                if reaction.message.attachments:
-                    if user.id == reaction.message.mentions[0].id:  #  if user.id == reaction.message.mentions[0].id:           
-                        # magic begins
-                        await reaction.message.channel.send("reaction detected")
-                        attachment = reaction.message.attachments[0]
-                        image_name = attachment.filename # named something like: tmpgtv4qjix1111269940599738479.png
-                        # remove .png first
-                        partialpathmessageid = image_name[:-4] # should be tmpgtv4qjix1111269940599738479 
-                        # extract partialpath, messageid
-                        partialpath = partialpathmessageid[:11] # tmpgtv4qjix
-                        messageid = partialpathmessageid[11:] # 1111269940599738479
-                        # add /tmp/ to partialpath, save as new variable
-                        fullpath = "/tmp/" + partialpath # should be /tmp/tmpgtv4qjix
-                        await reaction.message.channel.send(f"fullpath extracted, {fullpath}")        
-                        emoji = reaction.emoji
-                        
-                        if emoji == "1️⃣":
-                            index = 0
-                        elif emoji == "2️⃣":
-                            index = 1
-                        elif emoji == "3️⃣":
-                            index = 2
-                        elif emoji == "4️⃣":
-                            index = 3       
-                        await reaction.message.channel.send(f"index extracted, {index}")         
-                        index = index
-                        stage_1_result_path = fullpath
-                        thread = reaction.message.channel
-                        dfif_command_message_id = messageid
-                        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('❌')
-#---------------------------------------------------------------------------------------------------------------------------- 
 
     
 def run_bot():