Upload app.py

app.py

@@ -1,37 +1,57 @@
 import gradio as gr
-import Colony_Analyzer_AI2_HF as analyzer
 from PIL import Image
-import cv2
-import numpy as np
 
-#this one I know works with just the basic imaging functionality
-
-# Analysis function adapted from your Tkinter app
+# Single image analysis function (your existing logic)
 def analyze_image(image, min_size, circularity):
-    print(type(image))
-    print(len(image))
-    # Assume your analyzer.main accepts [image, params] format, adjust as needed
-    processed_img,picname, excelname = analyzer.main([image, min_size, circularity])
-    #print(type(processed_img))
-    # Convert back to RGB for display
-    #result = cv2.cvtColor(processed_img, cv2.COLOR_BGR2RGB)
+    import Colony_Analyzer_AI2_HF as analyzer
+    processed_img, picname, excelname = analyzer.main([image, min_size, circularity])
+    return Image.fromarray(processed_img), picname, excelname
+
+# Z-stack analysis function (adapt with your own logic)
+def analyze_zstack(images, min_size, circularity):
+    # images: list of PIL images
+    # Plug in your own z-stack segmentation logic here
+    # Example stub: pass images as a list to your analyzer
+    import Colony_Analyzer_AI_zstack2_HF as analyzer
+    images = [Image.open(f.name) for f in images]
+    processed_img, picname, excelname = analyzer.main([images, min_size, circularity])
     return Image.fromarray(processed_img), picname, excelname
 
-# Create Gradio interface
-iface = gr.Interface(
-    fn=analyze_image,
-    inputs=[
-        gr.Image(type="pil", label="Upload Image"),
-        gr.Number(label="Minimum Colony Size (pixels)", value=1000),
-        gr.Number(label="Minimum Circularity", value=0.25)
-    ],
-    outputs=[
-        gr.Image(type="pil", label="Analyzed Image"),
-        gr.File(label="Download Image"),
-        gr.File(label="Download results (Excel)")
-    ],
-    title="AI Colony Analyzer",
-    description="Upload an image to run the colony analysis."
-)
-
-iface.launch()
+with gr.Blocks() as demo:
+    gr.Markdown("# AI Colony Analyzer\nUpload an image (or Z-Stack) to run colony analysis.")
+
+    z_stack_checkbox = gr.Checkbox(label="Enable Z-Stack", value=False)
+    image_input_single = gr.Image(type="pil", label="Upload Image", visible=True)
+    image_input_multi = gr.File(file_count="multiple", type="file", label="Upload Z-Stack Images", visible=False)
+    min_size_input = gr.Number(label="Minimum Colony Size (pixels)", value=1000)
+    circularity_input = gr.Number(label="Minimum Circularity", value=0.25)
+    output_image = gr.Image(type="pil", label="Analyzed Image")
+    output_file_img = gr.File(label="Download Image")
+    output_file_excel = gr.File(label="Download results (Excel)")
+    process_btn = gr.Button("Process")
+
+    def toggle_inputs(z_stack_enabled):
+        return (
+            gr.update(visible=not z_stack_enabled),  # single input
+            gr.update(visible=z_stack_enabled)        # multi input
+        )
+
+    z_stack_checkbox.change(
+        toggle_inputs,
+        inputs=z_stack_checkbox,
+        outputs=[image_input_single, image_input_multi]
+    )
+
+    def conditional_analyze(z_stack, single_image, multi_images, min_size, circularity):
+        if z_stack:
+            return analyze_zstack(multi_images, min_size, circularity)
+        else:
+            return analyze_image(single_image, min_size, circularity)
+
+    process_btn.click(
+        conditional_analyze,
+        inputs=[z_stack_checkbox, image_input_single, image_input_multi, min_size_input, circularity_input],
+        outputs=[output_image, output_file_img, output_file_excel]
+    )
+
+demo.launch()