Update app.py

app.py

@@ -4,24 +4,30 @@ import shutil
 import gradio as gr
 from concurrent.futures import ThreadPoolExecutor
 from zipfile import ZipFile
+import logging
+
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
 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"""
+    logging.info(f"Fetching image IDs for batch {batch_id}")
     response = requests.get(f"{IIIF_URL}/arkis!{batch_id}/manifest")
     response.raise_for_status()
     response = response.json()
-    return [item["id"].split("!")[1][:14] for item in response["items"]]
+    image_ids = [item["id"].split("!")[1][:14] for item in response["items"]]
+    logging.info(f"Found {len(image_ids)} images in batch {batch_id}")
+    return image_ids
 
 def download_image(url: str, dest: str) -> None:
     """
     Download an image
-
     Arguments:
         url: Image url
         dest: Destination file name
     """
+    logging.info(f"Downloading image from {url} to {dest}")
     response = requests.get(url, stream=True)
     with open(dest, "wb") as out_file:
         shutil.copyfileobj(response.raw, out_file)
@@ -30,7 +36,6 @@ def download_image(url: str, dest: str) -> None:
 def download_image_by_image_id(image_id: str):
     """
     Download the image with the given image ID
-
     Creates a directory named after the batch ID and saves the image in
     that directory.
     """
@@ -41,6 +46,7 @@ def download_image_by_image_id(image_id: str):
     download_image(url, dest)
 
 def download_batch_images(batch_id: str, workers: int = 2, progress=None):
+    logging.info(f"Starting download for batch {batch_id}")
     image_ids = get_image_ids(batch_id)
     total_images = len(image_ids)
 
@@ -49,16 +55,17 @@ def download_batch_images(batch_id: str, workers: int = 2, progress=None):
 
     def track_download(image_id):
         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) / total_images
+            current_progress = (image_ids.index(image_id) + 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)
 
-    # Zip the folder with downloaded images
+    logging.info(f"Zipping downloaded images for batch {batch_id}")
     zip_filename = f"{batch_id}.zip"
     with ZipFile(zip_filename, 'w') as zipf:
         for image_id in image_ids:
@@ -68,6 +75,7 @@ def download_batch_images(batch_id: str, workers: int = 2, progress=None):
     if progress:
         progress(1, desc=f"Completed {batch_id}")
 
+    logging.info(f"Completed download and zip for batch {batch_id}")
     return zip_filename
 
 
@@ -77,10 +85,12 @@ def gradio_interface(batch_ids_input, progress=gr.Progress()):
     zip_files = []
     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
     except Exception as e:
+        logging.error(f"Error processing batches: {e}")
         return str(e)
 
 with gr.Blocks() as app: