fix: open-meteo tweaks

Author: rubiojr

docs/datasources/openmeteo.md

@@ -1,12 +1,14 @@
 # Open-Meteo Weather Datasource
 
-The Open-Meteo datasource fetches current weather data for any location worldwide using the free Open-Meteo API. It automatically geocodes location names and provides comprehensive weather information including temperature, wind, humidity, pressure, and UV index.
+The Open-Meteo datasource fetches current weather data and hourly forecasts for any location worldwide using the free Open-Meteo API. It automatically geocodes location names and provides comprehensive weather information including temperature, wind, humidity, pressure, UV index, and rain predictions.
 
 ## Features
 
 - 🌍 **Worldwide Coverage** - Fetch weather for any location globally
 - 📍 **Automatic Geocoding** - Simply provide a location name (city, town, etc.)
 - 🌡️ **Comprehensive Data** - Temperature, feels-like, wind, humidity, pressure, UV index
+- 🌧️ **Rain Predictions** - Alerts when rain is expected today with precipitation probability
+- 📊 **Hourly Forecast** - 24-hour forecast with detailed hourly weather conditions
 - 🎨 **Weather Icons** - Visual representation with emoji icons for each weather condition
 - 🆓 **Free API** - No API key required, uses the free Open-Meteo service
 - 🔄 **Real-time Updates** - Configurable fetch intervals for up-to-date weather
@@ -79,6 +81,21 @@ The datasource stores the following fields for each weather report:
 | `surface_pressure` | REAL | Surface pressure (hPa) |
 | `sealevel_pressure` | REAL | Sea level pressure (hPa) |
 | `uv_index` | REAL | Maximum UV index for the day |
+| `hourly_forecast` | TEXT | JSON array of hourly forecast data for today (24 hours) |
+
+### Hourly Forecast Data
+
+Each hourly forecast entry contains:
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `time` | TEXT | ISO 8601 timestamp for the hour |
+| `temperature` | REAL | Hourly temperature (°C) |
+| `weather_code` | INTEGER | WMO weather code for the hour |
+| `weather_description` | TEXT | Human-readable condition |
+| `precipitation` | REAL | Precipitation amount (mm) |
+| `precipitation_probability` | INTEGER | Chance of precipitation (%) |
+| `humidity` | REAL | Relative humidity (%) |
 
 ## Weather Codes and Icons
 
@@ -166,11 +183,24 @@ When fetching or streaming data, you'll see output like this:
 This datasource uses the free [Open-Meteo API](https://open-meteo.com/):
 
 - **Geocoding**: `geocoding-api.open-meteo.com` - Converts location names to coordinates
-- **Weather Data**: `api.open-meteo.com` - Provides current weather and forecasts
+- **Weather Data**: `api.open-meteo.com` - Provides current weather and 24-hour forecasts
 - **Air Quality**: `air-quality-api.open-meteo.com` - UV index and air quality data
 - **No API Key Required**: Free for non-commercial use
 - **Attribution**: Data provided by Open-Meteo.com
 
+## Rain Prediction & Forecast Display
+
+The weather renderer includes:
+
+- **Rain Alert Badge** - Prominent alert when rain is expected today, showing maximum precipitation probability
+- **Collapsible Hourly Forecast** - Interactive table with 24-hour forecast including:
+  - Time and weather condition icons
+  - Hourly temperature
+  - Precipitation amount and probability
+  - Humidity levels
+  
+The rain detection automatically checks all hourly forecasts for rain codes (51-82) and displays an alert if rain is expected at any point during the day.
+
 ## Location Examples
 
 You can use various location formats:
@@ -200,8 +230,9 @@ location = 'København'
 - **API Rate Limits**: Open-Meteo is free but has reasonable rate limits
 - **Update Frequency**: Weather data typically updates every 15-60 minutes
 - **Recommended Interval**: 30 minutes to 1 hour is usually sufficient
-- **Storage**: Creates one block per fetch, deduplicates based on weather conditions
+- **Storage**: Creates one block per fetch with 24-hour forecast data, deduplicates based on weather conditions
 - **Network**: Requires 3 API calls per fetch (geocoding, weather, air quality)
+- **Forecast Data**: Stores up to 24 hours of hourly forecast data per block
 
 ## Troubleshooting
 

pkg/datasources/openmeteo/blocks.go

@@ -32,6 +32,7 @@ type WeatherBlock struct {
 	surfacePressure     float64
 	sealevelPressure    float64
 	uvIndex             float64
+	hourlyForecast      []map[string]interface{}
 }
 
 func NewWeatherBlock(
@@ -43,6 +44,7 @@ func NewWeatherBlock(
 	weatherCode int,
 	weatherDescription string,
 	humidity, apparentTemperature, surfacePressure, sealevelPressure, uvIndex float64,
+	hourlyForecast []map[string]interface{},
 	createdAt time.Time,
 	source string,
 ) *WeatherBlock {
@@ -68,6 +70,7 @@ func NewWeatherBlock(
 		"sealevel_pressure":    sealevelPressure,
 		"uv_index":             uvIndex,
 		"source":               source,
+		"hourly_forecast":      hourlyForecast,
 	}
 
 	// Use content-based ID so we only create new blocks when weather changes significantly
@@ -96,6 +99,7 @@ func NewWeatherBlock(
 		surfacePressure:     surfacePressure,
 		sealevelPressure:    sealevelPressure,
 		uvIndex:             uvIndex,
+		hourlyForecast:      hourlyForecast,
 	}
 }
 
@@ -133,22 +137,23 @@ func (b *WeatherBlock) Summary() string {
 }
 
 // Custom accessor methods
-func (b *WeatherBlock) Location() string             { return b.location }
-func (b *WeatherBlock) Country() string              { return b.country }
-func (b *WeatherBlock) Latitude() float64            { return b.latitude }
-func (b *WeatherBlock) Longitude() float64           { return b.longitude }
-func (b *WeatherBlock) Timezone() string             { return b.timezone }
-func (b *WeatherBlock) Population() int64            { return b.population }
-func (b *WeatherBlock) Temperature() float64         { return b.temperature }
-func (b *WeatherBlock) WindSpeed() float64           { return b.windSpeed }
-func (b *WeatherBlock) WindDirection() float64       { return b.windDirection }
-func (b *WeatherBlock) WeatherCode() int             { return b.weatherCode }
-func (b *WeatherBlock) WeatherDescription() string   { return b.weatherDescription }
-func (b *WeatherBlock) Humidity() float64            { return b.humidity }
-func (b *WeatherBlock) ApparentTemperature() float64 { return b.apparentTemperature }
-func (b *WeatherBlock) SurfacePressure() float64     { return b.surfacePressure }
-func (b *WeatherBlock) SealevelPressure() float64    { return b.sealevelPressure }
-func (b *WeatherBlock) UVIndex() float64             { return b.uvIndex }
+func (b *WeatherBlock) Location() string                         { return b.location }
+func (b *WeatherBlock) Country() string                          { return b.country }
+func (b *WeatherBlock) Latitude() float64                        { return b.latitude }
+func (b *WeatherBlock) Longitude() float64                       { return b.longitude }
+func (b *WeatherBlock) Timezone() string                         { return b.timezone }
+func (b *WeatherBlock) Population() int64                        { return b.population }
+func (b *WeatherBlock) Temperature() float64                     { return b.temperature }
+func (b *WeatherBlock) WindSpeed() float64                       { return b.windSpeed }
+func (b *WeatherBlock) WindDirection() float64                   { return b.windDirection }
+func (b *WeatherBlock) WeatherCode() int                         { return b.weatherCode }
+func (b *WeatherBlock) WeatherDescription() string               { return b.weatherDescription }
+func (b *WeatherBlock) Humidity() float64                        { return b.humidity }
+func (b *WeatherBlock) ApparentTemperature() float64             { return b.apparentTemperature }
+func (b *WeatherBlock) SurfacePressure() float64                 { return b.surfacePressure }
+func (b *WeatherBlock) SealevelPressure() float64                { return b.sealevelPressure }
+func (b *WeatherBlock) UVIndex() float64                         { return b.uvIndex }
+func (b *WeatherBlock) HourlyForecast() []map[string]interface{} { return b.hourlyForecast }
 
 func (b *WeatherBlock) Type() string { return "openmeteo" }
 
@@ -173,6 +178,7 @@ func (b *WeatherBlock) Factory(genericBlock *core.GenericBlock, source string) c
 	surfacePressure := getFloatFromMetadata(metadata, "surface_pressure", 0.0)
 	sealevelPressure := getFloatFromMetadata(metadata, "sealevel_pressure", 0.0)
 	uvIndex := getFloatFromMetadata(metadata, "uv_index", 0.0)
+	hourlyForecast := getSliceFromMetadata(metadata, "hourly_forecast")
 
 	return &WeatherBlock{
 		id:                  genericBlock.ID(),
@@ -196,6 +202,7 @@ func (b *WeatherBlock) Factory(genericBlock *core.GenericBlock, source string) c
 		surfacePressure:     surfacePressure,
 		sealevelPressure:    sealevelPressure,
 		uvIndex:             uvIndex,
+		hourlyForecast:      hourlyForecast,
 	}
 }
 
@@ -219,6 +226,7 @@ func (f *BlockFactory) CreateFromGeneric(id, text string, createdAt time.Time, s
 	surfacePressure := getFloatFromMetadata(metadata, "surface_pressure", 0.0)
 	sealevelPressure := getFloatFromMetadata(metadata, "sealevel_pressure", 0.0)
 	uvIndex := getFloatFromMetadata(metadata, "uv_index", 0.0)
+	hourlyForecast := getSliceFromMetadata(metadata, "hourly_forecast")
 
 	return &WeatherBlock{
 		id:                  id,
@@ -242,6 +250,7 @@ func (f *BlockFactory) CreateFromGeneric(id, text string, createdAt time.Time, s
 		surfacePressure:     surfacePressure,
 		sealevelPressure:    sealevelPressure,
 		uvIndex:             uvIndex,
+		hourlyForecast:      hourlyForecast,
 	}
 }
 
@@ -255,6 +264,24 @@ func getStringFromMetadata(metadata map[string]interface{}, key, defaultValue st
 	return defaultValue
 }
 
+func getSliceFromMetadata(metadata map[string]interface{}, key string) []map[string]interface{} {
+	if value, exists := metadata[key]; exists {
+		if slice, ok := value.([]interface{}); ok {
+			result := make([]map[string]interface{}, 0, len(slice))
+			for _, item := range slice {
+				if m, ok := item.(map[string]interface{}); ok {
+					result = append(result, m)
+				}
+			}
+			return result
+		}
+		if slice, ok := value.([]map[string]interface{}); ok {
+			return slice
+		}
+	}
+	return []map[string]interface{}{}
+}
+
 func getFloatFromMetadata(metadata map[string]interface{}, key string, defaultValue float64) float64 {
 	if value, exists := metadata[key]; exists {
 		switch v := value.(type) {

pkg/datasources/openmeteo/datasource.go

@@ -64,6 +64,10 @@ type WeatherResult struct {
 		ApparentTemperature []float64 `json:"apparent_temperature"`
 		SurfacePressure     []float64 `json:"surface_pressure"`
 		PressureMSL         []float64 `json:"pressure_msl"`
+		Temperature         []float64 `json:"temperature_2m"`
+		WeatherCode         []int     `json:"weather_code"`
+		Precipitation       []float64 `json:"precipitation"`
+		PrecipitationProb   []int     `json:"precipitation_probability"`
 	} `json:"hourly"`
 }
 
@@ -125,6 +129,7 @@ func (d *Datasource) Schema() map[string]any {
 		"surface_pressure":     "REAL",
 		"sealevel_pressure":    "REAL",
 		"uv_index":             "REAL",
+		"hourly_forecast":      "TEXT",
 	}
 }
 
@@ -231,7 +236,8 @@ func (d *Datasource) fetchWeather(ctx context.Context, lat, lon float64) (*Weath
 	params.Add("latitude", fmt.Sprintf("%.4f", lat))
 	params.Add("longitude", fmt.Sprintf("%.4f", lon))
 	params.Add("current", "temperature_2m,wind_speed_10m,wind_direction_10m,weather_code")
-	params.Add("hourly", "relative_humidity_2m,apparent_temperature,surface_pressure,pressure_msl")
+	params.Add("hourly", "relative_humidity_2m,apparent_temperature,surface_pressure,pressure_msl,temperature_2m,weather_code,precipitation,precipitation_probability")
+	params.Add("forecast_days", "1")
 	params.Add("timezone", "auto")
 
 	reqURL := fmt.Sprintf("%s?%s", forecastURL, params.Encode())
@@ -338,6 +344,32 @@ func (d *Datasource) createWeatherBlock(
 		}
 	}
 
+	// Prepare hourly forecast data
+	hourlyForecast := make([]map[string]interface{}, 0)
+	maxHours := 24 // Only store today's forecast
+	for i := 0; i < maxHours && i < len(weather.Hourly.Time); i++ {
+		hourData := map[string]interface{}{
+			"time": weather.Hourly.Time[i],
+		}
+		if i < len(weather.Hourly.Temperature) {
+			hourData["temperature"] = weather.Hourly.Temperature[i]
+		}
+		if i < len(weather.Hourly.WeatherCode) {
+			hourData["weather_code"] = weather.Hourly.WeatherCode[i]
+			hourData["weather_description"] = translateWeatherCode(weather.Hourly.WeatherCode[i])
+		}
+		if i < len(weather.Hourly.Precipitation) {
+			hourData["precipitation"] = weather.Hourly.Precipitation[i]
+		}
+		if i < len(weather.Hourly.PrecipitationProb) {
+			hourData["precipitation_probability"] = weather.Hourly.PrecipitationProb[i]
+		}
+		if i < len(weather.Hourly.RelativeHumidity) {
+			hourData["humidity"] = weather.Hourly.RelativeHumidity[i]
+		}
+		hourlyForecast = append(hourlyForecast, hourData)
+	}
+
 	weatherDesc := translateWeatherCode(weather.Current.WeatherCode)
 
 	sourceName := d.instanceName
@@ -362,6 +394,7 @@ func (d *Datasource) createWeatherBlock(
 		surfacePressure,
 		sealevelPressure,
 		maxUVIndex,
+		hourlyForecast,
 		createdAt,
 		sourceName,
 	)

pkg/datasources/openmeteo/renderer/renderer.go

@@ -1,21 +1,20 @@
 package renderer
 
 import (
+	"bytes"
+	"context"
 	_ "embed"
 	"html/template"
-	"strings"
 
 	"github.com/rubiojr/ergs/pkg/core"
 	"github.com/rubiojr/ergs/pkg/render"
 )
 
-//go:embed template.html
-var weatherTemplate string
+//go:embed weather.css
+var weatherCSS string
 
-// WeatherRenderer renders weather data blocks
-type WeatherRenderer struct {
-	template *template.Template
-}
+// WeatherRenderer renders weather data blocks using templ
+type WeatherRenderer struct{}
 
 // init function automatically registers this renderer with the global registry
 func init() {
@@ -27,28 +26,23 @@ func init() {
 
 // NewWeatherRenderer creates a new weather renderer
 func NewWeatherRenderer() *WeatherRenderer {
-	tmpl, err := template.New("openmeteo").Funcs(render.GetTemplateFuncs()).Parse(weatherTemplate)
-	if err != nil {
-		return nil
-	}
-
-	return &WeatherRenderer{
-		template: tmpl,
-	}
+	return &WeatherRenderer{}
 }
 
-// Render creates an HTML representation of a weather block
+// Render creates an HTML representation of a weather block using templ
 func (r *WeatherRenderer) Render(block core.Block) template.HTML {
-	data := render.TemplateData{
-		Block:    block,
-		Metadata: block.Metadata(),
-		Links:    render.ExtractLinks(block.Text()),
-	}
+	var buf bytes.Buffer
+
+	// Inject CSS styles (only once per page load, ideally)
+	buf.WriteString("<style>")
+	buf.WriteString(weatherCSS)
+	buf.WriteString("</style>")
 
-	var buf strings.Builder
-	err := r.template.Execute(&buf, data)
+	// Use the templ component to render
+	component := WeatherBlock(block)
+	err := component.Render(context.Background(), &buf)
 	if err != nil {
-		return template.HTML("Error rendering weather template")
+		return template.HTML("Error rendering weather template: " + err.Error())
 	}
 
 	return template.HTML(buf.String())