reorganization

app.py

@@ -35,70 +35,79 @@ bot = commands.Bot(command_prefix='!', intents=intents)
 @bot.command()
 async def active(ctx):
     # get the number of active threads
-    activethreadcount = active_count()
+    activethreadcount = threading.active_count() # was active_count()
     await ctx.message.reply(f'active threads: {activethreadcount}')
     
 @bot.command()
 async def jojo(ctx):
+    #new
+    await asyncio.get_running_loop().run_in_executor(None, run_jojo, ctx) #do magically
+
+async def run_jojo(ctx):
+    safety = await safety_checks(ctx)
+    if safety:
+        #discord before
+        attachment = await discord_before(ctx)
+        #generation
+        generated_image = await generation(attachment)
+        #discord after
+        await discord_after(ctx, generated_image)
+
+async def discord_before(ctx):
+    await asyncio.gather(
+        ctx.message.add_reaction('🤖'),
+        asyncio.sleep(0.5),
+        ctx.message.add_reaction('⌛')  
+    )
+    attachment = ctx.message.attachments[0]
 
     # get the number of active threads
     activethreadcount = active_count()
     # report the number of active threads
     print(activethreadcount)
-    
-    attachment = await discord_before(ctx)
-    if attachment:
-        asyncio.create_task(generation(ctx, attachment))
-        #await generation(ctx, attachment)
-        
-async def discord_before(ctx):
-    if ctx.message.attachments: 
-        await asyncio.gather(
-            ctx.message.add_reaction('🤖'),
-            asyncio.sleep(0.5),
-            ctx.message.add_reaction('⌛')  
-        )
-        attachment = ctx.message.attachments[0]
+    return attachment
+
+async def generation(attachment):
+    style = 'JoJo'
+    #im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, style)
+    #im = await asyncio.to_thread(jojogan.predict, attachment.url, style)
+    generated_image = jojogan.predict(attachment.url, style) 
 
-        # get the number of active threads
-        activethreadcount = active_count()
-        # report the number of active threads
-        print(activethreadcount)
+    # get the number of active threads
+    activethreadcount = active_count()
+    # report the number of active threads
+    print(activethreadcount)
+    return generated_image
         
-        return attachment
+ async def discord_after(ctx, generated_image):
+    await asyncio.gather(
+        ctx.send(f'{ctx.author.mention} Here is the jojo version of it', file=discord.File(generated_image)),
+        asyncio.sleep(0.5),
+        ctx.message.remove_reaction('⌛', bot.user),
+        asyncio.sleep(0.5),
+        ctx.message.add_reaction('✅')
+    )   
+
+async def safety_checks(ctx):
+    if ctx.message.attachments:
+        return True
     else:
         await asyncio.gather(
             ctx.send(f"{ctx.author.mention} No attachments to be found... Can't animify dat! Try sending me an image 😉"),
             asyncio.sleep(0.5),
             ctx.message.add_reaction('❌') 
         )
-        return None
-
-async def generation(ctx, attachment):
-    if attachment:
-        style = 'JoJo'
-        im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, style)
-        #im = await asyncio.to_thread(jojogan.predict, attachment.url, style)
-        #im = jojogan.predict(attachment.url, style)
-
-        # get the number of active threads
-        activethreadcount = active_count()
-        # report the number of active threads
-        print(activethreadcount)
-        
-        await asyncio.gather(
-            ctx.send(f'{ctx.author.mention} Here is the jojo version of it'),
-            asyncio.sleep(0.5),
-            ctx.send(file=discord.File(im)),
-            asyncio.sleep(0.5),
-            ctx.message.remove_reaction('⌛', bot.user),
-            asyncio.sleep(0.5),
-            ctx.message.add_reaction('✅')
-        )   
+        return None  
+
 
 
 
- 
+
+
+
+        
+
+    
 
 
 #--------------------------------------------------------
@@ -128,13 +137,7 @@ demo.launch()
 
 
 '''
- async def discord_after(ctx, im):
-    await asyncio.gather(
-        ctx.send(f'{ctx.author.mention} Here is the jojo version of it'),
-        ctx.send(file=discord.File(im)),
-        ctx.message.remove_reaction('⌛', bot.user),
-        ctx.message.add_reaction('✅')
-    )  
+
 
 '''