Update app.py

app.py

@@ -8,7 +8,7 @@ import logging
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
-IIIF_URL = "https://lbiiif.riksarkivet.se" #"https://iiifintern.ra.se"
+IIIF_URL = "https://lbiiif.riksarkivet.se"  # "https://iiifintern.ra.se"
 
 def get_image_ids(batch_id: str) -> list[str]:
     """A list of image IDs in the given batch"""
@@ -57,17 +57,17 @@ def download_batch_images(batch_id: str, workers: int = 2, progress=None):
     if progress:
         progress(0, desc=f"Starting download for {batch_id}...")
 
-    def track_download(image_id):
+    def track_download(image_id, idx):
         download_image_by_image_id(image_id)
         logging.info(f"Downloaded image {image_id}")
         if progress:
             # Update progress after each image
-            current_progress = (image_ids.index(image_id) + 1) / total_images
+            current_progress = (idx + 1) / total_images
             progress(current_progress, desc=f"Downloading {image_id}...")
 
     with ThreadPoolExecutor(max_workers=workers) as executor:
-        for image_id in image_ids:
-            executor.submit(track_download, image_id)
+        for idx, image_id in enumerate(image_ids):
+            executor.submit(track_download, image_id, idx)
 
     logging.info(f"Zipping downloaded images for batch {batch_id}")
     zip_filename = f"{batch_id}.zip"
@@ -85,19 +85,13 @@ def download_batch_images(batch_id: str, workers: int = 2, progress=None):
     logging.info(f"Completed download and zip for batch {batch_id}")
     return zip_filename
 
-
-def gradio_interface(batch_ids_input, progress=gr.Progress()):
-    batch_ids = [batch_id.strip() for batch_id in batch_ids_input.split("\n") if batch_id.strip()]
-    
-    zip_files = []
+def gradio_interface(batch_id_input, progress=gr.Progress()):
+    batch_id = batch_id_input.strip()
     try:
-        for batch_id in progress.tqdm(batch_ids, desc="Processing batches"):
-            logging.info(f"Processing batch {batch_id}")
-            zip_file = download_batch_images(batch_id, progress=progress)
-            zip_files.append(zip_file)
-        return zip_files  # Return the list of zip files for download
+        zip_file = download_batch_images(batch_id, progress=progress)
+        return zip_file  # Return the zip file for download
     except Exception as e:
-        logging.error(f"Error processing batches: {e}")
+        logging.error(f"Error processing batch: {e}")
         return str(e)
 
 with gr.Blocks() as app:
@@ -105,16 +99,15 @@ with gr.Blocks() as app:
 
     with gr.Row():
         with gr.Column():
-            batch_ids_input = gr.Textbox(label="Batch IDs (one per line)", placeholder="Enter batch IDs, one per line.")
+            batch_id_input = gr.Textbox(label="Batch ID", placeholder="Enter batch ID.")
             download_button = gr.Button("Download Images")
         with gr.Column():
-            output_files = gr.File(label="Download Zip Files", file_count="multiple")
-
+            output_file = gr.File(label="Download Zip File")
 
     download_button.click(
         gradio_interface,
-        inputs=[batch_ids_input],
-        outputs=[output_files]
+        inputs=[batch_id_input],
+        outputs=[output_file]
     )
 
 app.queue()