Update app.py

app.py

@@ -72,17 +72,16 @@ def save_captions_to_csv(captions, csv_file_path='image_captions.csv'):
         print("No captions to save.")
     return csv_file_path
 
-def gr_process_zip(zip_files):
-    print(f"Processing {len(zip_files)} zip files")
-    captions = process_zip_files([zip_file.name for zip_file in zip_files])
-    print(f"Generated {len(captions)} captions from zip files")
-    return save_captions_to_csv(captions, 'zip_image_captions.csv')
-
-def gr_process_images(image_files):
-    print(f"Processing {len(image_files)} image files")
-    captions = process_images([image_file.name for image_file in image_files])
-    print(f"Generated {len(captions)} captions from image files")
-    return save_captions_to_csv(captions, 'image_captions.csv')
+def gr_process(zip_files, image_files):
+    captions = []
+    if zip_files:
+        zip_file_paths = [zip_file.name for zip_file in zip_files]
+        captions.extend(process_zip_files(zip_file_paths))
+    if image_files:
+        image_file_paths = [image_file.name for image_file in image_files]
+        captions.extend(process_images(image_file_paths))
+    
+    return save_captions_to_csv(captions)
 
 def combine_csv_files(file1, file2, output_file='combined_captions.csv'):
     with open(output_file, mode='w', newline='') as outfile:
@@ -149,8 +148,8 @@ with demo:
         return zip_files, image_files
 
     add_files_btn.click(add_files, inputs=[zip_files, image_files, new_zip_files, new_image_files], outputs=[zip_files, image_files])
-    generate_zip_captions_btn.click(fn=gr_process_zip, inputs=zip_files, outputs=output_zip_file)
-    generate_image_captions_btn.click(fn=gr_process_images, inputs=image_files, outputs=output_image_file)
+    generate_zip_captions_btn.click(fn=gr_process, inputs=zip_files, outputs=output_zip_file)
+    generate_image_captions_btn.click(fn=gr_process, inputs=image_files, outputs=output_image_file)
     combine_files_btn.click(fn=combine_csv_files, inputs=[output_zip_file, output_image_file], outputs=combined_file)
 
 demo.launch(share=True)