Update app.py

app.py

@@ -2,13 +2,12 @@ import os
 import requests
 import shutil
 import gradio as gr
-from tqdm import tqdm
 from concurrent.futures import ThreadPoolExecutor
 from zipfile import ZipFile
 
 def get_image_ids(batch_id: str) -> list[str]:
     """A list of image IDs in the given batch"""
-    response = requests.get(f"https://lbiiif.riksarkivet.se/arkis!{batch_id}/manifest")
+    response = requests.get(f"https://iiifintern.ra.se/arkis!{batch_id}/manifest")
     response.raise_for_status()
     response = response.json()
     return [item["id"].split("!")[1][:14] for item in response["items"]]
@@ -26,7 +25,7 @@ def download_image(url: str, dest: str) -> None:
         shutil.copyfileobj(response.raw, out_file)
     del response
 
-def download_image_by_image_id(image_id: str, progress=None):
+def download_image_by_image_id(image_id: str):
     """
     Download the image with the given image ID
 
@@ -35,23 +34,20 @@ def download_image_by_image_id(image_id: str, progress=None):
     """
     batch_id = image_id[:8]
     os.makedirs(batch_id, exist_ok=True)
-    url = f"https://lbiiif.riksarkivet.se/arkis!{image_id}/full/max/0/default.jpg"
+    url = f"https://iiifintern.ra.se/arkis!{image_id}/full/max/0/default.jpg"
     dest = os.path.join(batch_id, image_id + ".jpg")
     download_image(url, dest)
-    if progress:
-        progress.update(1)
 
-def download_batch_images(batch_id: str, workers: int = 2):
+def download_batch_images(batch_id: str, workers: int = 2, progress=None):
     image_ids = get_image_ids(batch_id)
     total_images = len(image_ids)
 
-    progress = tqdm(total=total_images, desc=f"Downloading {batch_id}", leave=False)
+    if progress:
+        progress(0, desc=f"Starting download for {batch_id}...")
     
     with ThreadPoolExecutor(max_workers=workers) as executor:
         for image_id in image_ids:
-            executor.submit(download_image_by_image_id, image_id, progress)
-
-    progress.close()
+            executor.submit(download_image_by_image_id, image_id)
 
     # Zip the folder with downloaded images
     zip_filename = f"{batch_id}.zip"
@@ -60,12 +56,20 @@ def download_batch_images(batch_id: str, workers: int = 2):
             img_path = os.path.join(batch_id, f"{image_id}.jpg")
             zipf.write(img_path, arcname=os.path.basename(img_path))
 
+    if progress:
+        progress(1, desc=f"Completed {batch_id}")
+        
     return zip_filename
 
-def gradio_interface(batch_id):
+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 = []
     try:
-        zip_file = download_batch_images(batch_id)
-        return zip_file  # Return the zip file path for download
+        for batch_id in progress.tqdm(batch_ids, desc="Processing batches"):
+            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
     except Exception as e:
         return str(e)
 
@@ -73,18 +77,18 @@ with gr.Blocks() as app:
     gr.Markdown("# Batch Image Downloader")
 
     with gr.Row():
-        batch_id_input = gr.Textbox(label="Batch ID")
-    
-    output_file = gr.File(label="Download Zip File")
+        with gr.Column():
+            batch_ids_input = gr.Textbox(label="Batch IDs (one per line)", placeholder="Enter batch IDs, one per line.")
+            download_button = gr.Button("Download Images")
+        with gr.Column():
+            output_files = gr.File(label="Download Zip Files", file_count="multiple")
 
-    download_button = gr.Button("Download Images")
 
     download_button.click(
         gradio_interface,
-        inputs=[batch_id_input],
-        outputs=[output_file]
+        inputs=[batch_ids_input],
+        outputs=[output_files]
     )
 
-app.queue(max_size=10)
-
+app.queue()
 app.launch()