Revert "fix: back to sequential file upload"
This reverts commit 3d099f88ea8799a80be9b860793e9c64a7cf4843.
This commit is contained in:
		
							parent
							
								
									3d099f88ea
								
							
						
					
					
						commit
						1f5a88b888
					
				@ -1338,7 +1338,7 @@ async def update_file_status(prompt_id: str, data, uploading, have_error=False,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
async def handle_upload(prompt_id: str, data, key: str, content_type_key: str, default_content_type: str):
 | 
					async def handle_upload(prompt_id: str, data, key: str, content_type_key: str, default_content_type: str):
 | 
				
			||||||
    items = data.get(key, [])
 | 
					    items = data.get(key, [])
 | 
				
			||||||
    # upload_tasks = []
 | 
					    upload_tasks = []
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for item in items:
 | 
					    for item in items:
 | 
				
			||||||
        # Skipping temp files
 | 
					        # Skipping temp files
 | 
				
			||||||
@ -1354,25 +1354,17 @@ async def handle_upload(prompt_id: str, data, key: str, content_type_key: str, d
 | 
				
			|||||||
        elif file_extension == '.webp':
 | 
					        elif file_extension == '.webp':
 | 
				
			||||||
            file_type = 'image/webp'
 | 
					            file_type = 'image/webp'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # upload_tasks.append(upload_file(
 | 
					        upload_tasks.append(upload_file(
 | 
				
			||||||
        #     prompt_id,
 | 
					 | 
				
			||||||
        #     item.get("filename"),
 | 
					 | 
				
			||||||
        #     subfolder=item.get("subfolder"),
 | 
					 | 
				
			||||||
        #     type=item.get("type"),
 | 
					 | 
				
			||||||
        #     content_type=file_type,
 | 
					 | 
				
			||||||
        #     item=item
 | 
					 | 
				
			||||||
        # ))
 | 
					 | 
				
			||||||
        await upload_file(
 | 
					 | 
				
			||||||
            prompt_id,
 | 
					            prompt_id,
 | 
				
			||||||
            item.get("filename"),
 | 
					            item.get("filename"),
 | 
				
			||||||
            subfolder=item.get("subfolder"),
 | 
					            subfolder=item.get("subfolder"),
 | 
				
			||||||
            type=item.get("type"),
 | 
					            type=item.get("type"),
 | 
				
			||||||
            content_type=file_type,
 | 
					            content_type=file_type,
 | 
				
			||||||
            item=item
 | 
					            item=item
 | 
				
			||||||
        )
 | 
					        ))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Execute all upload tasks concurrently
 | 
					    # Execute all upload tasks concurrently
 | 
				
			||||||
    # await asyncio.gather(*upload_tasks)
 | 
					    await asyncio.gather(*upload_tasks)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Upload files in the background
 | 
					# Upload files in the background
 | 
				
			||||||
async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=True, node_meta=None):
 | 
					async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=True, node_meta=None):
 | 
				
			||||||
@ -1415,7 +1407,6 @@ async def update_run_with_output(prompt_id, data, node_id=None, node_meta=None):
 | 
				
			|||||||
        "output_data": data,
 | 
					        "output_data": data,
 | 
				
			||||||
        "node_meta": node_meta,
 | 
					        "node_meta": node_meta,
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    pprint(body)
 | 
					 | 
				
			||||||
    have_upload_media = False
 | 
					    have_upload_media = False
 | 
				
			||||||
    if data is not None:
 | 
					    if data is not None:
 | 
				
			||||||
        have_upload_media = 'images' in data or 'files' in data or 'gifs' in data or 'mesh' in data
 | 
					        have_upload_media = 'images' in data or 'files' in data or 'gifs' in data or 'mesh' in data
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user