Update app.py

app.py

@@ -45,132 +45,84 @@ def get_snow_forecast(lat, lon):
         return f"Error getting forecast: {str(e)}"
 
 def get_forecast_images():
-    """Get forecast images and combine them into an animation."""
+    """Get forecast images."""
     try:
-        frames = []
+        gallery_images = []
         current_time = datetime.utcnow()
         
-        # List of forecast product URLs
-        forecast_urls = [
-            # National Forecast Products
-            f"https://graphical.weather.gov/images/conus/MaxT1_conus.png",
-            f"https://graphical.weather.gov/images/conus/MinT1_conus.png",
-            f"https://graphical.weather.gov/images/conus/Wx1_conus.png",
-            
-            # Winter Weather Probability
-            "https://www.wpc.ncep.noaa.gov/pwpf/24hr_pwpf_fill.gif",
-            "https://www.wpc.ncep.noaa.gov/pwpf/48hr_pwpf_fill.gif",
-            "https://www.wpc.ncep.noaa.gov/pwpf/72hr_pwpf_fill.gif",
-            
-            # Winter Weather Maps
-            "https://www.wpc.ncep.noaa.gov/wwd/24wp_d1_psnow.gif",
-            "https://www.wpc.ncep.noaa.gov/wwd/48wp_d2_psnow.gif",
-            "https://www.wpc.ncep.noaa.gov/wwd/72wp_d3_psnow.gif",
-            
-            # Precipitation Probability
-            f"https://graphical.weather.gov/images/conus/PoP1_conus.png",
-            f"https://graphical.weather.gov/images/conus/PoP2_conus.png",
-            
-            # Snow Amount Forecasts
-            f"https://graphical.weather.gov/images/conus/Snow1_conus.png",
-            f"https://graphical.weather.gov/images/conus/Snow2_conus.png"
+        # List of forecast product URLs with descriptions
+        forecast_products = [
+            {
+                "url": "https://graphical.weather.gov/images/conus/MaxT1_conus.png",
+                "title": "Maximum Temperature Forecast"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/MinT1_conus.png",
+                "title": "Minimum Temperature Forecast"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/Wx1_conus.png",
+                "title": "Weather Type Forecast"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/PoP1_conus.png",
+                "title": "Precipitation Probability (Day 1)"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/PoP2_conus.png",
+                "title": "Precipitation Probability (Day 2)"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/Snow1_conus.png",
+                "title": "Snowfall Amount (Day 1)"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/Snow2_conus.png",
+                "title": "Snowfall Amount (Day 2)"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/pwpf/24hr_pwpf_fill.gif",
+                "title": "24-hour Winter Precipitation Probability"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/pwpf/48hr_pwpf_fill.gif",
+                "title": "48-hour Winter Precipitation Probability"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/pwpf/72hr_pwpf_fill.gif",
+                "title": "72-hour Winter Precipitation Probability"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/wwd/24wp_d1_psnow.gif",
+                "title": "24-hour Snowfall Probability"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/wwd/48wp_d2_psnow.gif",
+                "title": "48-hour Snowfall Probability"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/wwd/72wp_d3_psnow.gif",
+                "title": "72-hour Snowfall Probability"
+            }
         ]
         
-        # Try to get each forecast image
-        for i, url in enumerate(forecast_urls):
+        for product in forecast_products:
             try:
-                response = requests.get(url, timeout=10)
+                response = requests.get(product["url"], timeout=10)
                 if response.status_code == 200:
-                    img = Image.open(io.BytesIO(response.content))
-                    
-                    # Convert to RGB if needed
-                    if img.mode != 'RGB':
-                        img = img.convert('RGB')
-                    
-                    # Resize to consistent dimensions
-                    img = img.resize((800, 600), Image.Resampling.LANCZOS)
-                    
-                    # Add descriptive text
-                    draw = ImageDraw.Draw(img)
-                    try:
-                        font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 20)
-                    except:
-                        font = ImageFont.load_default()
-                    
-                    # Determine image type
-                    if "MaxT" in url:
-                        text = "Maximum Temperature Forecast"
-                    elif "MinT" in url:
-                        text = "Minimum Temperature Forecast"
-                    elif "Wx" in url:
-                        text = "Weather Type Forecast"
-                    elif "pwpf" in url:
-                        hours = url.split('/')[-1].split('hr')[0]
-                        text = f"{hours}-hour Winter Precipitation Forecast"
-                    elif "psnow" in url:
-                        if "24wp" in url:
-                            text = "24-hour Snowfall Probability"
-                        elif "48wp" in url:
-                            text = "48-hour Snowfall Probability"
-                        else:
-                            text = "72-hour Snowfall Probability"
-                    elif "PoP" in url:
-                        text = "Precipitation Probability Forecast"
-                    elif "Snow" in url:
-                        text = "Snowfall Amount Forecast"
-                    else:
-                        text = f"Weather Forecast Product {i+1}"
-                    
-                    timestamp = f"Valid: {current_time.strftime('%Y-%m-%d %H:%M UTC')}"
-                    
-                    # Draw text with outline for visibility
-                    x, y = 10, 10
-                    for dx, dy in [(-1,-1), (-1,1), (1,-1), (1,1)]:
-                        draw.text((x+dx, y+dy), text, fill='black', font=font)
-                        draw.text((x+dx, y+dy+25), timestamp, fill='black', font=font)
-                    draw.text((x, y), text, fill='white', font=font)
-                    draw.text((x, y+25), timestamp, fill='white', font=font)
-                    
-                    frames.append(img)
-                    print(f"Successfully added frame from {url}")
+                    img_data = response.content
+                    caption = f"{product['title']} (Valid: {current_time.strftime('%Y-%m-%d %H:%M UTC')})"
+                    gallery_images.append((img_data, caption))
+                    print(f"Successfully added {product['title']}")
             except Exception as e:
-                print(f"Error processing forecast image from {url}: {str(e)}")
+                print(f"Error processing {product['title']}: {str(e)}")
                 continue
-        
-        if not frames:
-            raise Exception("No forecast images could be loaded")
-        
-        # Create animated GIF
-        with tempfile.NamedTemporaryFile(suffix='.gif', delete=False) as tmp_file:
-            frames[0].save(
-                tmp_file.name,
-                save_all=True,
-                append_images=frames[1:],
-                duration=3000,  # 3 seconds per frame
-                loop=0
-            )
-            return tmp_file.name
                 
-    except Exception as e:
-        print(f"Error creating forecast display: {str(e)}")
-        # Create error message image
-        img = Image.new('RGB', (800, 600), color='black')
-        draw = ImageDraw.Draw(img)
-        message = (
-            "Weather forecast images temporarily unavailable\n"
-            f"{str(e)}\n"
-            "Please check weather.gov for current conditions\n"
-            f"Last attempt: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
-        )
-        try:
-            font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 20)
-            draw.text((400, 300), message, fill='white', anchor="mm", align="center", font=font)
-        except:
-            draw.text((400, 300), message, fill='white', anchor="mm", align="center")
+        return gallery_images
         
-        with tempfile.NamedTemporaryFile(suffix='.gif', delete=False) as tmp_file:
-            img.save(tmp_file.name, format='GIF')
-            return tmp_file.name
+    except Exception as e:
+        print(f"Error getting forecast images: {str(e)}")
+        return []
 
 def get_map(lat, lon):
     """Create a map centered on the given coordinates with markers."""
@@ -205,21 +157,21 @@ def update_weather(lat, lon):
         lat = float(lat)
         lon = float(lon)
         if not (-90 <= lat <= 90 and -180 <= lon <= 180):
-            return "Invalid coordinates", None, get_map(45.5, -111.0)
+            return "Invalid coordinates", [], get_map(45.5, -111.0)
             
         # Get text forecast
         forecast_text = get_snow_forecast(lat, lon)
         
-        # Get forecast images animation
-        forecast_animation = get_forecast_images()
+        # Get forecast images
+        gallery_images = get_forecast_images()
         
         # Get map
         map_html = get_map(lat, lon)
         
-        return forecast_text, forecast_animation, map_html
+        return forecast_text, gallery_images, map_html
         
     except Exception as e:
-        return f"Error: {str(e)}", None, get_map(45.5, -111.0)
+        return f"Error: {str(e)}", [], get_map(45.5, -111.0)
 
 # Create Gradio interface
 with gr.Blocks(title="Montana Mountain Weather") as demo:
@@ -252,17 +204,20 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
             map_display = gr.HTML(get_map(45.5, -111.0))
     
     with gr.Row():
-        with gr.Column():
+        with gr.Column(scale=1):
             forecast_output = gr.Textbox(
-                label="Forecast",
+                label="Weather Forecast",
                 lines=12,
                 placeholder="Select a location to see the forecast..."
             )
-            forecast_gallery = gr.Gallery(
+        with gr.Column(scale=2):
+            forecast_images = gr.Gallery(
                 label="Weather Forecast Products",
                 show_label=True,
                 columns=2,
-                height=400
+                rows=2,
+                height="auto",
+                object_fit="contain"
             )
     
     # Handle submit button click
@@ -271,7 +226,7 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
         inputs=[lat_input, lon_input],
         outputs=[
             forecast_output,
-            forecast_gallery,
+            forecast_images,
             map_display
         ]
     )
@@ -287,7 +242,7 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
             inputs=[lat_input, lon_input],
             outputs=[
                 forecast_output,
-                forecast_gallery,
+                forecast_images,
                 map_display
             ]
         )
@@ -303,17 +258,16 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
     - Sacajawea Peak: 45°53′45″N 110°58′7″W
     - Pioneer Mountain: 45°13′55″N 111°27′2″W
     
-    **Forecast Products Include:**
-    - Temperature forecasts (max/min)
-    - Precipitation probability
-    - Snow amount predictions
-    - Winter weather probability
-    - 24/48/72-hour snowfall forecasts
-    
-    Each forecast image will be shown for 3 seconds in the animation.
+    **Available Forecast Products:**
+    - Temperature Forecasts (Max/Min)
+    - Weather Type Forecast
+    - Precipitation Probability (Days 1-2)
+    - Snowfall Amount Forecasts (Days 1-2)
+    - Winter Precipitation Probability (24/48/72-hour)
+    - Snowfall Probability (24/48/72-hour)
     
     **Note**: This app uses the NOAA Weather API and may have occasional delays or service interruptions.
     Mountain weather can change rapidly - always check multiple sources for safety.
     """)
 
-demo.queue().launch()
+demo.queue().launch()