fix: pass backend image fallback tags via system state instead of env vars

Instead of setting environment variables in run.go (which InstallBackends
cannot access), pass the configuration through the SystemState struct.

Changes:
- Added BackendImagesReleaseTag, BackendImagesBranchTag, and
  BackendDevSuffix fields to the Backend struct in pkg/system/state.go
- Added WithBackendImagesReleaseTag, WithBackendImagesBranchTag, and
  WithBackendDevSuffix SystemStateOptions functions
- Modified run.go to pass these options via systemStateOpts slice
- Updated getFallbackTagValues in gallery/backends.go to accept
  systemState parameter and read values from it first, falling back
  to environment variables

This follows the reviewer's request to pass-by configuration to
InstallBackends instead of setting environment variables.

Author: localai-bot

core/cli/run.go

@@ -103,10 +103,14 @@ func (r *RunCMD) Run(ctx *cliContext.Context) error {
 	os.MkdirAll(r.BackendsPath, 0750)
 	os.MkdirAll(r.ModelsPath, 0750)
 
+	systemStateOpts := []system.SystemStateOptions{
+	}
+
 	systemState, err := system.GetSystemState(
 		system.WithBackendSystemPath(r.BackendsSystemPath),
 		system.WithModelPath(r.ModelsPath),
 		system.WithBackendPath(r.BackendsPath),
+		 systemStateOpts...,
 	)
 	if err != nil {
 		return err
@@ -272,31 +276,18 @@ func (r *RunCMD) Run(ctx *cliContext.Context) error {
 		opts = append(opts, config.WithOpenResponsesStoreTTL(dur))
 	}
 
-	// Configure backend image fallback tags
-	if r.BackendImagesReleaseTag != "" {
-		opts = append(opts, config.WithBackendImagesReleaseTag(r.BackendImagesReleaseTag))
-	}
-	if r.BackendImagesBranchTag != "" {
-		opts = append(opts, config.WithBackendImagesBranchTag(r.BackendImagesBranchTag))
-	}
-	if r.BackendDevSuffix != "" {
-		opts = append(opts, config.WithBackendDevSuffix(r.BackendDevSuffix))
-	}
 
-	// Set environment variables for backend image fallback tags
-	// These are read by gallery.InstallBackend when installing backends
+	// Pass backend image fallback tags via system state
 	if r.BackendImagesReleaseTag != "" {
-		os.Setenv("LOCALAI_BACKEND_IMAGES_RELEASE_TAG", r.BackendImagesReleaseTag)
+		systemStateOpts = append(systemStateOpts, system.WithBackendImagesReleaseTag(r.BackendImagesReleaseTag))
 	}
 	if r.BackendImagesBranchTag != "" {
-		os.Setenv("LOCALAI_BACKEND_IMAGES_BRANCH_TAG", r.BackendImagesBranchTag)
+		systemStateOpts = append(systemStateOpts, system.WithBackendImagesBranchTag(r.BackendImagesBranchTag))
 	}
 	if r.BackendDevSuffix != "" {
-		os.Setenv("LOCALAI_BACKEND_DEV_SUFFIX", r.BackendDevSuffix)
+		systemStateOpts = append(systemStateOpts, system.WithBackendDevSuffix(r.BackendDevSuffix))
 	}
 
-
-
 	// split ":" to get backend name and the uri
 	for _, v := range r.ExternalGRPCBackends {
 		backend := v[:strings.IndexByte(v, ':')]

core/gallery/backends.go

@@ -38,13 +38,30 @@ const (
 	envDevSuffix = "LOCALAI_BACKEND_DEV_SUFFIX"
 )
 
-// getFallbackTagValues returns the configurable fallback tag values from environment variables
-func getFallbackTagValues() (latestTag, masterTag, devSuffix string) {
-	latestTag = os.Getenv(envLatestTag)
-	masterTag = os.Getenv(envMasterTag)
-	devSuffix = os.Getenv(envDevSuffix)
 
-	// Use defaults if environment variables are not set
+// getFallbackTagValues returns the configurable fallback tag values from system state, falling back to environment variables
+func getFallbackTagValues(systemState *system.SystemState) (latestTag, masterTag, devSuffix string) {
+	// First try to get values from system state
+	if systemState != nil && systemState.Backend.BackendImagesReleaseTag != "" {
+		latestTag = systemState.Backend.BackendImagesReleaseTag
+	} else {
+		// Fallback to environment variables
+		latestTag = os.Getenv(envLatestTag)
+	}
+
+	if systemState != nil && systemState.Backend.BackendImagesBranchTag != "" {
+		masterTag = systemState.Backend.BackendImagesBranchTag
+	} else {
+		masterTag = os.Getenv(envMasterTag)
+	}
+
+	if systemState != nil && systemState.Backend.BackendDevSuffix != "" {
+		devSuffix = systemState.Backend.BackendDevSuffix
+	} else {
+		devSuffix = os.Getenv(envDevSuffix)
+	}
+
+	// Use defaults if values are not set
 	if latestTag == "" {
 		latestTag = defaultLatestTag
 	}
@@ -58,6 +75,8 @@ func getFallbackTagValues() (latestTag, masterTag, devSuffix string) {
 	return latestTag, masterTag, devSuffix
 }
 
+}
+
 // backendCandidate represents an installed concrete backend option for a given alias
 type backendCandidate struct {
 	name    string
@@ -172,8 +191,8 @@ func InstallBackendFromGallery(ctx context.Context, galleries []config.Gallery,
 }
 
 func InstallBackend(ctx context.Context, systemState *system.SystemState, modelLoader *model.ModelLoader, config *GalleryBackend, downloadStatus func(string, string, string, float64)) error {
-	// Get configurable fallback tag values from environment variables
-	latestTag, masterTag, devSuffix := getFallbackTagValues()
+	// Get configurable fallback tag values from system state, falling back to environment variables
+	latestTag, masterTag, devSuffix := getFallbackTagValues(systemState)
 
 	// Create base path if it doesn't exist
 	err := os.MkdirAll(systemState.Backend.BackendsPath, 0750)

pkg/system/state.go

@@ -6,8 +6,11 @@ import (
 )
 
 type Backend struct {
-	BackendsPath       string
-	BackendsSystemPath string
+	BackendsPath           string
+	BackendsSystemPath     string
+	BackendImagesReleaseTag string // Release tag for backend images
+	BackendImagesBranchTag  string // Branch tag for backend images
+	BackendDevSuffix        string // Development suffix for backend images
 }
 
 type Model struct {
@@ -43,6 +46,24 @@ func WithModelPath(path string) SystemStateOptions {
 	}
 }
 
+func WithBackendImagesReleaseTag(tag string) SystemStateOptions {
+	return func(s *SystemState) {
+		s.Backend.BackendImagesReleaseTag = tag
+	}
+}
+
+func WithBackendImagesBranchTag(tag string) SystemStateOptions {
+	return func(s *SystemState) {
+		s.Backend.BackendImagesBranchTag = tag
+	}
+}
+
+func WithBackendDevSuffix(suffix string) SystemStateOptions {
+	return func(s *SystemState) {
+		s.Backend.BackendDevSuffix = suffix
+	}
+}
+
 func GetSystemState(opts ...SystemStateOptions) (*SystemState, error) {
 	state := &SystemState{}
 	for _, opt := range opts {