Update app.py

app.py

@@ -3,41 +3,69 @@ import os
 from utils import load_dicoms
 from model import generate_report
 from utils import load_dicoms, generate_pdf
+from utils import convert_dicom_zip_to_nifti, generate_pdf
 
-def process_scan(dicom_files):
-    if not dicom_files:
-        return gr.Gallery(visible=False), gr.Button(interactive=False)
+# def process_scan(dicom_files):
+#     if not dicom_files:
+#         return gr.Gallery(visible=False), gr.Button(interactive=False)
     
-    images = load_dicoms(dicom_files)
-    if not images:
-        return gr.Gallery(visible=False), gr.Button(interactive=False)
+#     images = load_dicoms(dicom_files)
+#     if not images:
+#         return gr.Gallery(visible=False), gr.Button(interactive=False)
         
-    return gr.Gallery(value=images, visible=True), gr.Button(interactive=True)
+#     return gr.Gallery(value=images, visible=True), gr.Button(interactive=True)
 
-def run_generate(dicom_files):
-    if not dicom_files:
-        return "", gr.DownloadButton(visible=False)
+# def run_generate(dicom_files):
+#     if not dicom_files:
+#         return "", gr.DownloadButton(visible=False)
     
-    images = load_dicoms(dicom_files)
-    if not images:
-        return gr.DownloadButton(visible=False)
+#     images = load_dicoms(dicom_files)
+#     if not images:
+#         return gr.DownloadButton(visible=False)
     
-    report = generate_report(images)
+#     report = generate_report(images)
     
-    return report, gr.DownloadButton(visible=True)
+#     return report, gr.DownloadButton(visible=True)
+
+# def download_report(report_text):
+#     if not report_text or not report_text.strip():
+#         gr.Warning("No report to download yet.")
+#         return None
+#     return generate_pdf(report_text)
+
+def process_scan(zip_file):
+    if zip_file is None:
+        return gr.Gallery(visible=False), gr.Button(interactive=False), None
 
-def download_report(report_text):
-    if not report_text or not report_text.strip():
-        gr.Warning("No report to download yet.")
-        return None
-    return generate_pdf(report_text)
+    sequence_images = convert_dicom_zip_to_nifti(zip_file)
+
+    if not sequence_images:
+        gr.Warning("No valid sequences found in ZIP.")
+        return gr.Gallery(visible=False), gr.Button(interactive=False), None
+
+    gallery_items = [(img, name) for img, name in sequence_images]
+
+    return (
+        gr.Gallery(value=gallery_items, visible=True),
+        gr.Button(interactive=True),
+        sequence_images        # ← saved into State
+    )
+def run_generate(sequence_images):
+    if not sequence_images:
+        return "", gr.DownloadButton(visible=False)
+
+    images = [s[1] for s in sequence_images]
+    report = generate_report(images)
+
+    return report, gr.DownloadButton(visible=True)
 
 def reset_on_clear():
     return (
         gr.Gallery(value=None, visible=False),  # scan_display
         "",                             # report_box
         gr.Button(interactive=False),   # generate_btn
-        gr.DownloadButton(visible=False) # download_btn
+        gr.DownloadButton(visible=False), # download_btn
+        None
     )
 
 # Build the UI
@@ -46,14 +74,16 @@ with gr.Blocks(title="MRI Brain Report Generator") as app:
     gr.Markdown("# MRI Brain Scan Report Generator")
     gr.Markdown("### Radiologist Assistant")
     gr.Markdown("Upload DICOM brain scans to generate a report.")
+
+    sequence_state = gr.State(value=None)
     
     with gr.Row():
         # Left column - image input/display
         with gr.Column():
             upload_btn = gr.File(
-                label="Upload MRI Sequences (T1, T2, FLAIR, DWI, ADC, GRE, T1+C)",
-                file_types=[".dcm"],
-                file_count="multiple"
+                label="Upload DICOM Study as ZIP",
+                file_types=[".zip"],
+                file_count="single"
             )
             scan_display = gr.Gallery(
                 label="Scan Preview",
@@ -84,12 +114,12 @@ with gr.Blocks(title="MRI Brain Report Generator") as app:
     upload_btn.change(
         fn=process_scan,
         inputs=upload_btn,
-        outputs=[scan_display, generate_btn]
+        outputs=[scan_display, generate_btn, sequence_state]
     )
 
     generate_btn.click(
         fn=run_generate,
-        inputs=upload_btn,
+        inputs=sequence_state,
         outputs=[report_box, download_btn]
     )
 
@@ -102,7 +132,7 @@ with gr.Blocks(title="MRI Brain Report Generator") as app:
     upload_btn.clear(
     fn=reset_on_clear,
     inputs=None,
-    outputs=[scan_display, report_box, generate_btn, download_btn]
+    outputs=[scan_display, report_box, generate_btn, download_btn, sequence_state]
 )
 
 app.launch()