Update app.py

app.py

@@ -28,6 +28,8 @@ import pandas as pd
 import numpy as np
 import io
 import os
+import tempfile
+import zipfile
 
 def zoom_at(img, x, y, zoom):
     '''
@@ -95,6 +97,51 @@ def apply_enhancements(img, x, y, zoom, contrast, brightness, sharpness):
     enhanced_sharpness = ImageEnhance.Sharpness(enhanced_brightness).enhance(sharpness)
     return enhanced_sharpness
 
+def create_zip(processed_img, description, params):
+    '''
+    Create a zip archive containing the processed image and annotations.
+
+    Parameters:
+    ----------
+    processed_img : PIL.Image
+        The processed image.
+    description : str
+        Description of the image.
+    params : dict
+        Image parameters.
+
+    Returns:
+    -------
+    bytes
+        Byte content of the zip file.
+    '''
+    # Create a temporary directory
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        # Define file paths
+        img_path = os.path.join(tmpdirname, "processed_image.jpg")
+        desc_path = os.path.join(tmpdirname, "description.txt")
+        params_path = os.path.join(tmpdirname, "parameters.json")
+
+        # Save processed image
+        processed_img.save(img_path)
+
+        # Save description
+        with open(desc_path, "w") as f:
+            f.write(description)
+
+        # Save parameters
+        pd.DataFrame([params]).to_json(params_path, orient="records")
+
+        # Create a zip file in memory
+        zip_buffer = io.BytesIO()
+        with zipfile.ZipFile(zip_buffer, "w") as zipf:
+            zipf.write(img_path, arcname="processed_image.jpg")
+            zipf.write(desc_path, arcname="description.txt")
+            zipf.write(params_path, arcname="parameters.json")
+
+        zip_buffer.seek(0)
+        return zip_buffer
+
 st.set_page_config(page_title="CLL Explorer", layout="wide")
 st.title("CLL Explorer: Cell Image Analysis Prep Tool")
 
@@ -151,34 +198,55 @@ if uploaded_files:
     st.image(img, use_column_width=True, caption="Original Image")
 
     # Save Options
-    save_image = st.checkbox("Save Processed Image")
-    if save_image:
-        st.session_state.processed_img.save("image-processed.jpg")
-        st.success("Image saved as `image-processed.jpg`")
+    st.markdown("---")
+    st.subheader("Save and Export Options")
 
-    with st.expander("Save Options"):
+    # Description and Parameters Inputs
+    with st.expander("Add Annotations", expanded=True):
         description = st.text_area("Describe the image", "")
-        if st.button("Save Description"):
-            with open("saved_image_description.txt", "w") as f:
-                f.write(description)
-            st.success("Description saved as `saved_image_description.txt`")
-
-        if st.button("Save Image Parameters"):
-            params = {
-                "coordinates_x": x,
-                "coordinates_y": y,
-                "zoom": zoom,
-                "contrast": contrast,
-                "brightness": brightness,
-                "sharpness": sharpness
-            }
-            with open("saved_image_parameters.json", "w") as f:
-                f.write(pd.DataFrame([params]).to_json(orient="records"))
-            st.success("Image parameters saved as `saved_image_parameters.json`")
+        params = {
+            "coordinates_x": x,
+            "coordinates_y": y,
+            "zoom": zoom,
+            "contrast": contrast,
+            "brightness": brightness,
+            "sharpness": sharpness
+        }
+
+    # Create a button to prepare the zip file
+    if st.button("Prepare Download"):
+        if 'processed_img' in st.session_state and description:
+            zip_buffer = create_zip(st.session_state.processed_img, description, params)
+            st.download_button(
+                label="Download Zip",
+                data=zip_buffer,
+                file_name="processed_image_and_annotations.zip",
+                mime="application/zip"
+            )
+            st.success("Zip file is ready for download.")
+        else:
+            st.warning("Ensure that the processed image is available and description is provided.")
 
-        if st.button("Rename Files"):
+    # Optional: Separate Save Image Checkbox
+    save_image = st.checkbox("Save Processed Image Locally")
+    if save_image:
+        if 'processed_img' in st.session_state:
+            st.session_state.processed_img.save("image-processed.jpg")
+            st.success("Image saved as `image-processed.jpg`")
+        else:
+            st.warning("No processed image to save.")
+
+    # Optional: Rename Files
+    if st.button("Rename Files"):
+        if 'processed_img' in st.session_state:
             file_ext = str(np.random.randint(100))
             os.rename("image-processed.jpg", f"img_processed{file_ext}.jpg")
+            with open("saved_image_parameters.json", "w") as f:
+                f.write(pd.DataFrame([params]).to_json(orient="records"))
             os.rename("saved_image_parameters.json", f"saved_image_parameters{file_ext}.json")
+            with open("saved_image_description.txt", "w") as f:
+                f.write(description)
             os.rename("saved_image_description.txt", f"saved_image_description{file_ext}.txt")
-            st.success("Files renamed successfully")
+            st.success("Files renamed successfully")
+        else:
+            st.warning("No processed image to rename.")