[dfif] testing fix for https://huggingface.co/spaces/DeepFloyd/IF/commit/fb79844b1d0b013a28ac435a36f804d8030fba50

app.py

@@ -382,17 +382,13 @@ async def deepfloydif(ctx, *, prompt: str):
             #    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')  
-            #loop = asyncio.get_running_loop()
-            #result = await loop.run_in_executor(None, inference, prompt)
-
-            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')
-            
+            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')            
-            #stage_1_results = result[0]
-            #stage_1_result_path = result[2]
+            stage_1_results = result[0]
+            stage_1_result_path = result[2]
             
             partialpath = stage_1_result_path[5:] #magic for later
             
@@ -408,10 +404,11 @@ async def deepfloydif(ctx, *, prompt: str):
         #posting images✅----------------------------------------------------------------    
         try:
             await thread.send(f'✅combining images...') 
-            png_files = [f for f in os.listdir(stage_1_results) if f.endswith('.png')]
+            #old, see: https://huggingface.co/spaces/DeepFloyd/IF/commit/fb79844b1d0b013a28ac435a36f804d8030fba50
+            #png_files = [f for f in os.listdir(stage_1_results) if f.endswith('.png')] 
+            png_files = list(glob.glob(f"{stage_1_results}/**/*.png"))
 
             if png_files:
-                await thread.send('png files exists, combining images...')    
                 first_png = png_files[0]
                 second_png = png_files[1]
                 third_png = png_files[2]
@@ -421,27 +418,25 @@ async def deepfloydif(ctx, *, prompt: str):
                 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)
-                await thread.send('defining images...')       
+    
                 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))
-                await thread.send('pasting images...')        
+    
                 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))
-                await thread.send('saving combined image...')    
+    
                 combined_image_path = os.path.join(stage_1_results, f'{partialpath}{dfif_command_message_id}.png')
                 combined_image.save(combined_image_path)   
-                await thread.send('before posting combined image in thread...')
-                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 
-            elif not png_files:
-                await thread.send('png files are empty.')
+
+            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 
 
             await thread.send(f'✅reacting with 1234...') 
             emoji_list = ['↖️', '↗️', '↙️', '↘️']
@@ -459,6 +454,7 @@ async def deepfloydif(ctx, *, prompt: str):
                     await asyncio.sleep(1)             
             
             '''
+            
         except Exception as e:
             print(f"Error: {e}")
             if thread is None:
@@ -467,7 +463,7 @@ async def deepfloydif(ctx, *, prompt: str):
             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 thread.edit(archived=True)            
     #deepfloydif try/except
     except Exception as e:
         print(f"Error: {e}")