Update app.py

app.py

@@ -18,7 +18,7 @@ center_tol = 30
 morph_dia = 5
 min_rad = 70
 
-def fetch_sdo_images(max_images, ident="0745", size="1024by960", tool="ccor1"):
+def fetch_sdo_images(max_images, size="1024by960", tool="ccor1"):
     """Fetch SDO images from NOAA URL directory."""
     try:
         # Construct the directory URL
@@ -33,22 +33,21 @@ def fetch_sdo_images(max_images, ident="0745", size="1024by960", tool="ccor1"):
         soup = BeautifulSoup(response.text, 'html.parser')
         links = soup.find_all('a')
         
-        # Extract image filenames matching the pattern {DATE}_{IDENT}_{TOOL}_{SIZE}.jpg
+        # Extract image filenames matching the pattern YYYYMMDD_HHMM_{tool}_{size}.jpg
         image_files = []
         for link in links:
-            print(link)
             href = link.get('href')
-            if href and href.endswith(f"_{size}.jpg"):
-                # Check if the filename starts with a valid timestamp (YYYYMMDD_HHMMSS)
-                if len(href) >= 15 and href[:8].isdigit() and href[9:15].isdigit():
+            if href and href.endswith(f"_{tool}_{size}.jpg"):
+                # Check if the filename starts with a valid timestamp (YYYYMMDD_HHMM)
+                if len(href) >= 12 and href[:8].isdigit() and href[9:13].isdigit():
                     image_files.append(href)
         
         # Sort images by timestamp (most recent first)
-        image_files = sorted(image_files, key=lambda x: x[:15], reverse=True)
+        image_files = sorted(image_files, key=lambda x: x[:13], reverse=True)
         total_images = len(image_files)
         
         if not image_files:
-            return None, f"No images found with ident={ident}, size={size}, tool={tool}.", total_images
+            return None, f"No images found with size={size}, tool={tool}.", total_images
         
         # Fetch up to max_images
         frames = []
@@ -131,9 +130,9 @@ def create_gif(frames, output_path, duration=0.5):
     )
     return output_path
 
-def handle_fetch(max_images, ident, size, tool):
+def handle_fetch(max_images, size, tool):
     """Fetch SDO images and return frames for preview and state."""
-    frames, message, total_images = fetch_sdo_images(max_images, ident, size, tool)
+    frames, message, total_images = fetch_sdo_images(max_images, size, tool)
     if frames is None:
         return message, [], frames, total_images
     preview_frames = [Image.fromarray(frame) for frame in frames]
@@ -240,7 +239,7 @@ def analyze_images(frames, lower_bound, upper_bound, param1, param2, center_tole
     except Exception as e:
         return f"Error during analysis: {str(e)}", [], None
 
-def process_input(gif_file, max_images, ident, size, tool, lower_bound, upper_bound, param1, param2, center_tolerance, morph_iterations, min_rad, display_mode, fetched_frames_state):
+def process_input(gif_file, max_images, size, tool, lower_bound, upper_bound, param1, param2, center_tolerance, morph_iterations, min_rad, display_mode, fetched_frames_state):
     """Process either uploaded GIF or fetched SDO images."""
     if gif_file:
         frames, error = extract_frames(gif_file.name)
@@ -277,7 +276,6 @@ with gr.Blocks(title="Solar CME Detection") as demo:
             gr.Markdown("### Input Options")
             gif_input = gr.File(label="Upload Solar GIF (optional)", file_types=[".gif"])
             max_images = gr.Slider(minimum=1, maximum=100, value=10, step=1, label="Max Images to Fetch")
-            ident = gr.Textbox(label="Image Identifier", value="0745")
             size = gr.Textbox(label="Image Size", value="1024by960")
             tool = gr.Textbox(label="Instrument", value="ccor1")
             fetch_button = gr.Button("Fetch Images from URL")
@@ -309,8 +307,7 @@ with gr.Blocks(title="Solar CME Detection") as demo:
     # Fetch button action
     fetch_button.click(
         fn=handle_fetch,
-        inputs=[max_images, ident, size, tool],
-        #inputs=[max_images],
+        inputs=[max_images, size, tool],
         outputs=[report, preview, fetched_frames_state, total_images]
     )
 
@@ -318,7 +315,7 @@ with gr.Blocks(title="Solar CME Detection") as demo:
     analyze_button.click(
         fn=process_input,
         inputs=[
-            gif_input, max_images, ident, size, tool,
+            gif_file, max_images, size, tool,
             lower_bound, upper_bound, param1, param2, center_tolerance, morph_iterations, min_rad, display_mode, fetched_frames_state
         ],
         outputs=[report, gallery, gif_output, preview, total_images]