fix(leaflet): ensure GIF loops + render via Folium or Leaflet; disable SSR so JS runs; fix(raw-grib): force Herbie download and copy into exports

app.py

@@ -467,6 +467,42 @@ def add_radar_image_layer(fig: go.Figure, lat2d: np.ndarray, lon2d: np.ndarray,
         print(f"Image layer error: {e}")
         return False
 
+def _locate_or_download_grib(forecast_hour: int):
+    """Return local GRIB2 path for HRRR REFC at fxx, downloading if needed."""
+    if not HERBIE_AVAILABLE:
+        return None, "Herbie is not available"
+    try:
+        current_time = datetime.utcnow().replace(minute=0, second=0, microsecond=0)
+        for hours_back in [2, 3, 6, 12, 18]:
+            try:
+                target_time = current_time - timedelta(hours=hours_back)
+                date_str = target_time.strftime('%Y-%m-%d %H:00')
+                H = Herbie(date_str, model='hrrr', product='sfc', fxx=int(forecast_hour))
+                # Ensure local file
+                local = None
+                try:
+                    local = H.get_localFilePath()
+                except Exception:
+                    local = None
+                if not local:
+                    files = None
+                    try:
+                        files = H.download()
+                    except Exception:
+                        files = None
+                    if isinstance(files, (list, tuple)) and files:
+                        local = files[0]
+                if not local and hasattr(H, 'fpath'):
+                    local = H.fpath
+                if local:
+                    return local, None
+            except Exception as e:
+                print(f"locate/download attempt failed: {e}")
+                continue
+        return None, "Unable to locate/download GRIB file"
+    except Exception as e:
+        return None, f"Locate/download error: {e}"
+
 def export_radar_grib(forecast_hour: int, min_dbz: float):
     """Export the HRRR radar (REFC) field to a GRIB2 file with values below min_dbz set to missing.
 
@@ -494,24 +530,14 @@ def export_radar_grib(forecast_hour: int, min_dbz: float):
         thr = float(min_dbz) if min_dbz is not None else 1.0
         z = np.where(z >= thr, z.astype(float), np.nan)
 
-        # Determine source GRIB path
+        # Determine or download source GRIB path
         src = None
-        if isinstance(info, dict):
-            src = info.get('file')
+        if isinstance(info, dict) and info.get('file') and os.path.exists(info['file']):
+            src = info['file']
         if not src:
-            # Try to pull from encodings
-            try:
-                src = ds.encoding.get('source', None)
-            except Exception:
-                pass
+            src, err = _locate_or_download_grib(int(forecast_hour))
             if not src:
-                for vn in var_names:
-                    enc = getattr(ds[vn], 'encoding', {})
-                    src = enc.get('source', None)
-                    if src:
-                        break
-        if not src:
-            return None, "Could not locate the source GRIB file path."
+                return None, err or "Could not obtain source GRIB file"
 
         import os
         from eccodes import codes_grib_new_from_file, codes_get, codes_set, codes_set_values, codes_write, codes_release
@@ -588,18 +614,19 @@ def download_raw_grib(forecast_hour: int):
     try:
         if not HERBIE_AVAILABLE:
             return None, "Herbie is not available"
-        ds, info = fetch_real_hrrr_data('REFC:entire atmosphere', int(forecast_hour), return_src=True)
-        if isinstance(info, dict) and info.get('file'):
-            src_file = info['file']
-            try:
-                import shutil
-                os.makedirs('exports', exist_ok=True)
-                base = os.path.basename(str(src_file))
-                dest = os.path.join('exports', f"raw_{base}")
-                shutil.copy2(src_file, dest)
-                return dest, None
-            except Exception as e:
-                return None, f"Copy error: {e}"
+        # Try immediate locate/download via Herbie
+        src_file, err = _locate_or_download_grib(int(forecast_hour))
+        if not src_file:
+            return None, err
+        try:
+            import shutil
+            os.makedirs('exports', exist_ok=True)
+            base = os.path.basename(str(src_file))
+            dest = os.path.join('exports', f"raw_{base}")
+            shutil.copy2(src_file, dest)
+            return dest, None
+        except Exception as e:
+            return None, f"Copy error: {e}"
         # Fallback: attempt direct Herbie path
         current_time = datetime.utcnow().replace(minute=0, second=0, microsecond=0)
         for hours_back in [2, 3, 6, 12, 18]:
@@ -615,16 +642,7 @@ def download_raw_grib(forecast_hour: int):
                         local = files[0]
                 if not local and hasattr(H, 'fpath'):
                     local = H.fpath
-                if local:
-                    try:
-                        import shutil
-                        os.makedirs('exports', exist_ok=True)
-                        base = os.path.basename(str(local))
-                        dest = os.path.join('exports', f"raw_{base}")
-                        shutil.copy2(local, dest)
-                        return dest, None
-                    except Exception as e:
-                        return None, f"Copy error: {e}"
+                # Fallback handled above
             except Exception:
                 continue
         return None, "Unable to locate/download raw GRIB file"
@@ -713,25 +731,42 @@ def build_leaflet_overlay_html(gif_path: Optional[str], grid: Optional[Dict[str,
             gif_b64 = base64.b64encode(f.read()).decode('ascii')
         data_url = f"data:image/gif;base64,{gif_b64}"
 
-        html = f"""
-        <link rel=\"stylesheet\" href=\"https://unpkg.com/leaflet@1.9.4/dist/leaflet.css\"/>
-        <div id=\"leaflet-map\" style=\"height:500px; border-radius:8px; overflow:hidden;\"></div>
-        <script src=\"https://unpkg.com/leaflet@1.9.4/dist/leaflet.js\"></script>
-        <script>
-        (function() {{
-            var map = L.map('leaflet-map', {{center: [{c_lat:.5f}, {c_lon:.5f}], zoom: 5, zoomControl: true}});
-            L.tileLayer('https://{{s}}.tile.openstreetmap.org/{{z}}/{{x}}/{{y}}.png', {{
-                maxZoom: 18,
-                attribution: '&copy; OpenStreetMap contributors'
-            }}).addTo(map);
-
-            var bounds = [[{min_lat:.6f}, {min_lon:.6f}], [{max_lat:.6f}, {max_lon:.6f}]];
-            var overlay = L.imageOverlay('{data_url}', bounds, {{opacity: 0.95, interactive: false}}).addTo(map);
-            map.fitBounds(bounds);
-        }})();
-        </script>
-        """
-        return html
+        # Prefer Folium (self-contained HTML) and fallback to raw Leaflet
+        try:
+            import folium
+            m = folium.Map(location=[c_lat, c_lon], zoom_start=5, control_scale=True)
+            folium.TileLayer('OpenStreetMap').add_to(m)
+            folium.raster_layers.ImageOverlay(
+                image=data_url,
+                bounds=[[min_lat, min_lon], [max_lat, max_lon]],
+                opacity=0.95,
+                interactive=False,
+                cross_origin=False,
+                zindex=2,
+            ).add_to(m)
+            folium.LayerControl().add_to(m)
+            html = m.get_root().render()
+            return html
+        except Exception as fe:
+            html = f"""
+            <link rel=\"stylesheet\" href=\"https://unpkg.com/leaflet@1.9.4/dist/leaflet.css\"/>
+            <div id=\"leaflet-map\" style=\"height:500px; border-radius:8px; overflow:hidden;\"></div>
+            <script src=\"https://unpkg.com/leaflet@1.9.4/dist/leaflet.js\"></script>
+            <script>
+            (function() {{
+                var map = L.map('leaflet-map', {{center: [{c_lat:.5f}, {c_lon:.5f}], zoom: 5, zoomControl: true}});
+                L.tileLayer('https://{{s}}.tile.openstreetmap.org/{{z}}/{{x}}/{{y}}.png', {{
+                    maxZoom: 18,
+                    attribution: '&copy; OpenStreetMap contributors'
+                }}).addTo(map);
+
+                var bounds = [[{min_lat:.6f}, {min_lon:.6f}], [{max_lat:.6f}, {max_lon:.6f}]];
+                var overlay = L.imageOverlay('{data_url}', bounds, {{opacity: 0.95, interactive: false}}).addTo(map);
+                map.fitBounds(bounds);
+            }})();
+            </script>
+            """
+            return html
     except Exception as e:
         return f"<div style='padding:8px;color:#900'>Leaflet overlay error: {str(e)}</div>"
 
@@ -1163,4 +1198,5 @@ with gr.Blocks(title="HRRR Weather + Radar") as app:
     )
 
 if __name__ == "__main__":
-    app.launch(server_name="0.0.0.0", server_port=7860)
+    # Disable SSR to allow custom JS (Leaflet/Folium) to run in gr.HTML blocks
+    app.launch(server_name="0.0.0.0", server_port=7860, ssr_mode=False)

requirements.txt

@@ -8,6 +8,7 @@ metpy>=1.5.0
 cartopy>=0.22.0
 matplotlib>=3.7.0
 imageio>=2.16.0
+folium>=0.14.0
 requests>=2.31.0
 aiohttp>=3.8.0
 fsspec>=2023.1.0