[deepfloydif.py] shifting job.submit back outside to dfif_stage_1_inference function

deepfloydif.py

@@ -30,6 +30,7 @@ async def deepfloydif_stage_1_inference(prompt):
         pass
     else:
         file_paths = job.outputs()
+        file_paths = file_paths[0]
         return file_paths    
 
 def deepfloydif_stage_2_inference(index, stage_1_result_path):
@@ -59,50 +60,32 @@ async def deepfloydif_stage_1(interaction, prompt, client):
                 dfif_command_message_id = message.id # used for updating the 'status' of our generations using reaction emojis
                 await thread.send(f'{interaction.user.mention} Generating images in thread, can take ~1 minute...')
 
-                '''
-                loop = asyncio.get_running_loop()
-                result = await loop.run_in_executor(None, deepfloydif_stage_1_inference, prompt)  
-                stage_1_results = result[0]
-                stage_1_result_path = result[2]                
-                '''
-                negative_prompt = ''
-                seed = random.randint(0, 1000)
-                number_of_images = 4
-                guidance_scale = 7
-                custom_timesteps_1 = 'smart50'
-                number_of_inference_steps = 50
+                file_paths = await deepfloydif_stage_1_inference(prompt)
                 
-                job = deepfloydif_client.submit(prompt, negative_prompt, seed, number_of_images, guidance_scale, custom_timesteps_1, number_of_inference_steps, api_name='/generate64')  # This is not blocking, similar to run_in_executor (but better)
-                while job.done() is False: 
-                    pass
-                else:
-                    file_paths = job.outputs()
-                    file_paths = file_paths[0]
-                    stage_1_results = file_paths[0]
-                    stage_1_result_path = file_paths[2]
+                stage_1_results = file_paths[0]
+                stage_1_result_path = file_paths[2]
+                partial_path = pathlib.Path(stage_1_result_path).name
+                png_files = list(glob.glob(f"{stage_1_results}/**/*.png"))
 
-                    partial_path = pathlib.Path(stage_1_result_path).name
-                    png_files = list(glob.glob(f"{stage_1_results}/**/*.png"))
-    
-                    if png_files:
-                        # take all 4 images and combine them into one large 2x2 image (similar to Midjourney)
-                        png_file_index = 0
-                        images = load_image(png_files, stage_1_results, png_file_index) 
-                        combined_image = Image.new('RGB', (images[0].width * 2, images[0].height * 2))
-                        combined_image.paste(images[0], (0, 0))
-                        combined_image.paste(images[1], (images[0].width, 0))
-                        combined_image.paste(images[2], (0, images[0].height))
-                        combined_image.paste(images[3], (images[0].width, images[0].height))
-                        combined_image_path = os.path.join(stage_1_results, f'{partial_path}{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'{interaction.user.mention} React with the image number you want to upscale!', file=discord.File(f, f'{partial_path}{dfif_command_message_id}.png'))                
-    
-                        emoji_list = ['↖️', '↗️', '↙️', '↘️']
-                        await react_1234(emoji_list, combined_image_dfif)
-                    else:
-                        await thread.send(f'{interaction.user.mention} No PNG files were found, cannot post them!')
+                if png_files:
+                    # take all 4 images and combine them into one large 2x2 image (similar to Midjourney)
+                    png_file_index = 0
+                    images = load_image(png_files, stage_1_results, png_file_index) 
+                    combined_image = Image.new('RGB', (images[0].width * 2, images[0].height * 2))
+                    combined_image.paste(images[0], (0, 0))
+                    combined_image.paste(images[1], (images[0].width, 0))
+                    combined_image.paste(images[2], (0, images[0].height))
+                    combined_image.paste(images[3], (images[0].width, images[0].height))
+                    combined_image_path = os.path.join(stage_1_results, f'{partial_path}{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'{interaction.user.mention} React with the image number you want to upscale!', file=discord.File(f, f'{partial_path}{dfif_command_message_id}.png'))                
+
+                    emoji_list = ['↖️', '↗️', '↙️', '↘️']
+                    await react_1234(emoji_list, combined_image_dfif)
+                else:
+                    await thread.send(f'{interaction.user.mention} No PNG files were found, cannot post them!')
 
     except Exception as e:
         print(f"Error: {e}")