Improve configuration reload

cmd/realtime/realtime.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/tphakala/birdnet-go/internal/analysis"
 	"github.com/tphakala/birdnet-go/internal/conf"
+	"github.com/tphakala/birdnet-go/internal/httpcontroller/handlers"
 )
 
 // RealtimeCommand creates a new command for real-time audio analysis.
@@ -17,7 +18,8 @@ func Command(settings *conf.Settings) *cobra.Command {
 		Short: "Analyze audio in realtime mode",
 		Long:  "Start analyzing incoming audio data in real-time looking for bird calls.",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return analysis.RealtimeAnalysis(settings)
+			notificationChan := make(chan handlers.Notification, 10)
+			return analysis.RealtimeAnalysis(settings, notificationChan)
 		},
 	}
 

internal/analysis/realtime.go

@@ -19,6 +19,7 @@ import (
 	"github.com/tphakala/birdnet-go/internal/datastore"
 	"github.com/tphakala/birdnet-go/internal/diskmanager"
 	"github.com/tphakala/birdnet-go/internal/httpcontroller"
+	"github.com/tphakala/birdnet-go/internal/httpcontroller/handlers"
 	"github.com/tphakala/birdnet-go/internal/myaudio"
 	"github.com/tphakala/birdnet-go/internal/telemetry"
 	"github.com/tphakala/birdnet-go/internal/weather"
@@ -28,7 +29,7 @@ import (
 var audioLevelChan = make(chan myaudio.AudioLevelData, 100)
 
 // RealtimeAnalysis initiates the BirdNET Analyzer in real-time mode and waits for a termination signal.
-func RealtimeAnalysis(settings *conf.Settings) error {
+func RealtimeAnalysis(settings *conf.Settings, notificationChan chan handlers.Notification) error {
 	// Initialize BirdNET interpreter
 	if err := initializeBirdNET(settings); err != nil {
 		return err
@@ -153,7 +154,7 @@ func RealtimeAnalysis(settings *conf.Settings) error {
 	startTelemetryEndpoint(&wg, settings, metrics, quitChan)
 
 	// start control monitor for hot reloads
-	startControlMonitor(&wg, controlChan, quitChan)
+	startControlMonitor(&wg, controlChan, quitChan, notificationChan)
 
 	// start quit signal monitor
 	monitorCtrlC(quitChan)
@@ -327,7 +328,7 @@ func initBirdImageCache(ds datastore.Interface, metrics *telemetry.Metrics) *ima
 }
 
 // startControlMonitor handles various control signals for realtime analysis mode
-func startControlMonitor(wg *sync.WaitGroup, controlChan chan string, quitChan chan struct{}) {
+func startControlMonitor(wg *sync.WaitGroup, controlChan chan string, quitChan chan struct{}, notificationChan chan handlers.Notification) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
@@ -338,8 +339,44 @@ func startControlMonitor(wg *sync.WaitGroup, controlChan chan string, quitChan c
 				case "rebuild_range_filter":
 					if err := birdnet.BuildRangeFilter(bn); err != nil {
 						log.Printf("\033[31m❌ Error handling range filter rebuild: %v\033[0m", err)
+						notificationChan <- handlers.Notification{
+							Message: fmt.Sprintf("Failed to rebuild range filter: %v", err),
+							Type:    "error",
+						}
 					} else {
 						log.Printf("\033[32m🔄 Range filter rebuilt successfully\033[0m")
+						notificationChan <- handlers.Notification{
+							Message: "Range filter rebuilt successfully",
+							Type:    "success",
+						}
+					}
+				case "reload_birdnet":
+					if err := bn.ReloadModel(); err != nil {
+						log.Printf("\033[31m❌ Error reloading BirdNET model: %v\033[0m", err)
+						notificationChan <- handlers.Notification{
+							Message: fmt.Sprintf("Failed to reload BirdNET model: %v", err),
+							Type:    "error",
+						}
+					} else {
+						log.Printf("\033[32m✅ BirdNET model reloaded successfully\033[0m")
+						notificationChan <- handlers.Notification{
+							Message: "BirdNET model reloaded successfully",
+							Type:    "success",
+						}
+						// Rebuild range filter after model reload
+						if err := birdnet.BuildRangeFilter(bn); err != nil {
+							log.Printf("\033[31m❌ Error rebuilding range filter after model reload: %v\033[0m", err)
+							notificationChan <- handlers.Notification{
+								Message: fmt.Sprintf("Failed to rebuild range filter: %v", err),
+								Type:    "error",
+							}
+						} else {
+							log.Printf("\033[32m✅ Range filter rebuilt successfully\033[0m")
+							notificationChan <- handlers.Notification{
+								Message: "Range filter rebuilt successfully",
+								Type:    "success",
+							}
+						}
 					}
 				default:
 					log.Printf("Received unknown control signal: %v", signal)

internal/birdnet/birdnet.go

@@ -12,7 +12,6 @@ import (
 	"runtime"
 	"strings"
 	"sync"
-	"time"
 
 	"github.com/tphakala/birdnet-go/internal/conf"
 	"github.com/tphakala/go-tflite"
@@ -45,7 +44,6 @@ type BirdNET struct {
 	AnalysisInterpreter *tflite.Interpreter
 	RangeInterpreter    *tflite.Interpreter
 	Settings            *conf.Settings
-	SpeciesListUpdated  time.Time // Timestamp for the last update of the species list.
 	mu                  sync.Mutex
 }
 
@@ -301,11 +299,105 @@ func (bn *BirdNET) loadModel() ([]byte, error) {
 	modelPath := bn.Settings.BirdNET.ModelPath
 	data, err := os.ReadFile(modelPath)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read custom model file: %w", err)
+		return nil, fmt.Errorf("failed to read model file: %w", err)
 	}
 	return data, nil
 }
 
+// validateModelAndLabels checks if the number of labels matches the model's output size
+func (bn *BirdNET) validateModelAndLabels() error {
+	// Get the output tensor to check its dimensions
+	outputTensor := bn.AnalysisInterpreter.GetOutputTensor(0)
+	if outputTensor == nil {
+		return fmt.Errorf("cannot get output tensor")
+	}
+
+	// Get the number of classes from the model's output tensor
+	modelOutputSize := outputTensor.Dim(outputTensor.NumDims() - 1)
+
+	// Compare with the number of labels
+	if len(bn.Settings.BirdNET.Labels) != modelOutputSize {
+		return fmt.Errorf("\033[31m❌ label count mismatch: model expects %d classes but label file has %d labels\033[0m",
+			modelOutputSize, len(bn.Settings.BirdNET.Labels))
+	}
+
+	bn.Debug("\033[32m✅ Model validation successful: %d labels match model output size\033[0m", modelOutputSize)
+	return nil
+}
+
+// ReloadModel safely reloads the BirdNET model and labels while handling ongoing analysis
+func (bn *BirdNET) ReloadModel() error {
+	bn.Debug("\033[33m🔒 Acquiring mutex for model reload\033[0m")
+	bn.mu.Lock()
+	defer bn.mu.Unlock()
+	bn.Debug("\033[32m✅ Acquired mutex for model reload\033[0m")
+
+	// Store old interpreters to clean up after successful reload
+	oldAnalysisInterpreter := bn.AnalysisInterpreter
+	oldRangeInterpreter := bn.RangeInterpreter
+
+	// Initialize new model
+	if err := bn.initializeModel(); err != nil {
+		return fmt.Errorf("\033[31m❌ failed to reload model: %w\033[0m", err)
+	}
+	bn.Debug("\033[32m✅ Model initialized successfully\033[0m")
+
+	// Initialize new meta model
+	if err := bn.initializeMetaModel(); err != nil {
+		// Clean up the newly created analysis interpreter if meta model fails
+		if bn.AnalysisInterpreter != nil {
+			bn.AnalysisInterpreter.Delete()
+		}
+		// Restore the old interpreters
+		bn.AnalysisInterpreter = oldAnalysisInterpreter
+		bn.RangeInterpreter = oldRangeInterpreter
+		return fmt.Errorf("\033[31m❌ failed to reload meta model: %w\033[0m", err)
+	}
+	bn.Debug("\033[32m✅ Meta model initialized successfully\033[0m")
+
+	// Reload labels
+	if err := bn.loadLabels(); err != nil {
+		// Clean up the newly created interpreters if label loading fails
+		if bn.AnalysisInterpreter != nil {
+			bn.AnalysisInterpreter.Delete()
+		}
+		if bn.RangeInterpreter != nil {
+			bn.RangeInterpreter.Delete()
+		}
+		// Restore the old interpreters
+		bn.AnalysisInterpreter = oldAnalysisInterpreter
+		bn.RangeInterpreter = oldRangeInterpreter
+		return fmt.Errorf("\033[31m❌ failed to reload labels: %w\033[0m", err)
+	}
+	bn.Debug("\033[32m✅ Labels loaded successfully\033[0m")
+
+	// Validate that the model and labels match
+	if err := bn.validateModelAndLabels(); err != nil {
+		// Clean up the newly created interpreters if validation fails
+		if bn.AnalysisInterpreter != nil {
+			bn.AnalysisInterpreter.Delete()
+		}
+		if bn.RangeInterpreter != nil {
+			bn.RangeInterpreter.Delete()
+		}
+		// Restore the old interpreters
+		bn.AnalysisInterpreter = oldAnalysisInterpreter
+		bn.RangeInterpreter = oldRangeInterpreter
+		return fmt.Errorf("\033[31m❌ model validation failed: %w\033[0m", err)
+	}
+
+	// Clean up old interpreters after successful reload
+	if oldAnalysisInterpreter != nil {
+		oldAnalysisInterpreter.Delete()
+	}
+	if oldRangeInterpreter != nil {
+		oldRangeInterpreter.Delete()
+	}
+
+	bn.Debug("\033[32m✅ Model reload completed successfully\033[0m")
+	return nil
+}
+
 // Debug prints debug messages if debug mode is enabled
 func (bn *BirdNET) Debug(format string, v ...interface{}) {
 	if bn.Settings.BirdNET.Debug {

internal/httpcontroller/handlers/handlers.go

@@ -30,6 +30,7 @@ type Handlers struct {
 	AudioLevelChan    chan myaudio.AudioLevelData // Channel for audio level updates
 	OAuth2Server      *security.OAuth2Server
 	controlChan       chan string
+	notificationChan  chan Notification
 }
 
 // HandlerError is a custom error type that includes an HTTP status code and a user-friendly message.
@@ -72,7 +73,7 @@ func (bh *baseHandler) logInfo(message string) {
 }
 
 // New creates a new Handlers instance with the given dependencies.
-func New(ds datastore.Interface, settings *conf.Settings, dashboardSettings *conf.Dashboard, birdImageCache *imageprovider.BirdImageCache, logger *log.Logger, sunCalc *suncalc.SunCalc, audioLevelChan chan myaudio.AudioLevelData, oauth2Server *security.OAuth2Server, controlChan chan string) *Handlers {
+func New(ds datastore.Interface, settings *conf.Settings, dashboardSettings *conf.Dashboard, birdImageCache *imageprovider.BirdImageCache, logger *log.Logger, sunCalc *suncalc.SunCalc, audioLevelChan chan myaudio.AudioLevelData, oauth2Server *security.OAuth2Server, controlChan chan string, notificationChan chan Notification) *Handlers {
 	if logger == nil {
 		logger = log.New(os.Stderr, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
 	}
@@ -91,6 +92,7 @@ func New(ds datastore.Interface, settings *conf.Settings, dashboardSettings *con
 		AudioLevelChan:    audioLevelChan,
 		OAuth2Server:      oauth2Server,
 		controlChan:       controlChan,
+		notificationChan:  notificationChan,
 	}
 }
 

internal/httpcontroller/handlers/settings.go

@@ -65,18 +65,30 @@ func (h *Handlers) SaveSettings(c echo.Context) error {
 		return h.NewHandlerError(err, "Error updating settings", http.StatusInternalServerError)
 	}
 
+	// Check if BirdNET settings have changed
+	if birdnetSettingsChanged(oldSettings, *settings) {
+		h.SSE.SendNotification(Notification{
+			Message: "Reloading BirdNET model...",
+			Type:    "info",
+		})
+
+		h.controlChan <- "reload_birdnet"
+	}
+
 	// Check if range filter related settings have changed
 	if rangeFilterSettingsChanged(oldSettings, *settings) {
-		//log.Println("Range filter settings changed, sending reload signal")
+		h.SSE.SendNotification(Notification{
+			Message: "Rebuilding range filter...",
+			Type:    "info",
+		})
 		h.controlChan <- "rebuild_range_filter"
 	}
 
 	// Check the authentication settings and update if needed
 	h.updateAuthenticationSettings(settings)
 
 	// Check if audio equalizer settings have changed
-	if equalizerSettingsChanged(settings.Realtime.Audio.Equalizer, settings.Realtime.Audio.Equalizer) {
-		//log.Println("Debug (SaveSettings): Equalizer settings changed, reloading audio filters")
+	if equalizerSettingsChanged(oldSettings.Realtime.Audio.Equalizer, settings.Realtime.Audio.Equalizer) {
 		if err := myaudio.UpdateFilterChain(settings); err != nil {
 			h.SSE.SendNotification(Notification{
 				Message: fmt.Sprintf("Error updating audio EQ filters: %v", err),
@@ -88,7 +100,6 @@ func (h *Handlers) SaveSettings(c echo.Context) error {
 
 	// Save settings to YAML file
 	if err := conf.SaveSettings(); err != nil {
-		// Send error notification if saving settings fails
 		h.SSE.SendNotification(Notification{
 			Message: fmt.Sprintf("Error saving settings: %v", err),
 			Type:    "error",
@@ -574,5 +585,44 @@ func rangeFilterSettingsChanged(oldSettings, currentSettings conf.Settings) bool
 		return true
 	}
 
+	// Check for changes in BirdNET range filter settings
+	if !reflect.DeepEqual(oldSettings.BirdNET.RangeFilter, currentSettings.BirdNET.RangeFilter) {
+		return true
+	}
+
+	// Check for changes in BirdNET latitude and longitude
+	if oldSettings.BirdNET.Latitude != currentSettings.BirdNET.Latitude || oldSettings.BirdNET.Longitude != currentSettings.BirdNET.Longitude {
+		return true
+	}
+
+	return false
+}
+
+func birdnetSettingsChanged(oldSettings, currentSettings conf.Settings) bool {
+	// Check for changes in BirdNET locale
+	if oldSettings.BirdNET.Locale != currentSettings.BirdNET.Locale {
+		return true
+	}
+
+	// Check for changes in BirdNET threads
+	if oldSettings.BirdNET.Threads != currentSettings.BirdNET.Threads {
+		return true
+	}
+
+	// Check for changes in BirdNET model path
+	if oldSettings.BirdNET.ModelPath != currentSettings.BirdNET.ModelPath {
+		return true
+	}
+
+	// Check for changes in BirdNET label path
+	if oldSettings.BirdNET.LabelPath != currentSettings.BirdNET.LabelPath {
+		return true
+	}
+
+	// Check for changes in BirdNET XNNPACK acceleration
+	if oldSettings.BirdNET.UseXNNPACK != currentSettings.BirdNET.UseXNNPACK {
+		return true
+	}
+
 	return false
 }

internal/httpcontroller/server.go

@@ -34,6 +34,7 @@ type Server struct {
 	SunCalc           *suncalc.SunCalc
 	AudioLevelChan    chan myaudio.AudioLevelData
 	controlChan       chan string
+	notificationChan  chan handlers.Notification
 
 	// Page and partial routes
 	pageRoutes    map[string]PageRouteConfig
@@ -54,6 +55,7 @@ func New(settings *conf.Settings, dataStore datastore.Interface, birdImageCache
 		OAuth2Server:      security.NewOAuth2Server(),
 		CloudflareAccess:  security.NewCloudflareAccess(),
 		controlChan:       controlChan,
+		notificationChan:  make(chan handlers.Notification, 10),
 	}
 
 	// Configure an IP extractor
@@ -63,7 +65,7 @@ func New(settings *conf.Settings, dataStore datastore.Interface, birdImageCache
 	s.SunCalc = suncalc.NewSunCalc(settings.BirdNET.Latitude, settings.BirdNET.Longitude)
 
 	// Initialize handlers
-	s.Handlers = handlers.New(s.DS, s.Settings, s.DashboardSettings, s.BirdImageCache, nil, s.SunCalc, s.AudioLevelChan, s.OAuth2Server, s.controlChan)
+	s.Handlers = handlers.New(s.DS, s.Settings, s.DashboardSettings, s.BirdImageCache, nil, s.SunCalc, s.AudioLevelChan, s.OAuth2Server, s.controlChan, s.notificationChan)
 
 	s.initializeServer()
 	return s